mongoid-multitenancy 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-multitenancy (0.3.2)
+    mongoid-multitenancy (0.3.3)
       mongoid (~> 3)
 
 GEM

data/lib/mongoid/multitenancy/document.rb

@@ -7,6 +7,7 @@ module Mongoid
         attr_accessor :tenant_field
 
         def tenant(association = :account, options={})
+          original_options = options.clone
           tenant_options = { optional: options.delete(:optional), immutable: options.delete(:immutable) { true } }
           # Setup the association between the class and the tenant class
           # TODO: should index this association if no other indexes are defined => , index: true
@@ -40,6 +41,11 @@ module Mongoid
               where(nil)
             end
           }
+
+          self.define_singleton_method(:inherited) do |child|
+            child.tenant association, original_options
+            super(child)
+          end
         end
 
         # Redefine 'validates_with' to add the tenant scope when using a UniquenessValidator

data/lib/mongoid/multitenancy/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Multitenancy
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/spec/inheritance_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'Inheritance' do
+
+  let(:client) { Account.create!(:name => "client") }
+
+  describe "class" do
+    before do
+      Mongoid::Multitenancy.current_tenant = client
+      MutableChild.create :title => "title X", :slug => "page-x"
+    end
+    after { Mongoid::Multitenancy.current_tenant = nil }
+
+    it 'should be valid' do
+      expect(Mutable.last).to be_a MutableChild
+    end
+  end
+end

data/spec/models/mutable_child.rb

@@ -0,0 +1,5 @@
+require 'models/mutable'
+
+class MutableChild < Mutable
+
+end

data/spec/mutable_child_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe MutableChild do
+
+  let(:client) { Account.create!(:name => "client") }
+  let(:another_client) { Account.create!(:name => "another client") }
+
+  describe "#valid?" do
+    before { Mongoid::Multitenancy.current_tenant = client; }
+    after { Mongoid::Multitenancy.current_tenant = nil }
+
+    let(:item) { MutableChild.new(:title => "title X", :slug => "page-x") }
+
+    it_behaves_like "a tenant validator"
+
+    context "when the tenant has not changed" do
+      before { item.save! }
+      it 'should be valid' do
+        item.title = "title X (2)"
+        item.should be_valid
+      end
+    end
+
+    context "when the tenant has changed" do
+      before { item.save!; Mongoid::Multitenancy.current_tenant = another_client }
+      it 'should be valid' do
+        item.client = another_client
+        item.should be_valid
+      end
+    end
+  end
+
+end

metadata

@@ -1,113 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: mongoid
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
-  type: :runtime
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rake
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: yard
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: mongoid-rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: database_cleaner
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: redcarpet
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
+    none: false
 description: MultiTenancy with Mongoid
 email:
 - aymeric.brisse@mperfect-memory.com
@@ -129,19 +144,21 @@ files:
 - lib/mongoid/validators/tenant_validator.rb
 - mongoid-multitenancy.gemspec
 - spec/immutable_spec.rb
+- spec/inheritance_spec.rb
 - spec/mandatory_spec.rb
 - spec/models/account.rb
 - spec/models/immutable.rb
 - spec/models/mandatory.rb
 - spec/models/mutable.rb
+- spec/models/mutable_child.rb
 - spec/models/optional.rb
 - spec/mongoid-multitenancy_spec.rb
+- spec/mutable_child_spec.rb
 - spec/mutable_spec.rb
 - spec/optional_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/PerfectMemory/mongoid-multitenancy
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -150,27 +167,38 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 3855106664827069335
       version: '0'
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 3855106664827069335
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Support of a multi-tenant database with Mongoid
 test_files:
 - spec/immutable_spec.rb
+- spec/inheritance_spec.rb
 - spec/mandatory_spec.rb
 - spec/models/account.rb
 - spec/models/immutable.rb
 - spec/models/mandatory.rb
 - spec/models/mutable.rb
+- spec/models/mutable_child.rb
 - spec/models/optional.rb
 - spec/mongoid-multitenancy_spec.rb
+- spec/mutable_child_spec.rb
 - spec/mutable_spec.rb
 - spec/optional_spec.rb
 - spec/spec_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWQ3NzVkNzFkZGVlMDc3Y2Y5NTc1ZjI0MDhkNjA0YWRhNDIxMzMzNA==
-  data.tar.gz: !binary |-
-    ZDMzNmQyMmFmZmEyYTYwYWM5ZjA3NGI0NzkxOGI1MGIxYTU0NGM2OA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjJkOGZlZDVkODlhODE3ZWUwYzM2NjliZmRhNjRhMDYxYWI3NWJiZDE5YWU3
-    YWQ3ODg1OWUwNzRmYTg2OWMyMDA2OTY2MmNlZGE1Y2JkNWExNTM1NjI4YTc0
-    NWYwZGE3MmE2OGYxMzNhZWNkMjI2YzE0ZmE2NGMyNzAzMmZiYTg=
-  data.tar.gz: !binary |-
-    YTBlZjk0OGFmM2Q4YjZhYjYyNjc3MTY0MmNiYTBjZjgxODNjM2Y3ZDA1NzMx
-    YmQ4MDkxOGU4MTgyMWM5ZWRiYThkMTUxMGJkYmQxOTY0OTYwMGM2ZWE3YTAy
-    ZDFmYzg3Y2FjOTAxMDZkZWMwNTg1NjExOWY5NjFlZjc2NzJmNDg=