arel-helpers 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 875e70afa83c9d6c1c5b74713162b2eef19c94b1
-  data.tar.gz: 562a0e972c495904a876f5cfcbf08dbadf71b058
+  metadata.gz: 5b9e21c4189a1c32c6361aca598fa70d942f5f2d
+  data.tar.gz: 10815ed87668b9fd619cfcdb83c4efef8ea0ad82
 SHA512:
-  metadata.gz: 2a364dbb1ccbe4937fa23892678261cdfabc4846111499748f244701f210d7a8996465f80f8d14d7c9add1ab4706f3b4a71d48736caa12ffed20f6b6c5f223f1
-  data.tar.gz: 746357d316c5eb82e29952f2a5fd54ffebae6e550acb7e8eebdf7fcc9bc6562e37975217afde0f8f4e441495b5789c907d0f2a0e22f398ef06d7913e842de0fe
+  metadata.gz: ca0257e7a5fe7e7ca769fd4fb60ab7016f8fd6d7e520e65527b8522db0ab07afb41c3e92ae02f009c73bcf1e0ab93d939b4256e51fa40bc46b24a90656e4c72a
+  data.tar.gz: 3a5b57d717d31d94d87008fca7cab200d50dbfff13a25a2f9050c4c24365c4e6d8197f3e491180df7785ca24abc201b2440b7192f6ae2a1dfe142a8a63ff3ba2

data/History.txt

@@ -33,3 +33,7 @@
 == 2.2.0
 
 * Adding polymorphic join support for Rails 4.2.
+
+== 2.3.0
+
+* Adding support for Rails 5 (@vkill #24, @camertron #26)

data/README.md

@@ -172,7 +172,7 @@ PostQueryBuilder.new
 
 ## Requirements
 
-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.
+Requires ActiveRecord >= 3.1.0, < 6, tested against Ruby 2.2.4. Depends on SQLite for testing purposes.
 
 ## Running Tests
 

data/arel-helpers.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   if ENV["AR"]
     s.add_dependency 'activerecord', ENV["AR"]
   else
-    s.add_dependency 'activerecord', '>= 3.1.0', '< 5'
+    s.add_dependency 'activerecord', '>= 3.1.0', '< 6'
   end
 
   s.require_path = 'lib'

data/lib/arel-helpers/join_association.rb

@@ -18,7 +18,9 @@ module ArelHelpers
       # 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::Nodes::InnerJoin, &block)
-        if ActiveRecord::VERSION::STRING >= '4.2.0'
+        if ActiveRecord::VERSION::STRING >= '5.0.0'
+          join_association_5_0(table, association, join_type, &block)
+        elsif 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)
@@ -99,6 +101,36 @@ module ArelHelpers
         join_strings.join(' ')
       end
 
+      def join_association_5_0(table, association, join_type)
+        associations = association.is_a?(Array) ? association : [association]
+        join_dependency = ActiveRecord::Associations::JoinDependency.new(table, associations, [])
+
+        constraints = join_dependency.join_constraints([], join_type)
+
+        binds = constraints.flat_map do |info|
+          prepared_binds = table.connection.prepare_binds_for_database(info.binds)
+          prepared_binds.map { |value| table.connection.quote(value) }
+        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
+
+            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)

data/lib/arel-helpers/version.rb

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

metadata

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