diff --git a/app/controllers/admin/plans_controller.rb b/app/controllers/admin/plans_controller.rb index e97497b..1fbcfbf 100644 --- a/app/controllers/admin/plans_controller.rb +++ b/app/controllers/admin/plans_controller.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions module Admin class PlansController < ::Admin::AdminController - include DiscoursePatrons::Stripe + include DiscourseSubscriptions::Stripe before_action :set_api_key diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 4edea66..dc5217a 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions module Admin class ProductsController < ::Admin::AdminController - include DiscoursePatrons::Stripe + include DiscourseSubscriptions::Stripe before_action :set_api_key diff --git a/app/controllers/admin/subscriptions_controller.rb b/app/controllers/admin/subscriptions_controller.rb index fea0a02..e0ef450 100644 --- a/app/controllers/admin/subscriptions_controller.rb +++ b/app/controllers/admin/subscriptions_controller.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions module Admin class SubscriptionsController < ::Admin::AdminController - include DiscoursePatrons::Stripe - include DiscoursePatrons::Group + include DiscourseSubscriptions::Stripe + include DiscourseSubscriptions::Group before_action :set_api_key def index @@ -21,7 +21,7 @@ module DiscoursePatrons begin subscription = ::Stripe::Subscription.delete(params[:id]) - customer = DiscoursePatrons::Customer.find_by( + customer = DiscourseSubscriptions::Customer.find_by( product_id: subscription[:plan][:product], customer_id: subscription[:customer] ) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 1ad25aa..c0cdb2d 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions class AdminController < ::Admin::AdminController def index head 200 diff --git a/app/controllers/concerns/group.rb b/app/controllers/concerns/group.rb index 11bffbd..eb63453 100644 --- a/app/controllers/concerns/group.rb +++ b/app/controllers/concerns/group.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions module Group extend ActiveSupport::Concern diff --git a/app/controllers/concerns/stripe.rb b/app/controllers/concerns/stripe.rb index ce5d638..2b072ba 100644 --- a/app/controllers/concerns/stripe.rb +++ b/app/controllers/concerns/stripe.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions module Stripe extend ActiveSupport::Concern diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 60dfdd9..5c15020 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions class CustomersController < ::ApplicationController - include DiscoursePatrons::Stripe + include DiscourseSubscriptions::Stripe before_action :set_api_key @@ -13,7 +13,7 @@ module DiscoursePatrons source: params[:source] ) - DiscoursePatrons::Customer.create_customer( + DiscourseSubscriptions::Customer.create_customer( current_user, customer ) diff --git a/app/controllers/invoices_controller.rb b/app/controllers/invoices_controller.rb index bb223b8..94a035e 100644 --- a/app/controllers/invoices_controller.rb +++ b/app/controllers/invoices_controller.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions class InvoicesController < ::ApplicationController - include DiscoursePatrons::Stripe + include DiscourseSubscriptions::Stripe before_action :set_api_key requires_login @@ -29,7 +29,7 @@ module DiscoursePatrons end def find_customer - DiscoursePatrons::Customer.find_user(current_user) + DiscourseSubscriptions::Customer.find_user(current_user) end end end diff --git a/app/controllers/patrons_controller.rb b/app/controllers/patrons_controller.rb index 0d38440..33f3ebf 100644 --- a/app/controllers/patrons_controller.rb +++ b/app/controllers/patrons_controller.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions class PatronsController < ::ApplicationController - include DiscoursePatrons::Stripe + include DiscourseSubscriptions::Stripe skip_before_action :verify_authenticity_token, only: [:create] before_action :set_api_key diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index f7a8150..980a3e6 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions class PlansController < ::ApplicationController - include DiscoursePatrons::Stripe + include DiscourseSubscriptions::Stripe before_action :set_api_key diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 8e7cc44..393cd12 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions class ProductsController < ::ApplicationController - include DiscoursePatrons::Stripe + include DiscourseSubscriptions::Stripe before_action :set_api_key @@ -46,7 +46,7 @@ module DiscoursePatrons def current_user_products return [] if current_user.nil? - ::DiscoursePatrons::Customer + ::DiscourseSubscriptions::Customer .select(:product_id) .where(user_id: current_user.id) .map { |c| c.product_id }.compact diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb index 3dc51d3..fde6262 100644 --- a/app/controllers/subscriptions_controller.rb +++ b/app/controllers/subscriptions_controller.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions class SubscriptionsController < ::ApplicationController - include DiscoursePatrons::Stripe - include DiscoursePatrons::Group + include DiscourseSubscriptions::Stripe + include DiscourseSubscriptions::Group before_action :set_api_key requires_login @@ -41,7 +41,7 @@ module DiscoursePatrons group.add(current_user) end - DiscoursePatrons::Customer.create( + DiscourseSubscriptions::Customer.create( user_id: current_user.id, customer_id: params[:customer], product_id: plan[:product] diff --git a/app/controllers/user/subscriptions_controller.rb b/app/controllers/user/subscriptions_controller.rb index cb90a2b..6d42c32 100644 --- a/app/controllers/user/subscriptions_controller.rb +++ b/app/controllers/user/subscriptions_controller.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions module User class SubscriptionsController < ::ApplicationController - include DiscoursePatrons::Stripe - include DiscoursePatrons::Group + include DiscourseSubscriptions::Stripe + include DiscourseSubscriptions::Group before_action :set_api_key requires_login diff --git a/app/models/customer.rb b/app/models/customer.rb index 9228d46..2d4b7df 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module DiscoursePatrons +module DiscourseSubscriptions class Customer < ActiveRecord::Base self.table_name = "discourse_subscriptions_customers" diff --git a/config/routes.rb b/config/routes.rb index 760bb23..1124db6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -DiscoursePatrons::Engine.routes.draw do +DiscourseSubscriptions::Engine.routes.draw do # TODO: namespace this scope 'admin' do get '/' => 'admin#index' diff --git a/lib/discourse_subscriptions/engine.rb b/lib/discourse_subscriptions/engine.rb index 22d53fb..d1d3baf 100644 --- a/lib/discourse_subscriptions/engine.rb +++ b/lib/discourse_subscriptions/engine.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -module ::DiscoursePatrons +module ::DiscourseSubscriptions class Engine < ::Rails::Engine - engine_name 'discourse-patrons' - isolate_namespace DiscoursePatrons + engine_name 'discourse-subscriptions' + isolate_namespace DiscourseSubscriptions end end diff --git a/plugin.rb b/plugin.rb index 35c6197..d90fc90 100644 --- a/plugin.rb +++ b/plugin.rb @@ -69,6 +69,6 @@ after_initialize do ].each { |path| require File.expand_path(path, __FILE__) } Discourse::Application.routes.append do - mount ::DiscoursePatrons::Engine, at: 's' + mount ::DiscourseSubscriptions::Engine, at: 's' end end diff --git a/spec/controllers/discourse_patrons/patrons_controller_spec.rb b/spec/controllers/discourse_patrons/patrons_controller_spec.rb index a1e734c..e8d9b24 100644 --- a/spec/controllers/discourse_patrons/patrons_controller_spec.rb +++ b/spec/controllers/discourse_patrons/patrons_controller_spec.rb @@ -2,9 +2,9 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe PatronsController, type: :controller do - routes { DiscoursePatrons::Engine.routes } + routes { DiscourseSubscriptions::Engine.routes } describe 'index' do it 'responds ok' do diff --git a/spec/fabricators/customer_fabricator.rb b/spec/fabricators/customer_fabricator.rb index 329af38..c3f9174 100644 --- a/spec/fabricators/customer_fabricator.rb +++ b/spec/fabricators/customer_fabricator.rb @@ -1,3 +1,3 @@ # frozen_string_literal: true -Fabricator(:customer, from: "DiscoursePatrons::Customer") +Fabricator(:customer, from: "DiscourseSubscriptions::Customer") diff --git a/spec/models/customer_spec.rb b/spec/models/customer_spec.rb index c27c6f5..f5afc40 100644 --- a/spec/models/customer_spec.rb +++ b/spec/models/customer_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe Customer do let(:user) { Fabricate(:user) } let(:stripe_customer) { { id: 'cus_id4567' } } diff --git a/spec/requests/admin/plans_controller_spec.rb b/spec/requests/admin/plans_controller_spec.rb index 0329a28..19d6873 100644 --- a/spec/requests/admin/plans_controller_spec.rb +++ b/spec/requests/admin/plans_controller_spec.rb @@ -2,11 +2,11 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions module Admin RSpec.describe PlansController do it 'is a subclass of AdminController' do - expect(DiscoursePatrons::Admin::PlansController < ::Admin::AdminController).to eq(true) + expect(DiscourseSubscriptions::Admin::PlansController < ::Admin::AdminController).to eq(true) end context 'not authenticated' do diff --git a/spec/requests/admin/products_controller_spec.rb b/spec/requests/admin/products_controller_spec.rb index a7cbfc9..d59e726 100644 --- a/spec/requests/admin/products_controller_spec.rb +++ b/spec/requests/admin/products_controller_spec.rb @@ -2,11 +2,11 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions module Admin RSpec.describe ProductsController do it 'is a subclass of AdminController' do - expect(DiscoursePatrons::Admin::ProductsController < ::Admin::AdminController).to eq(true) + expect(DiscourseSubscriptions::Admin::ProductsController < ::Admin::AdminController).to eq(true) end context 'unauthenticated' do diff --git a/spec/requests/admin/subscriptions_controller_spec.rb b/spec/requests/admin/subscriptions_controller_spec.rb index f58b4d7..65e8af7 100644 --- a/spec/requests/admin/subscriptions_controller_spec.rb +++ b/spec/requests/admin/subscriptions_controller_spec.rb @@ -2,10 +2,10 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe Admin::SubscriptionsController do it 'is a subclass of AdminController' do - expect(DiscoursePatrons::Admin::SubscriptionsController < ::Admin::AdminController).to eq(true) + expect(DiscourseSubscriptions::Admin::SubscriptionsController < ::Admin::AdminController).to eq(true) end context 'unauthenticated' do @@ -39,7 +39,7 @@ module DiscoursePatrons let(:group) { Fabricate(:group, name: 'subscribers') } before do - DiscoursePatrons::Customer.create( + DiscourseSubscriptions::Customer.create( user_id: user.id, customer_id: 'c_123', product_id: 'pr_34578' @@ -59,7 +59,7 @@ module DiscoursePatrons expect { delete "/s/admin/subscriptions/sub_12345.json" - }.to change { DiscoursePatrons::Customer.count }.by(-1) + }.to change { DiscourseSubscriptions::Customer.count }.by(-1) end it "removes the user from the group" do diff --git a/spec/requests/admin_controller_spec.rb b/spec/requests/admin_controller_spec.rb index 159de01..647b60e 100644 --- a/spec/requests/admin_controller_spec.rb +++ b/spec/requests/admin_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe AdminController do let(:admin) { Fabricate(:admin) } @@ -10,7 +10,7 @@ module DiscoursePatrons before { sign_in(admin) } it 'is a subclass of AdminController' do - expect(DiscoursePatrons::AdminController < ::Admin::AdminController).to eq(true) + expect(DiscourseSubscriptions::AdminController < ::Admin::AdminController).to eq(true) end it "is ok" do diff --git a/spec/requests/customers_controller_spec.rb b/spec/requests/customers_controller_spec.rb index 77d39ff..84e563e 100644 --- a/spec/requests/customers_controller_spec.rb +++ b/spec/requests/customers_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe CustomersController do describe "create" do describe "authenticated" do @@ -26,7 +26,7 @@ module DiscoursePatrons expect { post "/s/customers.json", params: { source: 'tok_interesting' } - }.to change { DiscoursePatrons::Customer.count } + }.to change { DiscourseSubscriptions::Customer.count } end end end diff --git a/spec/requests/invoices_controller_spec.rb b/spec/requests/invoices_controller_spec.rb index 7863ad5..054c56f 100644 --- a/spec/requests/invoices_controller_spec.rb +++ b/spec/requests/invoices_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe InvoicesController do describe "index" do describe "not authenticated" do @@ -39,7 +39,7 @@ module DiscoursePatrons context "stripe customer exists" do before do - DiscoursePatrons::Customer.create_customer(user, stripe_customer) + DiscourseSubscriptions::Customer.create_customer(user, stripe_customer) end it "lists the invoices" do diff --git a/spec/requests/plans_controller_spec.rb b/spec/requests/plans_controller_spec.rb index 12dc7d4..790a2c5 100644 --- a/spec/requests/plans_controller_spec.rb +++ b/spec/requests/plans_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe PlansController do describe "index" do it "lists the active plans" do diff --git a/spec/requests/products_controller_spec.rb b/spec/requests/products_controller_spec.rb index 4705ef0..1a0869a 100644 --- a/spec/requests/products_controller_spec.rb +++ b/spec/requests/products_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe ProductsController do describe "products" do let(:product) do @@ -53,7 +53,7 @@ module DiscoursePatrons end it "is subscribed" do - ::DiscoursePatrons::Customer.create(product_id: product[:id], user_id: user.id, customer_id: 'x') + ::DiscourseSubscriptions::Customer.create(product_id: product[:id], user_id: user.id, customer_id: 'x') ::Stripe::Product.expects(:list).with(active: true).returns(data: [product]) get "/s/products.json" @@ -62,7 +62,7 @@ module DiscoursePatrons end it "is not subscribed" do - ::DiscoursePatrons::Customer.delete_all + ::DiscourseSubscriptions::Customer.delete_all ::Stripe::Product.expects(:list).with(active: true).returns(data: [product]) get "/s/products.json" diff --git a/spec/requests/subscriptions_controller_spec.rb b/spec/requests/subscriptions_controller_spec.rb index ede90a5..9b77dca 100644 --- a/spec/requests/subscriptions_controller_spec.rb +++ b/spec/requests/subscriptions_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe SubscriptionsController do context "not authenticated" do it "does not create a subscription" do @@ -34,7 +34,7 @@ module DiscoursePatrons expect { post "/s/subscriptions.json", params: { plan: 'plan_1234', customer: 'cus_1234' } - }.to change { DiscoursePatrons::Customer.count } + }.to change { DiscourseSubscriptions::Customer.count } end it "creates a customer model" do @@ -43,7 +43,7 @@ module DiscoursePatrons expect { post "/s/subscriptions.json", params: { plan: 'plan_1234', customer: 'cus_1234' } - }.to change { DiscoursePatrons::Customer.count } + }.to change { DiscourseSubscriptions::Customer.count } end end diff --git a/spec/requests/user/subscriptions_controller_spec.rb b/spec/requests/user/subscriptions_controller_spec.rb index 2790be2..fcabc6d 100644 --- a/spec/requests/user/subscriptions_controller_spec.rb +++ b/spec/requests/user/subscriptions_controller_spec.rb @@ -2,10 +2,10 @@ require 'rails_helper' -module DiscoursePatrons +module DiscourseSubscriptions RSpec.describe User::SubscriptionsController do it 'is a subclass of ApplicationController' do - expect(DiscoursePatrons::User::SubscriptionsController < ::ApplicationController).to eq(true) + expect(DiscourseSubscriptions::User::SubscriptionsController < ::ApplicationController).to eq(true) end context "not authenticated" do @@ -106,7 +106,7 @@ module DiscoursePatrons expect { delete "/s/user/subscriptions/sub_12345.json" - }.not_to change { DiscoursePatrons::Customer.count } + }.not_to change { DiscourseSubscriptions::Customer.count } expect(response.status).to eq 422 end @@ -126,7 +126,7 @@ module DiscoursePatrons expect { delete "/s/user/subscriptions/sub_12345.json" - }.not_to change { DiscoursePatrons::Customer.count } + }.not_to change { DiscourseSubscriptions::Customer.count } expect(response.status).to eq 422 end @@ -180,7 +180,7 @@ module DiscoursePatrons expect { delete "/s/user/subscriptions/sub_12345.json" - }.to change { DiscoursePatrons::Customer.count }.by(-1) + }.to change { DiscourseSubscriptions::Customer.count }.by(-1) expect(response.status).to eq 200 end @@ -200,7 +200,7 @@ module DiscoursePatrons expect { delete "/s/user/subscriptions/sub_12345.json" - }.to change { DiscoursePatrons::Customer.count }.by(-1) + }.to change { DiscourseSubscriptions::Customer.count }.by(-1) expect(response.status).to eq 200 end @@ -220,7 +220,7 @@ module DiscoursePatrons expect { delete "/s/user/subscriptions/sub_12345.json" - }.to change { DiscoursePatrons::Customer.count }.by(-1) + }.to change { DiscourseSubscriptions::Customer.count }.by(-1) expect(response.status).to eq 200 end