dm-core 1.1.0 → 1.2.0.rc1

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

@@ -1,15 +1,12 @@
 # TODO: update Model#respond_to? to return true if method_method missing
 # would handle the message
 
-require 'dm-core/relationship_set'
-
 module DataMapper
   module Model
     module Relationship
       Model.append_extensions self
 
       include DataMapper::Assertions
-      extend Chainable
 
       # Initializes relationships hash for extended model
       # class.
@@ -23,21 +20,19 @@ module DataMapper
         model.instance_variable_set(:@relationships, {})
       end
 
-      chainable do
-        # When DataMapper model is inherited, relationships
-        # of parent are duplicated and copied to subclass model
-        #
-        # @api private
-        def inherited(model)
-          model.instance_variable_set(:@relationships, {})
-
-          @relationships.each do |repository_name, relationships|
-            model_relationships = model.relationships(repository_name)
-            relationships.each { |relationship| model_relationships << relationship }
-          end
+      # When DataMapper model is inherited, relationships
+      # of parent are duplicated and copied to subclass model
+      #
+      # @api private
+      def inherited(model)
+        model.instance_variable_set(:@relationships, {})
 
-          super
+        @relationships.each do |repository_name, relationships|
+          model_relationships = model.relationships(repository_name)
+          relationships.each { |relationship| model_relationships << relationship }
         end
+
+        super
       end
 
       # Returns copy of relationships set in given repository.
@@ -194,7 +189,7 @@ module DataMapper
         relationship
       end
 
-      private
+    private
 
       # Extract the model from an Array of arguments
       #
@@ -342,7 +337,7 @@ module DataMapper
             #       of 1:1, the underlying collection is hidden in a
             #       private ivar, and the resource is in a known ivar
 
-            persisted_state.get(relationships[#{name.inspect}], query)
+            persistence_state.get(relationships[#{name.inspect}], query)
           end
         RUBY
       end
@@ -362,22 +357,21 @@ module DataMapper
           #{writer_visibility}
           def #{writer_name}(target)
             relationship = relationships[#{name.inspect}]
-            self.persisted_state = persisted_state.set(relationship, target)
-            persisted_state.get(relationship)
+            self.persistence_state = persistence_state.set(relationship, target)
+            persistence_state.get(relationship)
           end
         RUBY
       end
 
-      chainable do
-        # @api public
-        def method_missing(method, *args, &block)
-          if relationship = relationships(repository_name)[method]
-            return Query::Path.new([ relationship ])
-          end
-
-          super
+      # @api public
+      def method_missing(method, *args, &block)
+        if relationship = relationships(repository_name)[method]
+          return Query::Path.new([ relationship ])
         end
+
+        super
       end
+
     end # module Relationship
   end # module Model
 end # module DataMapper

data/lib/dm-core/property.rb

@@ -1,6 +1,3 @@
-require 'dm-core/resource'
-require 'dm-core/query'
-
 module DataMapper
   # = Properties
   # Properties for a model are not derived from a database structure, but
@@ -83,11 +80,13 @@ module DataMapper
   #    property :title, String
   #
   #    def title=(new_title)
-  #      raise ArgumentError if new_title != 'Luke is Awesome'
-  #      @title = new_title
+  #      raise ArgumentError if new_title != 'Lee is l337'
+  #      super(new_title)
   #    end
   #  end
   #
+  # Calling super ensures that any validators defined for the property are kept active.
+  #
   # == Lazy Loading
   # By default, some properties are not loaded when an object is fetched in
   # DataMapper. These lazily loaded properties are fetched on demand when their
@@ -107,7 +106,7 @@ module DataMapper
   #
   # If you want to over-ride the lazy loading on any field you can set it to a
   # context or false to disable it with the :lazy option. Contexts allow
-  # multipule lazy properties to be loaded at one time. If you set :lazy to
+  # multiple lazy properties to be loaded at one time. If you set :lazy to
   # true, it is placed in the :default context
   #
   #  class Post
@@ -179,44 +178,40 @@ module DataMapper
   #
   # == Inferred Validations
   # If you require the dm-validations plugin, auto-validations will
-  # automatically be mixed-in in to your model classes:
-  # validation rules that are inferred when properties are declared with
-  # specific column restrictions.
+  # automatically be mixed-in in to your model classes: validation rules that
+  # are inferred when properties are declared with specific column restrictions.
   #
-  #  class Post
-  #    include DataMapper::Resource
-  #
-  #    property :title, String, :length => 250
-  #      # => infers 'validates_length :title,
-  #             :minimum => 0, :maximum => 250'
+  #   class Post
+  #     include DataMapper::Resource
   #
-  #    property :title, String, :required => true
-  #      # => infers 'validates_present :title
+  #     property :title, String, :length => 250, :min => 0, :max => 250
+  #     # => infers 'validates_length :title'
   #
-  #    property :email, String, :format => :email_address
-  #      # => infers 'validates_format :email, :with => :email_address
+  #     property :title, String, :required => true
+  #     # => infers 'validates_present :title'
   #
-  #    property :title, String, :length => 255, :required => true
-  #      # => infers both 'validates_length' as well as
-  #      #    'validates_present'
-  #      #    better: property :title, String, :length => 1..255
+  #     property :email, String, :format => :email_address
+  #     # => infers 'validates_format :email, :with => :email_address'
   #
-  #  end
+  #     property :title, String, :length => 255, :required => true
+  #     # => infers both 'validates_length' as well as 'validates_present'
+  #     #    better: property :title, String, :length => 1..255
+  #   end
   #
   # This functionality is available with the dm-validations gem. For more information
   # about validations, check the documentation for dm-validations.
   #
   # == Default Values
-  # To set a default for a property, use the <tt>:default</tt> key.  The
+  # To set a default for a property, use the <tt>:default</tt> key. The
   # property will be set to the value associated with that key the first time
   # it is accessed, or when the resource is saved if it hasn't been set with
-  # another value already.  This value can be a static value, such as 'hello'
+  # another value already. This value can be a static value, such as 'hello'
   # but it can also be a proc that will be evaluated when the property is read
-  # before its value has been set.  The property is set to the return of the
-  # proc.  The proc is passed two values, the resource the property is being set
+  # before its value has been set. The property is set to the return of the
+  # proc. The proc is passed two values, the resource the property is being set
   # for and the property itself.
   #
-  #   property :display_name, String, :default => { |resource, property| resource.login }
+  #   property :display_name, String, :default => lambda { |resource, property| resource.login }
   #
   # Word of warning.  Don't try to read the value of the property you're setting
   # the default for in the proc.  An infinite loop will ensue.
@@ -270,9 +265,6 @@ module DataMapper
   #                       Only makes sense for float type properties. Must be > 0.
   #                       Default is nil for Float type and 10 for BigDecimal
   #
-  #  All other keys you pass to +property+ method are stored and available
-  #  as options[:extra_keys].
-  #
   # == Overriding default Property options
   #
   # There is the ability to reconfigure a Property and it's subclasses by explicitly
@@ -291,7 +283,7 @@ module DataMapper
   #   DataMapper::Property.auto_validation(false)
   #
   #   # set all mutator methods to be private by default
-  #   DataMapper::Property.writer(false)
+  #   DataMapper::Property.writer(:private)
   #
   # Please note that this has no effect when a subclass has explicitly
   # defined it's own option. For example, setting the String length to
@@ -311,8 +303,7 @@ module DataMapper
     module PassThroughLoadDump
       # @api semipublic
       def load(value)
-        return if value.nil?
-        typecast(value)
+        typecast(value) unless value.nil?
       end
 
       # Stub instance method for dumping
@@ -329,10 +320,9 @@ module DataMapper
 
     include DataMapper::Assertions
     include Subject
-    extend Chainable
     extend Equalizer
 
-    equalize :model, :name
+    equalize :model, :name, :options
 
     PRIMITIVES = [
       TrueClass,
@@ -357,7 +347,10 @@ module DataMapper
     VISIBILITY_OPTIONS = [ :public, :protected, :private ].to_set.freeze
 
     # Invalid property names
-    INVALID_NAMES = (Resource.instance_methods + Resource.private_instance_methods + Query::OPTIONS.to_a).map { |name| name.to_s }.freeze
+    INVALID_NAMES = (Resource.instance_methods +
+                     Resource.private_instance_methods +
+                     Query::OPTIONS.to_a
+                    ).map { |name| name.to_s }
 
     attr_reader :primitive, :model, :name, :instance_variable_name,
       :reader_visibility, :writer_visibility, :options,
@@ -462,9 +455,8 @@ module DataMapper
       # @api public
       def options
         options = {}
-        accepted_options.each do |method|
-          value = send(method)
-          options[method] = value unless value.nil?
+        accepted_options.each do |name|
+          options[name] = send(name) if instance_variable_defined?("@#{name}")
         end
         options
       end
@@ -737,20 +729,15 @@ module DataMapper
       value.kind_of?(primitive)
     end
 
-    chainable do
-      def self.new(model, name, options = {})
-        super
-      end
-    end
-
-    protected
+  protected
 
     # @api semipublic
     def initialize(model, name, options = {})
       options = options.to_hash.dup
 
-      if INVALID_NAMES.include?(name.to_s)
-        raise ArgumentError, "+name+ was #{name.inspect}, which cannot be used as a property name since it collides with an existing method or a query option"
+      if INVALID_NAMES.include?(name.to_s) || (kind_of?(Boolean) && INVALID_NAMES.include?("#{name}?"))
+        raise ArgumentError,
+          "+name+ was #{name.inspect}, which cannot be used as a property name since it collides with an existing method or a query option"
       end
 
       assert_valid_options(options)

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

@@ -5,6 +5,11 @@ module DataMapper
 
       primitive ::TrueClass
 
+      TRUE_VALUES  = [ 1, '1', 't', 'T', 'true',  'TRUE'  ].freeze
+      FALSE_VALUES = [ 0, '0', 'f', 'F', 'false', 'FALSE' ].freeze
+      BOOLEAN_MAP  = Hash[
+        TRUE_VALUES.product([ true ]) + FALSE_VALUES.product([ false ]) ].freeze
+
       def primitive?(value)
         value == true || value == false
       end
@@ -19,16 +24,7 @@ module DataMapper
       #
       # @api private
       def typecast_to_primitive(value)
-        if value.kind_of?(::Integer)
-          return true  if value == 1
-          return false if value == 0
-        elsif value.respond_to?(:to_str)
-          string_value = value.to_str.downcase
-          return true  if %w[ true  1 t ].include?(string_value)
-          return false if %w[ false 0 f ].include?(string_value)
-        end
-
-        value
+        BOOLEAN_MAP.fetch(value, value)
       end
     end # class Boolean
   end # class Property

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

@@ -1,5 +1,3 @@
-require 'dm-core/property/typecast/time'
-
 module DataMapper
   class Property
     class Date < Object

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

@@ -1,5 +1,3 @@
-require 'dm-core/property/typecast/time'
-
 module DataMapper
   class Property
     class DateTime < Object

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

@@ -3,7 +3,11 @@ module DataMapper
     class Decimal < Numeric
       primitive BigDecimal
 
-      DEFAULT_SCALE = 0
+      DEFAULT_PRECISION = 10
+      DEFAULT_SCALE     = 0
+
+      precision(DEFAULT_PRECISION)
+      scale(DEFAULT_SCALE)
 
       protected
 

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

@@ -8,40 +8,38 @@ module DataMapper
 
       # @api private
       def bind
-        model.default_scope(repository_name).update(name => model.descendants.dup << model)
-
-        model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          extend Chainable
+        model.extend Model unless model < Model
+      end
 
-          extendable do
-            def inherited(model)
-              super  # setup self.descendants
-              set_discriminator_scope_for(model)
-            end
+      module Model
+        def inherited(model)
+          super  # setup self.descendants
+          set_discriminator_scope_for(model)
+        end
 
-            def new(*args, &block)
-              if args.size == 1 && args.first.kind_of?(Hash)
-                discriminator = properties(repository_name).discriminator
+        def new(*args, &block)
+          if args.size == 1 && args.first.kind_of?(Hash)
+            discriminator = properties(repository_name).discriminator
 
-                if discriminator_value = args.first[discriminator.name]
-                  model = discriminator.typecast_to_primitive(discriminator_value)
+            if discriminator_value = args.first[discriminator.name]
+              model = discriminator.typecast_to_primitive(discriminator_value)
 
-                  if model.kind_of?(Model) && !model.equal?(self)
-                    return model.new(*args, &block)
-                  end
-                end
+              if model.kind_of?(Model) && !model.equal?(self)
+                return model.new(*args, &block)
               end
-
-              super
             end
+          end
 
-            private
+          super
+        end
 
-            def set_discriminator_scope_for(model)
-              model.default_scope(#{repository_name.inspect}).update(#{name.inspect} => model.descendants.dup << model)
-            end
-          end
-        RUBY
+      private
+
+        def set_discriminator_scope_for(model)
+          discriminator = self.properties.discriminator
+          default_scope = model.default_scope(discriminator.repository_name)
+          default_scope.update(discriminator.name => model.descendants.dup << model)
+        end
       end
     end # class Discriminator
   end # module Property

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

@@ -3,7 +3,11 @@ module DataMapper
     class Float < Numeric
       primitive ::Float
 
-      DEFAULT_SCALE = nil
+      DEFAULT_PRECISION = 10
+      DEFAULT_SCALE     = nil
+
+      precision(DEFAULT_PRECISION)
+      scale(DEFAULT_SCALE)
 
       protected
 

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

@@ -1,5 +1,3 @@
-require 'dm-core/property/typecast/numeric'
-
 module DataMapper
   class Property
     class Numeric < Object
@@ -9,9 +7,8 @@ module DataMapper
       accept_options :precision, :scale, :min, :max
       attr_reader :precision, :scale, :min, :max
 
-      DEFAULT_PRECISION        = 10
-      DEFAULT_NUMERIC_MIN      = 0
-      DEFAULT_NUMERIC_MAX      = 2**31-1
+      DEFAULT_NUMERIC_MIN = 0
+      DEFAULT_NUMERIC_MAX = 2**31-1
 
       protected
 
@@ -19,8 +16,8 @@ module DataMapper
         super
 
         if @primitive == BigDecimal || @primitive == ::Float
-          @precision = @options.fetch(:precision, DEFAULT_PRECISION)
-          @scale     = @options.fetch(:scale,     self.class::DEFAULT_SCALE)
+          @precision = @options.fetch(:precision)
+          @scale     = @options.fetch(:scale)
 
           unless @precision > 0
             raise ArgumentError, "precision must be greater than 0, but was #{@precision.inspect}"
@@ -28,8 +25,8 @@ module DataMapper
         end
 
         if @options.key?(:min) || @options.key?(:max)
-          @min = @options.fetch(:min, DEFAULT_NUMERIC_MIN)
-          @max = @options.fetch(:max, DEFAULT_NUMERIC_MAX)
+          @min = @options.fetch(:min, self.class::DEFAULT_NUMERIC_MIN)
+          @max = @options.fetch(:max, self.class::DEFAULT_NUMERIC_MAX)
 
           if @max < DEFAULT_NUMERIC_MIN && !@options.key?(:min)
             raise ArgumentError, "min should be specified when the max is less than #{DEFAULT_NUMERIC_MIN}"