@@ -1,7 +1,7 @@ This is a datamapper adapter to couchdb. NOTE: some functionality and their specs are based on functionality that is in -edge couch but not in stable. If you want everything to work, use edge. +edge couch but not in stable. If you want everything to work, use edge. Otherwise, your milage may vary. Good luck and let me know about any bugs. == Setup adapters/dm-couchdb-adapter/README.txt @@ -249,10 +249,10 @@ module DataMapper ## # Prepares a REST request to a temporary view. Though convenient for # development, "slow" views should generally be avoided. - # + # # @param query<DataMapper::Query> the query # @return request<Net::HTTPRequest> a request object - # + # # @api private def ad_hoc_request(query) if query.order.empty? adapters/dm-couchdb-adapter/lib/couchdb_adapter.rb @@ -300,4 +300,4 @@ if COUCHDB_AVAILABLE end end -end \ No newline at end of file +end adapters/dm-couchdb-adapter/spec/couchdb_adapter_spec.rb @@ -44,4 +44,4 @@ describe DataMapper::CouchResource::View do Person.views[:by_name].should == {"map"=>"function(doc) { if (doc.couchdb_type == 'Person' || doc.couchdb_type == 'Employee') { emit(doc.name, doc); } }"} end end -end \ No newline at end of file +end adapters/dm-couchdb-adapter/spec/couchdb_view_spec.rb @@ -44,4 +44,4 @@ if COUCHDB_AVAILABLE class Employee < Person property :rank, String end -end \ No newline at end of file +end adapters/dm-couchdb-adapter/spec/spec_helper.rb @@ -17,10 +17,10 @@ module DataMapper class Relationship include Extlib::Hook include DataMapper::Constraints::DeleteConstraint - + attr_reader :delete_constraint OPTIONS << :constraint - + # initialize is a private method in Relationship # and private methods can not be "advised" (hooked into) # in extlib. @@ -33,13 +33,13 @@ end module DataMapper module Constraints - + include DeleteConstraint - + module ClassMethods include DeleteConstraint::ClassMethods end - + def self.included(model) model.extend(ClassMethods) model.class_eval do @@ -49,7 +49,7 @@ module DataMapper end end end - + end class AutoMigrator dm-constraints/lib/dm-constraints.rb @@ -1,11 +1,11 @@ module DataMapper module Constraints module DeleteConstraint - + def self.included(base) base.extend(ClassMethods) end - + module ClassMethods DELETE_CONSTRAINT_OPTIONS = [:protect, :destroy, :destroy!, :set_nil, :skip] def check_delete_constraint_type(cardinality, name, options = {}) @@ -16,20 +16,20 @@ module DataMapper raise ArgumentError, ":constraint option must be one of #{delete_constraint_options * ', '}" end end - + # TODO: that should be moved to a 'util-like' module def with_changed_method_visibility(method, from_visibility, to_visibility, &block) send(to_visibility, method) yield send(from_visibility, method) end - + end def add_delete_constraint_option(name, repository_name, child_model, parent_model, options = {}) - @delete_constraint = options[:constraint] + @delete_constraint = options[:constraint] end - + def check_delete_constraints model.relationships.each do |rel_name, rel| children = self.send(rel_name) @@ -52,8 +52,8 @@ module DataMapper end # case end # relationships end # check_delete_constraints - - + + end # DeleteConstraint end # Constraints end # DataMapper dm-constraints/lib/dm-constraints/delete_constraint.rb @@ -198,8 +198,8 @@ module DataMapper self.parent = self.ancestor # must set this again, because it might have been changed by the user before move. return false end - - + + DataMapper::Transaction.new(self.repository) do |transaction| ## @@ -211,7 +211,7 @@ module DataMapper raise RecursiveNestingError if position > self.lft && position < self.rgt # find out how wide this node is, as we need to make a gap large enough for it to fit in gap = self.rgt - self.lft + 1 - + # make a gap at position, that is as wide as this node self.model.base_model.adjust_gap!(nested_set,position-1,gap) @@ -219,7 +219,7 @@ module DataMapper self.reload_attributes(:lft,:rgt) old_position = self.lft offset = position - old_position - + nested_set.all(:rgt => self.lft..self.rgt).adjust!({:lft => offset, :rgt => offset},true) # close the gap this movement left behind. self.model.base_model.adjust_gap!(nested_set,old_position,-gap) dm-is-nested_set/lib/dm-is-nested_set/is/nested_set.rb @@ -20,4 +20,4 @@ describe DataMapper::Validate::LengthValidator do wock.id = 1 wock.should be_valid end -end \ No newline at end of file +end dm-validations/spec/integration/length_validator/error_message_spec.rb @@ -28,4 +28,4 @@ describe DataMapper::Validate::LengthValidator do launch.should_not be_valid launch.errors.on(:name).should include('Name must be less than 5 characters long') end -end \ No newline at end of file +end dm-validations/spec/integration/length_validator/maximum_spec.rb @@ -27,5 +27,5 @@ describe DataMapper::Validate::LengthValidator do launch.name = 'Ab' launch.should_not be_valid launch.errors.on(:name).should include('Name must be more than 3 characters long') - end -end \ No newline at end of file + end +end dm-validations/spec/integration/length_validator/minimum_spec.rb @@ -15,13 +15,13 @@ describe MotorLaunch do before :each do @launch = MotorLaunch.new end - + describe "with a value that is out of range bounds (too long)" do before :each do @launch.name = 'a' @launch.valid? end - + it "is invalid" do @launch.should_not be_valid end @@ -36,7 +36,7 @@ describe MotorLaunch do @launch.name = 'L' @launch.valid? end - + it "is invalid" do @launch.should_not be_valid end @@ -55,7 +55,7 @@ describe MotorLaunch do @launch.name = nil @launch.valid? end - + it "is invalid" do @launch.should_not be_valid end @@ -71,7 +71,7 @@ describe MotorLaunch do @launch.name = 'Lisp' @launch.valid? end - + it "is valid" do @launch.should be_valid end @@ -92,4 +92,4 @@ describe MotorLaunch do launch.name = 'Ride' launch.valid?.should == true end -end \ No newline at end of file +end dm-validations/spec/integration/length_validator/range_spec.rb @@ -9,4 +9,4 @@ class BoatDock property :id, Integer, :serial => true property :name, String, :auto_validation => false, :default => "I'm a long string" validates_length :name, :min => 3 -end \ No newline at end of file +end dm-validations/spec/integration/length_validator/spec_helper.rb @@ -10,4 +10,4 @@ describe DataMapper::Validate::LengthValidator do doc = BoatDock.new doc.should be_valid end -end \ No newline at end of file +end dm-validations/spec/integration/length_validator/valid_objects_spec.rb @@ -83,7 +83,7 @@ describe BasketballPlayer do @mj.should be_valid end end - + describe "with nil height" do before(:each) do @@ -98,5 +98,5 @@ describe BasketballPlayer do @mj.valid? @mj.errors.on(:height).should include("Height must be a number") end - end + end end dm-validations/spec/integration/numeric_validator/float_type_spec.rb @@ -73,7 +73,7 @@ describe Country do @country.should_not be_valid end end - + describe "with unknown area" do before(:each) do @@ -88,5 +88,5 @@ describe Country do @country.valid? @country.errors.on(:area).should include("Please use integers to specify area") end - end + end end dm-validations/spec/integration/numeric_validator/integer_only_true_spec.rb @@ -81,7 +81,7 @@ describe City do @city.should_not be_valid end end - + describe "with unknown foundation date" do before(:each) do @@ -96,5 +96,5 @@ describe City do @city.valid? @city.errors.on(:founded_in).should include("Foundation year must be an integer") end - end + end end dm-validations/spec/integration/numeric_validator/integer_type_spec.rb @@ -74,4 +74,4 @@ class Country validates_is_number :area, :message => "Please use integers to specify area" end -Country.auto_migrate! \ No newline at end of file +Country.auto_migrate! dm-validations/spec/integration/numeric_validator/spec_helper.rb @@ -59,7 +59,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES validates_present :name, :artist end - Artist.auto_migrate! + Artist.auto_migrate! Album.auto_migrate! dm-validations/spec/integration/required_field_validator/association_spec.rb @@ -123,4 +123,4 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES end end # describe "with on = -1100.5" end # describe Holiday -end # if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES \ No newline at end of file +end # if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES dm-validations/spec/integration/required_field_validator/date_type_value_spec.rb @@ -127,4 +127,4 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES end end # describe "with percentage = nil" end # describe CpuConsumption -end # if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES \ No newline at end of file +end # if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES dm-validations/spec/integration/required_field_validator/float_type_value_spec.rb @@ -16,17 +16,17 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES def empty; "" end def nil; nil end end - + @pc = PlainClass.new end - + it "should fail validation with empty, nil, or blank fields" do @pc.should_not be_valid @pc.errors.on(:empty).should include("Empty must not be blank") @pc.errors.on(:nil).should include("Nil must not be blank") @pc.errors.on(:accessor).should include("Accessor must not be blank") end - + it "giving accessor a value should remove validation error" do @pc.accessor = "full" @pc.valid? dm-validations/spec/integration/required_field_validator/plain_old_ruby_object_spec.rb @@ -21,4 +21,4 @@ describe GitOperation do @operation.errors.on(:name).should include('Name must not be blank') end end -end \ No newline at end of file +end dm-validations/spec/integration/required_field_validator/shared_examples.rb @@ -17,7 +17,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES # property :id, Integer, :serial => true - + # operation name property :name, String, :auto_validation => false @@ -25,7 +25,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES property :author_name, String, :auto_validation => false, :default => "Just another Ruby hacker" property :network_connection, Boolean, :auto_validation => false property :message, Text, :auto_validation => false - property :clean_working_copy, Boolean, :auto_validation => false + property :clean_working_copy, Boolean, :auto_validation => false # # Validations @@ -49,7 +49,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES validates_present :author_name, :when => :committing validates_present :committer_name, :when => :committing - + validates_present :message, :when => :committing validates_present :network_connection, :when => [:pushing, :pulling], :message => { :pushing => "though git is advanced, it cannot push without network connectivity", @@ -65,4 +65,4 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES __dir__ = File.dirname(__FILE__) require File.join(__dir__, "shared_examples") -end \ No newline at end of file +end dm-validations/spec/integration/required_field_validator/spec_helper.rb 8dcfcee906ef71126b99f9390388d4ec30216ca0 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/datamapper/dm-more/commit/8318bd1cce3812979a92987dd340d99292e1c883 8318bd1cce3812979a92987dd340d99292e1c883 2009-01-19T16:11:48-08:00 2009-01-19T16:11:48-08:00 Stripped whitespace with "sake strip" 3e4e0ec1ecc86516deda86016135793a46e0ccd6 Dan Kubb dan.kubb@autopilotmarketing.com