sam-dm-core 0.9.10 → 0.9.11

data/.gitignore

@@ -0,0 +1,18 @@
+*.log
+log/*
+doc
+cov
+pkg
+.DS_Store
+coverage/*
+*.db
+spec/integration/*.db*
+nbproject
+profile_results.*
+\#*
+TAGS
+lib/coverage.html
+*.rbc
+_Yardoc
+.yardoc
+tmp/*

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.9.10 / 2009-01-19
+
+* 1 major enhancement:
+
+  * Ruby 1.9.1 compatibility
+
+* 1 minor enhancement:
+
+  * Updated Resource marshaling to be more thorough
+
 === 0.9.9 / 2009-01-04
 
 * 1 minor enhancement:

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Sam Smoot
+Copyright (c) 2007, 2008, 2009 Sam Smoot, Dan Kubb
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -9,12 +9,12 @@ require 'lib/dm-core/version'
 
 ROOT = Pathname(__FILE__).dirname.expand_path
 
-AUTHOR = "Sam Smoot"
-EMAIL  = "ssmoot@gmail.com"
+AUTHOR = "Dan Kubb"
+EMAIL  = "dan.kubb@gmail.com"
 GEM_NAME = "dm-core"
 GEM_VERSION = DataMapper::VERSION
-GEM_DEPENDENCIES = ["data_objects", "~>0.9.10"],
-                   ["extlib", "~>0.9.9"],
+GEM_DEPENDENCIES = ["data_objects", "~>0.9.11"],
+                   ["extlib", "~>0.9.11"],
                    ["addressable", "~>2.0.1"]
 
 PROJECT_NAME = "datamapper"

data/dm-core.gemspec

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-core}
+  s.version = "0.9.11"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Dan Kubb"]
+  s.date = %q{2009-01-19}
+  s.description = %q{Faster, Better, Simpler.}
+  s.email = ["dan.kubb@gmail.com"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
+  s.files = [".autotest", ".gitignore", "CONTRIBUTING", "FAQ", "History.txt", "MIT-LICENSE", "Manifest.txt", "QUICKLINKS", "README.txt", "Rakefile", "SPECS", "TODO", "dm-core.gemspec", "lib/dm-core.rb", "lib/dm-core/adapters.rb", "lib/dm-core/adapters/abstract_adapter.rb", "lib/dm-core/adapters/data_objects_adapter.rb", "lib/dm-core/adapters/in_memory_adapter.rb", "lib/dm-core/adapters/mysql_adapter.rb", "lib/dm-core/adapters/postgres_adapter.rb", "lib/dm-core/adapters/sqlite3_adapter.rb", "lib/dm-core/associations.rb", "lib/dm-core/associations/many_to_many.rb", "lib/dm-core/associations/many_to_one.rb", "lib/dm-core/associations/one_to_many.rb", "lib/dm-core/associations/one_to_one.rb", "lib/dm-core/associations/relationship.rb", "lib/dm-core/associations/relationship_chain.rb", "lib/dm-core/auto_migrations.rb", "lib/dm-core/collection.rb", "lib/dm-core/dependency_queue.rb", "lib/dm-core/hook.rb", "lib/dm-core/identity_map.rb", "lib/dm-core/is.rb", "lib/dm-core/logger.rb", "lib/dm-core/migrations/destructive_migrations.rb", "lib/dm-core/migrator.rb", "lib/dm-core/model.rb", "lib/dm-core/naming_conventions.rb", "lib/dm-core/property.rb", "lib/dm-core/property_set.rb", "lib/dm-core/query.rb", "lib/dm-core/repository.rb", "lib/dm-core/resource.rb", "lib/dm-core/scope.rb", "lib/dm-core/support.rb", "lib/dm-core/support/array.rb", "lib/dm-core/support/assertions.rb", "lib/dm-core/support/errors.rb", "lib/dm-core/support/kernel.rb", "lib/dm-core/support/symbol.rb", "lib/dm-core/transaction.rb", "lib/dm-core/type.rb", "lib/dm-core/type_map.rb", "lib/dm-core/types.rb", "lib/dm-core/types/boolean.rb", "lib/dm-core/types/discriminator.rb", "lib/dm-core/types/object.rb", "lib/dm-core/types/paranoid_boolean.rb", "lib/dm-core/types/paranoid_datetime.rb", "lib/dm-core/types/serial.rb", "lib/dm-core/types/text.rb", "lib/dm-core/version.rb", "script/all", "script/performance.rb", "script/profile.rb", "spec/integration/association_spec.rb", "spec/integration/association_through_spec.rb", "spec/integration/associations/many_to_many_spec.rb", "spec/integration/associations/many_to_one_spec.rb", "spec/integration/associations/one_to_many_spec.rb", "spec/integration/auto_migrations_spec.rb", "spec/integration/collection_spec.rb", "spec/integration/data_objects_adapter_spec.rb", "spec/integration/dependency_queue_spec.rb", "spec/integration/model_spec.rb", "spec/integration/mysql_adapter_spec.rb", "spec/integration/postgres_adapter_spec.rb", "spec/integration/property_spec.rb", "spec/integration/query_spec.rb", "spec/integration/repository_spec.rb", "spec/integration/resource_spec.rb", "spec/integration/sqlite3_adapter_spec.rb", "spec/integration/sti_spec.rb", "spec/integration/strategic_eager_loading_spec.rb", "spec/integration/transaction_spec.rb", "spec/integration/type_spec.rb", "spec/lib/logging_helper.rb", "spec/lib/mock_adapter.rb", "spec/lib/model_loader.rb", "spec/lib/publicize_methods.rb", "spec/models/content.rb", "spec/models/vehicles.rb", "spec/models/zoo.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/adapters/abstract_adapter_spec.rb", "spec/unit/adapters/adapter_shared_spec.rb", "spec/unit/adapters/data_objects_adapter_spec.rb", "spec/unit/adapters/in_memory_adapter_spec.rb", "spec/unit/adapters/postgres_adapter_spec.rb", "spec/unit/associations/many_to_many_spec.rb", "spec/unit/associations/many_to_one_spec.rb", "spec/unit/associations/one_to_many_spec.rb", "spec/unit/associations/one_to_one_spec.rb", "spec/unit/associations/relationship_spec.rb", "spec/unit/associations_spec.rb", "spec/unit/auto_migrations_spec.rb", "spec/unit/collection_spec.rb", "spec/unit/data_mapper_spec.rb", "spec/unit/identity_map_spec.rb", "spec/unit/is_spec.rb", "spec/unit/migrator_spec.rb", "spec/unit/model_spec.rb", "spec/unit/naming_conventions_spec.rb", "spec/unit/property_set_spec.rb", "spec/unit/property_spec.rb", "spec/unit/query_spec.rb", "spec/unit/repository_spec.rb", "spec/unit/resource_spec.rb", "spec/unit/scope_spec.rb", "spec/unit/transaction_spec.rb", "spec/unit/type_map_spec.rb", "spec/unit/type_spec.rb", "tasks/ci.rb", "tasks/dm.rb", "tasks/doc.rb", "tasks/gemspec.rb", "tasks/hoe.rb", "tasks/install.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://datamapper.org}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{An Object/Relational Mapper for Ruby}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.11"])
+      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.11"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.0.1"])
+    else
+      s.add_dependency(%q<data_objects>, ["~> 0.9.11"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.11"])
+      s.add_dependency(%q<addressable>, ["~> 2.0.1"])
+    end
+  else
+    s.add_dependency(%q<data_objects>, ["~> 0.9.11"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.11"])
+    s.add_dependency(%q<addressable>, ["~> 2.0.1"])
+  end
+end

data/lib/dm-core.rb

@@ -19,7 +19,7 @@ require 'yaml'
 gem 'addressable', '~>2.0.1'
 require 'addressable/uri'
 
-gem 'extlib', '~>0.9.9'
+gem 'extlib', '~>0.9.11'
 require 'extlib'
 require 'extlib/inflection'
 

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

@@ -1,4 +1,4 @@
-gem 'data_objects', '~>0.9.10'
+gem 'data_objects', '~>0.9.11'
 require 'data_objects'
 
 module DataMapper
@@ -172,7 +172,7 @@ module DataMapper
           connection = create_connection
           return yield(connection)
         rescue => e
-          DataMapper.logger.error(e)
+          DataMapper.logger.error(e.to_s)
           raise e
         ensure
           close_connection(connection) if connection

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

@@ -0,0 +1,87 @@
+module DataMapper
+  module Adapters
+    class InMemoryAdapter < AbstractAdapter
+      def initialize(name, uri_or_options)
+        @records = Hash.new { |hash,model| hash[model] = Array.new }
+      end
+
+      def create(resources)
+        resources.each do |resource|
+          @records[resource.model] << resource
+        end.size # just return the number of records
+      end
+
+      def update(attributes, query)
+        read_many(query).each do |resource|
+          attributes.each do |property,value|
+            property.set!(resource, value)
+          end
+        end.size
+      end
+
+      def read_one(query)
+        read(query, query.model, false)
+      end
+
+      def read_many(query)
+        Collection.new(query) do |set|
+          read(query, set, true)
+        end
+      end
+
+      def delete(query)
+        records = @records[query.model]
+
+        read_many(query).each do |resource|
+          records.delete(resource)
+        end.size
+      end
+
+      private
+
+      def read(query, set, many = true)
+        model      = query.model
+        conditions = query.conditions
+
+        match_with = many ? :select : :detect
+
+        # Iterate over the records for this model, and return
+        # the ones that match the conditions
+        result = @records[model].send(match_with) do |resource|
+          conditions.all? do |tuple|
+            operator, property, bind_value = *tuple
+
+            value = property.get!(resource)
+
+            case operator
+              when :eql, :in then equality_comparison(bind_value, value)
+              when :not      then !equality_comparison(bind_value, value)
+              when :like     then Regexp.new(bind_value) =~ value
+              when :gt       then !value.nil? && value >  bind_value
+              when :gte      then !value.nil? && value >= bind_value
+              when :lt       then !value.nil? && value <  bind_value
+              when :lte      then !value.nil? && value <= bind_value
+              else raise "Invalid query operator: #{operator.inspect}"
+            end
+          end
+        end
+
+        return result unless many
+
+        # TODO Sort
+
+        # TODO Limit
+
+        set.replace(result)
+      end
+
+      def equality_comparison(bind_value, value)
+        case bind_value
+          when Array, Range then bind_value.include?(value)
+          when NilClass     then value.nil?
+          else                   bind_value == value
+        end
+      end
+    end
+  end
+end

data/lib/dm-core/adapters/mysql_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_mysql', '~>0.9.10'
+gem 'do_mysql', '~>0.9.11'
 require 'do_mysql'
 
 module DataMapper

data/lib/dm-core/adapters/postgres_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_postgres', '~>0.9.10'
+gem 'do_postgres', '~>0.9.11'
 require 'do_postgres'
 
 module DataMapper

data/lib/dm-core/adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '~>0.9.10'
+gem 'do_sqlite3', '~>0.9.11'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/associations/many_to_one.rb

@@ -48,7 +48,7 @@ module DataMapper
       class Proxy
         include Assertions
 
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
+        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ object_id kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
 
         def replace(parent)
           @parent = parent

data/lib/dm-core/associations/one_to_many.rb

@@ -72,7 +72,7 @@ module DataMapper
       class Proxy
         include Assertions
 
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
+        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class object_id kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
 
         # FIXME: remove when RelationshipChain#get_children can return a Collection
         def all(query = {})
@@ -85,14 +85,14 @@ module DataMapper
             query = args.pop
             @relationship.get_children(@parent, query, :first, *args)
           else
-            super
+            children.first(*args)
           end
         end
 
         def <<(resource)
           assert_mutable
           return self if !resource.new_record? && self.include?(resource)
-          super
+          children << resource
           relate_resource(resource)
           self
         end
@@ -100,7 +100,7 @@ module DataMapper
         def push(*resources)
           assert_mutable
           resources.reject { |resource| !resource.new_record? && self.include?(resource) }
-          super
+          children.push(*resources)
           resources.each { |resource| relate_resource(resource) }
           self
         end
@@ -108,7 +108,7 @@ module DataMapper
         def unshift(*resources)
           assert_mutable
           resources.reject { |resource| !resource.new_record? && self.include?(resource) }
-          super
+          children.unshift(*resources)
           resources.each { |resource| relate_resource(resource) }
           self
         end
@@ -117,42 +117,42 @@ module DataMapper
           assert_mutable
           each { |resource| orphan_resource(resource) }
           other = other.map { |resource| resource.kind_of?(Hash) ? new_child(resource) : resource }
-          super
+          children.replace(other)
           other.each { |resource| relate_resource(resource) }
           self
         end
 
         def pop
           assert_mutable
-          orphan_resource(super)
+          orphan_resource(children.pop)
         end
 
         def shift
           assert_mutable
-          orphan_resource(super)
+          orphan_resource(children.shift)
         end
 
         def delete(resource)
           assert_mutable
-          orphan_resource(super)
+          orphan_resource(children.delete(resource))
         end
 
         def delete_at(index)
           assert_mutable
-          orphan_resource(super)
+          orphan_resource(children.delete_at(index))
         end
 
         def clear
           assert_mutable
           each { |resource| orphan_resource(resource) }
-          super
+          children.clear
           self
         end
 
         def build(attributes = {})
           assert_mutable
           attributes = default_attributes.merge(attributes)
-          resource = children.respond_to?(:build) ? super(attributes) : new_child(attributes)
+          resource = children.respond_to?(:build) ? children.build(attributes) : new_child(attributes)
           resource
         end
 
@@ -160,7 +160,7 @@ module DataMapper
           assert_mutable
           raise UnsavedParentError, 'You cannot intialize until the parent is saved' if @parent.new_record?
           attributes = default_attributes.merge(attributes)
-          resource = children.respond_to?(:new) ? super(attributes) : @relationship.child_model.new(attributes)
+          resource = children.respond_to?(:new) ? children.new(attributes) : @relationship.child_model.new(attributes)
           self << resource
           resource
         end
@@ -169,7 +169,7 @@ module DataMapper
           assert_mutable
           raise UnsavedParentError, 'You cannot create until the parent is saved' if @parent.new_record?
           attributes = default_attributes.merge(attributes)
-          resource = children.respond_to?(:create) ? super(attributes) : @relationship.child_model.create(attributes)
+          resource = children.respond_to?(:create) ? children.create(attributes) : @relationship.child_model.create(attributes)
           self << resource
           resource
         end
@@ -177,25 +177,25 @@ module DataMapper
         def update(attributes = {})
           assert_mutable
           raise UnsavedParentError, 'You cannot mass-update until the parent is saved' if @parent.new_record?
-          super
+          children.update(attributes)
         end
 
         def update!(attributes = {})
           assert_mutable
           raise UnsavedParentError, 'You cannot mass-update without validations until the parent is saved' if @parent.new_record?
-          super
+          children.update!(attributes)
         end
 
         def destroy
           assert_mutable
           raise UnsavedParentError, 'You cannot mass-delete until the parent is saved' if @parent.new_record?
-          super
+          children.destroy
         end
 
         def destroy!
           assert_mutable
           raise UnsavedParentError, 'You cannot mass-delete without validations until the parent is saved' if @parent.new_record?
-          super
+          children.destroy!
         end
 
         def reload

data/lib/dm-core/associations/relationship.rb

@@ -60,14 +60,16 @@ module DataMapper
 
       # @api private
       def parent_model
-        Class === @parent_model ? @parent_model : (Class === @child_model ? @child_model.find_const(@parent_model) : Object.find_const(@parent_model))
+        return @parent_model if model_defined?(@parent_model)
+        @parent_model = @child_model.find_const(@parent_model)
       rescue NameError
         raise NameError, "Cannot find the parent_model #{@parent_model} for #{@child_model}"
       end
 
       # @api private
       def child_model
-        Class === @child_model ? @child_model : (Class === @parent_model ? @parent_model.find_const(@child_model) : Object.find_const(@child_model))
+        return @child_model if model_defined?(@child_model)
+        @child_model = @parent_model.find_const(@child_model)
       rescue NameError
         raise NameError, "Cannot find the child_model #{@child_model} for #{@parent_model}"
       end
@@ -130,7 +132,7 @@ module DataMapper
       # @api private
       def get_parent(child, parent = nil)
         child_value = child_key.get(child)
-        return nil unless child_value.nitems == child_value.size
+        return nil if child_value.any? { |v| v.nil? }
 
         with_repository(parent || parent_model) do
           parent_identity_map = (parent || parent_model).repository.identity_map(parent_model.base_model)
@@ -190,6 +192,10 @@ module DataMapper
         assert_kind_of 'child_model',     child_model,     String, Class
         assert_kind_of 'parent_model',    parent_model,    String, Class
 
+        unless model_defined?(child_model) || model_defined?(parent_model)
+          raise 'at least one of child_model and parent_model must be a Model object'
+        end
+
         if child_properties = options[:child_key]
           assert_kind_of 'options[:child_key]', child_properties, Array
         end

data/lib/dm-core/associations/relationship_chain.rb

@@ -60,7 +60,7 @@ module DataMapper
       # @api private
       def links
         if remote_relationship.kind_of?(RelationshipChain)
-          remote_relationship.instance_eval { links } + [remote_relationship.instance_eval { near_relationship } ]
+          remote_relationship.send(:links) + [ remote_relationship.send(:near_relationship) ]
         else
           [ remote_relationship ]
         end

data/lib/dm-core/collection.rb

@@ -491,7 +491,7 @@ module DataMapper
     #
     # @api public
     def respond_to?(method, include_private = false)
-      super || model.public_methods(false).include?(method.to_s) || relationships.has_key?(method)
+      super || model.public_methods(false).map { |m| m.to_s }.include?(method.to_s) || relationships.has_key?(method)
     end
 
     # TODO: add docs
@@ -537,7 +537,7 @@ module DataMapper
 
       unless block_given?
         # It can be helpful (relationship.rb: 112-13, used for SEL) to have a non-lazy Collection.
-        block = lambda {}
+        block = lambda { |c| }
       end
 
       @query          = query
@@ -639,7 +639,7 @@ module DataMapper
     ##
     # @api private
     def method_missing(method, *args, &block)
-      if model.public_methods(false).include?(method.to_s)
+      if model.public_methods(false).map { |m| m.to_s }.include?(method.to_s)
         model.send(:with_scope, query) do
           model.send(method, *args, &block)
         end