leases 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0ce803216d2e26f09fb7b819de4c44a65959855a
+  data.tar.gz: b85c860f0ab647bf449911897ab3c024aabba784
+SHA512:
+  metadata.gz: 4364efabe681179e5828cf555864e05f39a7fe3e5224ec7121d753520515317580eac5993c75dc5ac2a921a727912a0435976100158a3a8603156b7ca6263ec3
+  data.tar.gz: 97a5b807cb7651f3845c05bc7721ed1707682e504c1ac00cb31ecec0a59a037032a06d88f215841e2feefc9723289796ba24a22d717348f0aab9bdca14545b50

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.2.1
   - ruby-head
 
 env:
@@ -10,9 +11,11 @@ env:
   - "RAILS_VERSION=3.2.0"
   - "RAILS_VERSION=4.0.0"
   - "RAILS_VERSION=4.1.0"
+  - "RAILS_VERSION=4.2.0"
   - "RAILS_VERSION=master"
 
 matrix:
   allow_failures:
     - env: "RAILS_VERSION=master"
-    - rvm: ruby-head
+    - rvm: ruby-head
+  fast_finish: true

data/README.md

@@ -10,12 +10,14 @@ Database multi-tenancy for Rails.
 - Rails 3.2.x
 - Rails 4.0.x
 - Rails 4.1.x
+- Rails 4.2.x
 
 ## Supported Ruby versions
 
 - Ruby 1.9.3
 - Ruby 2.0.0
 - Ruby 2.1.1
+- Ruby 2.2.1
 
 ## Installation
 
@@ -40,7 +42,7 @@ class ApplicationController < ActionController::Base
   protected
 
   def current_account
-    @account
+    Account.find(params[:account_id])
   end
 end
 ```

data/leases.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'bundler',     '>= 1.3.0'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec',       '>= 2.11'
-  gem.add_development_dependency 'rspec-rails', '>= 2.11'
+  gem.add_development_dependency 'rspec',       '~> 2.11'
+  gem.add_development_dependency 'rspec-rails', '~> 2.11'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'with_model'
+  gem.add_development_dependency 'test-unit', '~> 3.0'
 
-  gem.add_dependency 'apartment', '>= 0.24.2'
+  gem.add_dependency 'apartment', '>= 1.0.0'
 end

data/lib/leases/model/base.rb

@@ -35,7 +35,7 @@ module Leases
       # account.enter
       #
       def enter
-        Apartment::Database.switch(leaser_name)
+        Apartment::Tenant.switch(leaser_name)
         Leases.current = self
       end
 
@@ -48,7 +48,7 @@ module Leases
       #
       def leave
         Leases.current = nil
-        Apartment::Database.reset
+        Apartment::Tenant.reset
       end
 
       ##
@@ -77,7 +77,7 @@ module Leases
       # account.lease!
       #
       def lease!
-        Apartment::Database.create(leaser_name)
+        Apartment::Tenant.create(leaser_name)
       end
 
       ##
@@ -89,7 +89,7 @@ module Leases
       # account.break!
       #
       def break!
-        Apartment::Database.drop(leaser_name)
+        Apartment::Tenant.drop(leaser_name)
       end
 
     end

data/lib/leases/model.rb

@@ -42,7 +42,7 @@ module Leases
         Apartment.excluded_models += [self.name]
         Apartment.excluded_models.uniq!
 
-        Apartment::Database.process_excluded_models
+        Apartment::Tenant.process_excluded_models
       end
 
     end

data/lib/leases/version.rb

@@ -1,3 +1,3 @@
 module Leases
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/leases/model/base_spec.rb

@@ -49,7 +49,7 @@ describe Leases::Model::Base do
 
     after(:each) { account.enter }
 
-    it { Apartment::Database.should_receive(:switch).with(account.leaser_name) }
+    it { Apartment::Tenant.should_receive(:switch).with(account.leaser_name) }
     it { Thread.current[:leaser].id.should == account.id }
 
   end
@@ -58,7 +58,7 @@ describe Leases::Model::Base do
 
     after(:each) { account.leave }
 
-    it { Apartment::Database.should_receive(:reset) }
+    it { Apartment::Tenant.should_receive(:reset) }
     it { Thread.current[:leaser].should == nil }
 
   end
@@ -78,7 +78,7 @@ describe Leases::Model::Base do
 
     after(:each) { account.lease! }
 
-    it { Apartment::Database.should_receive(:create).with(account.leaser_name) }
+    it { Apartment::Tenant.should_receive(:create).with(account.leaser_name) }
 
   end
 
@@ -86,7 +86,7 @@ describe Leases::Model::Base do
 
     after(:each) { account.break! }
 
-    it { Apartment::Database.should_receive(:drop).with(account.leaser_name) }
+    it { Apartment::Tenant.should_receive(:drop).with(account.leaser_name) }
 
   end
 

data/spec/spec_helper.rb

@@ -17,11 +17,11 @@ RSpec.configure do |config|
 
   config.before(:each) do
     # Stub Apartment database interactions
-    Apartment::Database.stub(:switch)
-    Apartment::Database.stub(:reset)
-    Apartment::Database.stub(:create)
-    Apartment::Database.stub(:drop)
-    Apartment::Database.stub(:process_excluded_models)
+    Apartment::Tenant.stub(:switch)
+    Apartment::Tenant.stub(:reset)
+    Apartment::Tenant.stub(:create)
+    Apartment::Tenant.stub(:drop)
+    Apartment::Tenant.stub(:process_excluded_models)
   end
 
 end

metadata

@@ -1,128 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: leases
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Arjen Oosterkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: with_model
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: apartment
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.2
+        version: 1.0.0
 description: Database multi-tenancy for Rails.
 email:
 - mail@arjen.me
@@ -130,8 +129,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -152,33 +151,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/Arjeno/leases
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3287290860337182926
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3287290860337182926
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Database multi-tenancy for Rails.
 test_files:
 - spec/leases/controller_spec.rb