refinerycms-core 2.0.6 → 2.0.7

data/app/helpers/refinery/image_helper.rb

@@ -1,5 +1,3 @@
-require 'ostruct'
-
 module Refinery
   module ImageHelper
 

data/lib/refinery/crud.rb

@@ -269,7 +269,7 @@ module Refinery
                 # After we drop Ruby 1.8.x support the following line can be changed back to
                 # list.each do |index, hash|
                 # because there won't be an ordering issue (see https://github.com/resolve/refinerycms/issues/1585)
-                list.sort.map { |item| item[1] }.each_with_index do |hash, index|
+                list.sort_by {|k, v| k.to_i}.map { |item| item[1] }.each_with_index do |hash, index|
                   moved_item_id = hash['id'].split(/#{singular_name}\_?/).reject(&:empty?).first
                   @current_#{singular_name} = #{class_name}.find_by_id(moved_item_id)
 

data/lib/refinery/version.rb

@@ -2,7 +2,7 @@ module Refinery
   class Version
     @major = 2
     @minor = 0
-    @tiny  = 6
+    @tiny  = 7
     @build = nil
 
     class << self

data/spec/lib/refinery/crud_spec.rb

@@ -100,6 +100,23 @@ module Refinery
         dummy.lft.should eq(9)
         dummy.rgt.should eq(10)
       end
+
+      # Regression test for https://github.com/resolve/refinerycms/issues/1585
+      it "sorts numerically rather than by string key" do
+        dummy, dummy_params = [], {}
+
+        # When we have 11 entries, the 11th index will be #10, which will be 
+        # sorted above #2 if we are sorting by strings.
+        11.times do |n|
+          dummy << Refinery::CrudDummy.create!
+          dummy_params["#{n}"] = {"id" => "crud_dummy_#{dummy[n].id}"}
+        end
+
+        post :update_positions, { "ul" => { "0" => dummy_params } }
+
+        dummy = dummy.last.reload
+        dummy.lft.should eq(21)
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_indexed
@@ -702,7 +702,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2135277000701086304
+      hash: 2236946699019047872
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -711,7 +711,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2135277000701086304
+      hash: 2236946699019047872
 requirements: []
 rubyforge_project: refinerycms
 rubygems_version: 1.8.22