dm-core 0.10.0 → 0.10.1

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

@@ -39,6 +39,9 @@ module DataMapper
 
       class AbstractOperation
         include Enumerable
+        extend Equalizer
+
+        equalize :slug, :sorted_operands
 
         # TODO: document
         # @api semipublic
@@ -62,6 +65,16 @@ module DataMapper
           slug ? @slug = slug : @slug
         end
 
+        # Return the comparison class slug
+        #
+        # @return [Symbol]
+        #   the comparison class slug
+        #
+        # @api private
+        def slug
+          self.class.slug
+        end
+
         # TODO: document
         # @api semipublic
         def each
@@ -71,7 +84,7 @@ module DataMapper
         # TODO: document
         # @api semipublic
         def valid?
-          operands.all? do |operand|
+          operands.any? && operands.all? do |operand|
             if operand.respond_to?(:valid?)
               operand.valid?
             else
@@ -87,52 +100,22 @@ module DataMapper
           self
         end
 
-        # TODO: document
-        # @api semipublic
-        def hash
-          @operands.sort_by { |operand| operand.hash }.hash
-        end
-
-        # TODO: document
-        # @api semipublic
-        def ==(other)
-          if equal?(other)
-            return true
-          end
-
-          other_class = other.class
-
-          unless other_class.respond_to?(:slug) && other_class.slug == self.class.slug
-            return false
-          end
-
-          unless other.respond_to?(:operands)
-            return false
-          end
-
-          cmp?(other, :==)
-        end
-
-        # TODO: document
-        # @api semipublic
-        def eql?(other)
-          if equal?(other)
-            return true
-          end
-
-          unless instance_of?(other.class)
-            return false
-          end
-
-          cmp?(other, :eql?)
-        end
-
         # TODO: document
         # @api semipublic
         def inspect
           "#<#{self.class} @operands=#{@operands.inspect}>"
         end
 
+        # Return a list of operands in predictable order
+        #
+        # @return [Array<AbstractOperation>]
+        #   list of operands sorted in deterministic order
+        #
+        # @api private
+        def sorted_operands
+          @operands.sort_by { |operand| operand.hash }
+        end
+
         private
 
         # TODO: document
@@ -146,12 +129,6 @@ module DataMapper
         def initialize_copy(*)
           @operands = @operands.map { |operand| operand.dup }
         end
-
-        # TODO: document
-        # @api private
-        def cmp?(other, operator)
-          @operands.sort_by { |operand| operand.hash }.send(operator, other.operands.sort_by { |operand| operand.hash })
-        end
       end # class AbstractOperation
 
       module FlattenOperation
@@ -216,6 +193,55 @@ module DataMapper
           super
         end
       end # class NotOperation
+
+      class NullOperation < AbstractOperation
+        undef_method :<<
+
+        slug :null
+
+        # Match the record
+        #
+        # @param [Resource] record
+        #   the resource to match
+        #
+        # @return [true]
+        #   every record matches
+        #
+        # @api semipublic
+        def matches?(record)
+          true
+        end
+
+        # Test validity of the operation
+        #
+        # @return [true]
+        #   always valid
+        #
+        # @api semipublic
+        def valid?
+          true
+        end
+
+        # Treat the operation the same as nil
+        #
+        # @return [true]
+        #   should be treated as nil
+        #
+        # @api semipublic
+        def nil?
+          true
+        end
+
+        # Inspecting the operation should return the same as nil
+        #
+        # @return [String]
+        #   return the string 'nil'
+        #
+        # @api semipublic
+        def inspect
+          'nil'
+        end
+      end
     end # module Conditions
   end # class Query
 end # module DataMapper

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

@@ -9,6 +9,9 @@ module DataMapper
   class Query
     class Operator
       include Extlib::Assertions
+      extend Equalizer
+
+      equalize :target, :operator
 
       # TODO: document
       # @api private
@@ -18,44 +21,6 @@ module DataMapper
       # @api private
       attr_reader :operator
 
-      # TODO: document
-      # @api private
-      def ==(other)
-        if equal?(other)
-          return true
-        end
-
-        unless other.respond_to?(:target)
-          return false
-        end
-
-        unless other.respond_to?(:operator)
-          return false
-        end
-
-        cmp?(other, :==)
-      end
-
-      # TODO: document
-      # @api private
-      def eql?(other)
-        if equal?(other)
-          return true
-        end
-
-        unless instance_of?(other.class)
-          return false
-        end
-
-        cmp?(other, :eql?)
-      end
-
-      # TODO: document
-      # @api private
-      def hash
-        @target.hash
-      end
-
       # TODO: document
       # @api private
       def inspect
@@ -72,13 +37,6 @@ module DataMapper
         @target   = target
         @operator = operator
       end
-
-      # TODO: document
-      # @api private
-      def cmp?(other, operator)
-        target.send(operator, other.target) &&
-        self.operator.send(operator, other.operator)
-      end
     end # class Operator
   end # class Query
 end # module DataMapper

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

@@ -10,6 +10,9 @@ module DataMapper
       instance_methods.each { |method| undef_method method unless %w[ __id__ __send__ send class dup object_id kind_of? instance_of? respond_to? equal? should should_not instance_variable_set instance_variable_get extend hash inspect ].include?(method.to_s) }
 
       include Extlib::Assertions
+      extend Equalizer
+
+      equalize :relationships, :property
 
       # TODO: document
       # @api semipublic
@@ -39,13 +42,13 @@ module DataMapper
       # TODO: document
       # @api public
       def kind_of?(klass)
-        super || (defined?(@property) && @property.kind_of?(klass))
+        super || (defined?(@property) ? @property.kind_of?(klass) : false)
       end
 
       # TODO: document
       # @api public
       def instance_of?(klass)
-        super || (defined?(@property) && @property.instance_of?(klass))
+        super || (defined?(@property) ? @property.instance_of?(klass) : false)
       end
 
       # TODO: document
@@ -57,38 +60,6 @@ module DataMapper
         @model.properties(@repository_name).named?(method)
       end
 
-      # TODO: document
-      # @api semipublic
-      def ==(other)
-        if equal?(other)
-          return true
-        end
-
-        unless other.respond_to?(:relationships)
-          return false
-        end
-
-        unless other.respond_to?(:property)
-          return false
-        end
-
-        cmp?(other, :==)
-      end
-
-      # TODO: document
-      # @api semipublic
-      def eql?(other)
-        if equal?(other)
-          return true
-        end
-
-        unless instance_of?(other.class)
-          return false
-        end
-
-        cmp?(other, :eql?)
-      end
-
       private
 
       # TODO: document
@@ -109,13 +80,6 @@ module DataMapper
         end
       end
 
-      # TODO: document
-      # @api private
-      def cmp?(other, operator)
-        relationships.send(operator, other.relationships) &&
-        property.send(operator, other.property)
-      end
-
       # TODO: document
       # @api semipublic
       def method_missing(method, *args)

data/lib/dm-core/query.rb

@@ -27,9 +27,12 @@ module DataMapper
   #
   class Query
     include Extlib::Assertions
+    extend Equalizer
 
     OPTIONS = [ :fields, :links, :conditions, :offset, :limit, :order, :unique, :add_reversed, :reload ].to_set.freeze
 
+    equalize :repository, :model, :sorted_fields, :links, :conditions, :order, :offset, :limit, :reload?, :unique?, :add_reversed?
+
     # Extract conditions to match a Resource or Collection
     #
     # @param [Array, Collection, Resource] source
@@ -419,6 +422,7 @@ module DataMapper
     #
     # @api semipublic
     def match_records(records)
+      return records if conditions.nil?
       records.select do |record|
         conditions.matches?(record)
       end
@@ -464,48 +468,6 @@ module DataMapper
       end
     end
 
-    # Compares another Query for equivalency
-    #
-    # @param [Query] other
-    #   the other Query to compare with
-    #
-    # @return [Boolean]
-    #   true if they are equivalent, false if not
-    #
-    # @api semipublic
-    def ==(other)
-      if equal?(other)
-        return true
-      end
-
-      unless [ :repository, :model, :fields, :links, :conditions, :order, :offset, :limit, :reload?, :unique?, :add_reversed? ].all? { |method| other.respond_to?(method) }
-        return false
-      end
-
-      cmp?(other, :==)
-    end
-
-    # Compares another Query for equality
-    #
-    # @param [Query] other
-    #   the other Query to compare with
-    #
-    # @return [Boolean]
-    #   true if they are equal, false if not
-    #
-    # @api semipublic
-    def eql?(other)
-      if equal?(other)
-        return true
-      end
-
-      unless instance_of?(other.class)
-        return false
-      end
-
-      cmp?(other, :eql?)
-    end
-
     # Slices collection by adding limit and offset to the
     # query, so a single query is executed
     #
@@ -591,6 +553,16 @@ module DataMapper
       properties
     end
 
+    # Return a list of fields in predictable order
+    #
+    # @return [Array<Property>]
+    #   list of fields sorted in deterministic order
+    #
+    # @api private
+    def sorted_fields
+      fields.sort_by { |property| property.hash }
+    end
+
     private
 
     # Initializes a Query instance
@@ -627,7 +599,7 @@ module DataMapper
 
       @fields       = @options.fetch :fields,       @properties.defaults
       @links        = @options.fetch :links,        []
-      @conditions   = Conditions::Operation.new(:and)  # AND all the conditions together
+      @conditions   = Conditions::Operation.new(:null)
       @offset       = @options.fetch :offset,       0
       @limit        = @options.fetch :limit,        nil
       @order        = @options.fetch :order,        @model.default_order(repository_name)
@@ -644,14 +616,14 @@ module DataMapper
       # parse @options[:conditions] differently
       case conditions = @options[:conditions]
         when Conditions::AbstractOperation, Conditions::AbstractComparison
-          @conditions << conditions
+          add_condition(conditions)
 
         when Hash
           conditions.each { |kv| append_condition(*kv) }
 
         when Array
           statement, *bind_values = *conditions
-          @conditions << [ statement, bind_values ]
+          add_condition([ statement, bind_values ])
           @raw = true
       end
 
@@ -953,7 +925,7 @@ module DataMapper
 
       @links.clear
 
-      while link = links.shift
+      while link = links.pop
         relationship = case link
           when Symbol, String             then @relationships[link]
           when Associations::Relationship then link
@@ -989,6 +961,7 @@ module DataMapper
           @links << relationship
         end
       end
+      @links.reverse!
     end
 
     # Append conditions to this Query
@@ -1038,7 +1011,7 @@ module DataMapper
         condition = Conditions::Operation.new(:not, condition)
       end
 
-      @conditions << condition
+      add_condition(condition)
     end
 
     # TODO: document
@@ -1052,7 +1025,10 @@ module DataMapper
     def append_string_condition(string, bind_value, model, operator)
       if string.include?('.')
         query_path = model
-        string.split('.').each { |method| query_path = query_path.send(method) }
+
+        target_components = string.split('.')
+        operator = target_components.pop.to_sym if DataMapper::Query::Conditions::Comparison.slugs.map{ |s| s.to_s }.include? target_components.last
+        target_components.each { |method| query_path = query_path.send(method) }
 
         append_condition(query_path, bind_value, model, operator)
       else
@@ -1077,6 +1053,19 @@ module DataMapper
       append_condition(path.property, bind_value, path.model, operator)
     end
 
+    # Add a condition to the Query
+    #
+    # @param [AbstractOperation, AbstractComparison]
+    #   the condition to add to the Query
+    #
+    # @return [undefined]
+    #
+    # @api private
+    def add_condition(condition)
+      @conditions = Conditions::Operation.new(:and) if @conditions.nil?
+      @conditions << condition
+    end
+
     # TODO: make this typecast all bind values that do not match the
     # property primitive
 
@@ -1142,66 +1131,6 @@ module DataMapper
       return new_offset, limit
     end
 
-    # Return true if +other+'s is equivalent or equal to +self+'s
-    #
-    # @param [Query] other
-    #   The Resource whose attributes are to be compared with +self+'s
-    # @param [Symbol] operator
-    #   The comparison operator to use to compare the attributes
-    #
-    # @return [Boolean]
-    #   The result of the comparison of +other+'s attributes with +self+'s
-    #
-    # @api private
-    def cmp?(other, operator)
-      # check the attributes that are most likely to differ first
-      unless repository.send(operator, other.repository)
-        return false
-      end
-
-      unless model.send(operator, other.model)
-        return false
-      end
-
-      unless conditions.send(operator, other.conditions)
-        return false
-      end
-
-      unless offset.send(operator, other.offset)
-        return false
-      end
-
-      unless limit.send(operator, other.limit)
-        return false
-      end
-
-      unless order.send(operator, other.order)
-        return false
-      end
-
-      unless fields.sort_by { |property| property.hash }.send(operator, other.fields.sort_by { |property| property.hash })
-        return false
-      end
-
-      unless links.send(operator, other.links)
-        return false
-      end
-
-      unless reload?.send(operator, other.reload?)
-        return false
-      end
-
-      unless unique?.send(operator, other.unique?)
-        return false
-      end
-
-      unless add_reversed?.send(operator, other.add_reversed?)
-        return false
-      end
-
-      true
-    end
-
     # TODO: DRY this up with conditions
     # @api private
     def record_value(record, property)

data/lib/dm-core/repository.rb

@@ -1,6 +1,9 @@
 module DataMapper
   class Repository
     include Extlib::Assertions
+    extend Equalizer
+
+    equalize :name, :adapter
 
     # Get the list of adapters registered for all Repositories,
     # keyed by repository name.
@@ -172,71 +175,6 @@ module DataMapper
       adapter.delete(collection)
     end
 
-    # Compares another Repository for equality
-    #
-    # Repository is equal to +other+ if they are the same object (identity)
-    # or if they are of the same class and have the same name
-    #
-    # @param [Repository] other
-    #   the other Repository to compare with
-    #
-    # @return [Boolean]
-    #   true if they are equal, false if not
-    #
-    # @api public
-    def eql?(other)
-      if equal?(other)
-        return true
-      end
-
-      unless instance_of?(other.class)
-        return false
-      end
-
-      cmp?(other, :eql?)
-    end
-
-    # Compares another Repository for equivalency
-    #
-    # Repository is equal to +other+ if they are the same object (identity)
-    # or if they both have the same name
-    #
-    # @param [Repository] other
-    #   the other Repository to compare with
-    #
-    # @return [Boolean]
-    #   true if they are equal, false if not
-    #
-    # @api public
-    def ==(other)
-      if equal?(other)
-        return true
-      end
-
-      unless other.respond_to?(:name)
-        return false
-      end
-
-      unless other.respond_to?(:adapter)
-        return false
-      end
-
-      cmp?(other, :==)
-    end
-
-    # Return the hash of the Repository
-    #
-    # This is necessary for properly determining the unique Repository
-    # in a Set or Hash
-    #
-    # @return [Integer]
-    #   the Hash of the Repository name
-    #
-    # @api private
-    def hash
-      name.hash
-    end
-
     # Return a human readable representation of the repository
     #
     #   TODO: create example
@@ -265,19 +203,5 @@ module DataMapper
       @name          = name
       @identity_maps = {}
     end
-
-    # TODO: document
-    # @api private
-    def cmp?(other, operator)
-      unless name.send(operator, other.name)
-        return false
-      end
-
-      unless adapter.send(operator, other.adapter)
-        return false
-      end
-
-      true
-    end
   end # class Repository
 end # module DataMapper