webpulser-habtm_list 0.1.3 → 0.1.3.1

data/lib/webpulser-habtm_list.rb

@@ -62,14 +62,62 @@ module RailsExtensions
 
     module AssociationListMethods
       def move_to_position(item, position)
-        return if !in_list?(item) || position.to_i == list_position(item)
+        #return if !in_list?(item) || position.to_i == list_position(item)
         list_item_class.transaction do
           remove_from_list(item)
+          decrement_positions_on_lower_items(item)
           insert_at_position(item, position)
         end
         resort_array
       end
 
+      # should only be called externally from the before_remove callback
+      def remove_from_list(item)
+        item[position_column] = nil
+      end
+
+      def insert_at_position(item, position)
+        increment_positions_on_lower_items(position)
+        set_position(item, position)
+      end
+
+      # This has the effect of moving all the lower items up one.
+      def decrement_positions_on_lower_items(item)
+        return unless in_list?(item)
+        position = list_position(item)
+        connection.update(
+          "UPDATE #{join_table} SET #{position_column} = (#{position_column} - 1) " +
+          "WHERE #{foreign_key} = #{owner.id} AND #{position_column} > #{position}"
+        )
+        target.each { |obj|
+          obj[position_column] = obj[position_column].to_i - 1 if in_list?(obj) && obj[position_column].to_i > position
+        } if target
+      end
+
+      # This has the effect of moving all the higher items down one.
+      def increment_positions_on_higher_items(item)
+        return unless in_list?(item)
+        position = list_position(item)
+        connection.update(
+          "UPDATE #{join_table} SET #{position_column} = (#{position_column} + 1) " +
+          "WHERE #{foreign_key} = #{owner.id} AND #{position_column} < #{position}"
+        )
+        target.each { |obj|
+          obj[position_column] = obj[position_column].to_i + 1 if in_list?(obj) && obj[position_column].to_i < position
+        } if target
+      end
+
+      def set_position(item, position)
+        connection.update(
+          "UPDATE #{join_table} SET #{position_column} = #{position} " +
+          "WHERE #{foreign_key} = #{owner.id} AND #{list_item_foreign_key} = #{item.id}"
+        ) if owner.id
+        if target
+          obj = target.find {|obj| obj.id == item.id}
+          obj[position_column] = position if obj
+        end
+      end
+
       def move_lower(item)
         list_item_class.transaction do
           lower = lower_item(item)
@@ -108,12 +156,6 @@ module RailsExtensions
         resort_array
       end
 
-      # should only be called externally from the before_remove callback
-      def remove_from_list(item)
-        decrement_positions_on_lower_items(item) if in_list?(item)
-        item[position_column] = nil
-      end
-
       def first?(item)
         item == self.first
       end
@@ -174,148 +216,102 @@ module RailsExtensions
         end
       end
 
+      def position_column
+        proxy_association.reflection.options[:order] || 'position'
+      end
 
-      private
-        def position_column
-          proxy_association.reflection.options[:order] || 'position'
-        end
-
-        def list_item_class
-          proxy_association.reflection.klass
-        end
-
-        def owner
-          proxy_association.owner
-        end
-
-        def target
-          proxy_association.target
-        end
-
-        def join_table
-          proxy_association.reflection.options[:join_table]
-        end
-
-        def foreign_key
-          proxy_association.reflection.primary_key_name
-        end
-
-        def list_item_foreign_key
-          proxy_association.reflection.association_foreign_key
-        end
+      def list_item_class
+        proxy_association.reflection.klass
+      end
 
-        def list_position(item)
-          self.index(item)
-        end
+      def owner
+        proxy_association.owner
+      end
 
+      def target
+        proxy_association.target
+      end
 
-        def set_position(item, position)
-          connection.update(
-            "UPDATE #{join_table} SET #{position_column} = #{position} " +
-            "WHERE #{foreign_key} = #{owner.id} AND #{list_item_foreign_key} = #{item.id}"
-          ) if owner.id
-          if target
-            obj = target.find {|obj| obj.id == item.id}
-            obj[position_column] = position if obj
-          end
-        end
+      def join_table
+        proxy_association.reflection.options[:join_table]
+      end
 
-        def assume_bottom_position(item)
-          set_position(item, self.length - 1)
-        end
+      def foreign_key
+        proxy_association.reflection.primary_key_name
+      end
 
-        def assume_top_position(item)
-          set_position(item, 0)
-        end
+      def list_item_foreign_key
+        proxy_association.reflection.association_foreign_key
+      end
 
-        def increment_position_by(item, increment)
-          return unless in_list?(item)
-          connection.update(
-            "UPDATE #{join_table} SET #{position_column} = #{position_column} + (#{increment}) " +
-            "WHERE #{foreign_key} = #{owner.id} AND #{list_item_foreign_key} = #{item.id}"
-          )
-          if target
-            obj = target.find {|obj| obj.id == item.id}
-            obj[position_column] = obj[position_column].to_i + increment if obj
-          end
-        end
+      def list_position(item)
+        self.index(item)
+      end
 
-        def increment_position(item)
-          increment_position_by(item, 1)
-        end
+      def assume_bottom_position(item)
+        set_position(item, self.length - 1)
+      end
 
-        def decrement_position(item)
-          increment_position_by(item, -1)
-        end
+      def assume_top_position(item)
+        set_position(item, 0)
+      end
 
-        # This has the effect of moving all the higher items up one.
-        def decrement_positions_on_higher_items(position)
-          connection.update(
-            "UPDATE #{join_table} SET #{position_column} = (#{position_column} - 1) " +
-            "WHERE #{foreign_key} = #{owner.id} AND #{position_column} <= #{position}"
-          )
-          target.each { |obj|
-            obj[position_column] = obj[position_column].to_i - 1 if in_list?(obj) && obj[position_column].to_i <= position
-          } if target
+      def increment_position_by(item, increment)
+        return unless in_list?(item)
+        connection.update(
+          "UPDATE #{join_table} SET #{position_column} = #{position_column} + (#{increment}) " +
+          "WHERE #{foreign_key} = #{owner.id} AND #{list_item_foreign_key} = #{item.id}"
+        )
+        if target
+          obj = target.find {|obj| obj.id == item.id}
+          obj[position_column] = obj[position_column].to_i + increment if obj
         end
+      end
 
-        # This has the effect of moving all the lower items up one.
-        def decrement_positions_on_lower_items(item)
-          return unless in_list?(item)
-          position = list_position(item)
-          connection.update(
-            "UPDATE #{join_table} SET #{position_column} = (#{position_column} - 1) " +
-            "WHERE #{foreign_key} = #{owner.id} AND #{position_column} > #{position}"
-          )
-          target.each { |obj|
-            obj[position_column] = obj[position_column].to_i - 1 if in_list?(obj) && obj[position_column].to_i > position
-          } if target
-        end
+      def increment_position(item)
+        increment_position_by(item, 1)
+      end
 
-        # This has the effect of moving all the higher items down one.
-        def increment_positions_on_higher_items(item)
-          return unless in_list?(item)
-          position = list_position(item)
-          connection.update(
-            "UPDATE #{join_table} SET #{position_column} = (#{position_column} + 1) " +
-            "WHERE #{foreign_key} = #{owner.id} AND #{position_column} < #{position}"
-          )
-          target.each { |obj|
-            obj[position_column] = obj[position_column].to_i + 1 if in_list?(obj) && obj[position_column].to_i < position
-          } if target
-        end
+      def decrement_position(item)
+        increment_position_by(item, -1)
+      end
 
-        # This has the effect of moving all the lower items down one.
-        def increment_positions_on_lower_items(position)
-          connection.update(
-            "UPDATE #{join_table} SET #{position_column} = (#{position_column} + 1) " +
-            "WHERE #{foreign_key} = #{owner.id} AND #{position_column} >= #{position}"
-          )
-          target.each { |obj|
-            obj[position_column] = obj[position_column].to_i + 1 if in_list?(obj) && obj[position_column].to_i >= position
-          } if target
-        end
+      # This has the effect of moving all the higher items up one.
+      def decrement_positions_on_higher_items(position)
+        connection.update(
+          "UPDATE #{join_table} SET #{position_column} = (#{position_column} - 1) " +
+          "WHERE #{foreign_key} = #{owner.id} AND #{position_column} <= #{position}"
+        )
+        target.each { |obj|
+          obj[position_column] = obj[position_column].to_i - 1 if in_list?(obj) && obj[position_column].to_i <= position
+        } if target
+      end
 
-        def increment_positions_on_all_items
-          connection.update(
-            "UPDATE #{join_table} SET #{position_column} = (#{position_column} + 1) " +
-            "WHERE #{foreign_key} = #{owner.id}"
-          )
-          target.each { |obj|
-            obj[position_column] = obj[position_column].to_i + 1 if in_list?(obj)
-          } if target
-        end
+      # This has the effect of moving all the lower items down one.
+      def increment_positions_on_lower_items(position)
+        connection.update(
+          "UPDATE #{join_table} SET #{position_column} = (#{position_column} + 1) " +
+          "WHERE #{foreign_key} = #{owner.id} AND #{position_column} >= #{position}"
+        )
+        target.each { |obj|
+          obj[position_column] = obj[position_column].to_i + 1 if in_list?(obj) && obj[position_column].to_i >= position
+        } if target
+      end
 
-        def insert_at_position(item, position)
-          remove_from_list(item)
-          increment_positions_on_lower_items(position)
-          set_position(item, position)
-        end
+      def increment_positions_on_all_items
+        connection.update(
+          "UPDATE #{join_table} SET #{position_column} = (#{position_column} + 1) " +
+          "WHERE #{foreign_key} = #{owner.id}"
+        )
+        target.each { |obj|
+          obj[position_column] = obj[position_column].to_i + 1 if in_list?(obj)
+        } if target
+      end
 
-        # called after changing position values so the array reflects the updated ordering
-        def resort_array
-          target.sort! {|x,y| x[position_column].to_i <=> y[position_column].to_i} if target
-        end
+      # called after changing position values so the array reflects the updated ordering
+      def resort_array
+        target.sort! {|x,y| x[position_column].to_i <=> y[position_column].to_i} if target
+      end
     end
   end
 end

metadata

@@ -1,61 +1,87 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: webpulser-habtm_list
-version: !ruby/object:Gem::Version
-  version: 0.1.3
+version: !ruby/object:Gem::Version 
+  hash: 73
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  - 1
+  version: 0.1.3.1
 platform: ruby
-authors:
+authors: 
 - James Healy
 - Cyril LEPAGNOT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-13 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &7573920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *7573920
-description: Adds list-like position functionality to Rails has_and_belongs_to_many
-  associations
+  version_requirements: *id001
+description: Adds list-like position functionality to Rails has_and_belongs_to_many associations
 email: cyril.lepagnot@webpulser.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README
 - MIT-LICENSE
 - Rakefile
 - lib/webpulser-habtm_list.rb
+has_rdoc: true
 homepage: http://wiki.rubyonrails.org/rails/pages/BetterHabtmList
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: has_and_belongs_to_many list-like
 test_files: []
+