activerecord-hierarchical_query 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6c42356f33dc54b6465666e31e25c1e4339e81d188dca9b128c9a6435239adf3
-  data.tar.gz: d2f9c3703c91a157bee7ce70dc83f4c11d52a88f65e0b29a50ad570aa6e412bb
+SHA1:
+  metadata.gz: 13f2aad576b516e9b2235f1e3776a6f5bd52b11b
+  data.tar.gz: e76658b0c6ffe75f4a4e0e0cc889290b1270957f
 SHA512:
-  metadata.gz: fe4ae82ba1fb0b099bc945e33d320f3499ae3f158922cf49692fda4bde3d92f5a58d73304d4d7ba474ef98a55640e46004ee31a4e64421cbac3d8829fdc6bed7
-  data.tar.gz: 186ffb55554c0d61d83f5dafdc2f7f76fb164f594337a7ff0c72baa4cce62a7d094426aa542146f8f2cba9da67bdcb2cad9e49dca0c906db93e0c90327513412
+  metadata.gz: 7fa854231ce99498de1046ab02c709523fe489a20b1ec8ba9c3bbda430a2bd894ac5dc5107b3333dc561328300ef111c668292b89b0ebd5c7659eed1dd78d55b
+  data.tar.gz: ea1b27e86b7eb26a7f025d59be55e4fe2e83046f50ceedb56940af267d3ccb28be8bfa7665240caf5904731906b5d0fc23de6b30f714edd01901f83edf701d57

data/README.md

@@ -6,21 +6,6 @@
 [![Dependency Status](https://gemnasium.com/take-five/activerecord-hierarchical_query.png)](https://gemnasium.com/take-five/activerecord-hierarchical_query)
 [![Gem Version](https://badge.fury.io/rb/activerecord-hierarchical_query.png)](http://badge.fury.io/rb/activerecord-hierarchical_query)
 
-## Rails 4 Only
-
-This is the README for the **Rails 4 version**. Support for Rails 4 is
-ending soon. Please upgrade to Rails 5 which is supported on the
-master branch.
-
-Be aware that this README and the gems dependencies for Rails 4
-may be out of date. If you must use Rails 4 please monitor this
-branch's requirements for security releases.
-
-If you are on a ruby version greater than 2.3 be sure that you
-are on Rails 4.2.
-
-## Introduction
-
 Create hierarchical queries using simple DSL, recursively traverse trees using single SQL query.
 
 If a table contains hierarchical data, then you can select rows in hierarchical order using hierarchical query builder.
@@ -80,7 +65,7 @@ crumbs = records.pluck(:name).join(' / ')
 
 ## Requirements
 
-* ActiveRecord >= 4.0, < 5.0
+* ActiveRecord >= 3.1.0 (Rails 5.0 not supported yet)
 * PostgreSQL >= 8.4
 
 ## Installation

data/lib/active_record/hierarchical_query/cte/non_recursive_term.rb

@@ -15,7 +15,7 @@ module ActiveRecord
         end
 
         def bind_values
-          scope.bind_values
+          scope.bound_attributes
         end
 
         def arel

data/lib/active_record/hierarchical_query/cte/query_builder.rb

@@ -40,7 +40,7 @@ module ActiveRecord
 
         private
         def build_manager
-          @arel = Arel::SelectManager.new(table.engine).
+          @arel = Arel::SelectManager.new(table).
               with(:recursive, with_query).
               from(recursive_table)
         end

data/lib/active_record/hierarchical_query/cte/recursive_term.rb

@@ -13,7 +13,7 @@ module ActiveRecord
         end
 
         def bind_values
-          scope.bind_values
+          scope.bound_attributes
         end
 
         def arel

data/lib/active_record/hierarchical_query/join_builder.rb

@@ -11,17 +11,21 @@ module ActiveRecord
         @query = query
         @builder = CTE::QueryBuilder.new(query, options: options)
         @relation = join_to
-        @alias = Arel::Table.new(subquery_alias, ActiveRecord::Base)
+        @alias = Arel::Table.new(subquery_alias)
         @options = options
       end
 
       def build
-        relation = @relation.joins(joined_arel_node)
-        # copy bound variables from inner subquery
-        relation.bind_values += bind_values
+        relation = @relation
+
         # add ordering by "__order_column"
         relation.order_values += order_columns if ordered?
 
+        relation = relation.joins(joined_arel_node)
+
+        # copy bound variables from inner subquery
+        relation.bind_values += bind_values
+
         relation
       end
 

data/lib/active_record/hierarchical_query/orderings.rb

@@ -100,15 +100,16 @@ module ActiveRecord
       def order_column
         table = order_attribute.relation
 
-        if table.engine == ActiveRecord::Base
+        engine = table.class.engine
+        if engine == ActiveRecord::Base
           columns =
-            if table.engine.connection.respond_to?(:schema_cache)
-              table.engine.connection.schema_cache.columns_hash(table.name)
+            if engine.connection.respond_to?(:schema_cache)
+              engine.connection.schema_cache.columns_hash(table.name)
             else
-              table.engine.connection_pool.columns_hash[table.name]
+              engine.connection_pool.columns_hash[table.name]
             end
         else
-          columns = table.engine.columns_hash
+          columns = engine.columns_hash
         end
 
         columns[order_attribute.name.to_s]

data/lib/active_record/hierarchical_query/query.rb

@@ -24,7 +24,7 @@ module ActiveRecord
                   :distinct_value
 
       # @api private
-      CHILD_SCOPE_METHODS = :where, :joins, :group, :having, :bind
+      CHILD_SCOPE_METHODS = :where, :joins, :group, :having
 
       def initialize(klass)
         @klass = klass
@@ -178,7 +178,6 @@ module ActiveRecord
       # @!method joins(*tables)
       # @!method group(*values)
       # @!method having(*conditions)
-      # @!method bind(value)
       CHILD_SCOPE_METHODS.each do |method|
         define_method(method) do |*args|
           @child_scope_value = @child_scope_value.public_send(method, *args)

data/lib/active_record/hierarchical_query/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HierarchicalQuery
-    VERSION = '0.2.0'
+    VERSION = '1.0.0'
   end
 end

data/spec/active_record/hierarchical_query_spec.rb

@@ -218,19 +218,6 @@ describe ActiveRecord::HierarchicalQuery do
         ).to match_array [child_4, child_5]
       end
     end
-
-    describe 'binding values' do
-      it 'binds values' do
-        expect(
-            klass.join_recursive do |query|
-              query.start_with('id = $1')
-                   .connect_by(id: :parent_id)
-                   .where(nil)
-                   .bind([nil, child_4.id])
-            end
-        ).to match_array([child_4, child_5])
-      end
-    end
   end
 
   describe '#join_recursive options' do

metadata

@@ -1,110 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexei Mikhailov
-- Zach Aysan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2017-04-10 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'
+        version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.9.1
 description: 
 email:
 - amikhailov83@gmail.com
-- zachaysan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -150,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Recursively traverse trees using a single SQL query