tenancy 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ef48b93df821bf2413626e56eb09d5f2d361c57
-  data.tar.gz: 6f306b0e6aed689b63dcb7e443f0902954b58bb2
+  metadata.gz: 47bf5750d6e22eda26e832b59751cb976ab8faf8
+  data.tar.gz: ddaf27685a4125e8dcdbe06448cfd4dcedb37924
 SHA512:
-  metadata.gz: 48e903000a84dcae9fb7ab6e168d006decd9ecc5beb40719800f660a7454d6dfaf610a02efc5568b3c64449f11097aa3f034749a9826e12f20f3a81802b988d0
-  data.tar.gz: b14758e30137dbd75adf79d532098ac922a390d433a446039988863350e60810fbb4f9d8f9f426f356cd860e1c17f0e22be636323e12f836568238c901f06141
+  metadata.gz: d1cf8a9ab76c12625a0dd0fe941b2ddfbfcd6c477908b57104742b2b2e72a41b508bd45fe8d95c6e26aea12627c60ea544cefec5d4c8c1b01062890a2a165ecc
+  data.tar.gz: db30925f250aad165be8a4ce08c200feb12412fd53773eea2f90b1bc4ca114f4e95219ede884ba0c69f202466bc39e1f678db45ec16bcbcb96593957c4ba3032

data/.rspec

@@ -1,2 +1 @@
---colour
---profile
+--colour

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.1.5

data/.travis.yml

@@ -2,19 +2,24 @@ services: mongodb
 language: ruby
 script: "bundle exec rake spec"
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
-  - 2.1.1
+  - 2.2.0
 env:
   - CODECLIMATE_REPO_TOKEN=891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e
 gemfile:
   - gemfiles/active_record_32.gemfile
   - gemfiles/active_record_40.gemfile
+  - gemfiles/active_record_41.gemfile
+  - gemfiles/active_record_42.gemfile
   - gemfiles/mongoid_3.gemfile
   - gemfiles/mongoid_4.gemfile
 notifications:
   email: false
+matrix:
+  exclude:
+    - rvm: 2.2.0
+      gemfile: gemfiles/active_record_32.gemfile
 addons:
-    code_climate:
-        repo_token: 891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e
+  code_climate:
+    repo_token: 891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e

data/Gemfile

@@ -1,16 +1,17 @@
 source 'https://rubygems.org'
 
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "coveralls", require: false
-gem "activerecord", "~> 4.0.2", :require => "active_record"
-gem "mongoid", "~> 4.0.0.beta1"
-gem "rspec"
-gem "mongoid-rspec"
-gem "database_cleaner"
-gem "shoulda-matchers"
-gem "pry"
-gem "sqlite3"
-gem "rake"
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'coveralls',          require: false
+gem 'activerecord',       '~> 4.0.13', require: 'active_record'
+gem 'mongoid',            '~> 4.0.1'
+gem 'rspec',              '~> 3.2.0'
+gem 'mongoid-rspec',      '~> 2.1.0'
+gem 'guard-rspec',        '>= 4.5.0'
+gem 'database_cleaner',   '= 1.3.0'
+gem 'shoulda-matchers',   '~> 2.8.0', require: false
+gem 'sqlite3',            '~> 1.3.10'
+gem 'pry'
+gem 'rake'
 
 # Specify your gem's dependencies in tenancy.gemspec
 gemspec

data/Guardfile

@@ -0,0 +1,77 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec feature)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), the you will want to move the Guardfile
+## to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Rails files
+  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  dsl.watch_spec_files_for(rails.app_files)
+  dsl.watch_spec_files_for(rails.views)
+
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.("routing/#{m[1]}_routing"),
+      rspec.spec.("controllers/#{m[1]}_controller"),
+      rspec.spec.("acceptance/#{m[1]}")
+    ]
+  end
+
+  # Rails config changes
+  watch(rails.spec_helper)     { rspec.spec_dir }
+  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+  # Capybara features specs
+  watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+end

data/Rakefile

@@ -10,7 +10,7 @@ end
 task :default => "spec:all"
 
 namespace :spec do
-  %w(active_record_41 active_record_40 active_record_32 mongoid_4 mongoid_3).each do |gemfile|
+  %w(active_record_42 active_record_41 active_record_40 active_record_32 mongoid_4 mongoid_3).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -20,7 +20,7 @@ namespace :spec do
 
   desc "Run Tests against active_record versions"
   task :all do
-    %w(active_record_41 active_record_40 active_record_32 mongoid_4 mongoid_3).each do |gemfile|
+    %w(active_record_42 active_record_41 active_record_40 active_record_32 mongoid_4 mongoid_3).each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rspec"
     end

data/gemfiles/active_record_32.gemfile

@@ -1,13 +1,13 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 3.2.16", :require => "active_record"
-gem "coveralls", require: false
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rspec"
-gem "database_cleaner"
-gem "shoulda-matchers"
-gem "pry"
-gem "sqlite3"
-gem "rake"
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'coveralls',          require: false
+gem 'activerecord',       '~> 3.2.21', require: 'active_record'
+gem 'rspec',              '~> 3.2.0'
+gem 'database_cleaner',   '= 1.3.0'
+gem 'shoulda-matchers',   '~> 2.8.0', require: false
+gem 'sqlite3',            '~> 1.3.10'
+gem 'pry'
+gem 'rake'
 
-gemspec :path => "../"
+gemspec :path => '../'

data/gemfiles/active_record_40.gemfile

@@ -1,13 +1,13 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 4.0.2", :require => "active_record"
-gem "coveralls", require: false
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rspec"
-gem "database_cleaner"
-gem "shoulda-matchers"
-gem "pry"
-gem "sqlite3"
-gem "rake"
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'coveralls',          require: false
+gem 'activerecord',       '~> 4.0.13', require: 'active_record'
+gem 'rspec',              '~> 3.2.0'
+gem 'database_cleaner',   '= 1.3.0'
+gem 'shoulda-matchers',   '~> 2.8.0', require: false
+gem 'sqlite3',            '~> 1.3.10'
+gem 'pry'
+gem 'rake'
 
-gemspec :path => "../"
+gemspec :path => '../'

data/gemfiles/active_record_41.gemfile

@@ -1,13 +1,13 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 4.1.0.rc2", :require => "active_record"
-gem "coveralls", require: false
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rspec"
-gem "database_cleaner"
-gem "shoulda-matchers"
-gem "pry"
-gem "sqlite3"
-gem "rake"
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'coveralls',          require: false
+gem 'activerecord',       '~> 4.1.9', require: 'active_record'
+gem 'rspec',              '~> 3.2.0'
+gem 'database_cleaner',   '= 1.3.0'
+gem 'shoulda-matchers',   '~> 2.8.0', require: false
+gem 'sqlite3',            '~> 1.3.10'
+gem 'pry'
+gem 'rake'
 
-gemspec :path => "../"
+gemspec :path => '../'

data/gemfiles/active_record_42.gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'coveralls',          require: false
+gem 'activerecord',       '~> 4.2.0', require: 'active_record'
+gem 'rspec',              '~> 3.2.0'
+gem 'database_cleaner',   '= 1.3.0'
+gem 'shoulda-matchers',   '~> 2.8.0', require: false
+gem 'sqlite3',            '~> 1.3.10'
+gem 'pry'
+gem 'rake'
+
+gemspec :path => '../'

data/gemfiles/mongoid_3.gemfile

@@ -1,12 +1,14 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "mongoid", "~> 3.1.6"
-gem "coveralls", require: false
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rspec"
-gem "database_cleaner"
-gem "mongoid-rspec"
-gem "pry"
-gem "rake"
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'coveralls',          require: false
+gem 'mongoid',            '~> 3.1.6'
+gem 'rspec',              '~> 3.2.0'
+gem 'mongoid-rspec',      '~> 1.13.0'
+gem 'database_cleaner',   '= 1.3.0'
+gem 'shoulda-matchers',   '~> 2.8.0', require: false
+gem 'sqlite3',            '~> 1.3.10'
+gem 'pry'
+gem 'rake'
 
-gemspec :path => "../"
+gemspec :path => '../'

data/gemfiles/mongoid_4.gemfile

@@ -1,12 +1,14 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "mongoid", ">= 4.0.0.beta2"
-gem "coveralls", require: false
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rspec"
-gem "database_cleaner"
-gem "mongoid-rspec"
-gem "pry"
-gem "rake"
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'coveralls',          require: false
+gem 'mongoid',            '~> 4.0.1'
+gem 'rspec',              '~> 3.2.0'
+gem 'mongoid-rspec',      '~> 2.1.0'
+gem 'database_cleaner',   '= 1.3.0'
+gem 'shoulda-matchers',   '~> 2.8.0', require: false
+gem 'sqlite3',            '~> 1.3.10'
+gem 'pry'
+gem 'rake'
 
-gemspec :path => "../"
+gemspec path: '../'

data/lib/tenancy/resource_scope.rb

@@ -9,7 +9,7 @@ module Tenancy
       end
 
       def tenant_scope(*resources)
-        tenancy_scoping.tenant_scope(resources)
+        tenancy_scoping.tenant_scope(resources.compact)
       end
 
       def validates_uniqueness_in_scope(fields, args={})

data/lib/tenancy/scoping/active_record.rb

@@ -27,19 +27,28 @@ module Tenancy
     end
 
     def tenant_scope(tenant_names)
-      scope = default_scoped
-      tenants.each do |tenant|
-        next if tenant_names.include?(tenant.name.to_sym)
+      if ::ActiveRecord::VERSION::MAJOR == 4 &&  ::ActiveRecord::VERSION::MINOR >= 1
+        foreign_keys = if tenant_names.blank?
+          tenants.map(&:foreign_key)
+        else
+          tenants.reject { |tenant| tenant_names.include?(tenant.name) }.map(&:foreign_key)
+        end
+        klass.unscope(where: foreign_keys)
+      else
+        scope = default_scoped
+        tenants.each do |tenant|
+          next if tenant_names.include?(tenant.name.to_sym)
 
-        tenant_scope_sql = klass.where(nil).table[tenant.foreign_key].eq(tenant.klass.current_id).to_sql
-        scope.where_values.delete_if { |query| query.to_sql == tenant_scope_sql }
-      end
+          tenant_scope_sql = klass.where(nil).table[tenant.foreign_key].eq(tenant.klass.current_id).to_sql
+          scope.where_values.delete_if { |query| query.to_sql == tenant_scope_sql }
+        end
 
-      scope
+        scope
+      end
     end
 
     def default_scoped
-      if ::ActiveRecord::VERSION::MAJOR >= 4 && ::ActiveRecord::VERSION::MINOR >= 1
+      if ::ActiveRecord::VERSION::MAJOR == 4 && ::ActiveRecord::VERSION::MINOR >= 1
         klass.where(nil).default_scoped
       else
         klass.where(nil).with_default_scope

data/lib/tenancy/version.rb

@@ -1,3 +1,3 @@
 module Tenancy
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/lib/resource_spec.rb

@@ -9,39 +9,39 @@ if defined?(ActiveRecord)
     it "set current with instance" do
       Portal.current = camyp
 
-      Portal.current.should == camyp
-      RequestStore.store[:"Portal.current"].should == camyp
+      expect(Portal.current).to eq(camyp)
+      expect(RequestStore.store[:"Portal.current"]).to eq(camyp)
     end
 
     it "set current with id" do
       Portal.current = panpage.id
 
-      Portal.current.should == panpage
-      RequestStore.store[:"Portal.current"].should == panpage
+      expect(Portal.current).to eq(panpage)
+      expect(RequestStore.store[:"Portal.current"]).to eq(panpage)
     end
 
     it "set current with nil" do
       Portal.current = panpage
       Portal.current = nil
 
-      Portal.current.should == nil
-      RequestStore.store[:"Portal.current"].should == nil
+      expect(Portal.current).to eq(nil)
+      expect(RequestStore.store[:"Portal.current"]).to eq(nil)
     end
 
     it "#current_id" do
       Portal.current = yoolk
 
-      Portal.current_id.should == yoolk.id
+      expect(Portal.current_id).to eq(yoolk.id)
     end
 
     it "#with_scope with block" do
-      Portal.current.should == nil
+      expect(Portal.current).to eq(nil)
 
       Portal.with_tenant(yoolk) do
-        Portal.current.should == yoolk
+        expect(Portal.current).to eq(yoolk)
       end
 
-      Portal.current.should == nil
+      expect(Portal.current).to eq(nil)
     end
 
     it "#with_scope without block" do
@@ -59,39 +59,39 @@ if defined?(Mongoid)
     it "set current with instance" do
       Mongo::Portal.current = camyp
 
-      Mongo::Portal.current.should == camyp
-      RequestStore.store[:"Mongo::Portal.current"].should == camyp
+      expect(Mongo::Portal.current).to eq(camyp)
+      expect(RequestStore.store[:"Mongo::Portal.current"]).to eq(camyp)
     end
 
     it "set current with id" do
       Mongo::Portal.current = panpage.id
 
-      Mongo::Portal.current.should == panpage
-      RequestStore.store[:"Mongo::Portal.current"].should == panpage
+      expect(Mongo::Portal.current).to eq(panpage)
+      expect(RequestStore.store[:"Mongo::Portal.current"]).to eq(panpage)
     end
 
     it "set current with nil" do
       Mongo::Portal.current = panpage
       Mongo::Portal.current = nil
 
-      Mongo::Portal.current.should == nil
-      RequestStore.store[:"Mongo::Portal.current"].should == nil
+      expect(Mongo::Portal.current).to eq(nil)
+      expect(RequestStore.store[:"Mongo::Portal.current"]).to eq(nil)
     end
 
     it "#current_id" do
       Mongo::Portal.current = yoolk
 
-      Mongo::Portal.current_id.should == yoolk.id
+      expect(Mongo::Portal.current_id).to eq(yoolk.id)
     end
 
     it "#with_scope with block" do
-      Mongo::Portal.current.should == nil
+      expect(Mongo::Portal.current).to eq(nil)
 
       Mongo::Portal.with_tenant(yoolk) do
-        Mongo::Portal.current.should == yoolk
+        expect(Mongo::Portal.current).to eq(yoolk)
       end
 
-      Mongo::Portal.current.should == nil
+      expect(Mongo::Portal.current).to eq(nil)
     end
 
     it "#with_scope without block" do

data/spec/lib/scoping/active_record_spec.rb

@@ -16,7 +16,11 @@ if defined?(ActiveRecord)
       it "have default_scope with :portal_id field" do
         Portal.current = camyp
 
-        expect(Listing.where(nil).to_sql).to eq(Listing.where(portal_id: Portal.current_id).to_sql)
+        if ::ActiveRecord::VERSION::MAJOR == 4 && ::ActiveRecord::VERSION::MINOR >= 1
+          expect(Listing.where(nil).to_sql).to eq(Listing.rewhere(portal_id: Portal.current_id).to_sql)
+        else
+          expect(Listing.where(nil).to_sql).to eq(Listing.where(portal_id: Portal.current_id).to_sql)
+        end
       end
 
       it "doesn't have default_scope when it doesn't have current portal" do
@@ -41,7 +45,11 @@ if defined?(ActiveRecord)
         Portal.current  = camyp
         Listing.current = listing
 
-        Communication.where(nil).to_sql.should == Communication.where(portal_id: Portal.current_id, listing_id: Listing.current_id).to_sql
+        if ::ActiveRecord::VERSION::MAJOR == 4 && ::ActiveRecord::VERSION::MINOR >= 1
+          expect(Communication.where(nil).to_sql).to eq(Communication.rewhere(portal_id: Portal.current_id, listing_id: Listing.current_id).to_sql)
+        else
+          expect(Communication.where(nil).to_sql).to eq(Communication.where(portal_id: Portal.current_id, listing_id: Listing.current_id).to_sql)
+        end
       end
 
       it "doesn't have default_scope when it doesn't have current portal and listing" do
@@ -109,14 +117,14 @@ if defined?(ActiveRecord)
         Listing.current = listing
 
         expect(Communication.tenant_scope(:portal).to_sql).not_to include(%{"communications"."listing_id" = #{Listing.current_id}})
-        expect(Communication.tenant_scope(:portal).to_sql).to eq(%{SELECT "communications".* FROM "communications"  WHERE "communications"."is_active" = 't' AND "communications"."portal_id" = #{Portal.current_id}})
+        expect(Communication.tenant_scope(:portal).to_sql.squeeze(' ')).to eq(%{SELECT "communications".* FROM "communications" WHERE "communications"."is_active" = 't' AND "communications"."portal_id" = #{Portal.current_id}})
       end
 
       it "scopes only :current_listing" do
         Listing.current = listing
 
         expect(Communication.tenant_scope(:listing).to_sql).not_to include(%{"communications"."portal_id" = #{Portal.current_id}})
-        expect(Communication.tenant_scope(:listing).to_sql).to eq(%{SELECT "communications".* FROM "communications"  WHERE "communications"."is_active" = 't' AND "communications"."listing_id" = #{Listing.current_id}})
+        expect(Communication.tenant_scope(:listing).to_sql.squeeze(' ')).to eq(%{SELECT "communications".* FROM "communications" WHERE "communications"."is_active" = 't' AND "communications"."listing_id" = #{Listing.current_id}})
       end
 
       it "scopes only :current_listing and :current_portal" do
@@ -128,7 +136,7 @@ if defined?(ActiveRecord)
       it "scopes nothing" do
         Listing.current = listing
 
-        expect(Communication.tenant_scope(nil).to_sql).to eq(%{SELECT "communications".* FROM "communications"  WHERE "communications"."is_active" = 't'})
+        expect(Communication.tenant_scope(nil).to_sql.squeeze(' ')).to eq(%{SELECT "communications".* FROM "communications" WHERE "communications"."is_active" = 't'})
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require "simplecov"
-require "coveralls"
-require "codeclimate-test-reporter"
+require 'simplecov'
+require 'coveralls'
+require 'codeclimate-test-reporter'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   Coveralls::SimpleCov::Formatter,
@@ -9,33 +9,31 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 ]
 
 SimpleCov.start do
-  add_filter "/spec/"
+  add_filter '/spec/'
 end
 
-require "pry"
-require "database_cleaner"
-require "logger"
-require "tenancy"
-require 'minitest/autorun'
+require 'pry'
+require 'database_cleaner'
+require 'logger'
+require 'tenancy'
 
 # active_record
-if Gem.loaded_specs["activerecord"]
-  load File.dirname(__FILE__) + "/support/active_record/schema.rb"
-  load File.dirname(__FILE__) + "/support/active_record/models.rb"
-  require "shoulda-matchers"
+if Gem.loaded_specs['activerecord']
+  load File.dirname(__FILE__) + '/support/active_record/schema.rb'
+  load File.dirname(__FILE__) + '/support/active_record/models.rb'
+  require 'shoulda-matchers'
 end
 
 # mongoid
-if Gem.loaded_specs["mongoid"]
-  load File.dirname(__FILE__) + "/support/mongoid/connection.rb"
-  load File.dirname(__FILE__) + "/support/mongoid/models.rb"
-  require "mongoid-rspec"
+if Gem.loaded_specs['mongoid']
+  load File.dirname(__FILE__) + '/support/mongoid/connection.rb'
+  load File.dirname(__FILE__) + '/support/mongoid/models.rb'
+  require 'mongoid-rspec'
 end
 
 RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
-  config.treat_symbols_as_metadata_keys_with_true_values = true
 
   config.before(:suite) do
     DatabaseCleaner.strategy = :truncation

data/spec/support/active_record/schema.rb

@@ -1,37 +1,37 @@
-require "active_record"
+require 'active_record'
 
-ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: "spec/test.sqlite3")
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: 'spec/test.sqlite3')
 ActiveRecord::Migration.verbose = false
 
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  create_table :portals, :force => true do |t|
+  create_table :portals, force: true do |t|
     t.string :domain_name
-    t.timestamps
+    t.timestamps null: false
   end
 
-  create_table :listings, :force => true do |t|
+  create_table :listings, force: true do |t|
     t.string :name
     t.references :portal
     t.boolean :is_active
-    t.timestamps
+    t.timestamps null: false
   end
 
-  create_table :communications, :force => true do |t|
+  create_table :communications, force: true do |t|
     t.string :label
     t.string :value
     t.references :listing
     t.references :portal
     t.boolean :is_active
-    t.timestamps
+    t.timestamps null: false
   end
 
-  create_table :extra_communications, :force => true do |t|
+  create_table :extra_communications, force: true do |t|
     t.string :label
     t.string :value
     t.references :listing
     t.references :portal
-    t.timestamps
+    t.timestamps null: false
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenancy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Chamnap Chhorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,12 +53,14 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/active_record_32.gemfile
 - gemfiles/active_record_40.gemfile
 - gemfiles/active_record_41.gemfile
+- gemfiles/active_record_42.gemfile
 - gemfiles/mongoid_3.gemfile
 - gemfiles/mongoid_4.gemfile
 - lib/tenancy.rb
@@ -101,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple multitenancy with activerecord/mongoid through scoping