mongoid-multitenancy 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbe595c3d525a08bfe506d7c116dde5c8928885
-  data.tar.gz: 27764ffe6c0c8096b5c7b17eace5c318c0a8037e
+  metadata.gz: 30fa52034535ce4524481877d5b9e048e1eeeaa5
+  data.tar.gz: 533f4f95ecb750443629027cac6d0dd9edc6bb73
 SHA512:
-  metadata.gz: 125f068d3618a1184254e2464719e8ac98b5bff432df29bdfebbc931fb5fb969317a93f2f3348d761e92ceef3f2d6735ef1234c69cfe780a91dd7e19fe02d3c1
-  data.tar.gz: 7d134e70413887e1f362e0727327f92ad8d2a713823512ee77d9be1af44c9fda8274a78b83268a053804f41a9ad4593ced7744d1204258e446a300ee43d05834
+  metadata.gz: efb3239aa595fe974954364f1b8b7cf2b0bb061d87dac50166294f54a219ed97b68504deead534086576016e840d38b125612a64d12a429d3b37c19ef90deb6a
+  data.tar.gz: f3a64574e2ef09ade685ab061806bd37885286ead3efe20d884887d14e42ab748e712a1635b9fc2724aa6bb520d614684e70b973bf4952b2866bad396e2125fd

data/.travis.yml

@@ -3,9 +3,8 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
-  - ruby-head
+  - 2.3.0
   - jruby
-  - jruby-head
 gemfile:
   - gemfiles/Gemfile.mongoid-4.0
   - gemfiles/Gemfile.mongoid-5.0

data/Gemfile

@@ -5,6 +5,7 @@ gem 'mongoid', '~> 5.0'
 gem 'rake', '~> 10.0'
 
 group :test do
+  gem 'database_cleaner', github: 'DatabaseCleaner/database_cleaner', ref: '1cab518'
   gem 'coveralls', require: false
   gem 'rspec', '~> 3.1'
   gem 'yard', '~> 0.8'

data/gemfiles/Gemfile.mongoid-4.0

@@ -5,6 +5,7 @@ gem 'mongoid', '~> 4.0'
 gem 'rake', '~> 10.0'
 
 group :test do
+  gem 'database_cleaner', github: 'DatabaseCleaner/database_cleaner', ref: '1cab518'
   gem 'coveralls', :require => false
   gem 'rspec', '~> 3.1'
   gem 'yard', '~> 0.8'

data/gemfiles/Gemfile.mongoid-5.0

@@ -5,6 +5,7 @@ gem 'mongoid', '~> 5.0'
 gem 'rake', '~> 10.0'
 
 group :test do
+  gem 'database_cleaner', github: 'DatabaseCleaner/database_cleaner', ref: '1cab518'
   gem 'coveralls', :require => false
   gem 'rspec', '~> 3.1'
   gem 'yard', '~> 0.8'

data/lib/mongoid/multitenancy/document.rb

@@ -120,7 +120,7 @@ module Mongoid
         def define_initializer(association)
           # Apply the default value when the default scope is complex (optional tenant)
           after_initialize lambda {
-            if Multitenancy.current_tenant && send(association.to_sym).nil? && new_record?
+            if Multitenancy.current_tenant && new_record?
               send "#{association}=".to_sym, Multitenancy.current_tenant
             end
           }

data/lib/mongoid/multitenancy/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   module Multitenancy
     # Version
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ MODELS = File.join(File.dirname(__FILE__), 'models')
 
 require 'simplecov'
 require 'coveralls'
+require 'database_cleaner'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
@@ -21,7 +22,6 @@ elsif Mongoid::VERSION.start_with? '4'
 end
 
 require_relative 'support/shared_examples'
-require_relative 'support/database_cleaner'
 require_relative 'support/mongoid_matchers'
 
 Dir["#{MODELS}/*.rb"].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -64,7 +64,6 @@ files:
 - spec/mutable_spec.rb
 - spec/optional_spec.rb
 - spec/spec_helper.rb
-- spec/support/database_cleaner.rb
 - spec/support/mongoid_matchers.rb
 - spec/support/shared_examples.rb
 homepage: https://github.com/PerfectMemory/mongoid-multitenancy
@@ -108,7 +107,6 @@ test_files:
 - spec/mutable_spec.rb
 - spec/optional_spec.rb
 - spec/spec_helper.rb
-- spec/support/database_cleaner.rb
 - spec/support/mongoid_matchers.rb
 - spec/support/shared_examples.rb
 has_rdoc: 

data/spec/support/database_cleaner.rb

@@ -1,36 +0,0 @@
-class DatabaseCleaner
-  class << self
-    def clean
-      new.clean
-    end
-  end
-
-  def clean
-    if mongoid4?
-      collections.each { |c| database[c].find.remove_all }
-    else
-      collections.each { |c| database[c].find.delete_many }
-    end
-  end
-
-  private
-
-  def mongoid4?
-    Mongoid::VERSION.start_with? '4'
-  end
-
-  def database
-    if mongoid4?
-      Mongoid.default_session
-    else
-      Mongoid::Clients.default
-    end
-  end
-
-  def collections
-    database['system.namespaces'].find(name: { '$not' => /\.system\.|\$/ }).to_a.map do |collection|
-      _, name = collection['name'].split('.', 2)
-      name
-    end
-  end
-end