acts_as_ordered_tree 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODI4NmU4NzcxYzdlNDY3ZTlmMTQ1ZGMyOWQ3MjhjYzc2OTVmZjZlZQ==
-  data.tar.gz: !binary |-
-    YzU5ZDA3YTU5NzIxOWIwYjFiZmE3ZTljYjE2OTkzYTM1NDJmNWEyNw==
+SHA1:
+  metadata.gz: 86dc7f385344addb7fa9390045711d13e450e08f
+  data.tar.gz: 00ed12a00031723963094178dc4820cfde4952b2
 SHA512:
-  metadata.gz: !binary |-
-    NjkyMzE1NzIzNjNhNTZiNWJlZDA5OTg4MDE4NjZiZGVlOWE3OGE1M2QwYjQy
-    ZjYwMWI4ZmRjMjhlNWYyMDRiYWUzMjU4OTU5YjE2YjEwNjhmMjRlZDFjZjlk
-    MjhmM2NhNDNlZTAyOWNiZDA0M2FmZDc0Nzc0ZmRlYjAxOGQzYzM=
-  data.tar.gz: !binary |-
-    YzlmNjMxYTZkYWEzMjE0ZGZlZjQ4ODQ3ZmIxNmVlZjc0MDczYzEwMmFiNTcw
-    ZDhhODgzZWFhNjM2MWIyYTUzOWU4YTlmN2U2MWY4OWNlMWIzYWRiMmI2MjE5
-    ZDc3MzdkM2M4ZjBlZjE5MzUyZDMwNDNkZjg3YzliZmQxYThiY2E=
+  metadata.gz: 7d7dfc4a087d7cdc79f7f819b4d732cdca4371950421f7b1bad0daf2e355469675a58b5a3f07fa83311dfabbd3892b3db73fd5ffd26fd7a9bb20fbaeea2e4a99
+  data.tar.gz: 8e4647629a8719db47d2875306a28bcea5932d87c2c0a4c5dfd14a5c7020a1bc84b1e2ee41e6b1ef387aec64c204c15ca253a7dc935ec1ad217a8c50a9ebf713

data/lib/acts_as_ordered_tree/adapters/postgresql_adapter.rb

@@ -1,5 +1,3 @@
-require "acts_as_ordered_tree/relation/recursive"
-
 module ActsAsOrderedTree
   module Adapters
     module PostgreSQLAdapter
@@ -16,8 +14,8 @@ module ActsAsOrderedTree
               INNER JOIN self_and_ancestors ON alias1.id = self_and_ancestors.#{parent_column}
           QUERY
 
-          recursive_scope.with_recursive("self_and_ancestors", query).
-                          order("self_and_ancestors._depth DESC")
+          with_recursive_join(query, 'self_and_ancestors').
+              order('self_and_ancestors._depth DESC')
         else
           ancestors + [self]
         end
@@ -35,8 +33,7 @@ module ActsAsOrderedTree
             INNER JOIN ancestors ON alias1.id = ancestors.#{parent_column}
         QUERY
 
-        recursive_scope.with_recursive("ancestors", query).
-                        order("ancestors._depth DESC")
+        with_recursive_join(query, 'ancestors').order('ancestors._depth DESC')
       end
 
       def root
@@ -54,8 +51,8 @@ module ActsAsOrderedTree
             #{self.class.quoted_table_name} alias1 ON alias1.parent_id = descendants.id
         QUERY
 
-        recursive_scope.with_recursive("descendants", query).
-                        order("descendants._positions ASC")
+        with_recursive_join(query, 'descendants').
+            order('descendants._positions ASC')
       end
 
       def descendants
@@ -66,6 +63,35 @@ module ActsAsOrderedTree
       def recursive_scope
         ActsAsOrderedTree::Relation::Recursive.new(ordered_tree_scope)
       end
+
+      def with_recursive_join(recursive_query_sql, aliaz)
+        join_sql = 'INNER JOIN (' +
+            "WITH RECURSIVE #{aliaz} AS (" +
+            recursive_query_sql +
+            ") SELECT * FROM #{aliaz} " +
+            ") #{aliaz} ON #{aliaz}.id = #{self.class.quoted_table_name}.id"
+
+        ordered_tree_scope.joins(join_sql)
+      end
+
+      # Rails 3.0 does not support update_all with joins, so we patch it :(
+      if ActiveRecord::VERSION::STRING <= '3.1.0'
+        module Rails30UpdateAllPatch
+          def update_all(updates, conditions = nil, options = {})
+            relation = except(:joins, :where).
+                where(:id => select(klass.arel_table[:id]).except(:order, :limit).arel)
+            relation.update_all(updates, conditions, options)
+          end
+        end
+
+        def with_recursive_join_30(recursive_query_sql, aliaz)
+          relation = with_recursive_join_31(recursive_query_sql, aliaz)
+          relation.extend(Rails30UpdateAllPatch)
+          relation
+        end
+        alias_method :with_recursive_join_31, :with_recursive_join
+        alias_method :with_recursive_join, :with_recursive_join_30
+      end
     end
   end
 end

data/lib/acts_as_ordered_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsOrderedTree
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/db/config.yml

@@ -9,5 +9,5 @@ mysql:
   password:
   encoding: utf8
 sqlite3:
-  adapter: sqlite3
+  adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
   database: acts_as_ordered_tree.sqlite3.db

data/spec/spec_helper.rb

@@ -1,37 +1,39 @@
+ENV['DB'] ||= 'pg'
 test_dir = File.dirname(__FILE__)
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "rspec"
-require "rspec-expectations"
+require 'rspec'
+require 'rspec-expectations'
 
 begin
-  require "simplecov"
+  require 'simplecov'
   SimpleCov.start
 rescue LoadError
   #ignore
 end
 
-require "active_record"
-require "factory_girl"
+require 'active_record'
+require 'factory_girl'
 
-require "acts_as_ordered_tree"
-require "logger"
-require "yaml"
+require 'acts_as_ordered_tree'
+require 'logger'
+require 'yaml'
+require 'erb'
 
 config_file = ENV['DBCONF'] || 'config.yml'
 
-ActiveRecord::Base.configurations = YAML::load(IO.read(File.join(test_dir, 'db', config_file)))
-ActiveRecord::Base.establish_connection(ENV['DB'] || "pg")
+ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(File.join(test_dir, 'db', config_file))).result)
+ActiveRecord::Base.establish_connection(ENV['DB'])
 ActiveRecord::Base.logger = Logger.new(ENV['DEBUG'] ? $stderr : '/dev/null')
 ActiveRecord::Migration.verbose = false
-load(File.join(test_dir, "db", "schema.rb"))
+load(File.join(test_dir, 'db', 'schema.rb'))
 
-require "shoulda-matchers"
-require "support/models"
-require "support/factories"
-require "support/matchers"
+require 'shoulda-matchers'
+require 'support/models'
+require 'support/factories'
+require 'support/matchers'
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods

data/spec/support/models.rb

@@ -1,5 +1,7 @@
 class Default < ActiveRecord::Base
-  self.table_name = "categories"
+  self.table_name = 'categories'
+
+  default_scope { where('1=1') }
 
   acts_as_ordered_tree
 end
@@ -8,19 +10,25 @@ class RenamedColumns < ActiveRecord::Base
   acts_as_ordered_tree :parent_column => :mother_id,
                        :position_column => :red,
                        :depth_column => :pitch
+
+  default_scope { where('1=1') }
 end
 
 class DefaultWithCounterCache < ActiveRecord::Base
-  self.table_name = "categories"
+  self.table_name = 'categories'
 
   acts_as_ordered_tree :counter_cache => :categories_count
+
+  default_scope { where('1=1') }
 end
 
 class DefaultWithCallbacks < ActiveRecord::Base
-  self.table_name = "categories"
+  self.table_name = 'categories'
 
   acts_as_ordered_tree
 
+  default_scope { where('1=1') }
+
   after_move     :after_move
   before_move    :before_move
   after_reorder  :after_reorder
@@ -33,7 +41,9 @@ class DefaultWithCallbacks < ActiveRecord::Base
 end
 
 class Scoped < ActiveRecord::Base
-  self.table_name = "scoped"
+  self.table_name = 'scoped'
+
+  default_scope { where('1=1') }
 
   acts_as_ordered_tree :scope => :scope_type
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_ordered_tree
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
@@ -99,14 +99,14 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 description: 
@@ -123,7 +123,6 @@ files:
 - lib/acts_as_ordered_tree/instance_methods.rb
 - lib/acts_as_ordered_tree/relation/base.rb
 - lib/acts_as_ordered_tree/relation/preloaded.rb
-- lib/acts_as_ordered_tree/relation/recursive.rb
 - lib/acts_as_ordered_tree/tenacious_transaction.rb
 - lib/acts_as_ordered_tree/validators.rb
 - lib/acts_as_ordered_tree/version.rb
@@ -145,17 +144,17 @@ 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: []
 rubyforge_project: acts_as_ordered_tree
-rubygems_version: 2.1.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension for sorted adjacency lists support

data/lib/acts_as_ordered_tree/relation/recursive.rb

@@ -1,57 +0,0 @@
-require "acts_as_ordered_tree/relation/base"
-
-module ActsAsOrderedTree
-  module Relation
-    # Recursive relation fixes Rails3.0 issue https://github.com/rails/rails/issues/522 for
-    # relations with joins to subqueries
-    class Recursive < Base
-      attr_accessor :recursive_table_value, :recursive_query_value
-
-      # relation.with_recursive("table_name", "SELECT * FROM table_name")
-      def with_recursive(recursive_table_name, query)
-        relation = clone
-        relation.recursive_table_value = recursive_table_name
-        relation.recursive_query_value = query
-        relation
-      end
-
-      def build_arel
-        if recursive_table_value && recursive_query_value
-          join_sql = "INNER JOIN (" +
-                       recursive_query_sql +
-                     ") AS #{recursive_table_value} ON #{recursive_table_value}.id = #{table.name}.id"
-
-          except(:recursive_table, :recursive_query).joins(join_sql).build_arel
-        else
-          super
-        end
-      end
-
-      def update_all(updates, conditions = nil, options = {})
-        if recursive_table_value && recursive_query_value
-          scope = where("id IN (SELECT id FROM (#{recursive_query_sql}) AS #{recursive_table_value})").
-              except(:recursive_table, :recursive_query, :limit, :order)
-
-          scope.update_all(updates, conditions, options)
-        else
-          super
-        end
-      end
-
-      def except(*skips)
-        result = super
-        ([:recursive_table, :recursive_query] - skips).each do |method|
-          result.send("#{method}_value=", send(:"#{method}_value"))
-        end
-
-        result
-      end
-
-      private
-      def recursive_query_sql
-        "WITH RECURSIVE #{recursive_table_value} AS (#{recursive_query_value}) " +
-        "SELECT * FROM #{recursive_table_value}"
-      end
-    end
-  end
-end