activerecord-hierarchical_query 0.0.2 → 0.0.5

data/lib/active_record/hierarchical_query/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HierarchicalQuery
-    VERSION = '0.0.2'
+    VERSION = '0.0.5'
   end
 end

data/lib/arel/nodes/postgresql.rb

@@ -1,3 +1,5 @@
+require 'arel/visitors/to_sql'
+
 module Arel
   module Nodes
     class PostgresArray < Node
@@ -14,14 +16,32 @@ module Arel
   end
 
   module Visitors
-    class ToSql < Arel::Visitors::Visitor
+    class ToSql < ToSql.superclass
       private
-      def visit_Arel_Nodes_PostgresArray o, *a
-        "ARRAY[#{visit o.values, *a}]"
-      end
+      ARRAY_OPENING = 'ARRAY['.freeze
+      ARRAY_CLOSING = ']'.freeze
+      ARRAY_CONCAT = '||'.freeze
+
+      if Arel::VERSION < '6.0.0'
+        def visit_Arel_Nodes_PostgresArray o, *a
+          "#{ARRAY_OPENING}#{visit o.values, *a}#{ARRAY_CLOSING}"
+        end
+
+        def visit_Arel_Nodes_ArrayConcat o, *a
+          "#{visit o.left, *a} #{ARRAY_CONCAT} #{visit o.right, *a}"
+        end
+      else
+        def visit_Arel_Nodes_PostgresArray o, collector
+          collector << ARRAY_OPENING
+          visit o.values, collector
+          collector << ARRAY_CLOSING
+        end
 
-      def visit_Arel_Nodes_ArrayConcat o, *a
-        "#{visit o.left, *a} || #{visit o.right, *a}"
+        def visit_Arel_Nodes_ArrayConcat o, collector
+          visit o.left, collector
+          collector << ARRAY_CONCAT
+          visit o.right, collector
+        end
       end
     end
   end

data/spec/active_record/hierarchical_query_spec.rb

@@ -4,11 +4,11 @@ describe ActiveRecord::HierarchicalQuery do
   let(:klass) { Category }
 
   let!(:root) { klass.create }
-  let!(:child_1) { klass.create(:parent => root) }
-  let!(:child_2) { klass.create(:parent => child_1) }
-  let!(:child_3) { klass.create(:parent => child_1) }
-  let!(:child_4) { klass.create(:parent => root) }
-  let!(:child_5) { klass.create(:parent => child_4) }
+  let!(:child_1) { klass.create(parent: root) }
+  let!(:child_2) { klass.create(parent: child_1) }
+  let!(:child_3) { klass.create(parent: child_1) }
+  let!(:child_4) { klass.create(parent: root) }
+  let!(:child_5) { klass.create(parent: child_4) }
 
   describe '#join_recursive' do
     describe 'CONNECT BY clause' do
@@ -20,7 +20,7 @@ describe ActiveRecord::HierarchicalQuery do
 
       it 'joins parent and child rows by hash map' do
         expect(
-          klass.join_recursive { connect_by(:id => :parent_id) }
+          klass.join_recursive { connect_by(id: :parent_id) }
         ).to include root, child_1, child_2, child_3, child_4, child_5
       end
 
@@ -37,25 +37,25 @@ describe ActiveRecord::HierarchicalQuery do
       def assert_start_with(&block)
         expect(
           klass.join_recursive do |b|
-            b.connect_by(:id => :parent_id).instance_eval(&block)
+            b.connect_by(id: :parent_id).instance_eval(&block)
           end
         ).to match_array [root, child_1, child_2, child_3, child_4, child_5]
       end
 
       it 'filters rows in non-recursive term by hash' do
-        assert_start_with { start_with(:parent_id => nil) }
+        assert_start_with { start_with(parent_id: nil) }
       end
 
       it 'filters rows in non-recursive term by block with arity > 0' do
-        assert_start_with { start_with { |root| root.where(:parent_id => nil) } }
+        assert_start_with { start_with { |root| root.where(parent_id: nil) } }
       end
 
       it 'filters rows in non-recursive term by block with arity = 0' do
-        assert_start_with { start_with { where(:parent_id => nil) } }
+        assert_start_with { start_with { where(parent_id: nil) } }
       end
 
       it 'filters rows in non-recursive term by scope' do
-        assert_start_with { start_with(klass.where(:parent_id => nil)) }
+        assert_start_with { start_with(klass.where(parent_id: nil)) }
       end
     end
 
@@ -63,7 +63,7 @@ describe ActiveRecord::HierarchicalQuery do
       def assert_ordered_by_name_desc(&block)
         expect(
           klass.join_recursive do |b|
-            b.connect_by(:id => :parent_id).start_with(:parent_id => nil).instance_eval(&block)
+            b.connect_by(id: :parent_id).start_with(parent_id: nil).instance_eval(&block)
           end
         ).to eq [root, child_4, child_5, child_1, child_3, child_2]
       end
@@ -71,13 +71,13 @@ describe ActiveRecord::HierarchicalQuery do
       def assert_ordered_by_name_asc(&block)
         expect(
             klass.join_recursive do |b|
-              b.connect_by(:id => :parent_id).start_with(:parent_id => nil).instance_eval(&block)
+              b.connect_by(id: :parent_id).start_with(parent_id: nil).instance_eval(&block)
             end
         ).to eq [root, child_1, child_2, child_3, child_4, child_5]
       end
 
       it 'orders rows by Hash' do
-        assert_ordered_by_name_desc { order_siblings(:name => :desc) }
+        assert_ordered_by_name_desc { order_siblings(name: :desc) }
       end
 
       it 'orders rows by String' do
@@ -95,15 +95,15 @@ describe ActiveRecord::HierarchicalQuery do
 
       it 'throws error when something weird given' do
         expect {
-          klass.join_recursive { connect_by(:id => :parent_id).order_siblings(1) }
+          klass.join_recursive { connect_by(id: :parent_id).order_siblings(1) }
         }.to raise_error /ORDER BY SIBLINGS/
       end
 
       context 'when one attribute given and this attribute support natural sorting' do
         let(:relation) do
           klass.join_recursive do
-            connect_by(:id => :parent_id).
-            start_with(:parent_id => nil).
+            connect_by(id: :parent_id).
+            start_with(parent_id: nil).
             order_siblings(:position)
           end
         end
@@ -121,12 +121,23 @@ describe ActiveRecord::HierarchicalQuery do
       it 'limits all rows' do
         expect(
           klass.join_recursive do
-            connect_by(:id => :parent_id).
-            start_with(:parent_id => nil).
-            order_siblings(:name).
+            connect_by(id: :parent_id).
+            start_with(parent_id: nil).
             limit(2).
             offset(2)
-          end
+          end.size
+        ).to eq 2
+      end
+
+      it 'limits all rows if ordering given' do
+        expect(
+            klass.join_recursive do
+              connect_by(id: :parent_id).
+              start_with(parent_id: nil).
+              order_siblings(:name).
+              limit(2).
+              offset(2)
+            end
         ).to eq ordered_nodes[2...4]
       end
     end
@@ -135,8 +146,8 @@ describe ActiveRecord::HierarchicalQuery do
       it 'filters child rows' do
         expect(
           klass.join_recursive do
-            connect_by(:id => :parent_id).
-            start_with(:parent_id => nil).
+            connect_by(id: :parent_id).
+            start_with(parent_id: nil).
             where('depth < ?', 2)
           end
         ).to match_array [root, child_1, child_4]
@@ -145,8 +156,8 @@ describe ActiveRecord::HierarchicalQuery do
       it 'allows to use PRIOR relation' do
         expect(
           klass.join_recursive do |b|
-            b.connect_by(:id => :parent_id)
-             .start_with(:parent_id => nil)
+            b.connect_by(id: :parent_id)
+             .start_with(parent_id: nil)
              .select(:depth)
              .where(b.prior[:depth].lt(1))
           end
@@ -157,9 +168,9 @@ describe ActiveRecord::HierarchicalQuery do
     describe 'SELECT clause' do
       it 'adds column to both recursive and non-recursive term' do
         expect(
-          klass.join_recursive(:as => 'categories_r') do
-            connect_by(:id => :parent_id).
-            start_with(:parent_id => nil).
+          klass.join_recursive(as: 'categories_r') do
+            connect_by(id: :parent_id).
+            start_with(parent_id: nil).
             select(:depth)
           end.where('categories_r.depth = 0')
         ).to eq [root]
@@ -167,25 +178,38 @@ describe ActiveRecord::HierarchicalQuery do
     end
 
     describe 'NOCYCLE clause' do
-      before { klass.where(:id => child_4.id).update_all(:parent_id => child_5.id) }
+      before { klass.where(id: child_4.id).update_all(parent_id: child_5.id) }
 
       it 'prevents recursive query from endless loops' do
         expect(
           klass.join_recursive do |query|
-            query.start_with(:id => child_4.id)
-                 .connect_by(:id => :parent_id)
+            query.start_with(id: child_4.id)
+                 .connect_by(id: :parent_id)
                  .nocycle
           end
         ).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
     describe ':as option' do
       it 'builds a join with specified alias' do
         expect(
-          klass.join_recursive(:as => 'my_table') { connect_by(:id => :parent_id) }.to_sql
+          klass.join_recursive(as: 'my_table') { connect_by(id: :parent_id) }.to_sql
         ).to match /my_table/
       end
     end

data/spec/database.yml

@@ -2,12 +2,4 @@ pg:
   adapter: postgresql
   database: hierarchical_query_test
   username: vagrant
-  min_messages: ERROR
-
-oracle:
-  adapter: oracle_enhanced
-  host: localhost
-  port: 1521
-  database: xe
-  username: system
-  password: manager
+  min_messages: ERROR

data/spec/schema.rb

@@ -1,7 +1,7 @@
 ActiveRecord::Migration.verbose = false
 
-ActiveRecord::Schema.define(:version => 0) do
-  create_table :categories, :force => true do |t|
+ActiveRecord::Schema.define(version: 0) do
+  create_table :categories, force: true do |t|
     t.column :parent_id, :integer
     t.column :name, :string
     t.column :depth, :integer

data/spec/spec_helper.rb

@@ -3,19 +3,18 @@ require 'pathname'
 require 'logger'
 
 ENV['TZ'] = 'UTC'
-ENV['DB'] ||= 'pg'
 
 SPEC_ROOT = Pathname.new(File.dirname(__FILE__))
 
 require 'bundler'
-Bundler.setup(:default, ENV['TRAVIS'] ? :travis : :local, ENV['DB'].to_sym)
+Bundler.setup(:default, ENV['TRAVIS'] ? :travis : :local)
 
 require 'rspec'
 require 'database_cleaner'
 require 'active_record'
 
 ActiveRecord::Base.configurations = YAML.load(SPEC_ROOT.join('database.yml').read)
-ActiveRecord::Base.establish_connection(ENV['DB'].to_sym)
+ActiveRecord::Base.establish_connection(:pg)
 ActiveRecord::Base.logger = Logger.new(ENV['DEBUG'] ? $stderr : '/dev/null')
 ActiveRecord::Base.logger.formatter = proc do |severity, datetime, progname, msg|
   "#{datetime.strftime('%H:%M:%S.%L')}: #{msg}\n"
@@ -28,7 +27,6 @@ DatabaseCleaner.strategy = :transaction
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/support/models.rb

@@ -14,10 +14,10 @@ class Category < ActiveRecord::Base
     end
   end
 
-  belongs_to :parent, :class_name => 'Category'
-  has_many :children, :class_name => 'Category'
+  belongs_to :parent, class_name: 'Category'
+  has_many :children, class_name: 'Category'
 
-  before_save :generate_name, :unless => :name?
+  before_save :generate_name, unless: :name?
   before_save :count_depth
   before_save :count_position
 
@@ -30,7 +30,7 @@ class Category < ActiveRecord::Base
   end
 
   def count_position
-    self.position = (self.class.where(:parent_id => parent_id).maximum(:position) || 0) + 1
+    self.position = (self.class.where(parent_id: parent_id).maximum(:position) || 0) + 1
   end
 
   def ancestors

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.1
 description: 
 email:
 - amikhailov83@gmail.com
@@ -104,21 +104,16 @@ files:
 - LICENSE.txt
 - README.md
 - lib/active_record/hierarchical_query.rb
-- lib/active_record/hierarchical_query/adapters.rb
-- lib/active_record/hierarchical_query/adapters/abstract.rb
-- lib/active_record/hierarchical_query/adapters/postgresql.rb
-- lib/active_record/hierarchical_query/builder.rb
 - lib/active_record/hierarchical_query/cte/columns.rb
+- lib/active_record/hierarchical_query/cte/cycle_detector.rb
 - lib/active_record/hierarchical_query/cte/non_recursive_term.rb
-- lib/active_record/hierarchical_query/cte/query.rb
+- lib/active_record/hierarchical_query/cte/query_builder.rb
 - lib/active_record/hierarchical_query/cte/recursive_term.rb
 - lib/active_record/hierarchical_query/cte/union_term.rb
 - lib/active_record/hierarchical_query/join_builder.rb
+- lib/active_record/hierarchical_query/orderings.rb
+- lib/active_record/hierarchical_query/query.rb
 - lib/active_record/hierarchical_query/version.rb
-- lib/active_record/hierarchical_query/visitors/orderings.rb
-- lib/active_record/hierarchical_query/visitors/postgresql/cycle_detector.rb
-- lib/active_record/hierarchical_query/visitors/postgresql/orderings.rb
-- lib/active_record/hierarchical_query/visitors/visitor.rb
 - lib/arel/nodes/postgresql.rb
 - spec/active_record/hierarchical_query_spec.rb
 - spec/database.travis.yml
@@ -136,12 +131,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []