dm-is-list 0.9.6 → 0.9.7

data/Rakefile

@@ -10,7 +10,7 @@ AUTHOR = "Sindre Aarsaether"
 EMAIL  = "sindre [a] identu [d] no"
 GEM_NAME = "dm-is-list"
 GEM_VERSION = DataMapper::Is::List::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], ["dm-adjust", GEM_VERSION]]
 GEM_CLEAN = ["log", "pkg"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
 

data/lib/dm-is-list.rb

@@ -2,10 +2,10 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.6'
+gem 'dm-core', '~>0.9.7'
 require 'dm-core'
 
-gem 'dm-adjust', '=0.9.6'
+gem 'dm-adjust', '~>0.9.7'
 require 'dm-adjust'
 
 require Pathname(__FILE__).dirname.expand_path / 'dm-is-list' / 'is' / 'list.rb'

data/lib/dm-is-list/is/list.rb

@@ -150,8 +150,7 @@ module DataMapper
         # @return <TrueClass, FalseClass> returns false if it cannot move to the position, otherwise true
         # @see move_without_saving
         def move(vector)
-          move_without_saving(vector)
-          save
+          move_without_saving(vector) && save
         end
 
         ##
@@ -166,6 +165,7 @@ module DataMapper
           minpos = self.class.list_options[:first]
           prepos = self.original_values[:position] || self.position
           maxpos = list.last ? (list.last == self ? prepos : list.last.position + 1) : minpos
+
           newpos = case action
             when :highest     then minpos
             when :lowest      then maxpos
@@ -177,6 +177,7 @@ module DataMapper
             else [action.to_i,maxpos].min
           end
 
+          return false if [:lower, :higher].include?(action) && newpos == prepos
           return false if !newpos || ([:above,:below].include?(action) && list_scope != object.list_scope)
           return true if newpos == position && position == prepos || (newpos == maxpos && position == maxpos-1)
 

data/lib/dm-is-list/is/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module List
-      VERSION = "0.9.6"
+      VERSION = "0.9.7"
     end
   end
 end

data/spec/integration/list_spec.rb

@@ -24,19 +24,19 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       is :list, :scope => [:user_id]
     end
 
-    before :all do
+    before :each do
       User.auto_migrate!(:default)
       Todo.auto_migrate!(:default)
 
-      u1 = User.create!(:name => "Johnny")
-      Todo.create!(:user => u1, :title => "Write down what is needed in a list-plugin")
-      Todo.create!(:user => u1, :title => "Complete a temporary version of is-list")
-      Todo.create!(:user => u1, :title => "Squash bugs in nested-set")
+      u1 = User.create(:name => "Johnny")
+      Todo.create(:user => u1, :title => "Write down what is needed in a list-plugin")
+      Todo.create(:user => u1, :title => "Complete a temporary version of is-list")
+      Todo.create(:user => u1, :title => "Squash bugs in nested-set")
 
-      u2 = User.create!(:name => "Freddy")
-      Todo.create!(:user => u2, :title => "Eat tasty cupcake")
-      Todo.create!(:user => u2, :title => "Procrastinate on paid work")
-      Todo.create!(:user => u2, :title => "Go to sleep")
+      u2 = User.create(:name => "Freddy")
+      Todo.create(:user => u2, :title => "Eat tasty cupcake")
+      Todo.create(:user => u2, :title => "Procrastinate on paid work")
+      Todo.create(:user => u2, :title => "Go to sleep")
 
     end
 
@@ -79,11 +79,11 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
       it 'should rearrange items correctly when moving :lower' do
         repository(:default) do |repos|
-          Todo.get(3).position.should == 2
-          Todo.get(2).position.should == 3
-          Todo.get(3).move :lower
-          Todo.get(3).position.should == 3
           Todo.get(2).position.should == 2
+          Todo.get(3).position.should == 3
+          Todo.get(2).move :lower
+          Todo.get(2).position.should == 3
+          Todo.get(3).position.should == 2
 
           Todo.get(4).position.should == 1
         end
@@ -107,23 +107,22 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
       it 'should not rearrange when trying to move top-item up, or bottom item down' do
         repository(:default) do |repos|
-          Todo.get(6).position.should == 1
-          Todo.get(6).move(:higher).should == false
-          Todo.get(6).position.should == 1
+          Todo.get(4).position.should == 1
+          Todo.get(4).move(:higher).should == false
+          Todo.get(4).position.should == 1
 
-          Todo.get(1).position.should == 3
-          Todo.get(2).position.should == 1
-          Todo.get(1).move(:lower).should == false
+          Todo.get(6).position.should == 3
+          Todo.get(6).move(:lower).should == false
         end
       end
 
       it 'should rearrange items correctly when moving :above or :below' do
         repository(:default) do |repos|
-          Todo.get(6).position.should == 1
-          Todo.get(5).position.should == 3
-          Todo.get(6).move(:below => Todo.get(5))
+          Todo.get(4).position.should == 1
           Todo.get(6).position.should == 3
-          Todo.get(5).position.should == 2
+          Todo.get(4).move(:below => Todo.get(6))
+          Todo.get(4).position.should == 3
+          Todo.get(6).position.should == 2
         end
       end
     end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '>=0.9.5'
+    gem lib, '~>0.9.7'
     require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-list
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 -06:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.6
+        version: 0.9.7
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-adjust
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: DataMapper plugin for creating and organizing lists
 email: 
@@ -79,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin for creating and organizing lists