dm-core 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/LICENSE

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

data/README.rdoc

@@ -201,4 +201,4 @@ nice syntax tweaks DataMapper delivers out of the box...
 
 == Copyright
 
-Copyright (c) 2009 Dan Kubb. See LICENSE for details.
+Copyright (c) 2010 Dan Kubb. See LICENSE for details.

data/Rakefile

@@ -10,17 +10,16 @@ begin
     gem.summary     = 'An Object/Relational Mapper for Ruby'
     gem.description = 'Faster, Better, Simpler.'
     gem.email       = 'dan.kubb@gmail.com'
-    gem.homepage    = 'http://github.com/datamapper/dm-core'
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Dan Kubb' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'extlib',              '~> 0.9.14'
-    gem.add_dependency 'addressable',         '~> 2.1'
+    gem.add_dependency 'extlib',      '~> 0.9.15'
+    gem.add_dependency 'addressable', '~> 2.1'
 
     gem.add_development_dependency 'rspec',   '~> 1.3'
     gem.add_development_dependency 'jeweler', '~> 1.4'
-
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{Faster, Better, Simpler.}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -126,6 +126,7 @@ Gem::Specification.new do |s|
      "spec/public/associations/one_to_one_spec.rb",
      "spec/public/associations/one_to_one_with_boolean_cpk_spec.rb",
      "spec/public/collection_spec.rb",
+     "spec/public/finalize_spec.rb",
      "spec/public/model/hook_spec.rb",
      "spec/public/model/property_spec.rb",
      "spec/public/model/relationship_spec.rb",
@@ -227,6 +228,7 @@ Gem::Specification.new do |s|
      "spec/public/associations/one_to_one_spec.rb",
      "spec/public/associations/one_to_one_with_boolean_cpk_spec.rb",
      "spec/public/collection_spec.rb",
+     "spec/public/finalize_spec.rb",
      "spec/public/model/hook_spec.rb",
      "spec/public/model/property_spec.rb",
      "spec/public/model/relationship_spec.rb",
@@ -310,18 +312,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.14"])
+      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.15"])
       s.add_runtime_dependency(%q<addressable>, ["~> 2.1"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.4"])
     else
-      s.add_dependency(%q<extlib>, ["~> 0.9.14"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.15"])
       s.add_dependency(%q<addressable>, ["~> 2.1"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.4"])
     end
   else
-    s.add_dependency(%q<extlib>, ["~> 0.9.14"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.15"])
     s.add_dependency(%q<addressable>, ["~> 2.1"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.4"])

data/lib/dm-core.rb

@@ -285,4 +285,48 @@ module DataMapper
       current_repository
     end
   end
+
+  # Perform necessary steps to finalize DataMapper for the current repository
+  #
+  # This method should be called after loading all models and plugins.
+  #
+  # It ensures foreign key properties and anonymous join models are created.
+  # These are otherwise lazily declared, which can lead to unexpected errors.
+  # It also performs basic validity checking of the DataMapper models.
+  #
+  # @return [DataMapper] The DataMapper module
+  #
+  # @api public
+  def self.finalize
+    Model.descendants.each do |model|
+      finalize_model(model)
+    end
+    self
+  end
+
+  private
+  # @api private
+  def self.finalize_model(model)
+    name            = model.name
+    repository_name = model.repository_name
+    relationships   = model.relationships(repository_name).values
+
+    if model.properties(repository_name).empty? &&
+      !relationships.any? { |relationship| relationship.kind_of?(Associations::ManyToOne::Relationship) }
+      raise IncompleteModelError, "#{name} must have at least one property or many to one relationship to be valid"
+    end
+
+    if model.key(repository_name).empty?
+      raise IncompleteModelError, "#{name} must have a key to be valid"
+    end
+
+
+    # initialize join models and target keys
+    relationships.each do |relationship|
+      relationship.child_key
+      relationship.through if relationship.respond_to?(:through)
+      relationship.via     if relationship.respond_to?(:via)
+    end
+
+  end
 end

data/lib/dm-core/adapters.rb

@@ -147,7 +147,7 @@ module DataMapper
       #
       # @api semipublic
       def adapter_name(const_name)
-        const_name.to_s.sub('Adapter', '').downcase
+        const_name.to_s.chomp('Adapter').downcase
       end
 
       # Require the adapter library

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

@@ -18,6 +18,22 @@ module DataMapper
 
       equalize :name, :options, :resource_naming_convention, :field_naming_convention
 
+      # @api semipublic
+      def self.descendants
+        @descendants ||= Set.new
+      end
+
+      # @api private
+      def self.inherited(subclass)
+        add_descendant(subclass)
+      end
+
+      # @api private
+      def self.add_descendant(subclass)
+        descendants << subclass
+        superclass.add_descendant(subclass) if superclass.respond_to?(:add_descendant)
+      end
+
       # Adapter name
       #
       # @example

data/lib/dm-core/collection.rb

@@ -1441,7 +1441,7 @@ module DataMapper
     def method_missing(method, *args, &block)
       relationships = self.relationships
 
-      if model.model_method_defined?(method)
+      if model.respond_to?(method)
         delegate_to_model(method, *args, &block)
       elsif relationship = relationships[method] || relationships[method.to_s.singularize.to_sym]
         delegate_to_relationship(relationship, *args)
@@ -1463,7 +1463,7 @@ module DataMapper
     # @api private
     def delegate_to_model(method, *args, &block)
       model = self.model
-      model.__send__(:with_scope, query) do
+      model.send(:with_scope, query) do
         model.send(method, *args, &block)
       end
     end

data/lib/dm-core/model.rb

@@ -7,6 +7,8 @@ module DataMapper
   module Model
     extend Chainable
 
+    include Enumerable
+
     # Creates a new Model class with default_storage_name +storage_name+
     #
     # If a block is passed, it will be eval'd in the context of the new Model
@@ -305,17 +307,23 @@ module DataMapper
       all.at(*args)
     end
 
+    def fetch(*args, &block)
+      all.fetch(*args, &block)
+    end
+
+    def values_at(*args)
+      all.values_at(*args)
+    end
+
     def reverse
       all.reverse
     end
 
-    # TODO: spec this
-    def entries
-      all.entries
+    def each(&block)
+      all.each(&block)
+      self
     end
 
-    alias to_a entries
-
     # Find a set of records matching an optional set of conditions. Additionally,
     # specify the order that the records are return.
     #
@@ -444,22 +452,6 @@ module DataMapper
       first(conditions) || create(conditions.merge(attributes))
     end
 
-    # Initializes an instance of Resource with the given attributes
-    #
-    # @param [Hash(Symbol => Object)] attributes
-    #   hash of attributes to set
-    #
-    # @return [Resource]
-    #   the newly initialized Resource instance
-    #
-    # @api public
-    chainable do
-      def new(*args, &block)
-        assert_valid
-        super
-      end
-    end
-
     # Create a Resource
     #
     # @param [Hash(Symbol => Object)] attributes
@@ -486,6 +478,56 @@ module DataMapper
       _create(attributes, false)
     end
 
+    # Update every Resource
+    #
+    #   Person.update(:allow_beer => true)
+    #
+    # @param [Hash] attributes
+    #   attributes to update with
+    #
+    # @return [Boolean]
+    #   true if the resources were successfully updated
+    #
+    # @api public
+    def update(attributes)
+      all.update(attributes)
+    end
+
+    # Update every Resource, bypassing validations
+    #
+    #   Person.update!(:allow_beer => true)
+    #
+    # @param [Hash] attributes
+    #   attributes to update with
+    #
+    # @return [Boolean]
+    #   true if the resources were successfully updated
+    #
+    # @api public
+    def update!(attributes)
+      all.update!(attributes)
+    end
+
+    # Remove all Resources from the repository
+    #
+    # @return [Boolean]
+    #   true if the resources were successfully destroyed
+    #
+    # @api public
+    def destroy
+      all.destroy
+    end
+
+    # Remove all Resources from the repository, bypassing validation
+    #
+    # @return [Boolean]
+    #   true if the resources were successfully destroyed
+    #
+    # @api public
+    def destroy!
+      all.destroy!
+    end
+
     # Copy a set of records from one repository to another.
     #
     # @param [String] source_repository_name
@@ -668,16 +710,6 @@ module DataMapper
       [ repository ].to_set + @properties.keys.map { |repository_name| DataMapper.repository(repository_name) }
     end
 
-    # @api private
-    def model_method_defined?(method)
-      model_methods.include?(method.to_s)
-    end
-
-    # @api private
-    def resource_method_defined?(method)
-      resource_methods.include?(method.to_s)
-    end
-
     private
 
     # @api private
@@ -748,6 +780,7 @@ module DataMapper
     end
 
     # @api private
+    # TODO: Remove this once appropriate warnings can be added.
     def assert_valid(force = false) # :nodoc:
       return if @valid && !force
       @valid = true
@@ -774,28 +807,6 @@ module DataMapper
       end
     end
 
-    # @api private
-    def model_methods
-      @model_methods ||= ancestor_instance_methods { |mod| mod.singleton_class }
-    end
-
-    # @api private
-    def resource_methods
-      @resource_methods ||= ancestor_instance_methods { |mod| mod }
-    end
-
-    # @api private
-    def ancestor_instance_methods
-      methods = Set.new
-
-      ancestors.each do |mod|
-        next unless mod <= DataMapper::Resource
-        methods.merge(yield(mod).instance_methods(false).map { |method| method.to_s })
-      end
-
-      methods
-    end
-
     # Raises an exception if #get receives the wrong number of arguments
     #
     # @param [Array] key

data/lib/dm-core/model/property.rb

@@ -222,9 +222,8 @@ module DataMapper
         name                   = property.name.to_s
         reader_visibility      = property.reader_visibility
         instance_variable_name = property.instance_variable_name
-        primitive              = property.primitive
 
-        unless resource_method_defined?(name)
+        unless reserved_method?(name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             chainable do
               #{reader_visibility}
@@ -239,10 +238,14 @@ module DataMapper
 
         boolean_reader_name = "#{name}?"
 
-        if primitive == TrueClass && !resource_method_defined?(boolean_reader_name)
+        if property.kind_of?(DataMapper::Property::Boolean) && !reserved_method?(boolean_reader_name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            #{reader_visibility}
-            alias #{boolean_reader_name} #{name}
+            chainable do
+              #{reader_visibility}
+              def #{boolean_reader_name}
+                #{name}
+              end
+            end
           RUBY
         end
       end
@@ -256,7 +259,7 @@ module DataMapper
 
         writer_name = "#{name}="
 
-        return if resource_method_defined?(writer_name)
+        return if reserved_method?(writer_name)
 
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           chainable do
@@ -270,6 +273,11 @@ module DataMapper
         RUBY
       end
 
+      # @api private
+      def reserved_method?(name)
+        method_defined?(name) && !%w[ id type ].include?(name)
+      end
+
       chainable do
         # @api public
         def method_missing(method, *args, &block)

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

@@ -81,17 +81,13 @@ module DataMapper
       #   cardinality that defines the association type and constraints
       # @param name [Symbol]
       #   the name that the association will be referenced by
-      # @param model [Model, #to_str]
-      #   the target model of the relationship
-      # @param opts [Hash]
-      #   an options hash
+      # @param *args [Model, Hash] model and/or options hash
       #
-      # @option :through[Symbol]  A association that this join should go through to form
+      # @option *args :through[Symbol] A association that this join should go through to form
       #   a many-to-many association
-      # @option :model[Model, String] The name of the class to associate with, if omitted
+      # @option *args :model[Model, String] The name of the class to associate with, if omitted
       #   then the association name is assumed to match the class name
-      # @option :repository[Symbol]
-      #   name of child model repository
+      # @option *args :repository[Symbol] name of child model repository
       #
       # @return [Association::Relationship] the relationship that was
       #   created to reflect either a one-to-one, one-to-many or many-to-many
@@ -148,15 +144,11 @@ module DataMapper
       #
       # @param name [Symbol]
       #   the name that the association will be referenced by
-      # @param model [Model, #to_str]
-      #   the target model of the relationship
-      # @param opts [Hash]
-      #   an options hash
+      # @param *args [Model, Hash] model and/or options hash
       #
-      # @option :model[Model, String] The name of the class to associate with, if omitted
+      # @option *args :model[Model, String] The name of the class to associate with, if omitted
       #   then the association name is assumed to match the class name
-      # @option :repository[Symbol]
-      #   name of child model repository
+      # @option *args :repository[Symbol] name of child model repository
       #
       # @return [Association::Relationship] The association created
       #   should not be accessed directly
@@ -311,7 +303,7 @@ module DataMapper
         # :target_key (will mean something different for each relationship)
 
         [ :child_key, :parent_key ].each do |key|
-          if options.key?(key) && !options[key].is_a?(Enumerable)
+          if options.key?(key)
             options[key] = Array(options[key])
           end
         end
@@ -328,7 +320,7 @@ module DataMapper
         name        = relationship.name
         reader_name = name.to_s
 
-        return if resource_method_defined?(reader_name)
+        return if method_defined?(reader_name)
 
         reader_visibility = relationship.reader_visibility
 
@@ -355,7 +347,7 @@ module DataMapper
         name        = relationship.name
         writer_name = "#{name}="
 
-        return if resource_method_defined?(writer_name)
+        return if method_defined?(writer_name)
 
         writer_visibility = relationship.writer_visibility