positionable 1.0.5 → 1.0.6

data/lib/positionable.rb

@@ -251,19 +251,15 @@ module Positionable
       # Reorders records between provided positions, unless the destination position is out of range.
       def reorder(from, to)
         if to > from
-          shift, siblings = -1, ((from + 1)..to).map { |p| at(p) }
+          shift, positions_range = -1, ((from + 1)..to)
         elsif scope_changed?
           # When scope changes, it actually inserts this record in the new scope
           # All next siblings (from new position to bottom) have to be staggered
-          shift, siblings = 1, (to..bottom).map { |p| at(p) }
+          shift, positions_range = 1, (to..bottom)
         else
-          shift, siblings = 1, (to..(from - 1)).map { |p| at(p) }
-        end
-        self.class.transaction do
-          siblings.map do |sibling|
-            sibling.update_column(:position, sibling.position + shift)
-          end
+          shift, positions_range = 1, (to..(from - 1))
         end
+        scoped_all.where(position: positions_range).update_all(['position = position + ?', shift])
       end
 
       # Reorders records between old and new position (and old and new scope).
@@ -296,11 +292,7 @@ module Positionable
 
       # Decrements the position of all the provided records.
       def decrement(records)
-        self.class.transaction do
-          records.each do |record|
-            record.update_column(:position, record.position - 1)
-          end
-        end
+        records.update_all(['position = position - 1'])
       end
 
     end

data/lib/positionable/version.rb

@@ -1,3 +1,3 @@
 module Positionable
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/positionable.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["philippe.guegan@gmail.com"]
   s.homepage    = "https://github.com/pguegan/positionable"
   s.summary     = %q(A gem for positionning your ActiveRecord models.)
-  s.description = %q(This extension provides contiguous positionning capabilities to you ActiveRecord models.)
+  s.description = %q(This extension provides contiguous positionning capabilities to your ActiveRecord models.)
 
   s.rubyforge_project = "positionable"
 

data/spec/lib/positionable_spec.rb

@@ -49,7 +49,7 @@ describe Positionable do
     it "orders records by their position by default" do
       shuffle_positions = (0..9).to_a.shuffle
       shuffle_positions.each do |position|
-        item = FactoryGirl.create(:default_item)
+        item = create(:default_item)
         item.update_column(:position, position)
       end
       DefaultItem.all.should be_contiguous.starting_at(0)
@@ -59,7 +59,7 @@ describe Positionable do
 
   context "contiguous positionning" do
 
-    let!(:items) { FactoryGirl.create_list(:default_item, 10) }
+    let!(:items) { create_list(:default_item, 10) }
     let(:middle) { items[items.size / 2] }
 
     it "makes the position to start at zero by default" do
@@ -67,7 +67,7 @@ describe Positionable do
     end
 
     it "increments position by one after creation" do
-      item = FactoryGirl.create(:default_item)
+      item = create(:default_item)
       item.position.should == items.last.position + 1
     end
 
@@ -106,17 +106,17 @@ describe Positionable do
     end
 
     it "caracterizes the first record" do
-      items.first.first?.should be_true
+      items.first.should be_first
       items.but_first.each do |item|
-        item.first?.should be_false
+        item.should_not be_first
       end
     end
 
     it "caracterizes the last record" do
       items.but_last.each do |item|
-        item.last?.should be_false
+        item.should_not be_last
       end
-      items.last.last?.should be_true
+      items.last.should be_last
     end
 
     it "decrements positions of next sibblings after deletion" do
@@ -167,9 +167,9 @@ describe Positionable do
     context "inheritance" do
 
       it "inserts contiguously records of all subclasses" do
-        FactoryGirl.create(:sub_item_1).position.should == items.count
-        FactoryGirl.create(:sub_item_2).position.should == items.count + 1
-        FactoryGirl.create(:sub_item_1).position.should == items.count + 2
+        create(:sub_item_1).position.should == items.count
+        create(:sub_item_2).position.should == items.count + 1
+        create(:sub_item_1).position.should == items.count + 2
       end
 
     end
@@ -256,10 +256,10 @@ describe Positionable do
 
   describe "range" do
 
-    let!(:items) { FactoryGirl.create_list(:default_item, 10) }
+    let!(:items) { create_list(:default_item, 10) }
 
     it "gives the range position of a new record" do
-      item = FactoryGirl.build(:default_item)
+      item = build(:default_item)
       item.range.should == (0..items.count)
     end
 
@@ -271,7 +271,7 @@ describe Positionable do
 
   context "scoping" do
 
-    let!(:folders) { FactoryGirl.create_list(:folder_with_documents, 5) }
+    let!(:folders) { create_list(:folder_with_documents, 5) }
 
     it "orders records by their position by default" do
       folders.each do |folder|
@@ -294,7 +294,7 @@ describe Positionable do
     it "increments position by one after creation inside a folder" do
       folders.each do |folder|
         last_position = folder.documents.last.position
-        document = FactoryGirl.create(:document, :folder => folder)
+        document = create(:document, :folder => folder)
         document.position.should == last_position + 1
       end
     end
@@ -353,9 +353,9 @@ describe Positionable do
     it "caracterizes the first record of the folder" do
       folders.each do |folder|
         documents = folder.documents
-        documents.first.first?.should be_true
+        documents.first.should be_first
         documents.but_first.each do |document|
-          document.first?.should be_false
+          document.should_not be_first
         end
       end
     end
@@ -364,9 +364,9 @@ describe Positionable do
       folders.each do |folder|
         documents = folder.documents
         documents.but_last.each do |document|
-          document.last?.should be_false
+          document.should_not be_last
         end
-        documents.last.last?.should be_true
+        documents.last.should be_last
       end
     end
 
@@ -438,19 +438,23 @@ describe Positionable do
       # Last document is a special case when changing scope, so it is avoided
       let!(:document) { old_folder.documents.but_last.sample }
       # A new folder containing a different count of documents than the old folder
-      let!(:new_folder) { FactoryGirl.create(:folder) }
-      let!(:new_documents) { FactoryGirl.create_list(:document, old_folder.documents.count + 1, :folder => new_folder) }
+      let!(:new_folder) { create(:folder) }
+      let!(:new_documents) { create_list(:document, old_folder.documents.count + 1, :folder => new_folder) }
 
       it "moves to bottom position when scope has changed but position is out of range" do
         document.update_attributes( {:folder_id => new_folder.id, :position => new_documents.count + 10 } )
         document.position.should == new_folder.documents.count - 1
-        document.last?.should be_true
+        document.should be_last
       end
 
       it "keeps position when scope has changed but position belongs to range" do
-        position = document.position
+        lambda {
+          document.update_attributes( {:folder_id => new_folder.id} )
+        }.should_not change(document, :position)
+      end
+
+      it "reorders records of target scope" do
         document.update_attributes( {:folder_id => new_folder.id} )
-        document.position.should == position # Position unchanged
         new_folder.reload.documents.should be_contiguous.starting_at(0)
       end
 
@@ -472,27 +476,27 @@ describe Positionable do
         end
 
         it "gives the range within a scope" do
-          folder = FactoryGirl.create(:folder_with_documents)
+          folder = create(:folder_with_documents)
           document = Document.new
           document.range(folder).should == (0..folder.documents.count)
         end
 
         it "gives the range within its own scope by default" do
-          folder = FactoryGirl.create(:folder_with_documents)
+          folder = create(:folder_with_documents)
           document = folder.documents.sample
           document.range.should == (0..(folder.documents.count - 1))
         end
 
         it "gives the range within another scope" do
-          document = FactoryGirl.build(:document)
-          folder = FactoryGirl.create(:folder_with_documents)
+          document = build(:document)
+          folder = create(:folder_with_documents)
           document.folder.should_not == folder # Meta!
           document.range(folder).should == (0..folder.documents.count)
         end
 
         it "gives the range within another empty scope" do
-          document = FactoryGirl.build(:document)
-          folder = FactoryGirl.create(:folder)
+          document = build(:document)
+          folder = create(:folder)
           document.folder.should_not == folder # Meta!
           folder.documents.should be_empty # Meta!
           document.range(folder).should == (0..0)
@@ -503,14 +507,14 @@ describe Positionable do
       context "existing record" do
 
         it "gives the range within its own scope" do
-          folder = FactoryGirl.create(:folder_with_documents)
+          folder = create(:folder_with_documents)
           document = folder.documents.sample
           document.range(folder).should == (0..(folder.documents.count - 1))
         end
 
         it "gives the range within another scope" do
-          document = FactoryGirl.create(:document)
-          folder = FactoryGirl.create(:folder_with_documents)
+          document = create(:document)
+          folder = create(:folder_with_documents)
           document.folder.should_not == folder # Meta!
           document.range(folder).should == (0..folder.documents.count)
         end
@@ -526,37 +530,36 @@ describe Positionable do
     let(:start) { 1 }
 
     it "starts at the given position" do
-      item = FactoryGirl.create(:starting_at_one_item)
+      item = create(:starting_at_one_item)
       item.position.should == start
     end
 
     it "increments by one the given start position" do
-      items = FactoryGirl.create_list(:starting_at_one_item, 5)
-      item = FactoryGirl.create(:starting_at_one_item)
+      items = create_list(:starting_at_one_item, 5)
+      item = create(:starting_at_one_item)
       item.position.should == items.size + start
     end
 
     it "caracterizes the first record according the start position" do
-      items = FactoryGirl.create_list(:starting_at_one_item, 5)
-      items.first.first?.should be_true
+      items = create_list(:starting_at_one_item, 5)
+      items.first.should be_first
       items.but_first.each do |item|
-        item.first?.should be_false
+        item.should_not be_first
       end
     end
 
     it "caracterizes the last record according the start position" do
-      items = FactoryGirl.create_list(:starting_at_one_item, 5)
+      items = create_list(:starting_at_one_item, 5)
       items.but_last.each do |item|
-        item.last?.should be_false
+        item.should_not be_last
       end
-      items.last.last?.should be_true
+      items.last.should be_last
     end
 
     describe "moving" do
 
       it "does not move anything if new position is before start position" do
-        items = FactoryGirl.create_list(:starting_at_one_item, 5)
-        item = items.sample
+        item = create_list(:starting_at_one_item, 5).sample
         lambda {
           item.move_to start - 1
         }.should_not change(item, :position)
@@ -567,7 +570,7 @@ describe Positionable do
     describe "range" do
 
       it "staggers range with start position" do
-        items = FactoryGirl.create_list(:starting_at_one_item, 5)
+        items = create_list(:starting_at_one_item, 5)
         items.sample.range.should == (start..(items.count + start - 1))
       end
 
@@ -580,13 +583,13 @@ describe Positionable do
     describe "asc" do
 
       it "appends at the last position" do
-        items = FactoryGirl.create_list(:asc_item, 5)
-        item = FactoryGirl.create(:asc_item)
+        items = create_list(:asc_item, 5)
+        item = create(:asc_item)
         item.position.should == items.size
       end
 
       it "orders items by ascending position" do
-        FactoryGirl.create_list(:asc_item, 5)
+        create_list(:asc_item, 5)
         AscItem.all.each_with_index do |item, index|
           item.position.should == index
         end
@@ -597,13 +600,13 @@ describe Positionable do
     describe "desc" do
 
       it "appends at the last position" do
-        items = FactoryGirl.create_list(:desc_item, 5)
-        item = FactoryGirl.create(:desc_item)
+        items = create_list(:desc_item, 5)
+        item = create(:desc_item)
         item.position.should == items.size
       end
 
       it "orders items by descending position" do
-        items = FactoryGirl.create_list(:desc_item, 5)
+        create_list(:desc_item, 5)
         DescItem.all.reverse.should be_contiguous.starting_at(0)
       end
 
@@ -613,13 +616,12 @@ describe Positionable do
 
   context "mixing options" do
 
-    let!(:groups) { FactoryGirl.create_list(:group_with_complex_items, 5) }
+    let!(:groups) { create_list(:group_with_complex_items, 5) }
     let(:start) { 1 } # Check configuration in support/models.rb
 
     it "manages complex items" do
       # All options are tested here (grouping, descending ordering and start position at 1)
       groups.each do |group|
-        size = group.complex_items.size
         group.complex_items.reverse.should be_contiguous.starting_at(start)
       end
     end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ end
 
 require 'factory_girl'
 FactoryGirl.find_definitions
+include FactoryGirl::Syntax::Methods
 
 require 'positionable'
 

data/spec/support/matchers/contiguity_matcher.rb

@@ -22,6 +22,7 @@ RSpec::Matchers.define :be_contiguous do
     end
     message << " would be contiguous"
     message << " (starting at #{@start})" if @start > 0
+    message
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: positionable
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,8 +107,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-description: This extension provides contiguous positionning capabilities to you ActiveRecord
-  models.
+description: This extension provides contiguous positionning capabilities to your
+  ActiveRecord models.
 email:
 - philippe.guegan@gmail.com
 executables: []
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: positionable
-rubygems_version: 1.8.18
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A gem for positionning your ActiveRecord models.
@@ -161,3 +161,4 @@ test_files:
 - spec/support/matchers/contiguity_matcher.rb
 - spec/support/models.rb
 - spec/support/schema.rb
+has_rdoc: