dm-is-list 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 
@@ -83,7 +83,6 @@ group :runtime do # Runtime dependencies (as in the gemspec)
 
   gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
   gem 'dm-adjust',       DM_VERSION, :git => "#{DATAMAPPER}/dm-adjust.git"
-  gem 'dm-transactions', DM_VERSION, :git => "#{DATAMAPPER}/dm-transactions.git"
 
 end
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Sindre Aarsaether
+Copyright (c) 2010 Sindre Aarsaether
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -10,14 +10,13 @@ begin
     gem.summary     = 'DataMapper plugin for creating and organizing lists'
     gem.description = gem.summary
     gem.email       = 'sindre [a] identu [d] no'
-    gem.homepage    = 'http://github.com/datamapper/dm-more/tree/master/%s' % gem.name
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Sindre Aarsaether' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',         '~> 1.0.0.rc2'
-    gem.add_dependency 'dm-adjust',       '~> 1.0.0.rc2'
-    gem.add_dependency 'dm-transactions', '~> 1.0.0.rc2'
+    gem.add_dependency 'dm-core',   '~> 1.0.0.rc3'
+    gem.add_dependency 'dm-adjust', '~> 1.0.0.rc3'
 
     gem.add_development_dependency 'rspec', '~> 1.3'
   end

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-is-list.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-list}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sindre Aarsaether"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{DataMapper plugin for creating and organizing lists}
   s.email = %q{sindre [a] identu [d] no}
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-is-list}
+  s.homepage = %q{http://github.com/datamapper/dm-is-list}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
@@ -53,20 +53,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_runtime_dependency(%q<dm-adjust>, ["~> 1.0.0.rc2"])
-      s.add_runtime_dependency(%q<dm-transactions>, ["~> 1.0.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_runtime_dependency(%q<dm-adjust>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_dependency(%q<dm-adjust>, ["~> 1.0.0.rc2"])
-      s.add_dependency(%q<dm-transactions>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-adjust>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-    s.add_dependency(%q<dm-adjust>, ["~> 1.0.0.rc2"])
-    s.add_dependency(%q<dm-transactions>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-adjust>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

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

@@ -1,5 +1,4 @@
 require 'dm-core'
-require 'dm-transactions'
 require 'dm-adjust'
 
 module DataMapper
@@ -253,8 +252,8 @@ module DataMapper
         extend  DataMapper::Is::List::ClassMethods
         include DataMapper::Is::List::InstanceMethods
 
-        unless properties.any? { |p| p.name == :position && p.primitive == Integer }
-          property :position, Integer
+        unless properties.any? { |p| p.kind_of?(Property::Integer) && p.name == :position }
+          property :position, Integer, :min => options[:first], :required => true
         end
 
         @list_options = options
@@ -442,13 +441,11 @@ module DataMapper
         #
         # @api public
         def move_to_list(scope, pos = nil)
-          transaction do |txn|
-            self.detach   # remove from current list
-            self.attribute_set(model.list_options[:scope][0], scope.to_i) # set new scope
-            self.save     # save progress. Needed to get the positions correct.
-            self.reload   # get a fresh new start
-            self.move(pos) unless pos.nil?
-          end
+          detach   # remove from current list
+          attribute_set(model.list_options[:scope][0], scope.to_i) # set new scope
+          save     # save progress. Needed to get the positions correct.
+          reload   # get a fresh new start
+          move(pos) unless pos.nil?
         end
 
         ##
@@ -517,9 +514,7 @@ module DataMapper
         #
         # @api public
         def move(vector)
-          transaction do |txn|
-            move_without_saving(vector) && save
-          end
+          move_without_saving(vector) && save
         end
 
 

data/spec/integration/list_spec.rb

@@ -568,11 +568,6 @@ describe 'DataMapper::Is::List' do
         end
 
         it "should move an item from one list to a fixed position in another list" do
-          pending %Q{Failing Test: Error = [ no such table: todos ]. Error is due to the nested transactions. (See notes in spec)}
-          # NOTE:: This error happens because of the nested transactions taking place
-          # first within the #move_to_list and then the #move method.
-          # If you comment out either of those transactions, the test passes.
-
           DataMapper.repository(:default) do |repos|
             item = Todo.get(2)
             list_scope = Todo.get(6).list_scope
@@ -638,10 +633,6 @@ describe 'DataMapper::Is::List' do
 
       describe "CRUD" do
 
-        # describe "#create" do
-        #   pending
-        # end #/ #create
-
         describe "Updating list items" do
 
           it "should NOT loose position when updating other attributes" do
@@ -956,8 +947,8 @@ describe 'DataMapper::Is::List' do
 
         property :id,    Serial
         property :title, String
-        property :position, Integer, :required => true, :unique_index => :position
-        property :client_id, Integer, :unique_index => :position
+        property :position, Integer, :min => 1, :required => true, :unique => :position
+        property :client_id, Integer, :unique => :position
 
         belongs_to :client
 

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/spec/spec_helper.rb

@@ -26,6 +26,8 @@ class Todo
   is :list, :scope => :user_id
 end
 
+DataMapper.finalize
+
 module TodoListHelper
   ##
   # Keep things DRY shortcut

data/tasks/spec.rake

@@ -35,4 +35,7 @@ rescue LoadError
   end
 end
 
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
 task :default => :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-list
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,36 +44,19 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dm-transactions
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 977940575
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc2
-        version: 1.0.0.rc2
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -84,7 +67,7 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: DataMapper plugin for creating and organizing lists
 email: sindre [a] identu [d] no
 executables: []
@@ -115,7 +98,7 @@ files:
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/datamapper/dm-more/tree/master/dm-is-list
+homepage: http://github.com/datamapper/dm-is-list
 licenses: []
 
 post_install_message: