dm-is-list 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,5 @@
+=== 0.9.8 / 2008-12-07
 
+* 1 bug fix:
+
+  * Applied patch to fix bug with manual positioning [#672 state:resolved]

data/Manifest.txt

@@ -10,3 +10,5 @@ lib/dm-is-list/is/version.rb
 spec/integration/list_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+tasks/install.rb
+tasks/spec.rb

data/Rakefile

@@ -1,49 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-ROOT = Pathname(__FILE__).dirname.expand_path
 require ROOT + 'lib/dm-is-list/is/version'
 
-AUTHOR = "Sindre Aarsaether"
-EMAIL  = "sindre [a] identu [d] no"
-GEM_NAME = "dm-is-list"
+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], ["dm-adjust", GEM_VERSION]]
-GEM_CLEAN = ["log", "pkg"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
-
-PROJECT_NAME = "datamapper"
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-is-list"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin for creating and organizing lists"
-
-require ROOT.parent + 'tasks/hoe'
-
-task :default => [ :spec ]
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"], ['dm-adjust', "~>#{GEM_VERSION}"]]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
-end
-
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
-end
-
-namespace :jruby do
-  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
-  task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
-  end
-end
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for creating and organizing lists'
 
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/lib/dm-is-list.rb

@@ -1,13 +1,12 @@
-
-require 'rubygems'
 require 'pathname'
+require 'rubygems'
 
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
 
-gem 'dm-adjust', '~>0.9.7'
+#gem 'dm-adjust', '~>0.9.8'
 require 'dm-adjust'
 
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-list' / 'is' / 'list.rb'
+require Pathname(__FILE__).dirname.expand_path / 'dm-is-list' / 'is' / 'list'
 
 DataMapper::Model.append_extensions DataMapper::Is::List

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

@@ -28,28 +28,28 @@ module DataMapper
 
         @list_options = options
 
-        before :save do
-          if self.new_record?
-            # a position has been set before save => open up and make room for item
-            # no position has been set => move to bottom of my scope-list (or keep detached?)
-            self.send(:move_without_saving, (self.position || :lowest))
-          else
-            # if the scope has changed, we need to detach our item from the old list
-            if self.list_scope != self.original_list_scope
-              newpos = self.position
-
-              self.detach(self.original_list_scope) # removing from old list
-              self.send(:move_without_saving, newpos || :lowest) # moving to pos or bottom of new list
-
-            elsif self.attribute_dirty?(:position) && !self.moved
-              self.send(:move_without_saving, self.position)
-            else
-              self.moved = false
-            end
-            # a (new) position has been set => move item to this position (only if position has been set manually)
-            # the scope has changed => detach from old list, and possibly move into position
-            # the scope and position has changed => detach from old, move to pos in new
+        before :create do
+          # a position has been set before save => open up and make room for item
+          # no position has been set => move to bottom of my scope-list (or keep detached?)
+          self.send(:move_without_saving, (self.position || :lowest))
+        end
+
+        before :update do
+          # if the scope has changed, we need to detach our item from the old list
+          if self.list_scope != self.original_list_scope
+            newpos = self.position
+            self.detach(self.original_list_scope) # removing from old list
+            self.send(:move_without_saving, newpos || :lowest) # moving to pos or bottom of new list
+          elsif self.attribute_dirty?(:position) && !self.moved
+            self.send(:move_without_saving, self.position)
           end
+
+          # on update, clean moved to prepare for the next change
+          self.moved = false
+
+          # a (new) position has been set => move item to this position (only if position has been set manually)
+          # the scope has changed => detach from old list, and possibly move into position
+          # the scope and position has changed => detach from old, move to pos in new
         end
 
         before :destroy do

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

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

data/spec/integration/list_spec.rb

@@ -60,11 +60,32 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
       it 'should rearrange items when setting position yourself' do
         repository(:default) do |repos|
-          Todo.get(2).update_attributes(:position => 1)
+          todo = Todo.get(2)
+          todo.position = 1
+          todo.save
+
           Todo.get(2).position.should == 1
           Todo.get(1).position.should == 2
         end
       end
+
+      it 'should rearrange items when setting the position yourself multiple times' do
+        repository(:default) do |repos|
+          todo = Todo.get(2)
+          todo.position = 3
+          todo.save
+
+          Todo.get(2).position.should == 3
+          Todo.get(3).position.should == 2
+
+          todo = Todo.get(2)
+          todo.position = 2
+          todo.save
+
+          Todo.get(2).position.should == 2
+          Todo.get(3).position.should == 3
+        end
+      end
     end
 
     describe 'movement' do

data/spec/spec.opts

@@ -1,2 +1 @@
---format specdoc
 --colour

data/spec/spec_helper.rb

@@ -1,22 +1,26 @@
+require 'pathname'
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-is-list'
+
+ROOT = Pathname(__FILE__).dirname.parent.expand_path
+
+# use local dm-adjust if running from dm-more directly
+lib = ROOT.parent.join('dm-adjust', 'lib').expand_path
+$LOAD_PATH.unshift(lib) if lib.directory?
+
+require ROOT + 'lib/dm-is-list'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
 
-  lib = "do_#{name}"
-
   begin
-    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]
     true
-  rescue Gem::LoadError => e
-    warn "Could not load #{lib}: #{e}"
+  rescue LoadError => e
+    warn "Could not load do_#{name}: #{e}"
     false
   end
 end

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-list
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-adjust
@@ -28,19 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 0.9.8
     version: 
 description: DataMapper plugin for creating and organizing lists
 email: 
@@ -53,6 +43,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -66,6 +57,8 @@ files:
 - spec/integration/list_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-is-list
 post_install_message: