dm-adjust 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,7 @@
+=== 0.10.0 / 2009-10-15
+
+* Updated to work with dm-core 0.10.0
+
 === 0.9.11 / 2009-03-29
 
 * No changes this version

data/Manifest.txt

@@ -1,13 +1,14 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 lib/dm-adjust.rb
 lib/dm-adjust/adapters/data_objects_adapter.rb
 lib/dm-adjust/collection.rb
 lib/dm-adjust/model.rb
+lib/dm-adjust/query/conditions/comparison.rb
 lib/dm-adjust/repository.rb
 lib/dm-adjust/resource.rb
 lib/dm-adjust/version.rb

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -14,10 +13,10 @@ 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 ] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin providing methods to increment and decrement properties'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/lib/dm-adjust.rb

@@ -1,15 +1,7 @@
-require 'rubygems'
-require 'pathname'
-
-require Pathname(__FILE__).dirname + 'dm-adjust/version'
-
-gem 'dm-core', '0.9.11'
-require 'dm-core'
-
-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'
+require 'dm-adjust/adapters/data_objects_adapter'
+require 'dm-adjust/collection'
+require 'dm-adjust/model'
+require 'dm-adjust/query/conditions/comparison'
+require 'dm-adjust/repository'
+require 'dm-adjust/resource'
+require 'dm-adjust/version'

data/lib/dm-adjust/adapters/data_objects_adapter.rb

@@ -1,9 +1,24 @@
 module DataMapper
   module Adapters
-    class DataObjectsAdapter
+    class DataObjectsAdapter < AbstractAdapter
       def adjust(attributes, query)
-        statement = adjust_statement(attributes.keys, query)
-        bind_values = attributes.values + query.bind_values
+        # TODO: if the query contains any links, a limit or an offset
+        # use a subselect to get the rows to be updated
+
+        properties  = []
+        bind_values = []
+
+        # make the order of the properties consistent
+        query.model.properties(name).each do |property|
+          next unless attributes.key?(property)
+          properties  << property
+          bind_values << attributes[property]
+        end
+
+        statement, conditions_bind_values = adjust_statement(properties, query)
+
+        bind_values.concat(conditions_bind_values)
+
         execute(statement, *bind_values)
       end
 
@@ -11,19 +26,17 @@ module DataMapper
         private
 
         def adjust_statement(properties, query)
-          repository = query.repository
-
-          statement = "UPDATE #{quote_table_name(query.model.storage_name(repository.name))}"
-          statement << " SET #{set_adjustment_statement(repository, properties)}"
-          statement << " WHERE #{conditions_statement(query)}" if query.conditions.any?
-          statement
-        rescue => e
-           DataMapper.logger.error("QUERY INVALID: #{query.inspect} (#{e})")
-           raise e
+          conditions_statement, bind_values = conditions_statement(query.conditions)
+
+          statement = "UPDATE #{quote_name(query.model.storage_name(name))}"
+          statement << " SET #{set_adjustment_statement(properties)}"
+          statement << " WHERE #{conditions_statement}" unless conditions_statement.blank?
+
+          return statement, bind_values
         end
 
-        def set_adjustment_statement(repository, properties)
-          properties.map { |p| [quote_column_name(p.field(repository.name))] * 2 * " = " + " + (?)" } * ", "
+        def set_adjustment_statement(properties)
+          properties.map { |p| "#{quote_name(p.field)} = #{quote_name(p.field)} + ?" }.join(', ')
         end
 
       end # module SQL

data/lib/dm-adjust/collection.rb

@@ -21,16 +21,23 @@ module DataMapper
 
       adjust_attributes = {}
 
-      model.properties(repository.name).slice(*attributes.keys).each do |property|
+      model.properties(repository.name).values_at(*attributes.keys).each do |property|
         adjust_attributes[property] = attributes[property.name] if property
       end
 
-      each { |r| attributes.each_pair{|a,v| r.attribute_set(a,r.send(a) + v) }; r.save } if loaded?
+      if loaded?
+        each { |r| attributes.each_pair { |a, v| r.attribute_set(a, r.send(a) + v) }; r.save }
+        return true
+      end
 
       # if none of the attributes that are adjusted is part of the collection-query
       # there is no need to load the collection (it will not change after adjustment)
       # 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 }
+      unless altered = query.raw?
+        query.conditions.each_node do |comparison|
+          altered = true
+        end
+      end
 
       identity_map   = repository.identity_map(model)
       key_properties = model.key(repository.name)
@@ -44,21 +51,31 @@ module DataMapper
         end
       end
 
-      repository.adjust(adjust_attributes,scoped_query)
+      repository.adjust(adjust_attributes, scoped_query({}))
 
       # Reload affected objects in identity-map. if collection was affected, dont use the scope.
-      (altered ? model : self).all(reload_query).reload(:fields => attributes.keys) if reload_query && reload_query.any?
+      if reload_query && reload_query.any?
+        (altered ? model : self).all(reload_query).reload(:fields => attributes.keys)
+      end
 
       # if preload was set to false, and collection was affected by updates,
       # something is now officially borked. We'll try the best we can (still many cases this is borked for)
-      query.conditions.each do |c|
-        if adjustment = adjust_attributes[c[1]]
-          case c[2]
-            when Numeric then c[2] += adjustment
-            when Range   then c[2] = (c[2].first+adjustment)..(c[2].last+adjustment)
-          end if adjustment = adjust_attributes[c[1]]
+      if altered
+        query.conditions.each_node do |comparison|
+          next unless adjustment = adjust_attributes[comparison.subject]
+
+          next unless key = [ comparison.subject, comparison.subject.name ].detect do |key|
+            query.options.key?(key)
+          end
+
+          value = case value = comparison.value
+            when Numeric then comparison.value + adjustment
+            when Range   then (value.first + adjustment)..(value.last + adjustment)
+          end
+
+          query.update(key => value)
         end
-      end if altered
+      end
 
       true
     end

data/lib/dm-adjust/query/conditions/comparison.rb

@@ -0,0 +1,25 @@
+module DataMapper
+  class Query
+    module Conditions
+      class AbstractOperation
+        def each_node
+          operands = self.operands.dup
+
+          while operand = operands.shift
+            if operand.respond_to?(:operands)
+              operands.concat(operand.operands)
+            else
+              yield operand
+            end
+          end
+        end
+      end
+
+      class AbstractComparison
+        # this is necessary to allow dm-adjust to change the conditions
+        # of the query in an existing collection
+        attr_accessor :value
+      end
+    end
+  end
+end

data/lib/dm-adjust/resource.rb

@@ -9,11 +9,11 @@ module DataMapper
 
       adjust_attributes = {}
 
-      model.properties(repository.name).slice(*attributes.keys).each do |property|
+      model.properties(repository.name).values_at(*attributes.keys).each do |property|
         adjust_attributes[property] = attributes[property.name] if property
       end
 
-      repository.adapter.adjust(adjust_attributes, to_query)
+      repository.adapter.adjust(adjust_attributes, query)
 
       collection.reload(:fields => adjust_attributes.keys) if reload
 

data/lib/dm-adjust/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Adjust
-    VERSION = '0.9.11'
+    VERSION = '0.10.0'.freeze
   end
 end

data/spec/integration/adjust_spec.rb

@@ -1,14 +1,13 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
   class Person
     include DataMapper::Resource
-    property :id, Integer, :serial => true
-    property :name, String
+    property :id,     Serial
+    property :name,   String
     property :salary, Integer, :default => 20000
-    property :age, Integer
+    property :age,    Integer
   end
 
   describe 'Adjust' do
@@ -25,7 +24,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe 'Model#adjust!' do
       it 'should adjust values' do
-        repository(:default) do
+        DataMapper.repository(:default) do
           Person.adjust!({:salary => 1000},true)
           Person.all.each{|p| p.salary.should == 21000}
         end
@@ -34,7 +33,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe 'Collection#adjust!' do
       it 'should adjust values' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
           @oldies = Person.all(:age.gte => 40)
           @oldies.adjust!({:salary => 5000},true)
           @oldies.each{|p| p.salary.should == 25000}
@@ -48,17 +47,28 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
 
       it 'should load the query if conditions were adjusted' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
           @specific = Person.all(:salary => 20000)
           @specific.adjust!({:salary => 5000},true)
-          @specific.length.should == 6
+
+          # Both of these are seemingly equal
+          # puts @specific.query.inspect
+          # puts Person.all(:salary => 25000).query.inspect
+          #<DataMapper::Query @repository=:default @model=Person @fields=[#<Property:Person:id>, #<Property:Person:name>, #<Property:Person:salary>, #<Property:Person:age>] @links=[] @conditions=[[:eql, #<Property:Person:salary>, 25000]] @order=[#<DataMapper::Query::Direction #<Property:Person:id> asc>] @limit=nil @offset=0 @reload=false @unique=false>
+          #<DataMapper::Query @repository=:default @model=Person @fields=[#<Property:Person:id>, #<Property:Person:name>, #<Property:Person:salary>, #<Property:Person:age>] @links=[] @conditions=[[:eql, #<Property:Person:salary>, 25000]] @order=[#<DataMapper::Query::Direction #<Property:Person:id> asc>] @limit=nil @offset=0 @reload=false @unique=false>
+          # puts @specific.all.length # is 0
+          # puts Person.all(@specific.query.relative({})).length # 0
+          # puts Person.all(:salary => 25000).length # 6 !
+
+          Person.all(:salary => 25000).length.should == 6
+          @specific.all.length.should == 6
         end
       end
     end
 
     describe 'Resource#adjust' do
       it 'should adjust the value' do
-        repository(:default) do |repos|
+        DataMapper.repository(:default) do |repos|
           p = Person.get(1)
           p.salary.should == 20000
           p.adjust!({:salary => 1000},true)

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,7 +1,14 @@
-require 'pathname'
 require 'rubygems'
 
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-adjust'
+# Use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-core'
+
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+
+require 'dm-adjust'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
@@ -9,7 +16,6 @@ def load_driver(name, default_uri)
   begin
     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 LoadError => e
     warn "Could not load do_#{name}: #{e}"

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   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).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       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
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-adjust
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: DataMapper plugin providing methods to increment and decrement properties
 email: 
 - sindre [a] identu [d] no
@@ -30,21 +21,22 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-adjust.rb
 - lib/dm-adjust/adapters/data_objects_adapter.rb
 - lib/dm-adjust/collection.rb
 - lib/dm-adjust/model.rb
+- lib/dm-adjust/query/conditions/comparison.rb
 - lib/dm-adjust/repository.rb
 - lib/dm-adjust/resource.rb
 - lib/dm-adjust/version.rb
@@ -54,11 +46,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-adjust
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-adjust
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -76,9 +70,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin providing methods to increment and decrement properties
 test_files: []