acts_as_ordered_tree 1.1.7 → 1.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 02d7e5c8d5d4f188a28d709689a5b549c34893ce
+  data.tar.gz: 687a430993d957a16afc33398cf8c18d0068b231
+SHA512:
+  metadata.gz: d3694d0b00dc899e89c91e0d240b7b1cc525f5417236b2a01d4562142589e1e45f7d14311779225a250bd292c6a1f9cb8cb9e7a285a0e5d4359aef71fd8e5771
+  data.tar.gz: 9a5b0b6614b3119962b7e49fc60582d5f912e681f23ddfa3cb1b9ad6061b85ff3c1369fcb0f41db32addce28b7d2011b2c91a1cea3ecc6cfccf7be075cded612

data/lib/acts_as_ordered_tree.rb

@@ -5,6 +5,12 @@ require "acts_as_ordered_tree/instance_methods"
 require "acts_as_ordered_tree/validators"
 
 module ActsAsOrderedTree
+  PROTECTED_ATTRIBUTES_SUPPORTED = ActiveRecord::VERSION::STRING < '4.0.0' ||
+    defined?(ProtectedAttributes)
+
+  # can we use has_many :children, :order => :position
+  PLAIN_ORDER_OPTION_SUPPORTED = ActiveRecord::VERSION::STRING < '4.0.0'
+
   # == Usage
   #   class Category < ActiveRecord::Base
   #     acts_as_ordered_tree :parent_column => :parent_id,
@@ -31,7 +37,6 @@ module ActsAsOrderedTree
     has_many_children_options = {
       :class_name    => "::#{base_class.name}",
       :foreign_key   => options[:parent_column],
-      :order         => options[:position_column],
       :inverse_of    => (:parent unless options[:polymorphic]),
       :dependent     => :destroy
     }
@@ -40,15 +45,34 @@ module ActsAsOrderedTree
       has_many_children_options[callback] = options[callback] if options.key?(callback)
     end
 
-    if scope_column_names.any?
-      has_many_children_options[:conditions] = proc do
-        [scope_column_names.map { |c| "#{c} = ?" }.join(' AND '),
-         scope_column_names.map { |c| self[c] }]
+    if PLAIN_ORDER_OPTION_SUPPORTED
+      has_many_children_options[:order] = options[:position_column]
+
+      if scope_column_names.any?
+        has_many_children_options[:conditions] = proc do
+          [scope_column_names.map { |c| "#{c} = ?" }.join(' AND '),
+           scope_column_names.map { |c| self[c] }]
+        end
       end
+
+      has_many :children, has_many_children_options
+    else
+      scope = ->(parent) {
+        relation = order(options[:position_column])
+
+        if scope_column_names.any?
+          relation = relation.where(
+            Hash[scope_column_names.map { |c| [c, parent[c]]}]
+          )
+        end
+
+        relation
+      }
+
+      has_many :children, scope, has_many_children_options
     end
 
-    # create associations
-    has_many   :children, has_many_children_options
+    # create parent association
     belongs_to :parent,
                :class_name => "::#{base_class.name}",
                :foreign_key => options[:parent_column],
@@ -67,7 +91,7 @@ module ActsAsOrderedTree
     extend ActiveSupport::Concern
 
     included do
-      attr_protected depth_column, position_column
+      attr_protected depth_column, position_column if PROTECTED_ATTRIBUTES_SUPPORTED
     end
 
     def parent_column

data/lib/acts_as_ordered_tree/class_methods.rb

@@ -5,11 +5,11 @@ module ActsAsOrderedTree
     extend ActiveSupport::Concern
 
     included do
-      scope :preorder, order(arel_table[position_column].asc)
-      scope :roots, where(arel_table[parent_column].eq(nil)).preorder
+      scope :preorder, -> { order(arel_table[position_column].asc) }
+      scope :roots, -> { where(arel_table[parent_column].eq(nil)).preorder }
 
       # add +leaves+ scope only if counter_cache column present
-      scope :leaves, where(arel_table[children_counter_cache_column].eq(0)) if
+      scope :leaves, -> { where(arel_table[children_counter_cache_column].eq(0)) } if
           children_counter_cache?
 
       # when default value for counter_cache is absent we should set it manually

data/lib/acts_as_ordered_tree/instance_methods.rb

@@ -288,7 +288,7 @@ module ActsAsOrderedTree
           target.send(:reload_node)
         elsif pos != :root && target
           # load object if node is not an object
-          target = self.class.find(target, :lock => true)
+          target = self.class.lock(true).find(target)
         elsif pos == :root
           # Obtain lock on all root nodes
           ordered_tree_scope.
@@ -308,7 +308,7 @@ module ActsAsOrderedTree
         # nothing changed - quit
         return if parent_id == parent_id_was && position == position_was
 
-        self.class.find(self, :lock => true)
+        self.class.lock(true).find(self)
         self[position_column], self[parent_column] = position, parent_id
 
         move_kind = case
@@ -484,7 +484,7 @@ module ActsAsOrderedTree
 
     def ordered_tree_scope #:nodoc:
       if scope_column_names.empty?
-        self.class.base_class.scoped
+        self.class.base_class
       else
         self.class.base_class.where Hash[scope_column_names.map { |column| [column, self[column]] }]
       end

data/lib/acts_as_ordered_tree/relation/base.rb

@@ -1,12 +1,14 @@
 module ActsAsOrderedTree
   module Relation
     class Base < ActiveRecord::Relation
+      EMPTY_SCOPE_METHOD = ActiveRecord::VERSION::STRING < '4.0.0' ? :scoped : :all
+
       # Create from existing +relation+ or from +class+ and +table+
       def initialize(class_or_relation, table = nil)
         relation = class_or_relation
 
         if class_or_relation.is_a?(Class)
-          relation = class_or_relation.scoped
+          relation = class_or_relation.send(EMPTY_SCOPE_METHOD)
           table ||= class_or_relation.arel_table
 
           super(class_or_relation, table)

data/lib/acts_as_ordered_tree/tenacious_transaction.rb

@@ -12,7 +12,7 @@ module ActsAsOrderedTree
       begin
         transaction(&block)
       rescue ActiveRecord::StatementInvalid => error
-        raise unless connection.open_transactions.zero?
+        raise unless self.class.connection.open_transactions.zero?
         raise unless error.message =~ DEADLOCK_MESSAGES
         raise unless retry_count < RETRY_COUNT
         retry_count += 1

data/lib/acts_as_ordered_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsOrderedTree
-  VERSION = '1.1.7'
+  VERSION = '1.1.8'
 end

data/spec/acts_as_ordered_tree_spec.rb

@@ -9,11 +9,13 @@ describe ActsAsOrderedTree, :transactional do
     its(:depth_column) { should eq :depth }
     its(:children_counter_cache_column) { be_nil }
 
-    context "instance" do
-      subject { Default.new }
+    if ActsAsOrderedTree::PROTECTED_ATTRIBUTES_SUPPORTED
+      context "instance" do
+        subject { Default.new }
 
-      it { should_not allow_mass_assignment_of(:position) }
-      it { should_not allow_mass_assignment_of(:depth) }
+        it { should_not allow_mass_assignment_of(:position) }
+        it { should_not allow_mass_assignment_of(:depth) }
+      end
     end
   end
 
@@ -30,11 +32,13 @@ describe ActsAsOrderedTree, :transactional do
     its(:position_column) { should eq :red }
     its(:depth_column) { should eq :pitch }
 
-    context "instance" do
-      subject { RenamedColumns.new }
+    if ActsAsOrderedTree::PROTECTED_ATTRIBUTES_SUPPORTED
+      context "instance" do
+        subject { RenamedColumns.new }
 
-      it { should_not allow_mass_assignment_of(:red) }
-      it { should_not allow_mass_assignment_of(:pitch) }
+        it { should_not allow_mass_assignment_of(:red) }
+        it { should_not allow_mass_assignment_of(:pitch) }
+      end
     end
   end
 
@@ -422,7 +426,11 @@ describe ActsAsOrderedTree, :transactional do
 
     subject { node.send :reload_node }
 
-    its(:name) { should eq 'changed' }
+    if ActiveRecord::VERSION::STRING >= '4.0.0'
+      xit 'ActiveRecord::Persistence#reload method ignores :select option since rails-4.0.0'
+    else
+      its(:name) { should eq 'changed' }
+    end
     its(:parent_id) { should be_nil }
     its(:position) { should eq 1 }
   end
@@ -802,7 +810,7 @@ describe ActsAsOrderedTree, :transactional do
     let!(:child1) { create :scoped, :parent => root1 }
     let!(:orphan) do
       record = create :scoped, :parent => root1
-      record.class.update_all({:scope_type => "t0", :position => 1}, {:id => record.id})
+      record.class.where(:id => record.id).update_all(:scope_type => "t0", :position => 1)
       record
     end
 

data/spec/db/config.travis.yml

@@ -0,0 +1,13 @@
+pg:
+  adapter: postgresql
+  username: postgres
+  database: acts_as_ordered_tree_test
+  min_messages: ERROR
+mysql:
+  adapter: mysql2
+  database: acts_as_ordered_tree_test
+  username: travis
+  encoding: utf8
+sqlite3:
+  adapter: sqlite3
+  database: acts_as_ordered_tree.sqlite3.db

data/spec/db/config.yml

@@ -1,9 +1,6 @@
 pg:
   adapter: postgresql
-  username: postgres
   database: acts_as_ordered_tree_test
-  host: 127.0.0.1
-  encoding: unicode
   min_messages: ERROR
 mysql:
   adapter: mysql2

data/spec/spec_helper.rb

@@ -20,7 +20,9 @@ require "acts_as_ordered_tree"
 require "logger"
 require "yaml"
 
-ActiveRecord::Base.configurations = YAML::load(IO.read(test_dir + "/db/config.yml"))
+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.logger = Logger.new(ENV['DEBUG'] ? $stderr : '/dev/null')
 ActiveRecord::Migration.verbose = false

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_ordered_tree
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -10,120 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-  prerelease: false
-  name: activerecord
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
-    none: false
-  prerelease: false
-  name: rake
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
-  prerelease: false
-  name: bundler
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.11'
-    none: false
-  prerelease: false
-  name: rspec
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.11'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-    none: false
-  prerelease: false
-  name: shoulda-matchers
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: '3'
-    none: false
-  prerelease: false
-  name: factory_girl
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: '3'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
-    none: false
-  prerelease: false
-  name: appraisal
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
-    none: false
 description: 
 email:
 - amikhailov83@gmail.com
@@ -144,6 +129,7 @@ files:
 - lib/acts_as_ordered_tree/version.rb
 - spec/acts_as_ordered_tree_spec.rb
 - spec/concurrency_support_spec.rb
+- spec/db/config.travis.yml
 - spec/db/config.yml
 - spec/db/schema.rb
 - spec/spec_helper.rb
@@ -152,37 +138,31 @@ files:
 - spec/support/models.rb
 homepage: https://github.com/take-five/acts_as_ordered_tree
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -154648787
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -154648787
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: acts_as_ordered_tree
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord extension for sorted adjacency lists support
 test_files:
 - spec/acts_as_ordered_tree_spec.rb
 - spec/concurrency_support_spec.rb
+- spec/db/config.travis.yml
 - spec/db/config.yml
 - spec/db/schema.rb
 - spec/spec_helper.rb