dm-core 1.1.0 → 1.2.0.rc1

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

@@ -8,6 +8,7 @@ module DataMapper
       accept_options :length
 
       DEFAULT_LENGTH = 50
+      length(DEFAULT_LENGTH)
 
       # Returns maximum property length (if applicable).
       # This usually only makes sense when property is of
@@ -29,7 +30,7 @@ module DataMapper
 
       def initialize(model, name, options = {})
         super
-        @length = @options.fetch(:length, DEFAULT_LENGTH)
+        @length = @options.fetch(:length)
       end
 
       # Typecast a value to a String

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

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

data/lib/dm-core/property/typecast/time.rb

@@ -15,14 +15,19 @@ module DataMapper
         #
         # @api private
         def extract_time(value)
-          mash = value.respond_to?(:to_mash) ? value.to_mash : DataMapper::Ext::Hash.to_mash(value)
+          mash = if value.respond_to?(:to_mash)
+                   value.to_mash
+                 else
+                   DataMapper::Ext::Hash.to_mash(value)
+                 end
+
           now  = ::Time.now
 
           [ :year, :month, :day, :hour, :min, :sec ].map do |segment|
             typecast_to_numeric(mash.fetch(segment, now.send(segment)), :to_i)
           end
         end
-      end # Numeric
+      end # Time
     end # Typecast
   end # Property
 end # DataMapper

data/lib/dm-core/property_set.rb

@@ -1,5 +1,3 @@
-require 'dm-core/support/subject_set'
-
 module DataMapper
   # Set of Property objects, used to associate
   # queries with set of fields it performed over,
@@ -144,7 +142,7 @@ module DataMapper
 
     # @api private
     def field_map
-      DataMapper::Ext::Array.to_hash(map { |property| [ property.field, property ] })
+      Hash[ map { |property| [ property.field, property ] } ]
     end
 
     def inspect

data/lib/dm-core/query.rb

@@ -1120,19 +1120,12 @@ module DataMapper
 
     # Normalize the unique attribute
     #
-    # If any links are present, and the unique attribute was not explicitly
-    # specified, then make sure the query is marked as unique. The exception
-    # to this rule is links where there is known to be 0..1 records on the
-    # the other side, such as belongs_to or a has 1. In this case, there
-    # is no need to explicitly mark the query unique. This in turn allows
-    # sane ordering on fields of the links, since no redundant GROUP BY
-    # clause will be generated.
+    # If any links are present, and the unique attribute was not
+    # explicitly specified, then make sure the query is marked as unique
     #
     # @api private
     def normalize_unique
-      unless @options.key?(:unique)
-        @unique = @links.reject {|x| x.min.between?(0, 1) && x.max == 1 }.any?
-      end
+      @unique = links.any? unless @options.key?(:unique)
     end
 
     # Append conditions to this Query

data/lib/dm-core/query/conditions/comparison.rb

@@ -102,7 +102,7 @@ module DataMapper
       class AbstractComparison
         extend Equalizer
 
-        equalize :slug, :subject, :value
+        equalize :subject, :value
 
         # @api semipublic
         attr_accessor :parent
@@ -797,6 +797,7 @@ module DataMapper
         #
         # @api semipublic
         def matches?(record)
+          return false if expected.nil?
           record_value = record_value(record)
           !record_value.nil? && record_value > expected
         end
@@ -827,6 +828,7 @@ module DataMapper
         #
         # @api semipublic
         def matches?(record)
+          return false if expected.nil?
           record_value = record_value(record)
           !record_value.nil? && record_value < expected
         end
@@ -857,6 +859,7 @@ module DataMapper
         #
         # @api semipublic
         def matches?(record)
+          return false if expected.nil?
           record_value = record_value(record)
           !record_value.nil? && record_value >= expected
         end
@@ -885,6 +888,7 @@ module DataMapper
         #
         # @api semipublic
         def matches?(record)
+          return false if expected.nil?
           record_value = record_value(record)
           !record_value.nil? && record_value <= expected
         end

data/lib/dm-core/query/conditions/operation.rb

@@ -70,7 +70,7 @@ module DataMapper
         include Enumerable
         extend Equalizer
 
-        equalize :slug, :sorted_operands
+        equalize :sorted_operands
 
         # Returns the parent operation
         #

data/lib/dm-core/relationship_set.rb

@@ -1,5 +1,3 @@
-require 'dm-core/support/subject_set'
-
 module DataMapper
 
   # A {SubjectSet} that keeps track of relationships defined in a {Model}

data/lib/dm-core/resource.rb

@@ -1,10 +1,6 @@
-# TODO: DRY up raise_on_save_failure with attr_accessor_with_default
-# once AS branch is merged in
-
 module DataMapper
   module Resource
     include DataMapper::Assertions
-    extend Chainable
 
     # @deprecated
     def self.append_inclusions(*inclusions)
@@ -80,24 +76,24 @@ module DataMapper
 
     # Get the persisted state for the resource
     #
-    # @return [Resource::State]
+    # @return [Resource::PersistenceState]
     #   the current persisted state for the resource
     #
     # @api private
-    def persisted_state
-      @_state ||= Resource::State::Transient.new(self)
+    def persistence_state
+      @_persistence_state ||= Resource::PersistenceState::Transient.new(self)
     end
 
     # Set the persisted state for the resource
     #
-    # @param [Resource::State]
+    # @param [Resource::PersistenceState]
     #   the new persisted state for the resource
     #
     # @return [undefined]
     #
     # @api private
-    def persisted_state=(state)
-      @_state = state
+    def persistence_state=(state)
+      @_persistence_state = state
     end
 
     # Test if the persisted state is set
@@ -106,8 +102,8 @@ module DataMapper
     #   true if the persisted state is set
     #
     # @api private
-    def persisted_state?
-      defined?(@_state) ? true : false
+    def persistence_state?
+      defined?(@_persistence_state) ? true : false
     end
 
     # Repository this resource belongs to in the context of this collection
@@ -153,7 +149,7 @@ module DataMapper
     #
     # @api public
     def new?
-      persisted_state.kind_of?(State::Transient)
+      persistence_state.kind_of?(PersistenceState::Transient)
     end
 
     # Checks if this Resource instance is saved
@@ -163,7 +159,7 @@ module DataMapper
     #
     # @api public
     def saved?
-      persisted_state.kind_of?(State::Persisted)
+      persistence_state.kind_of?(PersistenceState::Persisted)
     end
 
     # Checks if this Resource instance is destroyed
@@ -183,7 +179,8 @@ module DataMapper
     #
     # @api public
     def clean?
-      persisted_state.kind_of?(State::Clean) || persisted_state.kind_of?(State::Immutable)
+      persistence_state.kind_of?(PersistenceState::Clean) ||
+        persistence_state.kind_of?(PersistenceState::Immutable)
     end
 
     # Checks if the resource has unsaved changes
@@ -205,7 +202,7 @@ module DataMapper
     #
     # @api public
     def readonly?
-      persisted_state.kind_of?(State::Immutable)
+      persistence_state.kind_of?(PersistenceState::Immutable)
     end
 
     # Returns the value of the attribute.
@@ -240,7 +237,8 @@ module DataMapper
     #
     # @api public
     def attribute_get(name)
-      persisted_state.get(properties[name])
+      property = properties[name]
+      persistence_state.get(property) if property
     end
 
     alias_method :[], :attribute_get
@@ -281,7 +279,8 @@ module DataMapper
     #
     # @api public
     def attribute_set(name, value)
-      self.persisted_state = persisted_state.set(properties[name], value)
+      property = properties[name]
+      self.persistence_state = persistence_state.set(property, value) if property
     end
 
     alias_method :[]=, :attribute_set
@@ -330,13 +329,13 @@ module DataMapper
       attributes.each do |name, value|
         case name
           when String, Symbol
-            if model.public_method_defined?(setter = "#{name}=")
+            if model.allowed_writer_methods.include?(setter = "#{name}=")
               __send__(setter, value)
             else
               raise ArgumentError, "The attribute '#{name}' is not accessible in #{model}"
             end
           when Associations::Relationship, Property
-            self.persisted_state = persisted_state.set(name, value)
+            self.persistence_state = persistence_state.set(name, value)
         end
       end
     end
@@ -360,7 +359,7 @@ module DataMapper
         clear_subjects
       end
 
-      self.persisted_state = persisted_state.rollback
+      self.persistence_state = persistence_state.rollback
 
       self
     end
@@ -552,8 +551,8 @@ module DataMapper
     #
     # @api semipublic
     def original_attributes
-      if persisted_state.respond_to?(:original_attributes)
-        persisted_state.original_attributes.dup.freeze
+      if persistence_state.respond_to?(:original_attributes)
+        persistence_state.original_attributes.dup.freeze
       else
         {}.freeze
       end
@@ -755,7 +754,7 @@ module DataMapper
         instance_variable_set(ivar, DataMapper::Ext.try_dup(instance_variable_get(ivar)))
       end
 
-      self.persisted_state = persisted_state.class.new(self)
+      self.persistence_state = persistence_state.class.new(self)
     end
 
     # Returns name of the repository this object
@@ -954,7 +953,7 @@ module DataMapper
     #
     # @api private
     def _persist
-      self.persisted_state = persisted_state.commit
+      self.persistence_state = persistence_state.commit
     end
 
     # This method executes the hooks before and after resource creation
@@ -997,7 +996,7 @@ module DataMapper
     #
     # @api private
     def _destroy(execute_hooks = true)
-      self.persisted_state = persisted_state.delete
+      self.persistence_state = persistence_state.delete
       _persist
     end
 
@@ -1127,8 +1126,8 @@ module DataMapper
 
     # @api private
     def set_default_value(subject)
-      return unless persisted_state.respond_to?(:set_default_value, true)
-      persisted_state.__send__(:set_default_value, subject)
+      return unless persistence_state.respond_to?(:set_default_value, true)
+      persistence_state.__send__(:set_default_value, subject)
     end
 
     # Execute all the queued up hooks for a given type and name

data/lib/dm-core/resource/{state.rb → persistence_state.rb}

@@ -2,7 +2,7 @@ module DataMapper
   module Resource
 
     # the state of the resource (abstract)
-    class State
+    class PersistenceState
       extend Equalizer
 
       equalize :resource
@@ -70,6 +70,6 @@ module DataMapper
         set(relationship, get(relationship))
       end
 
-    end # class State
+    end # class PersistenceState
   end # module Resource
 end # module DataMapper

data/lib/dm-core/resource/{state → persistence_state}/clean.rb

@@ -1,6 +1,6 @@
 module DataMapper
   module Resource
-    class State
+    class PersistenceState
 
       # a persisted/unmodified resource
       class Clean < Persisted
@@ -8,10 +8,10 @@ module DataMapper
           if not_modified?(subject, value)
             self
           else
-            # assign to persisted_state so that if Dirty#set calls
+            # assign to persistence_state so that if Dirty#set calls
             # a Relationship#set, which modifies a Property, the same
             # Dirty state instance will be reused.
-            state = resource.persisted_state = Dirty.new(resource)
+            state = resource.persistence_state = Dirty.new(resource)
             state.set(subject, value)
           end
         end
@@ -35,6 +35,6 @@ module DataMapper
         end
 
       end # class Clean
-    end # class State
+    end # class PersistenceState
   end # module Resource
 end # module DataMapper

data/lib/dm-core/resource/{state → persistence_state}/deleted.rb

@@ -1,6 +1,6 @@
 module DataMapper
   module Resource
-    class State
+    class PersistenceState
 
       # a persisted/deleted resource
       class Deleted < Persisted
@@ -25,6 +25,6 @@ module DataMapper
         end
 
       end # class Deleted
-    end # class State
+    end # class PersistenceState
   end # module Resource
 end # module DataMapper

data/lib/dm-core/resource/{state → persistence_state}/dirty.rb

@@ -1,6 +1,6 @@
 module DataMapper
   module Resource
-    class State
+    class PersistenceState
 
       # a persisted/dirty resource
       class Dirty < Persisted
@@ -91,6 +91,6 @@ module DataMapper
         end
 
       end # class Dirty
-    end # class State
+    end # class PersistenceState
   end # module Resource
 end # module DataMapper

data/lib/dm-core/resource/{state → persistence_state}/immutable.rb

@@ -1,9 +1,9 @@
 module DataMapper
   module Resource
-    class State
+    class PersistenceState
 
       # a not-persisted/unmodifiable resource
-      class Immutable < State
+      class Immutable < PersistenceState
         def get(subject, *args)
           unless subject.loaded?(resource) || subject.kind_of?(Associations::Relationship)
             raise ImmutableError, 'Immutable resource cannot be lazy loaded'
@@ -29,6 +29,6 @@ module DataMapper
         end
 
       end # class Immutable
-    end # class State
+    end # class PersistenceState
   end # module Resource
 end # module DataMapper

data/lib/dm-core/resource/{state → persistence_state}/persisted.rb

@@ -1,9 +1,9 @@
 module DataMapper
   module Resource
-    class State
+    class PersistenceState
 
       # a persisted resource (abstract)
-      class Persisted < State
+      class Persisted < PersistenceState
         def get(subject, *args)
           lazy_load(subject)
           super
@@ -24,6 +24,6 @@ module DataMapper
         end
 
       end # class Persisted
-    end # class State
+    end # class PersistenceState
   end # module Resource
 end # module DataMapper

data/lib/dm-core/resource/{state → persistence_state}/transient.rb

@@ -1,9 +1,9 @@
 module DataMapper
   module Resource
-    class State
+    class PersistenceState
 
       # a not-persisted/modifiable resource
-      class Transient < State
+      class Transient < PersistenceState
         def get(subject, *args)
           set_default_value(subject)
           super
@@ -73,6 +73,6 @@ module DataMapper
         end
 
       end # class Transient
-    end # class State
+    end # class PersistenceState
   end # module Resource
 end # module DataMapper