schema_associations 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3b9c45613e71564c85a31fe61dbe4a568568a23
-  data.tar.gz: c45c59c0dab8f9e87e396ef90199c6d4f5f6f852
+  metadata.gz: 395a9d8c36949f31bba7558d51be3dda54be2bfb
+  data.tar.gz: c6807a2b495005257d0d749de2216625e5332899
 SHA512:
-  metadata.gz: febbd2e3214f1bd063d68f0e9f93c0a12da75acbe7aefec616892015992cdb2afc4a5a7c31db8bb17200a49032a4daf2f2f10d14247f0018f1f10ee56a101513
-  data.tar.gz: 7e83f3bf6be38cd776896fa58b1ff21f39cbb1c5b20bff219c9b1dc3fa181ba5a5bcaa36d38acf7f09ed287a8ae8310b7d175a39f5189d8c1963c98311aa47b3
+  metadata.gz: d4535711d17dc740000c135b41a42816d3dc5be8c0ad616c292870c43e2948b96132e914fd43a964ac3f6646aeb61e58f78c879b8d06353eafaf8638b12eb568
+  data.tar.gz: 112912f68d8a1f3b20151ac5799fd7f997d63b32ad2386c9464158105a2292fd9cf7b7bf3df924a838378b32739a135ebb7405daa047a193b75ec8034e7bc685

data/README.md

@@ -353,6 +353,10 @@ Code coverage results will be in coverage/index.html -- it should be at 100% cov
 
 ## Release notes:
 
+### 1.2.2
+
+* Bug fix (Rails workaround) for STI: propagate associations to subclasses, since Rails might not, depending on the load order.
+
 ### 1.2.1
 
 * Works with Rails 4.1

data/lib/schema_associations/active_record/associations.rb

@@ -114,6 +114,9 @@ module SchemaAssociations
 
         names = _determine_association_names(column_name.sub(/_id$/, ''), referencing_name, references_name)
 
+        argstr = ""
+
+
         case macro
         when :has_and_belongs_to_many
           name = names[:has_many]
@@ -145,20 +148,33 @@ module SchemaAssociations
                 opts[:order] = :position
               else
                 scope_block = lambda { order :position }
+                argstr += "-> { order :position }, "
               end
             end
           end
         end
+        argstr += opts.inspect[1...-1]
         if (_filter_association(macro, name) && !_method_exists?(name))
-          logger.info "[schema_associations] #{self.name || self.table_name.classify}.#{macro} #{name.inspect}, #{opts.inspect[1...-1]}"
           if ::ActiveRecord::VERSION::MAJOR.to_i < 4
-            send macro, name, opts.dup
+            _create_association(macro, name, argstr, opts.dup)
           else
-            send macro, name, scope_block, opts.dup
+            _create_association(macro, name, argstr, scope_block, opts.dup)
           end
         end
       end
 
+      def _create_association(macro, name, argstr, *args)
+        logger.info "[schema_associations] #{self.name || self.table_name.classify}.#{macro} #{name.inspect}, #{argstr}"
+        send macro, name, *args
+        case 
+        when respond_to?(:subclasses) then subclasses
+        when respond_to?(:descendants) then descendants
+        end.each do |subclass|
+          subclass.send :_create_association, macro, name, argstr, *args
+        end
+      end
+
+
       def _determine_association_names(reference_name, referencing_name, references_name)
 
         references_concise = _concise_name(references_name, referencing_name)

data/lib/schema_associations/version.rb

@@ -1,3 +1,3 @@
 module SchemaAssociations
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/association_spec.rb

@@ -614,16 +614,26 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {}, :type => {coltype: :string} }
+        "comments", {}, { :post_id => {}, :type => {coltype: :string} },
+        "citers", {}, {},
+        "citations", {}, { :comment_id => {}, :citer_id => {}}
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
+      class Citation < ActiveRecord::Base ; end
       class SubComment < Comment ; end
+      class OwnComment < Comment
+        has_one :citer, :through => :citations
+      end
     end
 
     it "defines association for subclass" do
       expect(SubComment.reflect_on_association(:post)).not_to be_nil
     end
+
+    it "defines association for subclass that has its own associations" do
+      expect(OwnComment.reflect_on_association(:post)).not_to be_nil
+    end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_associations
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ronen Barzel