rails_multitenant 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4332139531ab7372309d2b3452fdc0d19ebee747
-  data.tar.gz: ea6ec3f22079f4f7ba1049bae89e863c41372d18
+  metadata.gz: 77e1e600d2a712b57994c01909b43921dfbab522
+  data.tar.gz: c8ce8ec444923042f9035984bc6247a10f15a0f1
 SHA512:
-  metadata.gz: aaca7f0b01574daef246942acffbc94a36a00b3369d1e7b27f2899b4ed051d3a8a3c750656eefa64a3407a173b8f977cc69db637f28817599c795935f885e34d
-  data.tar.gz: 7adfb31a0b8a54e5e020a169c3410d8d8a0f3aae1cd5f393769dde2699bbf77ce1e4f105670365765973f89c7c7d7040e962991af607f5bfaa69a78300a4354c
+  metadata.gz: aa5c9360a04697ff2d7732f7d80cc11fa0696cfc5a40ff12b769ce92227dc15a2c2c3451a719c0c1dc55ad2a35dc63179587ab35e8c3901a835a04f1d756c49b
+  data.tar.gz: 7462b3c8d160c56516e5a17d07f17bf6baaaa29c26766d583faff24cef4289b9fddd20a0e5ba393329ac8004079bc23bf3c5892e5b8dd275e025e9ee549511c6

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 0.7.2
+* Fix bug that prevents clearing dependents of classes derived from CurrentInstance.  
+
 ### 0.7.1
 * Added as_current multi-tenant class method.
 

data/lib/rails_multitenant/global_context_registry.rb

@@ -107,7 +107,8 @@ module RailsMultitenant
         private
 
         def __clear_dependents!
-          GlobalContextRegistry.send(:dependencies_for, self).each(&:clear_current!)
+          key_class = respond_to?(:base_class) ? base_class : self
+          GlobalContextRegistry.send(:dependencies_for, key_class).each(&:clear_current!)
         end
 
         def current_instance_registry_id

data/lib/rails_multitenant/version.rb

@@ -1,3 +1,3 @@
 module RailsMultitenant
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/spec/current_spec.rb.dis

@@ -0,0 +1,80 @@
+# Create multiple orgs
+# Create an item in each
+# Make sure you can only see one org's item in one org
+
+describe RailsMultitenant::GlobalContextRegistry::Current do
+
+  class Parent
+    include RailsMultitenant::GlobalContextRegistry::Current
+
+    attr_accessor :id
+
+    def initialize(id: 0)
+      @id = id
+    end
+  end
+
+  class Dependent
+    include RailsMultitenant::GlobalContextRegistry::Current
+    global_context_dependent_on Parent
+  end
+
+  class StepParent < Parent
+  end
+
+  it 'current' do
+    expect(Parent.current.id).to eq(0)
+    expect(Parent.current).to eq(Parent.current)
+  end
+
+  it 'current=' do
+    Parent.current = Parent.new(id: 42)
+    expect(Parent.current.id).to eq(42)
+  end
+
+
+  it 'clear_current!' do
+    Parent.clear_current!
+    expect(Parent.current.id).to eq(0)
+  end
+
+  it 'current?' do
+    Parent.clear_current!
+    expect(Parent.current?).to be_falsey
+    Parent.current = Parent.new(id: 42)
+    expect(Parent.current?).to be_truthy
+  end
+
+  context 'with dependencies' do
+    it 'dependent is cleared' do
+      Parent.current = Parent.new(id: 78)
+      Dependent.current = Dependent.new
+      Parent.current = Parent.new(id: 78)
+      expect(Dependent.current?).to be_falsey
+    end
+
+    it 'dependent subclass is cleared' do
+      Parent.current = Parent.new(id: 78)
+      Dependent.current = Dependent.new
+      Parent.current = StepParent.new(id: 78)
+      expect(Dependent.current?).to be_falsey
+    end
+
+
+    #let(dependent_id) { Organization.current.id }
+
+    it 'dependent model subclass is cleared' do
+      #Organization.current = Organization.create!
+      DependsOnOrganization.current = DependsOnOrganization.create!
+      dependent_id = DependsOnOrganization.current.object_id
+      SubOrganization.current = SubOrganization.create!
+      expect(DependsOnOrganization.current.object_id).not_to eq(dependent_id)
+
+
+
+
+
+    end
+  end
+
+end

data/spec/db/schema.rb

@@ -4,6 +4,8 @@ ActiveRecord::Schema.define(version: 0) do
 
   create_table(:organizations, force: true)
 
+  create_table(:dependent_models, force: true)
+
   create_table(:items, force: true) do |t|
     t.integer :organization_id
     t.string :type
@@ -27,6 +29,11 @@ class Organization < ActiveRecord::Base
   include RailsMultitenant::GlobalContextRegistry::CurrentInstance
 end
 
+class DependentModel < ActiveRecord::Base
+  include RailsMultitenant::GlobalContextRegistry::CurrentInstance
+  global_context_dependent_on Organization
+end
+
 class Item < ActiveRecord::Base
   include RailsMultitenant::MultitenantModel
   multitenant_on_model :organization

data/spec/item_spec.rb

@@ -30,6 +30,15 @@ describe Item do
     end
   end
 
+  class DependentClass
+    include RailsMultitenant::GlobalContextRegistry::Current
+    global_context_dependent_on Organization
+  end
+
+  class SubOrganization < Organization
+
+  end
+
   describe '.as_current' do
     it 'returns the correct items with an org supplied' do
       Organization.as_current(org2) do
@@ -47,6 +56,23 @@ describe Item do
       model = Item.new
       expect { Organization.as_current(model) {}}.to raise_error("#{model} is not a Organization")
     end
+
+    it 'invalidates dependent models' do
+      DependentModel.current = DependentModel.create!
+      dependent = DependentModel.current
+
+      SubOrganization.create!.as_current do
+        expect(DependentModel.current).not_to equal(dependent)
+      end
+    end
+
+    it 'invalidates dependent objects' do
+      dependent = DependentClass.current
+
+      SubOrganization.create!.as_current do
+        expect(DependentClass.current).not_to equal(dependent)
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Pat Breault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,6 +176,7 @@ files:
 - lib/rails_multitenant/version.rb
 - rails_multitenant.gemspec
 - spec/be_multitenant_on_matcher_spec.rb
+- spec/current_spec.rb.dis
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/external_item_spec.rb
@@ -211,14 +212,15 @@ signing_key:
 specification_version: 4
 summary: Automatically configures multiple tenants in a Rails environment
 test_files:
-- spec/be_multitenant_on_matcher_spec.rb
-- spec/db/database.yml
-- spec/db/schema.rb
-- spec/external_item_spec.rb
-- spec/external_item_with_optional_org_spec.rb
+- spec/spec_helper.rb
 - spec/global_context_registry_spec.rb
-- spec/item_spec.rb
+- spec/external_item_spec.rb
 - spec/item_subtype_spec.rb
+- spec/current_spec.rb.dis
+- spec/item_spec.rb
+- spec/external_item_with_optional_org_spec.rb
+- spec/db/schema.rb
+- spec/db/database.yml
+- spec/be_multitenant_on_matcher_spec.rb
 - spec/item_with_optional_org_spec.rb
 - spec/middleware_isolated_context_registry_spec.rb
-- spec/spec_helper.rb