positionable 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea4446e013f0d3c7e57d4bf2e8d74c7af721686
-  data.tar.gz: 9970c900f6539bb9927e8453778a660e71a97499
+  metadata.gz: b8f6aadcd04a2af3bd0c273694b1645d9ddfef2c
+  data.tar.gz: 8e1f5f8db76a76410ebd7566953457b832ffd909
 SHA512:
-  metadata.gz: 5e4b68e82b37b1924ce4c867522459c0edf8f0b2bce39d1bacfbf9a4430c8a05eed4b914de6636950d7d059fff10816a33540578e2cb12f94896f6aee2c5cfb3
-  data.tar.gz: f62639878cbc83cfe151c1c4769baecdf42c785bab701f7cd1b2384d0a2376afbbe40ea816957dd7e4f6ce92ae8d2ca3726bde79f81688fea622b2b51c3eceac
+  metadata.gz: c1e2f772054b7569e856a0cd242061285e4b5e3101ca790d4688ee507a597287a4c77a57b268f1a772d2f58004d1847665a78208129034ff722a62ed9a17c180
+  data.tar.gz: f02091c09cb80bc3157c34150fd93b13e619e4f42346a859255f404f8041cb26e11f7e9577a407744cbcc87755ccb5f5a8e7987ce826f7aac05529d504cb0395

data/.travis.yml

@@ -1,4 +1,4 @@
-rvm: 1.9.2
+rvm: 1.9.3
 script: "bundle exec rspec spec"
 branches:
   only: 

data/lib/positionable.rb

@@ -9,7 +9,7 @@ require 'active_record'
 # to be <em>contiguous</em>, ie.: there is no 'hole' between two adjacent positions.
 #
 # Positionable has a strong management of records that belong to a group (a.k.a. scope). When a
-# record is moved whithin its scope, or from a scope to another, other impacted records are 
+# record is moved whithin its scope, or from a scope to another, other impacted records are
 # also reordered accordingly.
 #
 # You can use the provided instance methods (<tt>up!</tt>, <tt>down!</tt> or <tt>move_to</tt>)
@@ -29,12 +29,12 @@ module Positionable
   module PositionableMethods
 
     # Makes this model positionable.
-    # 
+    #
     #   class Item < ActiveRecord::Base
     #     is_positionable
     #   end
     #
-    # Maybe your items are grouped (typically with a +belongs_to+ association). In this case, 
+    # Maybe your items are grouped (typically with a +belongs_to+ association). In this case,
     # you'll want to restrict the position in each group by declaring the +:scope+ option:
     #
     #   class Folder < ActiveRecord::Base
@@ -48,7 +48,7 @@ module Positionable
     #
     # By default, position starts by zero. But you may want to change this at the model level,
     # for instance by starting at one (which seems more natural for some people):
-    # 
+    #
     #   class Item < ActiveRecord::Base
     #     is_positionable :start => 1
     #   end
@@ -69,7 +69,7 @@ module Positionable
       default_scope { order("#{ActiveRecord::Base.connection.quote_table_name self.table_name}.#{ActiveRecord::Base.connection.quote_column_name 'position'} #{order}") }
 
       before_create :add_to_bottom
-      before_update :update_position
+      before_update :update_position unless options[:skip] == :update
       after_destroy :decrement_all_next
 
       if scope_id_attr
@@ -89,9 +89,9 @@ module Positionable
             target_scope_id = scope.nil? ? scope_id : scope.id
             # Number of records whithin the target scope
             count = if target_scope_id.nil?
-              self.class.where("#{scope_id_attr} IS NULL").count
+              self.class.base_class.where("#{scope_id_attr} IS NULL").count
             else
-              self.class.where("#{scope_id_attr} = ?", target_scope_id).count
+              self.class.base_class.where("#{scope_id_attr} = ?", target_scope_id).count
             end
             # An additional position is available if this record is new, or if it's moved to another scope
             if new_record? or target_scope_id != scope_id
@@ -212,13 +212,13 @@ module Positionable
       # are ordered by their respective positions, depending on the <tt>order</tt> option
       # provided to <tt>is_positionable</tt>.
       def all_next
-        self.class.where("#{scoped_position} > ?", position)
+        self.class.base_class.where("#{scoped_position} > ?", position)
       end
 
-      # All the next records <em>of the old scope</em>, whose positions are greater 
+      # All the next records <em>of the old scope</em>, whose positions are greater
       # than this record before it was moved from its old record.
       def all_next_was
-        self.class.where("#{scoped_position_was} > ?", position_was)
+        self.class.base_class.where("#{scoped_position_was} > ?", position_was)
       end
 
       # Gives the next sibling record, whose position is right before this record.
@@ -230,7 +230,7 @@ module Positionable
       # are ordered by their respective positions, depending on the <tt>order</tt> option
       # provided to <tt>is_positionable</tt> (ascending by default).
       def all_previous
-        self.class.where("#{scoped_position} < ?", position)
+        self.class.base_class.where("#{scoped_position} < ?", position)
       end
 
     private
@@ -242,12 +242,12 @@ module Positionable
 
       # Finds the record at the given position.
       def at(position)
-        self.class.where("#{scoped_position} = ?", position).limit(1).first
+        self.class.base_class.where("#{scoped_position} = ?", position).limit(1).first
       end
 
       # Swaps this record's position with the other provided record.
       def swap_with(other)
-        self.class.transaction do
+        self.class.base_class.transaction do
           old_position = position
           update_attribute(:position, other.position)
           other.update_attribute(:position, old_position)

data/lib/positionable/version.rb

@@ -1,3 +1,3 @@
 module Positionable
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/positionable.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "factory_girl"
+  s.add_development_dependency "byebug"
 
   s.add_runtime_dependency "activerecord", ">= 3.1"
 end

data/spec/factories.rb

@@ -58,4 +58,8 @@ FactoryGirl.define do
     sequence(:title) { |n| "Stuff #{n}" }
   end
 
+  factory :skip_update_item do
+    sequence(:title) { |n| "Skip Update Item #{n}" }
+  end
+
 end

data/spec/lib/positionable_spec.rb

@@ -171,7 +171,7 @@ describe Positionable do
     describe "moving" do
 
       context "mass-assignement" do
-        
+
         it "reorders records when position is updated" do
           old_position = middle.position
           new_position = old_position + 3
@@ -197,7 +197,7 @@ describe Positionable do
           middle.update_attributes({ :position => -1 })
           items.should be_contiguous.starting_at(0)
         end
-      
+
       end
 
       it "also moves the previous records when moving to a lower position" do
@@ -407,7 +407,7 @@ describe Positionable do
         previous.reload.position.should == position
         middle.position.should == position - 1
         neXt.reload.position.should == position + 1
-      end     
+      end
     end
 
     it "reorders the records positions after downing" do
@@ -446,24 +446,24 @@ describe Positionable do
       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.update_attributes( {:folder => new_folder, :position => new_documents.count + 10 } )
         document.position.should == new_folder.documents.count - 1
         document.should be_last
       end
 
       it "keeps position when scope has changed but position belongs to range" do
         lambda {
-          document.update_attributes( {:folder_id => new_folder.id} )
+          document.update_attributes( {:folder => new_folder} )
         }.should_not change(document, :position)
       end
 
       it "reorders records of target scope" do
-        document.update_attributes( {:folder_id => new_folder.id} )
+        document.update_attributes( {:folder => new_folder} )
         new_folder.reload.documents.should be_contiguous.starting_at(0)
       end
 
       it "reorders records of previous scope" do
-        document.update_attributes( {:folder_id => new_folder.id} )
+        document.update_attributes( {:folder => new_folder} )
         old_folder.reload.documents.should be_contiguous.starting_at(0)
       end
 
@@ -632,4 +632,18 @@ describe Positionable do
 
   end
 
+  context "skip update" do
+
+    let(:items) { create_list(:skip_update_item, 5) }
+    let(:item) { items[2] }
+
+    it "does not update sibbling positions" do
+      item.position.should == 2 # Meta!
+      item.update(position: 1)
+      item.position.should == 1 # Meta!
+      SkipUpdateItem.all.map(&:position).should == [0, 1, 1, 3, 4]
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ SimpleCov.start do
   add_filter "/spec/support/"
 end
 
+require 'byebug'
+
 require 'factory_girl'
 FactoryGirl.find_definitions
 include FactoryGirl::Syntax::Methods
@@ -15,6 +17,11 @@ load File.dirname(__FILE__) + '/support/schema.rb'
 load File.dirname(__FILE__) + '/support/models.rb'
 load File.dirname(__FILE__) + '/support/matchers/contiguity_matcher.rb'
 
+RSpec.configure do |config|
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+end
+
 class Array
 
   def but_last

data/spec/support/models.rb

@@ -42,4 +42,8 @@ class ComplexItem < Item
 end
 
 class Dummy < ActiveRecord::Base
+end
+
+class SkipUpdateItem < ActiveRecord::Base
+  is_positionable :skip => :update
 end

data/spec/support/schema.rb

@@ -3,19 +3,19 @@ ActiveRecord::Schema.define do
 
   create_table :folders, :force => true do |t|
     t.string :title
-    t.timestamps
+    t.timestamps null: true
   end
 
   create_table :documents, :force => true do |t|
     t.integer :folder_id
     t.string :title
     t.integer :position
-    t.timestamps
+    t.timestamps null: true
   end
 
   create_table :groups, :force => true do |t|
     t.string :title
-    t.timestamps
+    t.timestamps null: true
   end
 
   create_table :items, :force => true do |t|
@@ -23,11 +23,17 @@ ActiveRecord::Schema.define do
     t.string :title
     t.integer :position
     t.string :type
-    t.timestamps
+    t.timestamps null: true
   end
 
   create_table :dummies, :force => true do |t|
     t.string :title
-    t.timestamps
+    t.timestamps null: true
+  end
+
+  create_table :skip_update_items, :force => true do |t|
+    t.string :title
+    t.integer :position
+    t.timestamps null: true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: positionable
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Philippe Guégan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: positionable
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A gem for positionning your ActiveRecord models.