mongoid_listable 0.2.5 → 0.2.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGRmODIzNGZkMzFlYmQyM2M2NDBlZDRkYmE0NDNmMWFjNjE1ZTA2Yg==
+  data.tar.gz: !binary |-
+    YzlkMTZhNDRkOTczNmU2MDlhMmRjNmY5ZTRiYjY3NTc0NzEwNDljOQ==
+SHA512:
+  metadata.gz: !binary |-
+    N2NjZTgxZjAyOWQwMWU3M2M3OGQ4OWNiZmU1YTI2ZGVmNjVmNTMzNmNjYThk
+    NzhhNjJjM2Y4NDAxNWEyODA2YTEyYTg3NWIwYjJmMWMyYjUwZDhmMjY1MTgx
+    NTBiYjVjZDc5M2Y4OGUwZTk4YzdmYWUyMDRkN2Q2MTc0NGI3MDY=
+  data.tar.gz: !binary |-
+    YmYzMWEwZDJjMmQzNDAxNjM0YTUwMWUxYmQ1Zjk0NWRmODNhZTZjNTE4ZGJm
+    OTZiYjdlYTI0Mjg2YmM1Zjg0Nzg2ZDU5ZjZkMDI5NzJkYmM5NmU2YmJiY2Vi
+    YmJhZTBjMGRlNGVhNDdjZDdiZThiNGFlM2NkN2Q3ZDEwODgxYTE=

data/lib/mongoid/listable.rb

@@ -48,7 +48,7 @@ module Mongoid
               else                
                 self.class
               end
-      klass.where(field.exists => true).ne id: id
+      klass.where(field.exists => true).ne(id: id)
     end
 
     def embedded_one?
@@ -68,7 +68,7 @@ module Mongoid
     # @param [ Integer ] start The starting position
     #
     # @since 0.1.0
-    def reposition objects, field, start
+    def reposition objects, field, start      
       objects.each_with_index do |object, index|
         object.set field, start + index
       end

data/lib/mongoid/listable/callbacks.rb

@@ -154,7 +154,8 @@ module Mongoid
       # @since 0.1.0
       def change_on name
         from, to = send "#{name}_change"
-        from ||= 0
+        from ||= siblings(name).count
+        to ||= siblings(name).count + 1
         to = if to > siblings(name).count + 1
                siblings(name).count + 1
              elsif to < 1

data/lib/mongoid/listable/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Listable
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

data/spec/mongoid_listable_spec.rb

@@ -81,6 +81,15 @@ describe Mongoid::Listable do
       expect(Item.send(SCOPE).where(FIELD => 4).first).to eq(item)
     end
 
+    it 'should maintain order when moving two objects\' positions' do
+      item_1 = Item.send(SCOPE).where(FIELD => 8).first
+      item_2 = Item.send(SCOPE).where(FIELD => 9).first
+      item_1.update_attribute FIELD, 2
+      item_2.update_attribute FIELD, 6
+      expect(Item.send(SCOPE).where(FIELD => 2).first).to eq(item_1)
+      expect(Item.send(SCOPE).where(FIELD => 6).first).to eq(item_2)
+    end
+
     it 'should do nothing when assigning object to same position' do
       item = Item.send(SCOPE).where(FIELD => 5).first
       item.update_attribute FIELD, 5
@@ -95,10 +104,15 @@ describe Mongoid::Listable do
 
     it 'should compensate for updated positions that are lower than bounds' do
       item = Item.send(SCOPE).where(FIELD => 5).first
-      item.update_attribute FIELD, -100
+      item.update_attribute FIELD, 0
       expect(Item.send(SCOPE).first).to eq(item)
     end
 
+    it 'should compensate for updated positions that are nil' do 
+      item = Item.send(SCOPE).where(FIELD => 5).first
+      item.update_attribute FIELD, nil
+      expect(Item.send(SCOPE).last).to eq(item)
+    end
   end
 
   describe 'lists' do
@@ -202,6 +216,12 @@ describe Mongoid::Listable do
         section.update_attribute :article_position, -100
         expect(Article.first.sections.first).to eq(section)
       end
+
+      it 'should compensate for updated positions that are nil' do 
+        section = Article.first.sections.where(article_position: 5).first
+        section.update_attribute :article_position, nil
+        expect(Article.first.sections.last).to eq(section)
+      end
       
     end
 
@@ -321,6 +341,12 @@ describe Mongoid::Listable do
         expect(User.first.photos.first).to eq(photo)
       end
 
+      it 'should compensate for updated positions that are nil' do 
+        photo = User.first.photos.where(user_position: 5).first
+        photo.update_attribute :user_position, nil
+        expect(User.first.photos.last).to eq(photo)
+      end
+
     end
 
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_listable
 version: !ruby/object:Gem::Version
-  version: 0.2.5
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - richardcalahan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -95,27 +88,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - spec/models/article.rb