acts_as_ordered_tree 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 02d7e5c8d5d4f188a28d709689a5b549c34893ce
-  data.tar.gz: 687a430993d957a16afc33398cf8c18d0068b231
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODI4NmU4NzcxYzdlNDY3ZTlmMTQ1ZGMyOWQ3MjhjYzc2OTVmZjZlZQ==
+  data.tar.gz: !binary |-
+    YzU5ZDA3YTU5NzIxOWIwYjFiZmE3ZTljYjE2OTkzYTM1NDJmNWEyNw==
 SHA512:
-  metadata.gz: d3694d0b00dc899e89c91e0d240b7b1cc525f5417236b2a01d4562142589e1e45f7d14311779225a250bd292c6a1f9cb8cb9e7a285a0e5d4359aef71fd8e5771
-  data.tar.gz: 9a5b0b6614b3119962b7e49fc60582d5f912e681f23ddfa3cb1b9ad6061b85ff3c1369fcb0f41db32addce28b7d2011b2c91a1cea3ecc6cfccf7be075cded612
+  metadata.gz: !binary |-
+    NjkyMzE1NzIzNjNhNTZiNWJlZDA5OTg4MDE4NjZiZGVlOWE3OGE1M2QwYjQy
+    ZjYwMWI4ZmRjMjhlNWYyMDRiYWUzMjU4OTU5YjE2YjEwNjhmMjRlZDFjZjlk
+    MjhmM2NhNDNlZTAyOWNiZDA0M2FmZDc0Nzc0ZmRlYjAxOGQzYzM=
+  data.tar.gz: !binary |-
+    YzlmNjMxYTZkYWEzMjE0ZGZlZjQ4ODQ3ZmIxNmVlZjc0MDczYzEwMmFiNTcw
+    ZDhhODgzZWFhNjM2MWIyYTUzOWU4YTlmN2U2MWY4OWNlMWIzYWRiMmI2MjE5
+    ZDc3MzdkM2M4ZjBlZjE5MzUyZDMwNDNkZjg3YzliZmQxYThiY2E=

data/lib/acts_as_ordered_tree/instance_methods.rb

@@ -227,16 +227,6 @@ module ActsAsOrderedTree
     end
 
     private
-    # reloads relevant ordered_tree columns
-    def reload_node #:nodoc:
-      reload(
-        :select => [parent_column,
-                    position_column,
-                    depth_column,
-                    children_counter_cache_column].compact,
-        :lock => true
-      )
-    end
 
     def compute_level #:nodoc:
       ancestors.count
@@ -283,10 +273,7 @@ module ActsAsOrderedTree
     # This method do real node movements
     def move_to(target, pos) #:nodoc:
       tenacious_transaction do
-        if target.is_a? self.class.base_class
-          # lock obtained here
-          target.send(:reload_node)
-        elsif pos != :root && target
+        if pos != :root && target
           # load object if node is not an object
           target = self.class.lock(true).find(target)
         elsif pos == :root
@@ -324,7 +311,7 @@ module ActsAsOrderedTree
             reorder!(parent_id, position_was, position)
           end
 
-          reload_node
+          reload
         end
 
         if move_kind
@@ -332,6 +319,7 @@ module ActsAsOrderedTree
         else
           update.call
         end
+
       end
     end
 
@@ -376,13 +364,14 @@ module ActsAsOrderedTree
         arel[parent_column].eq(parent_id)
       )
 
-      binds = {:parent_id_was => parent_id_was,
+      binds = {:id => id,
+               :parent_id_was => parent_id_was,
                :parent_id => parent_id,
                :position_was => position_was,
                :position => position,
                :depth => depth}
 
-      update_changed_attributes! conditions, assignments, binds
+      ordered_tree_scope.where(conditions).update_all([assignments.compact.join(', '), binds])
     end
 
     # Internal
@@ -414,23 +403,9 @@ module ActsAsOrderedTree
       ]
 
       conditions = arel[parent_column].eq(parent_id)
-      binds = {:position_was => position_was, :position => position}
-
-      update_changed_attributes! conditions, assignments, binds
-    end
-
-    def update_changed_attributes!(scope_conditions, assignments, binds)
-      # add assignments for externally changed attributes
-      internal_attributes = [parent_column.to_s, position_column.to_s, depth_column.to_s, self.class.primary_key]
-      external_changed_attrs = changed - internal_attributes
-      unless external_changed_attrs.empty?
-        external_changed_attrs.each do |attr|
-          assignments << "#{attr} = CASE WHEN #{self.class.primary_key} = :id THEN :#{attr} ELSE #{attr} END"
-          binds[attr.to_sym] = self[attr]
-        end
-      end
+      binds = {:id => id, :position_was => position_was, :position => position}
 
-      ordered_tree_scope.where(scope_conditions).update_all([assignments.compact.join(', '), {:id => id}.merge(binds)])
+      ordered_tree_scope.where(conditions).update_all([assignments.compact.join(', '), binds])
     end
 
     # recursively load descendants

data/lib/acts_as_ordered_tree/version.rb

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

data/spec/acts_as_ordered_tree_spec.rb

@@ -415,26 +415,6 @@ describe ActsAsOrderedTree, :transactional do
     end
   end
 
-  describe "#reload_node" do
-    let!(:node) { create :default }
-
-    before do
-      node.name = 'changed'
-      node.parent_id = 200
-      node.position = 1000
-    end
-
-    subject { node.send :reload_node }
-
-    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
-
   describe "move actions" do
     let!(:root) { create :default_with_counter_cache, :name => 'root' }
     let!(:child_1) { create :default_with_counter_cache, :parent => root, :name => 'child_1' }
@@ -796,11 +776,12 @@ describe ActsAsOrderedTree, :transactional do
     end
 
     context "changed attributes" do
-      specify "changed attributes should be saved" do
-        child_2.name = 'name100'
+      before do
+        child_2.name = 'changed_100'
         child_2.move_to_left_of child_1
-        child_2.reload.name.should eq 'name100'
       end
+
+      it { child_2.reload.name.should eq 'child_2' }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_ordered_tree
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-03 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: 
@@ -145,17 +145,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.11
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension for sorted adjacency lists support