arel-helpers 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f4827c570f384201da3e8d5b4cb4ba128647338
-  data.tar.gz: 41862cd346409a675ce805be9be7b9bf870f1fad
+  metadata.gz: 307887bb3095f9de4ea562feb2e36c96dc85f131
+  data.tar.gz: 6bc236ff8796f5c9e3aba3aa2dedb2c5fb83fe3b
 SHA512:
-  metadata.gz: 74e3d838e06893f725de391c378367693fb1b6215124eeae4ae0f9357347b044fd35d53eafc38673f0fab9c60c05b340c33d543496eec7be259d6230f20b8f80
-  data.tar.gz: 7aac06ec8e7433ed527cb81ab85aa269affb9bbc760b144565c35f36386d5bfee44264bc7c1e48bb015ca9ff6b36c037c594d06b7b54e84e336caab1f483b1b1
+  metadata.gz: 0d7370d6b5fbb42e29b352d4fc07e2dadf0b5d7b1e2e885ac2b85c236556074125eca920a4ab0c7befcb4de7d0a451a66e2f72334210c2804c50df6e3d5186a8
+  data.tar.gz: 1805436115bc5c944cd99d5b850a842f5e2f93825e9e0881d51dfdf2010bd3b0b4bfecd5fbb5d4b671d46a31efda36fb615921b7f3f651f288395de21eabb620

data/History.txt

@@ -21,3 +21,7 @@
 == 2.0.2
 
 * Fix issue causing CollectionProxy#[] to return Arel::Attribute objects instead of model instances. See https://github.com/camertron/arel-helpers/pull/11
+
+== 2.1.0
+
+* Adding support for Rails 4.2 (@hasghari, github issue #12)

data/README.md

@@ -155,7 +155,7 @@ PostQueryBuilder.new
 
 ## Requirements
 
-Requires ActiveRecord >= 3.1.0, <= 4.1.0, tested with Ruby 1.9.3, 2.0.0, and 2.1.0. Depends on SQLite for testing purposes.
+Requires ActiveRecord >= 3.1.0, <= 4.2.0, tested with Ruby 1.9.3, 2.0.0, and 2.1.0. Depends on SQLite for testing purposes.
 
 ## Running Tests
 

data/lib/arel-helpers/join_association.rb

@@ -17,8 +17,10 @@ module ArelHelpers
       # For example, for HABTM associations, two join statements are required.
       # This method encapsulates that functionality and yields an intermediate object for chaining.
       # It also allows you to use an outer join instead of the default inner via the join_type arg.
-      def join_association(table, association, join_type = Arel::InnerJoin, &block)
-        if ActiveRecord::VERSION::STRING >= '4.1.0'
+      def join_association(table, association, join_type = Arel::Nodes::InnerJoin, &block)
+        if ActiveRecord::VERSION::STRING >= '4.2.0'
+          join_association_4_2(table, association, join_type, &block)
+        elsif ActiveRecord::VERSION::STRING >= '4.1.0'
           join_association_4_1(table, association, join_type, &block)
         else
           join_association_3_1(table, association, join_type, &block)
@@ -62,6 +64,23 @@ module ArelHelpers
           join_type.new(constraint.left, right)
         end
       end
+
+      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|
+          constraint.joins.map do |join|
+            right = if block_given?
+                      yield join.left.name.to_sym, join.right
+                    else
+                      join.right
+                    end
+
+            join_type.new(join.left, right)
+          end
+        end
+      end
     end
   end
 end

data/lib/arel-helpers/version.rb

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

data/spec/join_association_spec.rb

@@ -10,7 +10,7 @@ describe ArelHelpers do
     end
 
     it "should work with an outer join" do
-      Post.joins(ArelHelpers.join_association(Post, :comments, Arel::OuterJoin)).to_sql.should ==
+      Post.joins(ArelHelpers.join_association(Post, :comments, Arel::Nodes::OuterJoin)).to_sql.should ==
         'SELECT "posts".* FROM "posts" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id"'
     end
 
@@ -45,6 +45,11 @@ describe ArelHelpers do
       end).to_sql.should ==
         'SELECT "posts".* FROM "posts" INNER JOIN "comments" ON "comments"."post_id" = "posts"."id" AND "comments"."text" = \'Awesome post!\' INNER JOIN "favorites" (ON "favorites"."post_id" = "posts"."id" OR "favorites"."amount" = \'lots\')'
     end
+
+    it 'should be able to handle has_and_belongs_to_many associations' 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
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord