dm-core 0.10.2 → 1.0.0.rc1

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

@@ -0,0 +1,12 @@
+module DataMapper
+  class Property
+    class Text < String
+      length  65535
+      lazy    true
+
+      def primitive?(value)
+        value.kind_of?(::String)
+      end
+    end # class Text
+  end # class Property
+end # module DataMapper

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

@@ -0,0 +1,48 @@
+require 'dm-core/property/typecast/time'
+
+module DataMapper
+  class Property
+    class Time < Object
+      include PassThroughLoadDump
+      include Typecast::Time
+
+      primitive ::Time
+
+      # Typecasts an arbitrary value to a Time
+      # Handles both Hashes and Time instances.
+      #
+      # @param [#to_mash, #to_s] value
+      #   value to be typecast
+      #
+      # @return [Time]
+      #   Time constructed from value
+      #
+      # @api private
+      def typecast_to_primitive(value)
+        if value.respond_to?(:to_time)
+          value.to_time
+        elsif value.respond_to?(:to_mash)
+          typecast_hash_to_time(value)
+        else
+          ::Time.parse(value.to_s)
+        end
+      rescue ArgumentError
+        value
+      end
+
+      # Creates a Time instance from a Hash with keys :year, :month, :day,
+      # :hour, :min, :sec
+      #
+      # @param [#to_mash] value
+      #   value to be typecast
+      #
+      # @return [Time]
+      #   Time constructed from hash
+      #
+      # @api private
+      def typecast_hash_to_time(value)
+        ::Time.local(*extract_time(value))
+      end
+    end # class Time
+  end # class Property
+end # module DataMapper

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

@@ -0,0 +1,32 @@
+module DataMapper
+  class Property
+    module Typecast
+      module Numeric
+        # Match numeric string
+        #
+        # @param [#to_str, Numeric] value
+        #   value to typecast
+        # @param [Symbol] method
+        #   method to typecast with
+        #
+        # @return [Numeric]
+        #   number if matched, value if no match
+        #
+        # @api private
+        def typecast_to_numeric(value, method)
+          if value.respond_to?(:to_str)
+            if value.to_str =~ /\A(-?(?:0|[1-9]\d*)(?:\.\d+)?|(?:\.\d+))\z/
+              $1.send(method)
+            else
+              value
+            end
+          elsif value.respond_to?(method)
+            value.send(method)
+          else
+            value
+          end
+        end
+      end # Numeric
+    end # Typecast
+  end # Property
+end # DataMapper

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

@@ -0,0 +1,28 @@
+module DataMapper
+  class Property
+    module Typecast
+      module Time
+        include Numeric
+
+        # Extracts the given args from the hash. If a value does not exist, it
+        # uses the value of Time.now.
+        #
+        # @param [#to_mash] value
+        #   value to extract time args from
+        #
+        # @return [Array]
+        #   Extracted values
+        #
+        # @api private
+        def extract_time(value)
+          mash = value.to_mash
+          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 # Typecast
+  end # Property
+end # DataMapper

data/lib/dm-core/property_set.rb

@@ -25,7 +25,7 @@ module DataMapper
 
     # @api semipublic
     def named?(name)
-      @properties.key?(name)
+      @properties.key?(name.to_sym)
     end
 
     # @api semipublic
@@ -68,7 +68,7 @@ module DataMapper
 
     # @api semipublic
     def discriminator
-      @discriminator ||= detect { |property| property.type == Types::Discriminator }
+      @discriminator ||= detect { |property| property.kind_of?(Property::Discriminator) || property.type == Types::Discriminator }
     end
 
     # @api semipublic
@@ -87,7 +87,8 @@ module DataMapper
 
     # @api semipublic
     def get(resource)
-      map { |property| property.get(resource) }
+      return [] if resource.nil?
+      map { |property| resource.__send__(property.name) }
     end
 
     # @api semipublic
@@ -97,7 +98,7 @@ module DataMapper
 
     # @api semipublic
     def set(resource, values)
-      zip(values) { |property, value| property.set(resource, value) }
+      zip(values) { |property, value| resource.__send__("#{property.name}=", value) }
     end
 
     # @api semipublic
@@ -147,6 +148,11 @@ module DataMapper
       properties_in_context.flatten.uniq
     end
 
+    # @api private
+    def field_map
+      map { |property| [ property.field, property ] }.to_hash
+    end
+
     private
 
     # @api semipublic

data/lib/dm-core/query.rb

@@ -26,7 +26,7 @@ module DataMapper
   # Generally Query objects can be found inside Collection objects.
   #
   class Query
-    include Extlib::Assertions
+    include DataMapper::Assertions
     extend Equalizer
 
     OPTIONS = [ :fields, :links, :conditions, :offset, :limit, :order, :unique, :add_reversed, :reload ].to_set.freeze
@@ -106,7 +106,7 @@ module DataMapper
       elsif source.kind_of?(Enumerable)
         key        = model.key(repository.name)
         conditions = Query.target_conditions(source, key, key)
-        Query.new(repository, model, :conditions => conditions)
+        repository.new_query(model, :conditions => conditions)
       else
         raise ArgumentError, "+source+ must respond to #query or be an Enumerable, but was #{source.class}"
       end
@@ -349,13 +349,12 @@ module DataMapper
     #
     # @api semipublic
     def update(other)
-      assert_kind_of 'other', other, self.class, Hash
-
       other_options = if kind_of?(other.class)
         return self if self.eql?(other)
         assert_valid_other(other)
         other.options
       else
+        other = other.to_hash
         return self if other.empty?
         other
       end
@@ -401,7 +400,7 @@ module DataMapper
     #
     # @api semipublic
     def relative(options)
-      assert_kind_of 'options', options, Hash
+      options = options.to_hash
 
       offset = nil
       limit  = self.limit
@@ -734,7 +733,7 @@ module DataMapper
       @offset       = @options.fetch :offset,       0
       @limit        = @options.fetch :limit,        nil
       @order        = @options.fetch :order,        @model.default_order(repository_name)
-      @unique       = @options.fetch :unique,       false
+      @unique       = @options.fetch :unique,       true
       @add_reversed = @options.fetch :add_reversed, false
       @reload       = @options.fetch :reload,       false
       @raw          = false
@@ -763,7 +762,7 @@ module DataMapper
     #
     # @api private
     def assert_valid_options(options)
-      assert_kind_of 'options', options, Hash
+      options = options.to_hash
 
       options.each do |attribute, value|
         case attribute
@@ -785,7 +784,7 @@ module DataMapper
     #
     # @api private
     def assert_valid_fields(fields, unique)
-      assert_kind_of 'options[:fields]', fields, Array
+      fields = fields.to_ary
 
       model = self.model
 
@@ -814,7 +813,7 @@ module DataMapper
     #
     # @api private
     def assert_valid_links(links)
-      assert_kind_of 'options[:links]', links, Array
+      links = links.to_ary
 
       if links.empty?
         raise ArgumentError, '+options[:links]+ should not be empty'
@@ -854,7 +853,7 @@ module DataMapper
             inspect = subject.inspect
 
             case subject
-              when Symbol, String
+              when Symbol, ::String
                 unless subject.to_s.include?('.') || @properties.named?(subject) || @relationships.key?(subject)
                   raise ArgumentError, "condition #{inspect} does not map to a property or relationship in #{model}"
                 end
@@ -899,7 +898,7 @@ module DataMapper
     # Verifies that query offset is non-negative and only used together with limit
     # @api private
     def assert_valid_offset(offset, limit)
-      assert_kind_of 'options[:offset]', offset, Integer
+      offset = offset.to_int
 
       unless offset >= 0
         raise ArgumentError, "+options[:offset]+ must be greater than or equal to 0, but was #{offset.inspect}"
@@ -917,7 +916,7 @@ module DataMapper
     #
     # @api private
     def assert_valid_limit(limit)
-      assert_kind_of 'options[:limit]', limit, Integer
+      limit = limit.to_int
 
       unless limit >= 0
         raise ArgumentError, "+options[:limit]+ must be greater than or equal to 0, but was #{limit.inspect}"
@@ -1105,28 +1104,6 @@ module DataMapper
         if relationship.respond_to?(:links)
           stack.concat(relationship.links)
         elsif !@links.include?(relationship)
-          repository_name = relationship.relative_target_repository_name
-          model           = relationship.target_model
-
-          # TODO: see if this can handle extracting the :order option and sort the
-          # resulting collection using the order specified by through relationships
-
-          model.current_scope.merge(relationship.query).each do |subject, value|
-            # TODO: figure out how to merge Query options from links
-            if OPTIONS.include?(subject)
-              next  # skip for now
-            end
-
-            # set @repository when appending conditions
-            original, @repository = @repository, DataMapper.repository(repository_name)
-
-            begin
-              append_condition(subject, value, model)
-            ensure
-              @repository = original
-            end
-          end
-
           @links << relationship
         end
       end
@@ -1424,7 +1401,7 @@ module DataMapper
             model,
             model,
             self_relationship_options
-            )
+          )
         end
     end
 
@@ -1440,8 +1417,8 @@ module DataMapper
       {
         :child_key              => keys,
         :parent_key             => keys,
-        :child_repository_name  => repository,
-        :parent_repository_name => repository,
+        :child_repository_name  => repository.name,
+        :parent_repository_name => repository.name,
       }
     end
 

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

@@ -340,7 +340,7 @@ module DataMapper
 
         # @api private
         def dump_property(value)
-          subject.value(value)
+          subject.dump(value)
         end
 
         # Returns a value for the comparison +subject+
@@ -385,7 +385,7 @@ module DataMapper
         def record_value_from_hash(hash, subject, key_type)
           hash.fetch subject, case subject
             when Property
-              hash[subject.field]
+              subject.load(hash[subject.field])
             when Associations::Relationship
               subject.send(key_type).map { |property|
                 record_value_from_hash(hash, property, key_type)
@@ -471,8 +471,10 @@ module DataMapper
         #
         # @api semipublic
         def foreign_key_mapping
-          inverse = subject.inverse
-          Query.target_conditions(value, inverse.source_key, inverse.target_key)
+          relationship = subject.inverse
+          relationship = relationship.links.first if relationship.respond_to?(:links)
+
+          Query.target_conditions(value, relationship.source_key, relationship.target_key)
         end
 
         private
@@ -624,7 +626,7 @@ module DataMapper
 
         # @api private
         def valid_range?(range)
-          (!range.empty? || negated?) && valid_for_subject?(range.first) && valid_for_subject?(range.last)
+          (range.any? || negated?) && valid_for_subject?(range.first) && valid_for_subject?(range.last)
         end
 
         # @api private
@@ -697,7 +699,7 @@ module DataMapper
         # @api private
         def dump
           loaded_value = self.loaded_value
-          if subject.respond_to?(:value) && loaded_value.respond_to?(:map) && !loaded_value.kind_of?(Range)
+          if subject.respond_to?(:dump) && loaded_value.respond_to?(:map) && !loaded_value.kind_of?(Range)
             dumped_value = loaded_value.map { |value| dump_property(value) }
             dumped_value.uniq!
             dumped_value

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

@@ -66,7 +66,7 @@ module DataMapper
       end # class Operation
 
       class AbstractOperation
-        include Extlib::Assertions
+        include DataMapper::Assertions
         include Enumerable
         extend Equalizer
 
@@ -132,6 +132,17 @@ module DataMapper
           self.class.slug
         end
 
+        # Get the first operand
+        #
+        # @return [AbstractOperation, AbstractComparison, Array]
+        #   returns the first operand
+        #
+        # @api semipublic
+        def first
+          each { |operand| return operand }
+          nil
+        end
+
         # Iterate through each operand in the operation
         #
         # @yield [operand]
@@ -149,6 +160,26 @@ module DataMapper
           self
         end
 
+        # Test to see if there are operands
+        #
+        # @return [Boolean]
+        #   returns true if there are operands
+        #
+        # @api semipublic
+        def empty?
+          @operands.empty?
+        end
+
+        # Test to see if there is one operand
+        #
+        # @return [Boolean]
+        #   true if there is only one operand
+        #
+        # @api semipublic
+        def one?
+          @operands.size == 1
+        end
+
         # Test if the operation is valid
         #
         # @return [Boolean]
@@ -359,7 +390,7 @@ module DataMapper
         # @return [AbstractOperation, AbstractComparison, Array]
         #   the operand that was related to self
         #
-        # @api privTE
+        # @api private
         def relate_operand(operand)
           operand.parent = self if operand.respond_to?(:parent=)
           operand

data/lib/dm-core/query/operator.rb

@@ -8,7 +8,7 @@
 module DataMapper
   class Query
     class Operator
-      include Extlib::Assertions
+      include DataMapper::Assertions
       extend Equalizer
 
       equalize :target, :operator
@@ -28,10 +28,7 @@ module DataMapper
 
       # @api private
       def initialize(target, operator)
-        assert_kind_of 'operator', operator, Symbol
-
-        @target   = target
-        @operator = operator
+        @target, @operator = target, operator.to_sym
       end
     end # class Operator
   end # class Query