shopping_mall 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c31f20bcc6bebef0f76579bc3f50ba5d928bc1f
-  data.tar.gz: 48d1d76291834d7ab8fbe02b453a98956f800bfb
+  metadata.gz: e0ad2598552cdb31ca7f85e6b31fa4b18a3d3b31
+  data.tar.gz: 72a0b2f17f213b8fa45032d2dea3e2db42f8def5
 SHA512:
-  metadata.gz: 32942545208ca96bbf3ed987fd4cfdd43497488838222f15287b628fa42e4fc5548a73386b3dc3f3fdc38fb81c7bf94064062359a6136173eb450815005d4d39
-  data.tar.gz: adddba58ba6137d73cff51a5c2dc110f22301dd9636cc5718fa38fdf5e8d22e2aa69005cb5406cd4561edd5adb5f9387692cbcab85271add378d4773e0cfb808
+  metadata.gz: 78714d6525a692a6fb6d639878144928cbcfe56ac1fbceebb8c3fc4c1e6371715b11fb3e6b741d102f5ba84972b526c6afc4e30b6cce3a74a29a84a1ad9302eb
+  data.tar.gz: 86aeab513d2a58c90128e4885ce5d47239aeceab3795da663852e2404badfad4fa6b96ef0fa8f8b8cd66f6b5f5dd1d3a16e30a04a9327760051d96a25798d13f

data/README.md

@@ -22,29 +22,21 @@ After installing ShoppingMall, run the generator:
 
     rails generate shopping_mall:install
 
-This will adds a `shopping_mall.rb` initializer to your app, and adds the following to your `application.rb`:
+This will adds a `shopping_mall.rb` initializer to your app, and adds the following to your production and development environment:
 
 ```ruby
-config.middleware.insert_before(
-  'ActiveRecord::ConnectionAdapters::ConnectionManagement',
-  'ShoppingMall::Escalator'
-)
+Rails.application.configure do |config|
+  ...
+  'config.cache_store = :memory_store, { namespace: -> { ShoppingMall::Store.current } }'
+  ...
+end
 ```
 
-> See [https://github.com/influitive/apartment/issues/134](https://github.com/influitive/apartment/issues/134) for more information on this insert_before hack.
+## Configuration
 
+Some sane defaults have been added for auto tracking of Tenants for migrations and seeds. `ShoppingMall.configure` is just a pass-thru so anything that is available to `Apartment` can be passed here
 
-## Config
-
-The following config options should be set up in the `shopping_mall.rb` initializer:
-
-#### Escalators
-
-Escalators are thinly wrapped Apartment::Elevators, the current escalators available are: `Subdomain`, `Domain`, and `FirstSubdomain`. The default escalator is `Subdomain`.
-
-```ruby
-config.escalator = 'Subdomain'
-```
+Check here: https://github.com/influitive/apartment for configuration options
 
 #### Excluding Models
 
@@ -54,30 +46,14 @@ If you have some models that should always access the `public` (global) tenant,
 config.excluded_models = ["Spree::User", ...] # these models will not be multi-tenanted, but remain in the global (public) namespace
 ```
 
-Out of the box ShoppingMall has the following Spree models excluded:
-
-```ruby
-[
-  'Spree::Country',
-  'Spree::Property',
-  'Spree::Prototype',
-  'Spree::Role',
-  'Spree::RolesUser',
-  'Spree::State',
-  'Spree::TaxRate',
-  'Spree::Tracker',
-  'Spree::User',
-  'Spree::Zone',
-  'Spree::ZoneMember'
-]
-```
+Out of the box ShoppingMall has the following Spree model excluded: `Spree::Tenant`
 
-> NOTE: Rails will always access the `public` tenant when accessing these models, but note that tables will be created in all schemas. This may not be ideal, but its done this way because otherwise rails wouldn't be able to properly generate the `schema.rb` file.
+> NOTE: Rails will always access the `public` tenant when accessing excluded models, but note that tables will be created in all schemas. This may not be ideal, but its done this way because otherwise rails wouldn't be able to properly generate the `schema.rb` file.
 
 
 ## Create Tenant (Rake Task)
 
-The tenant name will change depending on the escalator you are using. See the [Escalators](#escalators) section for more information.
+The tenant name will change depending on the elevator you are using. See the [Apartment Elevators](https://github.com/influitive/apartment#switching-tenants-per-request) section for more information.
 
     rake tenant:create['tenant_name_here']
 
@@ -85,7 +61,7 @@ If the tenant already exists, it will *not* be overwritten. It will need to be *
 
 #### Subdomain
 
-This escalator will use the entire subdomain, including nested subdomains. If your domain is `foo.example.com`, the rake task you would need to run is:
+This elevator will use the entire subdomain, including nested subdomains. If your domain is `foo.example.com`, the rake task you would need to run is:
 
     rake tenant:create['foo']
 

data/Rakefile

@@ -2,15 +2,15 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/extension_rake'
+require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
-task :default => [:spec]
+task default: :spec
 
 desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'shopping_mall'
   ENV['DB'] = 'postgres'
-  Rake::Task["extension:test_app"].invoke
+  Rake::Task['common:test_app'].invoke
 end

data/app/models/spree/image_decorator.rb

@@ -0,0 +1,10 @@
+module Spree
+  Image.class_eval do
+    cattr_accessor :tenant_proc, instance_writer: false, instance_reader: false
+    self.tenant_proc = -> { Apartment::Tenant.current }
+
+    def tenant
+      self.class.tenant_proc.call
+    end
+  end
+end

data/app/models/spree/preferences/scoped_store_decorator.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Preferences
+    ScopedStore.class_eval do
+      private
+
+      def rails_cache_id
+        "#{ENV['RAILS_CACHE_ID']}#{Apartment::Tenant.current}"
+      end
+    end
+  end
+end

data/app/models/spree/tenant.rb

@@ -0,0 +1,5 @@
+module Spree
+  class Tenant < ActiveRecord::Base
+    validates :name, uniqueness: true
+  end
+end

data/config/initializers/apartment.rb

@@ -0,0 +1,4 @@
+Apartment.configure do |config|
+  config.excluded_models = ['Spree::Tenant']
+  config.tenant_names = -> { Spree::Tenant.pluck(:name) }
+end

data/db/migrate/20150901171448_create_spree_tenants.rb

@@ -0,0 +1,11 @@
+class CreateSpreeTenants < ActiveRecord::Migration
+  def change
+    create_table :spree_tenants do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+
+    add_index :spree_tenants, :name
+  end
+end

data/lib/generators/shopping_mall/install_generator.rb

@@ -5,25 +5,6 @@ module ShoppingMall
 
       source_root File.expand_path('../../templates', __FILE__)
 
-      desc 'Creates initializer and inserts middleware'
-
-      def copy_initializer
-        template 'shopping_mall.rb', 'config/initializers/shopping_mall.rb'
-      end
-
-      def copy_middleware
-        application do
-          <<-STR
-
-    # Inserted with shopping_mall:install
-    config.middleware.insert_before(
-      'ActiveRecord::ConnectionAdapters::ConnectionManagement',
-      'ShoppingMall::Escalator'
-    )
-          STR
-        end
-      end
-
       def add_migrations
         run 'bundle exec rake railties:install:migrations FROM=shopping_mall'
       end
@@ -31,6 +12,19 @@ module ShoppingMall
       def run_migrations
         run 'bundle exec rake db:migrate'
       end
+
+      desc 'Creates initializer and inserts middleware'
+      def copy_initializer
+        template 'shopping_mall.rb', 'config/initializers/shopping_mall.rb'
+      end
+
+      def add_namespacing_to_cache
+        %w{development production}.each do |env|
+          application(nil, env: env) do
+            'config.cache_store = :memory_store, { namespace: -> { Apartment::Tenant.current } }'
+          end
+        end
+      end
     end
   end
 end

data/lib/generators/templates/shopping_mall.rb

@@ -1,22 +1,66 @@
 ShoppingMall.configure do |config|
-  # Available escalators %w[Subdomain Domain FirstSubdomain]
-  config.escalator = 'Subdomain'
-
-  # By default ShoppingMall excludes the following Spree models
-  # [
-  #   'Spree::Country',
-  #   'Spree::Property',
-  #   'Spree::Prototype',
-  #   'Spree::Role',
-  #   'Spree::RolesUser',
-  #   'Spree::State',
-  #   'Spree::TaxRate',
-  #   'Spree::Tracker',
-  #   'Spree::User',
-  #   'Spree::Zone',
-  #   'Spree::ZoneMember'
-  #  ]
-
-  # Feel free to exclude what you want!
-  # config.excluded_models = ['Spree::AwesomeModel']
+  # Add any models that you do not want to be multi-tenanted, but remain in the global (public) namespace.
+  # A typical example would be a Customer or Tenant model that stores each Tenant's information.
+  #
+  # config.excluded_models = %w{ Tenant }
+  #
+  config.excluded_models = [
+    'Spree::Tenant', # Shared to allow proper migrations and seeding to tenants
+  ]
+
+  # In order to migrate all of your Tenants you need to provide a list of Tenant names to Apartment.
+  # You can make this dynamic by providing a Proc object to be called on migrations.
+  # This object should yield an array of strings representing each Tenant name.
+  #
+  # config.tenant_names = lambda{ Customer.pluck(:tenant_name) }
+  # config.tenant_names = ['tenant1', 'tenant2']
+  #
+  # Currently setup to allow auto-magical seeds and migrations, feel free to change.
+  config.tenant_names = -> { Spree::Tenant.pluck(:name) }
+
+  #
+  # ==> PostgreSQL only options
+
+  # Specifies whether to use PostgreSQL schemas or create a new database per Tenant.
+  # The default behaviour is true.
+  #
+  # config.use_schemas = true
+
+  # Apartment can be forced to use raw SQL dumps instead of schema.rb for creating new schemas.
+  # Use this when you are using some extra features in PostgreSQL that can't be respresented in
+  # schema.rb, like materialized views etc. (only applies with use_schemas set to true).
+  # (Note: this option doesn't use db/structure.sql, it creates SQL dump by executing pg_dump)
+  #
+  # config.use_sql = false
+
+  # There are cases where you might want some schemas to always be in your search_path
+  # e.g when using a PostgreSQL extension like hstore.
+  # Any schemas added here will be available along with your selected Tenant.
+  #
+  # config.persistent_schemas = %w{ hstore }
+
+  # <== PostgreSQL only options
+  #
+
+  # By default, and only when not using PostgreSQL schemas, Apartment will prepend the environment
+  # to the tenant name to ensure there is no conflict between your environments.
+  # This is mainly for the benefit of your development and test environments.
+  # Uncomment the line below if you want to disable this behaviour in production.
+  #
+  # config.prepend_environment = !Rails.env.production?
+end
+
+# Allows Paperclip to place assets within a tenants scope
+Paperclip.interpolates :tenant do |attachment, _style|
+  attachment.instance.tenant
 end
+
+# Namespace attachments by tenant
+Spree::Image.attachment_definitions[:attachment][:url] = '/spree/products/:tenant/:id/:style/:basename.:extension'
+Spree::Image.attachment_definitions[:attachment][:path] = ':rails_root/public/spree/products/:tenant/:id/:style/:basename.:extension'
+
+# https://github.com/influitive/apartment/issues/134 for more information on this insert_before hack.
+Rails.application.config.middleware.insert_before(
+  'ActiveRecord::ConnectionAdapters::ConnectionManagement',
+  'Apartment::Elevators::Subdomain'
+)

data/lib/shopping_mall.rb

@@ -1,49 +1,15 @@
 require 'spree_core'
 require 'apartment'
+require 'apartment/elevators/generic'
 require 'apartment/elevators/domain'
 require 'apartment/elevators/first_subdomain'
 require 'apartment/elevators/subdomain'
 require 'shopping_mall/engine'
-require 'shopping_mall/escalator'
 
 module ShoppingMall
-  DEFAULT_SPREE_EXCLUSIONS = [
-    'Spree::Country',
-    'Spree::Property',
-    'Spree::Prototype',
-    'Spree::Role',
-    'Spree::RolesUser',
-    'Spree::State',
-    'Spree::TaxRate',
-    'Spree::Tracker',
-    'Spree::User',
-    'Spree::Zone',
-    'Spree::ZoneMember'
-  ]
-
-  ESCALATORS = %w(Domain FirstSubdomain Subdomain)
-
   def self.configure
-    yield self if block_given?
-  end
-
-  def self.excluded_models
-    Apartment.excluded_models
-  end
-
-  def self.excluded_models=(models)
-    Apartment.configure { |config| config.excluded_models = models }
-  end
-
-  def self.escalator
-    @escalator ||= 'Subdomain'
-  end
-
-  def self.escalator=(escalator)
-    @escalator = escalator
-  end
-
-  def self.escalator_class
-    "Apartment::Elevators::#{escalator}".constantize
+    Apartment.configure do |config|
+      yield config
+    end
   end
 end

data/lib/shopping_mall/engine.rb

@@ -8,6 +8,10 @@ module ShoppingMall
     config.generators { |gen| gen.test_framework :rspec }
 
     def self.activate
+      unless defined? Spree::Preferences::StoreInstance
+        Spree::Core::Engine.instance.eager_load!
+      end
+
       Dir[File.join(__dir__, '../../app/**/*_decorator*.rb')].each do |klass|
         Rails.application.config.cache_classes ? require(klass) : load(klass)
       end

data/lib/shopping_mall/version.rb

@@ -1,3 +1,3 @@
 module ShoppingMall
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/lib/tasks/tenant.rake

@@ -15,12 +15,13 @@ namespace :tenant do
       raise "Tenant `#{tenant}` already exists. Will not overwrite."
     end
 
-    Apartment::Tenant.create(tenant)
+    Spree::Tenant.create name: tenant
+    Apartment::Tenant.create tenant
 
-    puts 'Tenant created successfully'
+    puts 'Store created successfully'
     ENV['RAILS_CACHE_ID'] = tenant
 
-    Apartment::Tenant.process(tenant) do
+    Apartment::Tenant.switch(tenant) do
       # Hack the current method so we're able to return a gateway
       # without a RAILS_ENV
       Spree::Gateway.class_eval do
@@ -28,6 +29,8 @@ namespace :tenant do
           Spree::Gateway::Bogus.new
         end
       end
+
+      Rake::Task['db:seed'].invoke
     end
   end
 
@@ -44,7 +47,10 @@ namespace :tenant do
          data in the future unless backups are available. Are you sure you
          wish to continue? [Y/n]', true)
       begin
-        Apartment::Tenant.drop(args.tenant)
+        spree_tenant = Spree::Tenant.find_by name: tenant
+        spree_tenant.destroy if spree_tenant
+
+        Apartment::Tenant.drop(tenant)
         puts "Tenant `#{tenant}` has been dropped. It is no longer available."
       rescue => err
         raise err
@@ -56,10 +62,10 @@ namespace :tenant do
 
   # Check is schema is currently in use
   def schema_in_use?(tenant)
-    schema = ActiveRecord::Base.connection
-                               .execute("SELECT schema_name
-                                         FROM information_schema.schemata
-                                         WHERE schema_name = '#{tenant}'")
+    schema = ActiveRecord::Base.connection.
+      execute("SELECT schema_name
+               FROM information_schema.schemata
+               WHERE schema_name = '#{tenant}'")
     schema.ntuples > 0
   end
 end

data/spec/models/spree/image_decorator_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Spree::Image do
+  describe '.tenant_proc' do
+    it 'returns ShoppingMall::Store#current' do
+      expect(described_class.tenant_proc.call).to eq Apartment::Tenant.current
+    end
+  end
+
+  describe '#tenant' do
+    before do
+      %w(tenant1 tenant2).each do |name|
+        Apartment::Tenant.create name
+      end
+    end
+
+    context 'with different tenants' do
+      it 'returns ShoppingMall::Store#current' do
+        Apartment::Tenant.switch! 'tenant1'
+        expect(subject.tenant).to eq 'tenant1'
+
+        Apartment::Tenant.switch! 'tenant2'
+        expect(subject.tenant).to eq 'tenant2'
+      end
+    end
+  end
+
+  describe 'tenant directory within image path' do
+    before do
+      Apartment::Tenant.create 'tenant1'
+
+      Paperclip.interpolates :tenant do |attachment, _style|
+        attachment.instance.tenant
+      end
+      Spree::Image.attachment_definitions[:attachment][:url] =
+        '/spree/products/:tenant/:id/:style/:basename.:extension'
+      Spree::Image.attachment_definitions[:attachment][:path] =
+        ':rails_root/public/spree/products/:tenant/:id/:style/:basename.:extension'
+
+      Apartment::Tenant.switch! 'tenant1'
+    end
+
+    it 'uses current tenant' do
+      subject.attachment = Rack::Test::UploadedFile.new(
+        'spec/fixtures/test_cat.jpg'
+      )
+
+      expect(subject.attachment.url(:original)).
+        to start_with "/spree/products/tenant1//original/test_cat.jpg"
+    end
+  end
+end

data/spec/models/spree/preferences/scoped_store_decorator_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Spree::Preferences::ScopedStore do
+  before do
+    Apartment::Tenant.create('tenant_name1')
+  end
+
+  describe '#fetch' do
+    it 'appends current tenant to RAILS_CACHE_ID' do
+      ENV['RAILS_CACHE_ID'] = 'cache_id'
+      fake_instance = double('FakeStoreInstance', fetch: true)
+      allow(Spree::Preferences::Store).to receive(:instance) { fake_instance }
+
+      Apartment::Tenant.switch!('tenant_name1')
+
+      scoped_store = described_class.new('prefix')
+
+      scoped_store.fetch('neat')
+
+      expect(fake_instance).to have_received(:fetch).
+        with 'cache_idtenant_name1/prefix/neat'
+    end
+  end
+end

data/spec/models/spree/tenant_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Spree::Tenant do
+  it { is_expected.to validate_uniqueness_of(:name) }
+end

data/spec/models/spree/user_decorator_spec.rb

@@ -3,10 +3,6 @@ require 'spec_helper'
 describe Spree::User do
   it { should have_many(:roles).through(:roles_users) }
 
-  it 'is on default_schema' do
-    expect(Spree::User.table_name).to eq 'public.spree_users'
-  end
-
   context 'has_many through sanity check' do
     it 'associates correctly' do
       user = create :user, roles: [create(:role)]

data/spec/models/spree/zone_decorator_spec.rb

@@ -10,13 +10,10 @@ describe Spree::Zone do
     end
   end
 
-  context '#match' do
+  describe '#match' do
     let(:country_zone) { create(:zone, name: 'CountryZone') }
     let(:country) do
-      country = create(:country)
-      # Create at least one state for this country
-      state = create(:state, country: country)
-      country
+      create(:country, states: [create(:state)])
     end
 
     before { country_zone.members.create(zoneable: country) }

data/spec/shopping_mall/config_spec.rb

@@ -1,71 +1,11 @@
 require 'spec_helper'
 
 describe ShoppingMall do
-  let(:exclusions) { ['Spree::User'] }
-
   context '#configure' do
-    it 'has default excluded_models on initialize' do
-      expect(ShoppingMall.excluded_models).to eq(
-        ShoppingMall::DEFAULT_SPREE_EXCLUSIONS
-      )
-    end
-
-    it 'excluded_models is a pass-through to Apartment' do
-      ShoppingMall.excluded_models = exclusions
-      expect(Apartment.excluded_models).to eq exclusions
-    end
-
-    it 'has default escalator of `Subdomain` on initialize' do
-      expect(ShoppingMall.escalator).to eq 'Subdomain'
-    end
-
-    it 'has default escalator_class of `"Apartment::Elevators::Subdomain`' do
-      expect(ShoppingMall.escalator_class).to eq Apartment::Elevators::Subdomain
-    end
-
-    it 'sets values correctly' do
+    it 'is a pass-through to Apartment' do
       ShoppingMall.configure do |config|
-        config.excluded_models = exclusions
-        config.escalator       = 'Domain'
-      end
-
-      expect(ShoppingMall.excluded_models).to eq exclusions
-      expect(ShoppingMall.escalator).to eq 'Domain'
-      expect(ShoppingMall.escalator_class).to eq Apartment::Elevators::Domain
-    end
-  end
-
-  context '#excluded_models' do
-    it 'sets a custom value for `excluded_models`' do
-      ShoppingMall.excluded_models = exclusions
-      expect(ShoppingMall.excluded_models).to eq exclusions
-    end
-  end
-
-  context '#escalator' do
-    ShoppingMall::ESCALATORS.each do |escalator|
-      it "sets and returns `#{escalator}` as the escalator" do
-        ShoppingMall.escalator = escalator
-        expect(ShoppingMall.escalator).to eq escalator
-      end
-    end
-  end
-
-  context '#escalator_class' do
-    ShoppingMall::ESCALATORS.each do |escalator|
-      it "returns `#{escalator}` as the escalator_class" do
-        ShoppingMall.escalator = escalator
-        expect(ShoppingMall.escalator_class).to eq(
-          "Apartment::Elevators::#{escalator}".constantize
-        )
+        expect(config.to_s).to eq 'Apartment'
       end
     end
   end
-
-  after do
-    ShoppingMall.configure do |config|
-      config.escalator = 'Subdomain'
-      config.excluded_models = ShoppingMall::DEFAULT_SPREE_EXCLUSIONS
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopping_mall
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Vincent Franco
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: spree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -243,12 +243,14 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/models/spree/image_decorator.rb
 - app/models/spree/option_type_decorator.rb
 - app/models/spree/option_types_prototype.rb
 - app/models/spree/option_value_decorator.rb
 - app/models/spree/option_values_variant.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/orders_promotion.rb
+- app/models/spree/preferences/scoped_store_decorator.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/products_promotion_rule.rb
 - app/models/spree/promotion_decorator.rb
@@ -260,33 +262,36 @@ files:
 - app/models/spree/roles_user.rb
 - app/models/spree/shipping_method_decorator.rb
 - app/models/spree/shipping_methods_zone.rb
+- app/models/spree/tenant.rb
 - app/models/spree/user_decorator.rb
 - app/models/spree/variant_decorator.rb
 - app/models/spree/zone_decorator.rb
-- config/initializers/shopping_mall_initializer.rb
+- config/initializers/apartment.rb
 - db/migrate/20140611225105_hatbm_to_hmt.rb
+- db/migrate/20150901171448_create_spree_tenants.rb
 - lib/generators/shopping_mall/install_generator.rb
 - lib/generators/templates/shopping_mall.rb
 - lib/shopping_mall.rb
 - lib/shopping_mall/engine.rb
-- lib/shopping_mall/escalator.rb
 - lib/shopping_mall/version.rb
 - lib/tasks/tenant.rake
-- spec/features/tenancy_spec.rb
+- spec/fixtures/test_cat.jpg
+- spec/models/spree/image_decorator_spec.rb
 - spec/models/spree/option_type_decorator_spec.rb
 - spec/models/spree/option_value_decorator_spec.rb
 - spec/models/spree/order_decorator_spec.rb
+- spec/models/spree/preferences/scoped_store_decorator_spec.rb
 - spec/models/spree/product_decorator_spec.rb
 - spec/models/spree/promotion_decorator_spec.rb
 - spec/models/spree/property_decorator_spec.rb
 - spec/models/spree/prototype_decorator_spec.rb
 - spec/models/spree/role_decorator_spec.rb
 - spec/models/spree/shipping_method_decorator_spec.rb
+- spec/models/spree/tenant_spec.rb
 - spec/models/spree/user_decorator_spec.rb
 - spec/models/spree/variant_decorator_spec.rb
 - spec/models/spree/zone_decorator_spec.rb
 - spec/shopping_mall/config_spec.rb
-- spec/shopping_mall/escalator_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/groundctrl/shopping_mall
 licenses:
@@ -314,19 +319,21 @@ signing_key:
 specification_version: 4
 summary: Multi-tenancy for Spree 3.x.x
 test_files:
-- spec/features/tenancy_spec.rb
+- spec/fixtures/test_cat.jpg
+- spec/models/spree/image_decorator_spec.rb
 - spec/models/spree/option_type_decorator_spec.rb
 - spec/models/spree/option_value_decorator_spec.rb
 - spec/models/spree/order_decorator_spec.rb
+- spec/models/spree/preferences/scoped_store_decorator_spec.rb
 - spec/models/spree/product_decorator_spec.rb
 - spec/models/spree/promotion_decorator_spec.rb
 - spec/models/spree/property_decorator_spec.rb
 - spec/models/spree/prototype_decorator_spec.rb
 - spec/models/spree/role_decorator_spec.rb
 - spec/models/spree/shipping_method_decorator_spec.rb
+- spec/models/spree/tenant_spec.rb
 - spec/models/spree/user_decorator_spec.rb
 - spec/models/spree/variant_decorator_spec.rb
 - spec/models/spree/zone_decorator_spec.rb
 - spec/shopping_mall/config_spec.rb
-- spec/shopping_mall/escalator_spec.rb
 - spec/spec_helper.rb

data/config/initializers/shopping_mall_initializer.rb

@@ -1,3 +0,0 @@
-ShoppingMall.configure do |config|
-  config.excluded_models = ShoppingMall::DEFAULT_SPREE_EXCLUSIONS
-end

data/lib/shopping_mall/escalator.rb

@@ -1,20 +0,0 @@
-module ShoppingMall
-  class Escalator
-    attr_reader :app, :escalator
-
-    def initialize(app)
-      @app = app
-      @escalator = _escalator_factory app
-    end
-
-    def call(env)
-      escalator.call env
-    end
-
-    private
-
-    def _escalator_factory(app)
-      ShoppingMall.escalator_class.new app
-    end
-  end
-end

data/spec/features/tenancy_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-feature 'Tenancy', js: true do
-  context 'index' do
-    background do
-      visit 'http://tenant-name.example.dev:3000'
-    end
-
-    xscenario 'homepage' do
-      expect(page).to have_text 'welcome'
-      expect(response).to have_http_status(:ok)
-    end
-  end
-end

data/spec/shopping_mall/escalator_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe ShoppingMall::Escalator do
-  context 'delegation' do
-    %w[Subdomain Domain FirstSubdomain].each do |domain_type|
-      context "with config as #{domain_type}" do
-        it "sets delegator as Apartment::Elevator::#{domain_type}" do
-          ShoppingMall.configure { |config| config.escalator = domain_type }
-          test = ShoppingMall::Escalator.new double(foo: 'bar')
-          expect(test.escalator.class.to_s).to(
-            eq "Apartment::Elevators::#{domain_type}"
-          )
-        end
-      end
-    end
-
-    it '.call is passed to escalator' do
-      test = ShoppingMall::Escalator.new double(foo: 'bar')
-      env = Rack::MockRequest.env_for('foo')
-      expect(test.escalator).to receive(:call).with(env)
-      test.call env
-    end
-  end
-
-  after do
-    ShoppingMall.configure do |config|
-      config.escalator = 'Subdomain'
-      config.excluded_models = ShoppingMall::DEFAULT_SPREE_EXCLUSIONS
-    end
-  end
-end