mongoid-multitenancy 0.3.3 → 0.3.4

data/Gemfile.lock

@@ -1,46 +1,46 @@
 PATH
   remote: .
   specs:
-    mongoid-multitenancy (0.3.3)
+    mongoid-multitenancy (0.3.4)
       mongoid (~> 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     builder (3.0.4)
-    database_cleaner (1.0.1)
+    database_cleaner (1.2.0)
     diff-lcs (1.2.4)
-    i18n (0.6.1)
-    mongoid (3.1.3)
+    i18n (0.6.5)
+    mongoid (3.1.5)
       activemodel (~> 3.2)
-      moped (~> 1.4.2)
+      moped (~> 1.4)
       origin (~> 1.0)
-      tzinfo (~> 0.3.22)
-    mongoid-rspec (1.8.1)
+      tzinfo (~> 0.3.29)
+    mongoid-rspec (1.9.0)
       mongoid (>= 3.0.1)
       rake
-      rspec (>= 2.9)
-    moped (1.4.5)
-    multi_json (1.7.3)
+      rspec (>= 2.14)
+    moped (1.5.1)
+    multi_json (1.8.2)
     origin (1.1.0)
-    rake (10.0.4)
-    redcarpet (2.2.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rake (10.1.0)
+    redcarpet (2.3.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    tzinfo (0.3.37)
-    yard (0.8.6.1)
+    rspec-mocks (2.14.4)
+    tzinfo (0.3.38)
+    yard (0.8.7.2)
 
 PLATFORMS
   ruby

data/LICENSE.TXT

@@ -1,20 +1,20 @@
-Copyright (c) 2012 Perfect Memory
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2013 Perfect Memory
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/mongoid/multitenancy/document.rb

@@ -7,11 +7,11 @@ 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 } }
+          active_model_options = options.clone
+          tenant_options = { optional: active_model_options.delete(:optional), immutable: active_model_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
-          belongs_to association, options
+          belongs_to association, active_model_options
 
           # Get the tenant model and its foreign key
           tenant_field = reflect_on_association(association).foreign_key
@@ -43,7 +43,7 @@ module Mongoid
           }
 
           self.define_singleton_method(:inherited) do |child|
-            child.tenant association, original_options
+            child.tenant association, options
             super(child)
           end
         end

data/lib/mongoid/multitenancy/version.rb

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

data/mongoid-multitenancy.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{MultiTenancy with Mongoid}
   gem.summary       = %q{Support of a multi-tenant database with Mongoid}
   gem.homepage      = "https://github.com/PerfectMemory/mongoid-multitenancy"
-
+  gem.license       = 'MIT'
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/spec/inheritance_spec.rb

@@ -5,14 +5,13 @@ 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"
+    it 'should use inheritance pattern' do
+      MutableChild.create!(:title => "title X", :slug => "page-x")
+      expect(Mutable.last).to be_a MutableChild
     end
-    after { Mongoid::Multitenancy.current_tenant = nil }
 
-    it 'should be valid' do
-      expect(Mutable.last).to be_a MutableChild
+    it 'should keep options' do
+      AnotherMutableChild.new(:title => "title X", :slug => "page-x").should be_valid
     end
   end
 end

data/spec/models/mutable.rb

@@ -2,7 +2,7 @@ class Mutable
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant(:client, :class_name => 'Account', :immutable => false)
+  tenant :client, :class_name => 'Account', :immutable => false, :optional => true
 
   field :slug, :type => String
   field :title, :type => String

data/spec/models/mutable_child.rb

@@ -1,5 +1,9 @@
 require 'models/mutable'
 
 class MutableChild < Mutable
+	field :random, type: String
+end
 
+class AnotherMutableChild < Mutable
+	field :random, type: String
 end

metadata

@@ -2,127 +2,127 @@
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: mongoid
-  type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
     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
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     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
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     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
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     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
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+  name: mongoid-rspec
+  requirement: !ruby/object:Gem::Requirement
     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
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
     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
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
-    none: false
+  prerelease: false
+  type: :development
 description: MultiTenancy with Mongoid
 email:
 - aymeric.brisse@mperfect-memory.com
@@ -158,29 +158,30 @@ files:
 - spec/optional_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/PerfectMemory/mongoid-multitenancy
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3855106664827069335
+      hash: 1046556066794350660
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3855106664827069335
+      hash: 1046556066794350660
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25