arel-helpers 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7caa6de6e09401386429457aabaaebbe22cc7644
-  data.tar.gz: 9f60d6693ff7bb7fe28e81b89d96544c30754388
+  metadata.gz: 875e70afa83c9d6c1c5b74713162b2eef19c94b1
+  data.tar.gz: 562a0e972c495904a876f5cfcbf08dbadf71b058
 SHA512:
-  metadata.gz: 7eedcd17a17eb46a6cbef05be4470eb96fe9cf0e462cddf6b5313de9dea179c7497a8d83207923c0684a6088f3edb6022fc1468dfa02741e8bec725cdfd2f10f
-  data.tar.gz: e99be0b2d82076d2c24b898fd6ae08dac884fb2d34378dcb9778e36e1b2ebcd3ae7d52a16862a5eaba342157255bb06d26038f5c68e85e3f3b8fcee6aa00c90c
+  metadata.gz: 2a364dbb1ccbe4937fa23892678261cdfabc4846111499748f244701f210d7a8996465f80f8d14d7c9add1ab4706f3b4a71d48736caa12ffed20f6b6c5f223f1
+  data.tar.gz: 746357d316c5eb82e29952f2a5fd54ffebae6e550acb7e8eebdf7fcc9bc6562e37975217afde0f8f4e441495b5789c907d0f2a0e22f398ef06d7913e842de0fe

data/History.txt

@@ -29,3 +29,7 @@
 == 2.1.1
 
 * Fixing issue causing ArelTable instances to get returned when accessing records inside an ActiveRecord::Relation. (@svoynow, #18)
+
+== 2.2.0
+
+* Adding polymorphic join support for Rails 4.2.

data/lib/arel-helpers/join_association.rb

@@ -56,30 +56,55 @@ module ArelHelpers
 
         join_dependency.join_constraints([]).map do |constraint|
           right = if block_given?
-                    yield constraint.left.name.to_sym, constraint.right
-                  else
-                    constraint.right
-                  end
+            yield constraint.left.name.to_sym, constraint.right
+          else
+            constraint.right
+          end
 
           join_type.new(constraint.left, right)
         end
       end
 
+      # ActiveRecord 4.2 moves bind variables out of the join classes
+      # and into the relation. For this reason, a method like
+      # join_association isn't able to add to the list of bind variables
+      # dynamically. To get around the problem, this method must return
+      # a string.
       def join_association_4_2(table, association, join_type)
         associations = association.is_a?(Array) ? association : [association]
         join_dependency = ActiveRecord::Associations::JoinDependency.new(table, associations, [])
 
-        join_dependency.join_constraints([]).map do |constraint|
+        constraints = join_dependency.join_constraints([])
+
+        binds = constraints.flat_map do |info|
+          info.binds.map { |bv| table.connection.quote(*bv.reverse) }
+        end
+
+        joins = constraints.flat_map do |constraint|
           constraint.joins.map do |join|
             right = if block_given?
-                      yield join.left.name.to_sym, join.right
-                    else
-                      join.right
-                    end
+              yield join.left.name.to_sym, join.right
+            else
+              join.right
+            end
 
             join_type.new(join.left, right)
           end
         end
+
+        join_strings = joins.map do |join|
+          to_sql(join, table, binds)
+        end
+
+        join_strings.join(' ')
+      end
+
+      private
+
+      def to_sql(node, table, binds)
+        visitor = table.connection.visitor
+        collect = visitor.accept(node, Arel::Collectors::Bind.new)
+        collect.substitute_binds(binds).join
       end
     end
   end

data/lib/arel-helpers/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ArelHelpers
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/spec/env.rb

@@ -28,6 +28,10 @@ module ArelHelpers
         CreateAuthorsTable.new.change
         CreateFavoritesTable.new.change
         CreateCollabPostsTable.new.change
+        CreateCardsTable.new.change
+        CreateCardLocationsTable.new.change
+        CreateLocationsTable.new.change
+        CreateCommunityTicketsTable.new.change
       end
 
       def reset
@@ -37,4 +41,4 @@ module ArelHelpers
 
     end
   end
-end
+end

data/spec/env/migrations.rb

@@ -40,3 +40,30 @@ class CreateCollabPostsTable < ActiveRecord::Migration
     end
   end
 end
+
+class CreateCardsTable < ActiveRecord::Migration
+  def change
+    create_table :cards
+  end
+end
+
+class CreateCardLocationsTable < ActiveRecord::Migration
+  def change
+    create_table :card_locations do |t|
+      t.references :location
+      t.references :card, polymorphic: true
+    end
+  end
+end
+
+class CreateLocationsTable < ActiveRecord::Migration
+  def change
+    create_table :locations
+  end
+end
+
+class CreateCommunityTicketsTable < ActiveRecord::Migration
+  def change
+    create_table :community_tickets
+  end
+end

data/spec/env/models.rb

@@ -27,3 +27,24 @@ class CollabPost < ActiveRecord::Base
   include ArelHelpers::ArelTable
   has_and_belongs_to_many :authors
 end
+
+class Card < ActiveRecord::Base
+  has_many :card_locations
+end
+
+class CardLocation < ActiveRecord::Base
+  belongs_to :location
+  belongs_to :card, polymorphic: true
+end
+
+class Location < ActiveRecord::Base
+  has_many :card_locations
+  has_many :community_tickets, {
+    through: :card_locations, source: :card, source_type: 'CommunityTicket'
+  }
+end
+
+class CommunityTicket < ActiveRecord::Base
+  has_many :card_locations, as: :card, source_type: 'CommunityTicket'
+  has_many :locations, through: :card_locations
+end

data/spec/join_association_spec.rb

@@ -50,6 +50,16 @@ describe ArelHelpers do
       CollabPost.joins(ArelHelpers.join_association(CollabPost, :authors)).to_sql.should ==
         'SELECT "collab_posts".* FROM "collab_posts" INNER JOIN "authors_collab_posts" ON "authors_collab_posts"."collab_post_id" = "collab_posts"."id" INNER JOIN "authors" ON "authors"."id" = "authors_collab_posts"."author_id"'
     end
+
+    it 'handles polymorphic through associations' do
+      relation = Location.joins(
+        ArelHelpers.join_association(Location, :community_tickets)
+      )
+
+      relation.to_sql.should == 'SELECT "locations".* FROM "locations" ' +
+        'INNER JOIN "card_locations" ON "card_locations"."location_id" = "locations"."id" AND "card_locations"."card_type" = \'CommunityTicket\' ' +
+        'INNER JOIN "community_tickets" ON "community_tickets"."id" = "card_locations"."card_id"'
+    end
   end
 end
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: arel-helpers
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: '5'
 description: Useful tools to help construct database queries with ActiveRecord and
   Arel.
 email:
@@ -69,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Useful tools to help construct database queries with ActiveRecord and Arel.