dm-adjust 0.10.1 → 0.10.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Sindre Aarsaether
+Copyright (c) 2009 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

@@ -1,24 +1,29 @@
-require 'pathname'
+require 'rubygems'
+require 'rake'
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
 
-require ROOT + 'lib/dm-adjust/version'
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'dm-adjust'
+    gem.summary     = 'DataMapper plugin providing methods to increment and decrement properties'
+    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.authors     = [ 'Sindre Aarsaether' ]
 
-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.rdoc LICENSE TODO History.rdoc ] }
+    gem.rubyforge_project = 'datamapper'
 
-PROJECT_NAME = 'datamapper'
-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'
+    gem.add_dependency 'dm-core', '~> 0.10.2'
 
-[ ROOT, ROOT.parent ].each do |dir|
-  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
+    gem.add_development_dependency 'rspec', '~> 1.2.9'
+    gem.add_development_dependency 'yard',  '~> 0.4.0'
+  end
+
+  Jeweler::GemcutterTasks.new
+
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/VERSION

@@ -0,0 +1 @@
+0.10.2

data/dm-adjust.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-adjust}
+  s.version = "0.10.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sindre Aarsaether"]
+  s.date = %q{2009-12-11}
+  s.description = %q{DataMapper plugin providing methods to increment and decrement properties}
+  s.email = %q{sindre [a] identu [d] no}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "dm-adjust.gemspec",
+     "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/repository.rb",
+     "lib/dm-adjust/resource.rb",
+     "spec/integration/adjust_spec.rb",
+     "spec/rcov.opts",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "tasks/ci.rake",
+     "tasks/metrics.rake",
+     "tasks/spec.rake",
+     "tasks/yard.rake",
+     "tasks/yardstick.rake"
+  ]
+  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-adjust}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{DataMapper plugin providing methods to increment and decrement properties}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+    else
+      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+  end
+end
+

data/lib/dm-adjust.rb

@@ -1,7 +1,5 @@
 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,7 +1,9 @@
 module DataMapper
   module Adapters
     class DataObjectsAdapter < AbstractAdapter
-      def adjust(attributes, query)
+      def adjust(attributes, collection)
+        query = collection.query
+
         # TODO: if the query contains any links, a limit or an offset
         # use a subselect to get the rows to be updated
 
@@ -19,7 +21,7 @@ module DataMapper
 
         bind_values.concat(conditions_bind_values)
 
-        execute(statement, *bind_values)
+        execute(statement, *bind_values).affected_rows
       end
 
       module SQL

data/lib/dm-adjust/collection.rb

@@ -19,65 +19,33 @@ module DataMapper
     def adjust!(attributes = {}, reload = false)
       return true if attributes.empty?
 
-      adjust_attributes = {}
-
-      model.properties(repository.name).values_at(*attributes.keys).each do |property|
-        adjust_attributes[property] = attributes[property.name] if property
-      end
-
-      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.
-      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)
-
-      if identity_map.any? && reload
-        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
+      reload_conditions = if reload
+        model_key = model.key(repository.name)
+        Query.target_conditions(self, model_key, model_key)
       end
 
-      repository.adjust(adjust_attributes, scoped_query({}))
+      adjust_attributes = adjust_attributes(attributes)
+      repository.adjust(adjust_attributes, self)
 
-      # Reload affected objects in identity-map. if collection was affected, dont use the scope.
-      if reload_query && reload_query.any?
-        (altered ? model : self).all(reload_query).reload(:fields => attributes.keys)
+      if reload_conditions
+        @query.clear
+        @query.update(:conditions => reload_conditions)
+        self.reload
       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)
-      if altered
-        query.conditions.each_node do |comparison|
-          next unless adjustment = adjust_attributes[comparison.subject]
+      true
+    end
 
-          next unless key = [ comparison.subject, comparison.subject.name ].detect do |key|
-            query.options.key?(key)
-          end
+    private
 
-          value = case value = comparison.value
-            when Numeric then comparison.value + adjustment
-            when Range   then (value.first + adjustment)..(value.last + adjustment)
-          end
+    def adjust_attributes(attributes)
+      adjust_attributes = {}
 
-          query.update(key => value)
-        end
+      model.properties(repository.name).values_at(*attributes.keys).each do |property|
+        adjust_attributes[property] = attributes[property.name]
       end
 
-      true
+      adjust_attributes
     end
   end # Collection
 end # DataMapper

data/lib/dm-adjust/model.rb

@@ -1,8 +1,8 @@
 module DataMapper
   module Model
 
-    def adjust(attributes = {}, reload = false)
-      raise NotImplementedError, 'adjust *with* validations has not be written yet, try adjust!'
+    def adjust(*args)
+      all.adjust(*args)
     end
 
     ##
@@ -14,8 +14,8 @@ module DataMapper
     #
     # @param attributes <Hash> A hash of attributes to adjust, and their adjustment
     # @public
-    def adjust!(attributes,reload=false)
-      all.adjust!(attributes,reload)
+    def adjust!(*args)
+      all.adjust!(*args)
     end
   end # Model
 end # DataMapper

data/lib/dm-adjust/resource.rb

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

data/spec/rcov.opts

@@ -0,0 +1,6 @@
+--exclude "spec"
+--sort coverage
+--callsites
+--xrefs
+--profile
+--text-summary

data/spec/spec.opts

@@ -1,2 +1,4 @@
 --colour
 --loadby random
+--format profile
+--backtrace

data/tasks/ci.rake

@@ -0,0 +1 @@
+task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/metrics.rake

@@ -0,0 +1,36 @@
+begin
+  require 'metric_fu'
+rescue LoadError
+  namespace :metrics do
+    task :all do
+      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
+    end
+  end
+end
+
+begin
+  require 'reek/adapters/rake_task'
+
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose       = false
+    t.source_files  = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort 'Reek is not available. In order to run reek, you must: gem install reek'
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
+  end
+end

data/tasks/spec.rake

@@ -0,0 +1,41 @@
+spec_defaults = lambda do |spec|
+  spec.pattern    = 'spec/**/*_spec.rb'
+  spec.libs      << 'lib' << 'spec'
+  spec.spec_opts << '--options' << 'spec/spec.opts'
+end
+
+begin
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+rescue LoadError
+  task :spec do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+end
+
+begin
+  require 'rcov'
+  require 'spec/rake/verify_rcov'
+
+  Spec::Rake::SpecTask.new(:rcov) do |rcov|
+    spec_defaults.call(rcov)
+    rcov.rcov      = true
+    rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
+  end
+
+  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
+    rcov.threshold = 100
+  end
+rescue LoadError
+  %w[ rcov verify_rcov ].each do |name|
+    task name do
+      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
+    end
+  end
+end
+
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
+task :default => :spec

data/tasks/yard.rake

@@ -0,0 +1,9 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yard do
+    abort 'YARD is not available. In order to run yard, you must: gem install yard'
+  end
+end

data/tasks/yardstick.rake

@@ -0,0 +1,19 @@
+begin
+  require 'pathname'
+  require 'yardstick/rake/measurement'
+  require 'yardstick/rake/verify'
+
+  # yardstick_measure task
+  Yardstick::Rake::Measurement.new
+
+  # verify_measurements task
+  Yardstick::Rake::Verify.new do |verify|
+    verify.threshold = 100
+  end
+rescue LoadError
+  %w[ yardstick_measure verify_measurements ].each do |name|
+    task name.to_s do
+      abort "Yardstick is not available. In order to run #{name}, you must: gem install yardstick"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-adjust
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -07:00
+date: 2009-12-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,50 +18,67 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
     version: 
 description: DataMapper plugin providing methods to increment and decrement properties
-email: 
-- sindre [a] identu [d] no
+email: sindre [a] identu [d] no
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE
-- TODO
-- History.rdoc
+- README.rdoc
 files: 
-- History.rdoc
 - LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
-- TODO
+- VERSION
+- dm-adjust.gemspec
 - 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
 - spec/integration/adjust_spec.rb
+- spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/install.rb
-- tasks/spec.rb
+- tasks/ci.rake
+- tasks/metrics.rake
+- tasks/spec.rake
+- tasks/yard.rake
+- tasks/yardstick.rake
 has_rdoc: true
 homepage: http://github.com/datamapper/dm-more/tree/master/dm-adjust
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/History.rdoc

@@ -1,27 +0,0 @@
-=== 0.10.1 / 2009-09-30
-
-* No changes this version
-
-=== 0.10.0 / 2009-09-15
-
-* Updated to work with dm-core 0.10.0
-
-=== 0.9.11 / 2009-03-29
-
-* No changes this version
-
-=== 0.9.10 / 2009-01-19
-
-* No changes this version
-
-=== 0.9.9 / 2009-01-04
-
-* No changes this version
-
-=== 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

@@ -1,19 +0,0 @@
-History.rdoc
-LICENSE
-Manifest.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
-spec/integration/adjust_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/install.rb
-tasks/spec.rb

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

@@ -1,25 +0,0 @@
-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/version.rb

@@ -1,5 +0,0 @@
-module DataMapper
-  module Adjust
-    VERSION = '0.10.1'.freeze
-  end
-end

data/tasks/install.rb

@@ -1,13 +0,0 @@
-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 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

@@ -1,25 +0,0 @@
-begin
-  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.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
-
-    begin
-      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
-  # rspec not installed
-end