@@ -4,7 +4,7 @@ module DataMapper def adjust(attributes = {}, reload = false) raise NotImplementedError, 'adjust *with* validations has not be written yet, try adjust!' end - + ## # increment or decrement attributes on a collection # @@ -26,7 +26,7 @@ module DataMapper end each { |r| attributes.each_pair{|a,v| r.attribute_set(a,r.send(a) + v) }; r.save } if loaded? - + # 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. dm-adjust/lib/dm-adjust/collection.rb @@ -2,7 +2,7 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper' if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES - + class Person include DataMapper::Resource property :id, Integer, :serial => true @@ -10,9 +10,9 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES property :salary, Integer, :default => 20000 property :age, Integer end - + describe 'Adjust' do - + before :all do Person.auto_migrate!(:default) Person.create(:name => 'George', :age => 15) @@ -22,7 +22,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES Person.create(:name => 'John', :age => 49) Person.create(:name => 'Amadeus',:age => 60) end - + describe 'Resource#adjust!' do it 'should adjust values' do repository(:default) do @@ -33,7 +33,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES end end end - + describe 'Collection#adjust!' do it 'should adjust values' do repository(:default) do |repos| dm-adjust/spec/integration/adjust_spec.rb @@ -13,4 +13,4 @@ require 'dm-aggregates' require Pathname(__FILE__).dirname.expand_path / 'dm-is-list' / 'is' / 'list.rb' -DataMapper::Model.append_extensions DataMapper::Is::List \ No newline at end of file +DataMapper::Model.append_extensions DataMapper::Is::List dm-is-list/lib/dm-is-list.rb @@ -28,8 +28,6 @@ module DataMapper @list_scope = options[:scope] - - before :save do if self.new_record? # a position has been set before save => open up and make room for item @@ -56,12 +54,12 @@ module DataMapper before :destroy do self.detach end - + # we need to make sure that STI-models will inherit the list_scope. after_class_method :inherited do |target| target.instance_variable_set(:@list_scope, @list_scope.dup) end - + end module ClassMethods dm-is-list/lib/dm-is-list/is/list.rb @@ -47,7 +47,7 @@ module DataMapper end module ClassMethods - + def adjust_gap!(from,adjustment) all(:rgt.gt => from).adjust!({:rgt => adjustment},true) all(:lft.gt => from).adjust!({:lft => adjustment},true) dm-is-nested_set/lib/dm-is-nested_set/is/nested_set.rb @@ -8,7 +8,7 @@ module DataMapper class ValidationErrors include Enumerable - + # Clear existing validation errors. def clear! errors.clear @@ -48,11 +48,11 @@ module DataMapper def empty? entries.empty? end - + def method_missing(meth, *args, &block) errors.send(meth, *args, &block) end - + private def errors @errors ||= {} dm-validations/lib/dm-validations/validation_errors.rb @@ -1,7 +1,7 @@ require 'rails_generator/generators/components/model/model_generator' class DmModelGenerator <ModelGenerator - + def manifest record do |m| # Check for class naming collisions. @@ -22,5 +22,5 @@ class DmModelGenerator <ModelGenerator end end end - -end \ No newline at end of file + +end rails_datamapper/generators/dm_model/dm_model_generator.rb @@ -1,10 +1,10 @@ require 'rails_generator/generators/components/model/model_generator' class RspecDmModelGenerator <ModelGenerator - + def manifest record do |m| - + # Check for class naming collisions. m.class_collisions class_path, class_name @@ -21,9 +21,9 @@ class RspecDmModelGenerator <ModelGenerator :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}" }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}" end - + end end - -end \ No newline at end of file + +end rails_datamapper/generators/rspec_dm_model/rspec_dm_model_generator.rb @@ -1,10 +1,10 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper') - + describe <%= class_name %> do before(:each) do @<%= file_name %> = <%= class_name %>.new end - + it "should be valid" do end -end \ No newline at end of file +end rails_datamapper/generators/rspec_dm_model/templates/model_spec.rb @@ -1,4 +1,4 @@ gem 'dm-core' require 'dm-core' require File.expand_path(File.dirname(__FILE__) + '/lib/rails_datamapper') -create_connection() \ No newline at end of file +create_connection() rails_datamapper/init.rb @@ -42,4 +42,4 @@ def symbolize_keys(h) end config -end \ No newline at end of file +end rails_datamapper/lib/rails_datamapper.rb 0cc2acf230f82d6dedc04b66e75546e5a9a78b29 somebee sindre@identu.no http://github.com/sam/dm-more/commit/fc233d4caf3aeac546f4d870ba2fb6bc123319b6 fc233d4caf3aeac546f4d870ba2fb6bc123319b6 2008-06-20T06:49:09-07:00 2008-06-20T06:49:09-07:00 sake strip 0d48728003fbdc92e04b486a7d364e3ce14fe3c1 somebee sindre@identu.no