rails_multitenant 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9d1830ec790f9afd698f90dab03a3758940e64
-  data.tar.gz: a2e30e84291bc0080fbf75be97b676f576e2347c
+  metadata.gz: ff528a38b03db9f83d9665fc802a577fa10cc0cb
+  data.tar.gz: d75fb03a0907977a6f18cf1fdc8a32a183179e88
 SHA512:
-  metadata.gz: db8809d3660df19cae83d21b9e39d6f816c85eef587890a04042c0bdeb36a0919a052158cef1fc47b59d4741b18d71f9209a17cb3191ec0796ee8efeac09a177
-  data.tar.gz: d188d1dbabb872fca6ec705714a704cbf3c87513d37fb88357f680637f8aba242519b460479042133f30819506e9f73127e584e57de6529f2bab98b3375422c3
+  metadata.gz: a3fd2430828d14280bd19414b20079814babd2ae01d67eb783b2130e2ddb029bde5521ee3dd6cec73ed2e7150637be99ab83c4d635db0d450f072ec28a3a8688
+  data.tar.gz: dd556073c42ef36665285a03018e2042375b815195a879687ddbe8c65d79f643a612c359425d88d6f006e0f16813b34c3e95e4d519af82cf79409b8b4c5ce43a

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--require spec_helper

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 sudo: false
 env:
-  - RAILS_VERSION="~> 3.2.22"
-  - RAILS_VERSION="~> 4.0.13"
-  - RAILS_VERSION="~> 4.1.13"
-  - RAILS_VERSION="~> 4.2.4"
+  - RAILS_VERSION="~> 4.1.16"
+  - RAILS_VERSION="~> 4.2.7"
+  - RAILS_VERSION="~> 5.0.0"
 rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.10.6
+  - 2.3.1
+before_install: gem install bundler -v 1.12.5

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-### 0.3.1 (unreleased)
+### 0.4.0
+* Fix be_multitenant_on matcher to handle models that don't include the `RailsMultitenant::MultitenantModel` module.
+* Fix `context_entity_id_field` to work with inheritance.
+* Drop Rails 3.2 and 4.0 support since `unscope` doesn't work propertly with default scopes.
+
+### 0.3.1
 * Fix strip_<entity>_scope
 
 ### 0.3.0

data/lib/rails_multitenant/multitenant_model.rb

@@ -3,9 +3,7 @@ module RailsMultitenant
     extend ActiveSupport::Concern
 
     included do
-      class << self
-        attr_accessor :context_entity_id_field
-      end
+      class_attribute :context_entity_id_field
     end
 
     module ClassMethods

data/lib/rails_multitenant/rspec.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define(:be_multitenant_on) do |expected|
   match do |actual|
-    actual.context_entity_id_field == expected
+    actual.respond_to?(:context_entity_id_field) && actual.context_entity_id_field == expected
   end
 end

data/lib/rails_multitenant/version.rb

@@ -1,3 +1,3 @@
 module RailsMultitenant
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/rails_multitenant.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
 
-  spec.add_dependency 'activerecord', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 4.3'])
-  spec.add_dependency 'activesupport', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 4.3'])
+  spec.add_dependency 'activerecord', ENV.fetch('RAILS_VERSION', ['>= 4.1', '< 5.1'])
+  spec.add_dependency 'activesupport', ENV.fetch('RAILS_VERSION', ['>= 4.1', '< 5.1'])
 
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'

data/spec/be_multitenant_on_matcher_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'rails_multitenant/rspec'
 
 describe "be_multitenant_on matcher" do
@@ -9,4 +8,8 @@ describe "be_multitenant_on matcher" do
   it "rejects an invalid context field id" do
     expect(ExternalItem).not_to be_multitenant_on(:other_field)
   end
+
+  it "rejects classes that don't have a context field id" do
+    expect(String).not_to be_multitenant_on(:other_field)
+  end
 end

data/spec/db/schema.rb

@@ -6,6 +6,7 @@ ActiveRecord::Schema.define(version: 0) do
 
   create_table(:items, force: true) do |t|
     t.integer :organization_id
+    t.string :type
   end
 
   create_table(:external_items, force: true) do |t|
@@ -22,6 +23,10 @@ class Item < ActiveRecord::Base
   multitenant_on_model :organization
 end
 
+class ItemSubtype < Item
+
+end
+
 class ExternalItem < ActiveRecord::Base
   include RailsMultitenant::MultitenantModel
   multitenant_on :external_organization_id

data/spec/external_item_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 include RailsMultitenant
 
 describe ExternalItem do

data/spec/global_context_registry_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 include RailsMultitenant
 
 describe GlobalContextRegistry do

data/spec/item_spec.rb

@@ -2,8 +2,6 @@
 # Create an item in each
 # Make sure you can only see one org's item in one org
 
-require 'spec_helper'
-
 describe Item do
 
   let!(:item1) { Item.create! }

data/spec/item_subtype_spec.rb

@@ -0,0 +1,37 @@
+# Create multiple orgs
+# Create an item in each
+# Make sure you can only see one org's item in one org
+
+describe ItemSubtype do
+
+  let!(:item1) { ItemSubtype.create! }
+
+  let!(:org2) { Organization.create! }
+  let!(:item2) { org2.as_current { ItemSubtype.create! } }
+  let!(:item3) { org2.as_current { ItemSubtype.create! } }
+
+  it 'inherits the multitenant settings from its parent class' do
+    expect(ItemSubtype).to be_multitenant_on(:organization_id)
+  end
+
+  specify 'default org should have one item' do
+    expect(ItemSubtype.all).to eq([item1])
+  end
+
+  it 'does not return item2' do
+    expect(ItemSubtype.where(id: item2.id)).to eq([])
+  end
+
+  specify 'org2 should have two items' do
+    org2.as_current do
+      expect(ItemSubtype.all).to eq([item2, item3])
+    end
+  end
+
+  it 'does not return item1' do
+    org2.as_current do
+      expect(ItemSubtype.where(id: item1.id)).to eq([])
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Pat Breault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,40 +30,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -177,6 +178,7 @@ files:
 - spec/external_item_spec.rb
 - spec/global_context_registry_spec.rb
 - spec/item_spec.rb
+- spec/item_subtype_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/salsify/rails_multitenant
 licenses:
@@ -209,4 +211,5 @@ test_files:
 - spec/external_item_spec.rb
 - spec/global_context_registry_spec.rb
 - spec/item_spec.rb
+- spec/item_subtype_spec.rb
 - spec/spec_helper.rb