dm-adjust 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,7 @@
+=== 0.9.8 / 2008-12-07
 
+* 3 minor enhancements:
+
+  * Added Resource#adjust! method
+  * Added Resource#adjust and Model#adjust (validation respecting) stubs
+  * Preparations for dkubb/dm-core

data/Manifest.txt

@@ -9,7 +9,10 @@ lib/dm-adjust/adapters/data_objects_adapter.rb
 lib/dm-adjust/collection.rb
 lib/dm-adjust/model.rb
 lib/dm-adjust/repository.rb
+lib/dm-adjust/resource.rb
 lib/dm-adjust/version.rb
 spec/integration/adjust_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+tasks/install.rb
+tasks/spec.rb

data/README.txt

@@ -5,8 +5,8 @@ DataMapper plugin providing methods to increment and decrement properties
 
 It provides the following function (for collections and resources):
 
-== adjust
+== adjust!
 
- Person.adjust(:salary => 1000) # increases the salary of all people with 1000.
- Person.all(:age.gte => 40).adjust(:salary => 2000) # increase salary of them oldies.
- Children.adjust(:allowance => -100) # less money for candy and concerts
+ Person.adjust!(:salary => 1000) # increases the salary of all people with 1000.
+ Person.all(:age.gte => 40).adjust!(:salary => 2000) # increase salary of them oldies.
+ @child.adjust!(:allowance => -100) # less money for candy and concerts

data/Rakefile

@@ -1,53 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
 
-ROOT = Pathname(__FILE__).dirname.expand_path
-require ROOT + 'lib/dm-adjust/version'
-
-AUTHOR = "Sindre Aarsaether"
-EMAIL  = "sindre [a] identu [d] no"
-GEM_NAME = "dm-adjust"
-GEM_VERSION = DataMapper::More::Adjust::VERSION
-GEM_DEPENDENCIES = [["dm-core", 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-adjust"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin providing methods to increment and decrement properties"
-
-require ROOT.parent + 'tasks/hoe'
-
-task :default => [ :spec ]
-
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('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
+require ROOT + 'lib/dm-adjust/version'
 
-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
+AUTHOR = 'Sindre Aarsaether'
+EMAIL  = 'sindre [a] identu [d] no'
+GEM_NAME = 'dm-adjust'
+GEM_VERSION = DataMapper::Adjust::VERSION
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"]]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-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)
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin providing methods to increment and decrement properties'
 
-  begin
-    t.rcov = 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 Exception
-    # rcov not installed
-  end
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/TODO

@@ -1,6 +0,0 @@
-TODO
-====
-
----
-TODO tickets may also be found in the DataMapper Issue Tracker:
-http://wm.lighthouseapp.com/projects/4819-datamapper/overview

data/lib/dm-adjust.rb

@@ -3,7 +3,7 @@ require 'pathname'
 
 require Pathname(__FILE__).dirname + 'dm-adjust/version'
 
-gem 'dm-core', DataMapper::More::Adjust::VERSION
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-adjust'
@@ -11,4 +11,5 @@ dir = Pathname(__FILE__).dirname.expand_path / 'dm-adjust'
 require dir / 'collection'
 require dir / 'model'
 require dir / 'repository'
+require dir / 'resource'
 require dir / 'adapters' / 'data_objects_adapter'

data/lib/dm-adjust/collection.rb

@@ -32,9 +32,16 @@ module DataMapper
       # if the query contains a raw sql-string, we cannot (truly) know, and must load.
       altered = query.conditions.detect{|c| adjust_attributes.include?(c[1]) || c[0] == :raw }
 
+      identity_map   = repository.identity_map(model)
+      key_properties = model.key(repository.name)
+
       if identity_map.any? && reload
-        reload_query = @key_properties.zip(identity_map.keys.transpose).to_hash
-        reload_query = all(reload_query.merge(:fields => @key_properties)).send(:keys) if altered
+        reload_query = key_properties.zip(identity_map.keys.transpose).to_hash
+
+        if altered
+          keys = all(reload_query.merge(:fields => key_properties)).map { |r| r.key }
+          reload_query = model.key(repository.name).zip(keys.transpose).to_hash
+        end
       end
 
       repository.adjust(adjust_attributes,scoped_query)
@@ -53,8 +60,7 @@ module DataMapper
         end
       end if altered
 
-      return true
-
-    end # adjust
+      true
+    end
   end # Collection
 end # DataMapper

data/lib/dm-adjust/model.rb

@@ -1,6 +1,10 @@
 module DataMapper
   module Model
 
+    def adjust(attributes = {}, reload = false)
+      raise NotImplementedError, 'adjust *with* validations has not be written yet, try adjust!'
+    end
+
     ##
     # increment or decrement attributes on all objects in a resource
     #
@@ -13,5 +17,5 @@ module DataMapper
     def adjust!(attributes,reload=false)
       all.adjust!(attributes,reload)
     end
-  end
-end
+  end # Model
+end # DataMapper

data/lib/dm-adjust/resource.rb

@@ -0,0 +1,23 @@
+module DataMapper
+  module Resource
+    def adjust(attributes = {}, reload = false)
+      raise NotImplementedError, 'adjust *with* validations has not be written yet, try adjust!'
+    end
+
+    def adjust!(attributes = {}, reload = false)
+      return true if attributes.empty?
+
+      adjust_attributes = {}
+
+      model.properties(repository.name).slice(*attributes.keys).each do |property|
+        adjust_attributes[property] = attributes[property.name] if property
+      end
+
+      repository.adapter.adjust(adjust_attributes, to_query)
+
+      collection.reload(:fields => adjust_attributes.keys) if reload
+
+      true
+    end
+  end # Resource
+end # DataMapper

data/lib/dm-adjust/version.rb

@@ -1,7 +1,5 @@
 module DataMapper
-  module More
-    module Adjust
-      VERSION = "0.9.7"
-    end
+  module Adjust
+    VERSION = '0.9.8'
   end
 end

data/spec/integration/adjust_spec.rb

@@ -13,7 +13,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
   describe 'Adjust' do
 
-    before :all do
+    before do
       Person.auto_migrate!(:default)
       Person.create(:name => 'George', :age => 15)
       Person.create(:name => 'Puff',   :age => 18)
@@ -23,11 +23,9 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       Person.create(:name => 'Amadeus',:age => 60)
     end
 
-    describe 'Resource#adjust!' do
+    describe 'Model#adjust!' do
       it 'should adjust values' do
         repository(:default) do
-          p = Person.get(1)
-          p.salary.should == 20000
           Person.adjust!({:salary => 1000},true)
           Person.all.each{|p| p.salary.should == 21000}
         end
@@ -51,9 +49,20 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
       it 'should load the query if conditions were adjusted' do
         repository(:default) do |repos|
-          @specific = Person.all(:salary => 25000)
+          @specific = Person.all(:salary => 20000)
           @specific.adjust!({:salary => 5000},true)
-          @specific.length.should == 2
+          @specific.length.should == 6
+        end
+      end
+    end
+
+    describe 'Resource#adjust' do
+      it 'should adjust the value' do
+        repository(:default) do |repos|
+          p = Person.get(1)
+          p.salary.should == 20000
+          p.adjust!({:salary => 1000},true)
+          p.salary.should == 21000
         end
       end
     end

data/spec/spec.opts

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

data/spec/spec_helper.rb

@@ -1,21 +1,18 @@
-require 'rubygems'
 require 'pathname'
+require 'rubygems'
+
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-adjust'
 
 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]
     # DataObjects::Sqlite3.logger = DataObjects::Logger.new(Pathname(__FILE__).dirname+'dm.log',0)
     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-adjust
 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,19 +18,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 providing methods to increment and decrement properties
 email: 
@@ -43,6 +33,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -55,10 +46,13 @@ files:
 - lib/dm-adjust/collection.rb
 - lib/dm-adjust/model.rb
 - lib/dm-adjust/repository.rb
+- lib/dm-adjust/resource.rb
 - lib/dm-adjust/version.rb
 - spec/integration/adjust_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-adjust
 post_install_message: