acts_as_tenant 0.3.6 → 0.3.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNiZWQ1ZWI4YWU2Y2M4YTMxNjRiN2RkYTA0MzNkN2VkZTRhNTczOA==
+    NzI5YTBmNmY5NjY3MDFmYjU5MzcxZjY3NzU4NjMwNzMxOGM3MTgzZg==
   data.tar.gz: !binary |-
-    YzUzZmVmOTdhY2NlZDQ3NGMxZWRjMDYxY2RjODBmOWE1MjJlOTRiMA==
+    OTExMzUxY2U4YjYzMzcwOTExNjk0MzRhMWRkNjAxOTU1Y2Y5YmYyMQ==
 SHA512:
   metadata.gz: !binary |-
-    NzhmYWY4NmY3ZTkxZjE0MTIzZjdlYjc2ZTI5ZmFhMWI0OGEzZmRhYzFmYjQ3
-    ODhiMmVmMmE0MTFiYjBiZTQyODg1ZTU3MzRiMzZmNmJmMzYwYzZkMTI1OGJi
-    ZDRjODllOWMzNmVhZmUxNmFkMmM1MjRjNDhmZjU4MTc3Y2YyMjQ=
+    OTZmZThmMDZlYTg5OWU1YzBkOTQ1NjdmNWJhYjE2MjI4MjJhYzU5OGRkYWJk
+    ZTg0OGQwNWNjZTBkNDdiMGFkNDIzOTRmODNmOWNhNzEzY2E2YTZhODk5ZDIz
+    ZjRiMmY0OWJjNTI0ZDA1MTQ1M2Y2ZTdjMzFhMTAxZDMzNzlhZDQ=
   data.tar.gz: !binary |-
-    NmU4NjEzZGQyOGQ5ZTk2MzgyMzMyYjRmMDczNGIwOTQ4NDA4YTNmNzc0MTU4
-    ZDc5M2UwNDMzMTI5YmExN2I1MjRhYTgxMDgyYjI0MjY3OWZkNjgyOTQxOGMw
-    MzYyNThlNjhiMTM2YTdhZTQ0NzQ4ODQxZDUzYTZlNTNhM2YyNzQ=
+    OWYzNzlkODkyM2EyMTMxN2MxMjY1ZWRmZDVhN2UxZjIxOTNmMzYzMjJlNTdj
+    ODMxNTdmMWMxZTJlODcyNmIwNzM4YjUxOTMyYWE0M2M0MTM2M2Y1ZDZmZTY2
+    MDBjMWRiNGRiY2M4ZTViZjZhMDc5MDMxMjVlMWJmMWY5OGQwNTc=

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.3.7
+-----
+* Fix for proper handling of polymorphic associations (thx sol1dus)
+* Fix fefault scope to generate correct sql when using database prefix (thx IgorDobryn)
+* Added ability to specify a custom Primary Key (thx matiasdim)
+* Sidekiq 3.2.2+ no longer supports Ruby 1.9. Locking Sidekiq in gemspec at 3.2.1.
+* Update RSPEC to 3.0. Convert all specs (thx petergoldstein)
+* support sidekiq 3 interface (thx davekaro)
+
 0.3.6
 -----
 * Added method `set_current_tenant_by_subdomain_or_domain` (thx preth00nker)

data/acts_as_tenant.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('database_cleaner')
   s.add_development_dependency('sqlite3')
 
-  s.add_development_dependency('sidekiq', '>= 3.0')
+  s.add_development_dependency('sidekiq', '3.2.1')
 end

data/lib/acts_as_tenant/model_extensions.rb

@@ -53,7 +53,7 @@ module ActsAsTenant
           if ActsAsTenant.configuration.require_tenant && ActsAsTenant.current_tenant.nil?
             raise ActsAsTenant::Errors::NoTenantSet
           end
-          where({"#{self.table_name}.#{fkey}" => ActsAsTenant.current_tenant.id})  if ActsAsTenant.current_tenant
+          where(fkey.to_sym => ActsAsTenant.current_tenant.id) if ActsAsTenant.current_tenant
         }
 
         # Add the following validations to the receiving model:
@@ -66,11 +66,15 @@ module ActsAsTenant
           end
         }, :on => :create
 
+        polymorphic_foreign_keys = reflect_on_all_associations.select do |a|
+          a.options[:polymorphic]
+        end.map { |a| a.foreign_key }
+
         reflect_on_all_associations.each do |a|
-          unless a == reflect_on_association(tenant) || a.macro != :belongs_to || a.options[:polymorphic]
+          unless a == reflect_on_association(tenant) || a.macro != :belongs_to || polymorphic_foreign_keys.include?(a.foreign_key)
             association_class =  a.options[:class_name].nil? ? a.name.to_s.classify.constantize : a.options[:class_name].constantize
             validates_each a.foreign_key.to_sym do |record, attr, value|
-              record.errors.add attr, "association is invalid [ActsAsTenant]" unless value.nil? || association_class.where(:id => value).present?
+              record.errors.add attr, "association is invalid [ActsAsTenant]" unless value.nil? || association_class.where(association_class.primary_key.to_sym => value).present?
             end
           end
         end

data/lib/acts_as_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTenant
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/acts_as_tenant/model_extensions_spec.rb

@@ -52,6 +52,12 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :accountID, :integer
   end
 
+  create_table :comments, :force => true do |t|
+    t.column :commentable_id, :integer
+    t.column :commentable_type, :string
+    t.column :account_id, :integer
+  end
+
 end
 
 # Setup the models
@@ -100,6 +106,12 @@ class CustomForeignKeyTask < ActiveRecord::Base
   validates_uniqueness_to_tenant :name
 end
 
+class Comment < ActiveRecord::Base
+  belongs_to :commentable, polymorphic: true
+  belongs_to :task, -> { where(comments: { commentable_type: 'Task'  })  }, foreign_key: 'commentable_id'
+  acts_as_tenant :account
+end
+
 # Start testing!
 describe ActsAsTenant do
   after { ActsAsTenant.current_tenant = nil }
@@ -251,6 +263,17 @@ describe ActsAsTenant do
     it { expect(AliasedTask.create(:name => 'foo', :project_alias => @project2).valid?).to eq(true) }
   end
 
+  describe "It should be possible to use associations with foreign_key from polymorphic" do
+    before do
+      @account = Account.create!(name: 'foo')
+      ActsAsTenant.current_tenant = @account
+      @project = Project.create!(name: 'project', account: @account)
+      @comment = Comment.new commentable: @project, account: @account
+    end
+
+    it { expect(@comment.save!).to eq(true) }
+  end
+
   # Additional default_scopes
   describe 'When dealing with a user defined default_scope' do
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Erwin Matthijssen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -98,16 +98,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.1
 description: Integrates multi-tenancy into a Rails application in a convenient and
   out-of-your way manner
 email: