activerecord-multi-tenant 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c30e8a7b37b923b66c5043fb73f3c9e776cea85
-  data.tar.gz: 63a2537270723a549cab19a3a75e5c9eaee4fdac
+  metadata.gz: 3ed816e4227187f3f64ae1e1b53471c74f220150
+  data.tar.gz: acd8708805299354b2516a61fe3365f557ac09d4
 SHA512:
-  metadata.gz: 5fe0741bcd4279f6852aa8fc64a25921bb8fb9953cbce564a81ec611602bc0321ca6ededc84ade5053795d64c3e1d3b2a055c6e5c19aa54003ea18c65aa5651e
-  data.tar.gz: f59653a116f517ceafdd91677518113299bf86b281259a0816c66299c3ac5b2fa8ec2d347078034ace050adb21aeb12c40ff476e36fe8f9e238f695d99c1f3ad
+  metadata.gz: 74c9aa0bba774511e236db9e08f830ebc09703b8f58d3d6f39c97454032ac607a0f5b7050ec24a78a6b3322cc7df9b11f658ef61f8ddbbaf0726c8b73c5b32d0
+  data.tar.gz: b5f1427977dac05e87491fa72e604a6454067d9d8b3742ee5b63f367de0dc6411bf17386e868a5761a3bce1c9df5166ac00eecc0d1e522e52a64397b91cbb73b

data/.travis.yml

@@ -6,6 +6,7 @@ language: ruby
 rvm:
   - 2.1
   - 2.3.3
+  - 2.4.0
 
 gemfile:
   - gemfiles/rails_3.2.gemfile
@@ -13,12 +14,21 @@ gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
+  - gemfiles/active_record_5.0.gemfile
 
 matrix:
   fast_finish: true
   exclude:
-    - gemfile: gemfiles/rails_5.0.gemfile
-      rvm: 2.1
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/active_record_5.0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.1.gemfile
 
 services:
   - docker

data/Appraisals

@@ -18,3 +18,7 @@ end
 appraise 'rails-5.0' do
   gem 'rails', '5.0.1'
 end
+
+appraise 'active-record-5.0' do
+  gem 'activerecord', '5.0.2'
+end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.1       2017-03-23
+
+* Allow use outside of Rails, e.g. when using Sinatra with ActiveRecord [@nathanstitt](https://github.com/nathanstitt) [#5](https://github.com/citusdata/activerecord-multi-tenant/pull/5)
+
+
 ## 0.4.0       2017-03-22
 
 * Infer multi_tenant setting from parent classes [@webandtech](https://github.com/webandtech) [#6](https://github.com/citusdata/activerecord-multi-tenant/pull/6)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-multi-tenant (0.4.0)
+    activerecord-multi-tenant (0.4.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/gemfiles/active_record_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "5.0.2"
+
+gemspec :path => "../"

data/gemfiles/active_record_5.0.gemfile.lock

@@ -0,0 +1,154 @@
+PATH
+  remote: ../
+  specs:
+    activerecord-multi-tenant (0.4.1)
+      rails (>= 3.1)
+      request_store (>= 1.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
+      globalid (>= 0.3.6)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
+      arel (~> 7.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.4)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    database_cleaner (1.3.0)
+    diff-lcs (1.3)
+    erubis (2.7.0)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    i18n (0.8.1)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
+      mini_portile2 (~> 2.1.0)
+    pg (0.20.0)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.2)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    request_store (1.3.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 5.0.2)
+  activerecord-multi-tenant!
+  appraisal
+  database_cleaner (~> 1.3.0)
+  pg
+  rake
+  rspec (>= 3.0)
+  rspec-rails
+  thor
+
+BUNDLED WITH
+   1.14.5

data/gemfiles/rails_3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-multi-tenant (0.4.0)
+    activerecord-multi-tenant (0.4.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -115,7 +115,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.52)
+    tzinfo (0.3.53)
 
 PLATFORMS
   ruby

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-multi-tenant (0.4.0)
+    activerecord-multi-tenant (0.4.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -99,7 +99,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tzinfo (0.3.52)
+    tzinfo (0.3.53)
 
 PLATFORMS
   ruby

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-multi-tenant (0.4.0)
+    activerecord-multi-tenant (0.4.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-multi-tenant (0.4.0)
+    activerecord-multi-tenant (0.4.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-multi-tenant (0.4.0)
+    activerecord-multi-tenant (0.4.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/lib/activerecord-multi-tenant.rb

@@ -1,9 +1,11 @@
-require 'activerecord-multi-tenant/controller_extensions'
-require 'activerecord-multi-tenant/copy_from_client'
-require 'activerecord-multi-tenant/default_scope'
-require 'activerecord-multi-tenant/migrations'
-require 'activerecord-multi-tenant/model_extensions'
-require 'activerecord-multi-tenant/multi_tenant'
-require 'activerecord-multi-tenant/referential_integrity'
-require 'activerecord-multi-tenant/version'
-require 'activerecord-multi-tenant/with_lock'
+if Object.const_defined?(:ActionController)
+  require_relative 'activerecord-multi-tenant/controller_extensions'
+end
+require_relative 'activerecord-multi-tenant/copy_from_client'
+require_relative 'activerecord-multi-tenant/default_scope'
+require_relative 'activerecord-multi-tenant/migrations'
+require_relative 'activerecord-multi-tenant/model_extensions'
+require_relative 'activerecord-multi-tenant/multi_tenant'
+require_relative 'activerecord-multi-tenant/referential_integrity'
+require_relative 'activerecord-multi-tenant/version'
+require_relative 'activerecord-multi-tenant/with_lock'

data/lib/activerecord-multi-tenant/default_scope.rb

@@ -1,3 +1,5 @@
+require 'active_record'
+
 class ActiveRecord::Base
   class << self
     alias :unscoped_orig :unscoped

data/lib/activerecord-multi-tenant/model_extensions.rb

@@ -45,7 +45,7 @@ module MultiTenant
           if MultiTenant.current_tenant_id
             where(arel_table[partition_key].eq(MultiTenant.current_tenant_id))
           else
-            Rails::VERSION::MAJOR < 4 ? scoped : all
+            ActiveRecord::VERSION::MAJOR < 4 ? scoped : all
           end
         }
 

data/lib/activerecord-multi-tenant/version.rb

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/activerecord-multi-tenant/with_lock.rb

@@ -6,7 +6,7 @@ class ActiveRecord::Base
   def lock!(lock = true)
     if lock && persisted? && self.class.respond_to?(:scoped_by_tenant?) && MultiTenant.current_tenant_id && MultiTenant.with_lock_workaround_enabled?
       self.class.unscoped.where(id: id).update_all(id: id) # No-op UPDATE that locks the row
-      reload # This is just to act similar to the default Rails approach, in case someone relies on the reload
+      reload # This is just to act similar to the default ActiveRecord approach, in case someone relies on the reload
       self
     else
       lock_orig(lock)

data/spec/activerecord-multi-tenant/controller_extensions_spec.rb

@@ -1,48 +1,19 @@
 require 'spec_helper'
 
-class Account
-  attr_accessor :name
-end
-
-class ApplicationController < ActionController::Base
-  include Rails.application.routes.url_helpers
-  set_current_tenant_through_filter
-
-  if Rails::VERSION::MAJOR < 4
-    before_filter :your_method_that_finds_the_current_tenant
-  else
-    before_action :your_method_that_finds_the_current_tenant
+describe "Controller Extensions", type: :controller do
+  class Account
+    attr_accessor :name
   end
 
-  def your_method_that_finds_the_current_tenant
-    current_account = Account.new
-    current_account.name = 'account1'
-    set_current_tenant(current_account)
-  end
-end
-
-describe ApplicationController, type: :controller do
-  controller do
-    def index
-      if Rails::VERSION::MAJOR >= 5
-        render body: 'custom called'
-      else
-        render text: 'custom called'
-      end
-    end
-  end
-
-  it 'Finds the correct tenant using the filter command' do
-    get :index
-    expect(MultiTenant.current_tenant.name).to eq 'account1'
-  end
-end
-
-if Rails::VERSION::MAJOR >= 5
-  class APIApplicationController < ActionController::API
+  class ApplicationController < ActionController::Base
     include Rails.application.routes.url_helpers
     set_current_tenant_through_filter
-    before_action :your_method_that_finds_the_current_tenant
+
+    if ActionPack::VERSION::MAJOR < 4
+      before_filter :your_method_that_finds_the_current_tenant
+    else
+      before_action :your_method_that_finds_the_current_tenant
+    end
 
     def your_method_that_finds_the_current_tenant
       current_account = Account.new
@@ -51,10 +22,14 @@ if Rails::VERSION::MAJOR >= 5
     end
   end
 
-  describe APIApplicationController, type: :controller do
+  describe ApplicationController, type: :controller do
     controller do
       def index
-        render body: 'custom called'
+        if ActionPack::VERSION::MAJOR >= 5
+          render body: 'custom called'
+        else
+          render text: 'custom called'
+        end
       end
     end
 
@@ -63,4 +38,31 @@ if Rails::VERSION::MAJOR >= 5
       expect(MultiTenant.current_tenant.name).to eq 'account1'
     end
   end
+
+  if ActionPack::VERSION::MAJOR >= 5
+    class APIApplicationController < ActionController::API
+      include Rails.application.routes.url_helpers
+      set_current_tenant_through_filter
+      before_action :your_method_that_finds_the_current_tenant
+
+      def your_method_that_finds_the_current_tenant
+        current_account = Account.new
+        current_account.name = 'account1'
+        set_current_tenant(current_account)
+      end
+    end
+
+    describe APIApplicationController, type: :controller do
+      controller do
+        def index
+          render body: 'custom called'
+        end
+      end
+
+      it 'Finds the correct tenant using the filter command' do
+        get :index
+        expect(MultiTenant.current_tenant.name).to eq 'account1'
+      end
+    end
+  end
 end

data/spec/schema.rb

@@ -83,7 +83,7 @@ class Project < ActiveRecord::Base
   has_many :tasks
   has_many :sub_tasks, through: :tasks
 
-  if Rails::VERSION::MAJOR < 4
+  if ActiveRecord::VERSION::MAJOR < 4
     validates_uniqueness_of :name, scope: [:account_id]
   else
     validates_uniqueness_of :name, scope: [:account]
@@ -126,7 +126,7 @@ end
 class CustomPartitionKeyTask < ActiveRecord::Base
   multi_tenant :account, partition_key: 'accountID'
 
-  if Rails::VERSION::MAJOR < 4
+  if ActiveRecord::VERSION::MAJOR < 4
     validates_uniqueness_of :name, scope: [:accountID]
   else
     validates_uniqueness_of :name, scope: [:account]
@@ -141,7 +141,7 @@ class Comment < ActiveRecord::Base
   multi_tenant :account
   belongs_to :commentable, polymorphic: true
 
-  if Rails::VERSION::MAJOR >= 4
+  if ActiveRecord::VERSION::MAJOR >= 4
     belongs_to :task, -> { where(comments: { commentable_type: 'Task'  }) }, foreign_key: 'commentable_id'
   end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ ActiveRecord::Base.establish_connection(dbconfig['test'])
 RSpec.configure do |config|
   config.infer_base_class_for_anonymous_controllers = true
   config.use_transactional_fixtures = false
+  config.filter_run_excluding type: :controller unless Object.const_defined?(:ActionController)
 
   config.after(:each) do
     MultiTenant.current_tenant = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -138,6 +138,8 @@ files:
 - Rakefile
 - activerecord-multi-tenant.gemspec
 - docker-compose.yml
+- gemfiles/active_record_5.0.gemfile
+- gemfiles/active_record_5.0.gemfile.lock
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_3.2.gemfile.lock
 - gemfiles/rails_4.0.gemfile