rails_multitenant 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77e1e600d2a712b57994c01909b43921dfbab522
-  data.tar.gz: c8ce8ec444923042f9035984bc6247a10f15a0f1
+  metadata.gz: 94a0e8e9b129d21e888c56a07658779a32b4a4a8
+  data.tar.gz: a6004fe24c2671ca3153cbff26b7215059033ae9
 SHA512:
-  metadata.gz: aa5c9360a04697ff2d7732f7d80cc11fa0696cfc5a40ff12b769ce92227dc15a2c2c3451a719c0c1dc55ad2a35dc63179587ab35e8c3901a835a04f1d756c49b
-  data.tar.gz: 7462b3c8d160c56516e5a17d07f17bf6baaaa29c26766d583faff24cef4289b9fddd20a0e5ba393329ac8004079bc23bf3c5892e5b8dd275e025e9ee549511c6
+  metadata.gz: f406387794a47eff446ba20ec4e8adac962adf50f393cc0946122d49d29de456ed3bb1adef6dd128228924a1aa8813c8ea2886883f301621c62c7848aadda2c5
+  data.tar.gz: fd621cc380a647a82ebd9e888bd0e7c0ed2e10d3206ade3bc82e7623e8adf8e7d265181dbea98193cbc6b18df6fd6963b503c9202c656c238296773c1d3cabe8

data/.ruby-version

@@ -1 +1 @@
-2.4.2
+2.4.3

data/.travis.yml

@@ -2,9 +2,23 @@ language: ruby
 sudo: false
 env:
   - RAILS_VERSION="~> 4.1.16"
-  - RAILS_VERSION="~> 4.2.9"
-  - RAILS_VERSION="~> 5.0.4"
-  - RAILS_VERSION="~> 5.1.2"
+  - RAILS_VERSION="~> 4.2.10"
+  - RAILS_VERSION="~> 5.0.6"
+  - RAILS_VERSION="~> 5.1.4"
 rvm:
-  - 2.3.4
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - 2.2.9
+  - 2.1.10
+matrix:
+  exclude:
+  - rvm: 2.1.10
+    env: RAILS_VERSION="~> 5.0.6"
+  - rvm: 2.1.10
+    env: RAILS_VERSION="~> 5.1.4"
+  - rvm: 2.4.3
+    env: RAILS_VERSION="~> 4.1.16"
+  - rvm: 2.5.0
+    env: RAILS_VERSION="~> 4.1.16"
 before_install: gem install bundler -v 1.15.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.8.0
+* Switch usage of Fixnum to Integer for Ruby > 2.4 
+* Test with multiple Rubies
+
 ### 0.7.2
 * Fix bug that prevents clearing dependents of classes derived from CurrentInstance.  
 

data/lib/rails_multitenant/global_context_registry.rb

@@ -171,7 +171,7 @@ module RailsMultitenant
     # Duplicate the registry
     def duplicate_registry
       globals.each_with_object({}) do |(key, value), result|
-        result[key] = (value.nil? || value.is_a?(Fixnum)) ? value : value.dup
+        result[key] = (value.nil? || value.is_a?(Integer)) ? value : value.dup
       end
     end
 
@@ -224,6 +224,5 @@ module RailsMultitenant
       Thread.current[:global_context_registry] = value
       value
     end
-
   end
 end

data/lib/rails_multitenant/version.rb

@@ -1,3 +1,3 @@
 module RailsMultitenant
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

data/rails_multitenant.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.1.0'
+
   spec.add_development_dependency "bundler", "~> 1.10"
 
   spec.add_dependency 'activerecord', ENV.fetch('RAILS_VERSION', ['>= 4.1', '< 5.2'])
@@ -26,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
   spec.add_development_dependency 'rake', '< 11.0'
   spec.add_development_dependency 'rspec', '~> 2'
-  spec.add_development_dependency 'simplecov', '~> 0.7.1'
+  spec.add_development_dependency 'simplecov', '~> 0.15.1'
   spec.add_development_dependency 'sqlite3'
 end

data/spec/global_context_registry_spec.rb

@@ -100,7 +100,7 @@ describe GlobalContextRegistry do
       end
     end
 
-    context 'with fixnums' do
+    context 'with integers' do
       def setup_registry
         GlobalContextRegistry.set(:bar, 5)
       end

data/spec/spec_helper.rb

@@ -3,10 +3,10 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
-]
+])
 SimpleCov.start do
  add_filter 'spec'
 end
@@ -51,4 +51,4 @@ RSpec.configure do |config|
   end
 end
 
-puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+puts "Testing with Ruby #{RUBY_VERSION} and ActiveRecord #{ActiveRecord::VERSION::STRING}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Pat Breault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,6 @@ files:
 - lib/rails_multitenant/version.rb
 - rails_multitenant.gemspec
 - spec/be_multitenant_on_matcher_spec.rb
-- spec/current_spec.rb.dis
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/external_item_spec.rb
@@ -199,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -207,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Automatically configures multiple tenants in a Rails environment
@@ -216,7 +215,6 @@ test_files:
 - spec/global_context_registry_spec.rb
 - spec/external_item_spec.rb
 - spec/item_subtype_spec.rb
-- spec/current_spec.rb.dis
 - spec/item_spec.rb
 - spec/external_item_with_optional_org_spec.rb
 - spec/db/schema.rb

data/spec/current_spec.rb.dis

@@ -1,80 +0,0 @@
-# Create multiple orgs
-# Create an item in each
-# Make sure you can only see one org's item in one org
-
-describe RailsMultitenant::GlobalContextRegistry::Current do
-
-  class Parent
-    include RailsMultitenant::GlobalContextRegistry::Current
-
-    attr_accessor :id
-
-    def initialize(id: 0)
-      @id = id
-    end
-  end
-
-  class Dependent
-    include RailsMultitenant::GlobalContextRegistry::Current
-    global_context_dependent_on Parent
-  end
-
-  class StepParent < Parent
-  end
-
-  it 'current' do
-    expect(Parent.current.id).to eq(0)
-    expect(Parent.current).to eq(Parent.current)
-  end
-
-  it 'current=' do
-    Parent.current = Parent.new(id: 42)
-    expect(Parent.current.id).to eq(42)
-  end
-
-
-  it 'clear_current!' do
-    Parent.clear_current!
-    expect(Parent.current.id).to eq(0)
-  end
-
-  it 'current?' do
-    Parent.clear_current!
-    expect(Parent.current?).to be_falsey
-    Parent.current = Parent.new(id: 42)
-    expect(Parent.current?).to be_truthy
-  end
-
-  context 'with dependencies' do
-    it 'dependent is cleared' do
-      Parent.current = Parent.new(id: 78)
-      Dependent.current = Dependent.new
-      Parent.current = Parent.new(id: 78)
-      expect(Dependent.current?).to be_falsey
-    end
-
-    it 'dependent subclass is cleared' do
-      Parent.current = Parent.new(id: 78)
-      Dependent.current = Dependent.new
-      Parent.current = StepParent.new(id: 78)
-      expect(Dependent.current?).to be_falsey
-    end
-
-
-    #let(dependent_id) { Organization.current.id }
-
-    it 'dependent model subclass is cleared' do
-      #Organization.current = Organization.create!
-      DependsOnOrganization.current = DependsOnOrganization.create!
-      dependent_id = DependsOnOrganization.current.object_id
-      SubOrganization.current = SubOrganization.create!
-      expect(DependsOnOrganization.current.object_id).not_to eq(dependent_id)
-
-
-
-
-
-    end
-  end
-
-end