dm-adjust 1.1.0 → 1.2.0.rc1

data/Gemfile

@@ -5,26 +5,26 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0'
-DO_VERSION     = '~> 0.10.2'
+DM_VERSION     = '~> 1.2.0.rc1'
+DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
 gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 
 group :development do
 
-  gem 'jeweler', '~> 1.5.2'
-  gem 'rake',    '~> 0.8.7'
-  gem 'rspec',   '~> 1.3.1'
+  gem 'jeweler', '~> 1.6.4'
+  gem 'rake',    '~> 0.9.2'
+  gem 'rspec',   '~> 1.3.2'
 
 end
 
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc1

data/dm-adjust.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-adjust}
-  s.version = "1.1.0"
+  s.name = "dm-adjust"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sindre Aarsaether"]
-  s.date = %q{2011-03-16}
-  s.description = %q{DataMapper plugin providing methods to increment and decrement properties}
-  s.email = %q{sindre [a] identu [d] no}
+  s.date = "2011-09-09"
+  s.description = "DataMapper plugin providing methods to increment and decrement properties"
+  s.email = "sindre [a] identu [d] no"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
     "dm-adjust.gemspec",
     "lib/dm-adjust.rb",
     "lib/dm-adjust/adapters/data_objects_adapter.rb",
+    "lib/dm-adjust/adapters/in_memory_adapter.rb",
+    "lib/dm-adjust/adapters/yaml_adapter.rb",
     "lib/dm-adjust/collection.rb",
     "lib/dm-adjust/model.rb",
     "lib/dm-adjust/repository.rb",
@@ -37,35 +39,31 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-adjust}
+  s.homepage = "http://github.com/datamapper/dm-adjust"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{DataMapper plugin providing methods to increment and decrement properties}
-  s.test_files = [
-    "spec/integration/adjust_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "DataMapper plugin providing methods to increment and decrement properties"
 
   if s.respond_to? :specification_version then
     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.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

data/lib/dm-adjust.rb

@@ -1,6 +1,8 @@
 require 'dm-core'
 
 require 'dm-adjust/adapters/data_objects_adapter'
+require 'dm-adjust/adapters/in_memory_adapter'
+require 'dm-adjust/adapters/yaml_adapter'
 require 'dm-adjust/collection'
 require 'dm-adjust/model'
 require 'dm-adjust/repository'

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

@@ -1,6 +1,6 @@
 module DataMapper
   module Adapters
-    class DataObjectsAdapter < AbstractAdapter
+    module DataObjectsAdapterAdjust
       def adjust(attributes, collection)
         query = collection.query
 
@@ -38,12 +38,24 @@ module DataMapper
         end
 
         def set_adjustment_statement(properties)
-          properties.map { |p| "#{quote_name(p.field)} = #{quote_name(p.field)} + ?" }.join(', ')
+          properties.map { |p| "#{quote_name(p.field)} = COALESCE(#{quote_name(p.field)}, 0) + ?" }.join(', ')
         end
 
       end # module SQL
 
       include SQL
-    end # class DataObjectsAdapter
+    end # module DataObjectsAdapterAdjust
+
+    extendable do
+      # @api private
+      def const_added(const_name)
+        if const_name == :DataObjectsAdapter
+          DataObjectsAdapter.send(:include, DataObjectsAdapterAdjust)
+        end
+
+        super
+      end
+    end
+
   end # module Adapters
 end # module DataMapper

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

@@ -0,0 +1,26 @@
+module DataMapper
+  module Adapters
+    module InMemoryAdapterAdjust
+      def adjust(attributes, collection)
+        attributes = attributes_as_fields(attributes)
+        read(collection.query).each do |record|
+          record.update(attributes) do |key, oldvalue, newvalue|
+            (oldvalue || 0) + newvalue
+          end
+        end.size
+      end
+    end # module InMemoryAdapterAdjust
+
+    extendable do
+      # @api private
+      def const_added(const_name)
+        if const_name == :InMemoryAdapter
+          InMemoryAdapter.send(:include, InMemoryAdapterAdjust)
+        end
+
+        super
+      end
+    end
+
+  end # module Adapters
+end # module DataMapper

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

@@ -0,0 +1,30 @@
+module DataMapper
+  module Adapters
+    module YamlAdapterAdjust
+      def adjust(attributes, collection)
+        attributes = attributes_as_fields(attributes)
+
+        update_records(collection.model) do |records|
+          records_to_update = collection.query.filter_records(records.dup)
+          records_to_update.each do |record|
+            record.update(attributes) do |key, oldvalue, newvalue|
+              (oldvalue || 0) + newvalue
+            end
+          end.size
+        end
+      end
+    end # module YamlAdapterAdjust
+
+    extendable do
+      # @api private
+      def const_added(const_name)
+        if const_name == :YamlAdapter
+          YamlAdapter.send(:include, YamlAdapterAdjust)
+        end
+
+        super
+      end
+    end
+
+  end # module Adapters
+end # module DataMapper

data/spec/integration/adjust_spec.rb

@@ -14,12 +14,13 @@ describe 'dm-adjust' do
 
   end
 
-  supported_by :sqlite, :mysql, :postgres do
+  supported_by :in_memory, :yaml, :sqlite, :mysql, :postgres do
 
     describe 'Adjust' do
 
       before do
         Person.auto_migrate!(:default)
+        Person.all.destroy
         Person.create(:name => 'George', :age => 15)
         Person.create(:name => 'Puff',   :age => 18)
         Person.create(:name => 'Danny',  :age => 26)

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-adjust
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Sindre Aarsaether
@@ -10,53 +17,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-core
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: rspec
 description: DataMapper plugin providing methods to increment and decrement properties
 email: sindre [a] identu [d] no
 executables: []
@@ -75,6 +103,8 @@ files:
 - dm-adjust.gemspec
 - lib/dm-adjust.rb
 - lib/dm-adjust/adapters/data_objects_adapter.rb
+- lib/dm-adjust/adapters/in_memory_adapter.rb
+- lib/dm-adjust/adapters/yaml_adapter.rb
 - lib/dm-adjust/collection.rb
 - lib/dm-adjust/model.rb
 - lib/dm-adjust/repository.rb
@@ -86,7 +116,6 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-adjust
 licenses: []
 
@@ -100,20 +129,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin providing methods to increment and decrement properties
-test_files: 
-- spec/integration/adjust_spec.rb
-- spec/spec_helper.rb
+test_files: []
+