mongory 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e912f1cb9b9d1c87259e837d71c1b7034359d360d2c2f9d4f09ab30b740270c
-  data.tar.gz: 6d007afc7889af43f94b4d704d8512ba3cc39ceafd974433168bfa57c0e1ba87
+  metadata.gz: 78a3d73e3c078b41aeeeb727445229e4edce85ff089de2d7412c9e64bfc613c0
+  data.tar.gz: d7a9191a78a75b00f7a3ef7aa5d0b8e5ed8e8cb53e6a839e0873548da341849f
 SHA512:
-  metadata.gz: ff4f410a6d7fb0da08f6fe2dae1701d3d740c0f318982283d639a0a23b5f5798f048e9b483439e157ffcfb954f83f9985886534ec44b55da1dde1a810eb35e15
-  data.tar.gz: 41ff1d53a5f06ef0c2912b2d5e5a81b31b5639b95f84b2c5d932fd5ce350fafb2cdbb8058716a16b88a5d59d65bac0c74ce8d51cecb4a8e911e2926e7652fe8c
+  metadata.gz: 6cc1387d67ccf0559a5f12d2140b2f0349a16b8461ae3e6992a3ba199a1824b178236d91cd8fe31bdbd73a85d056074efac32440ef8827bb31e9aebb6fd544bf
+  data.tar.gz: 8f34cab007b5c692b48634686aa2931036b3f928da72004512b7e0de744dbe009656cac108f9f2d6d3d59b8d6d7e997b1b1b3f3a5865998bc83168c2dce60ea0

data/lib/mongory/converters/converted.rb

@@ -14,9 +14,9 @@ module Mongory
         return other if other.is_a?(Converted)
 
         case other
-        when Hash
+        when ::Hash
           Converted::Hash.new(other)
-        when Array
+        when ::Array
           Converted::Array.new(other)
         else
           other

data/lib/mongory/matchers/abstract_matcher.rb

@@ -161,6 +161,10 @@ module Mongory
         puts "#{prefix}#{is_last ? '└─ ' : '├─ '}#{tree_title}\n"
       end
 
+      def priority
+        20
+      end
+
       private
 
       # Returns a single-line string representing this matcher in the tree output.

data/lib/mongory/matchers/abstract_multi_matcher.rb

@@ -75,6 +75,50 @@ module Mongory
           matcher.render_tree(new_prefix, is_last: index == last_index)
         end
       end
+
+      def priority
+        1 + matchers.sum(&:priority)
+      end
+
+      private
+
+      # Recursively combines multiple matcher procs with AND logic.
+      # This method optimizes the combination of multiple matchers by building
+      # a balanced tree of AND operations.
+      #
+      # @param left [Proc] The left matcher proc to combine
+      # @param rest [Array<Proc>] The remaining matcher procs to combine
+      # @return [Proc] A new proc that combines all matchers with AND logic
+      # @example
+      #   combine_procs_with_and(proc1, proc2, proc3)
+      #   #=> proc { |record| proc1.call(record) && proc2.call(record) && proc3.call(record) }
+      def combine_procs_with_and(left = TRUE_PROC, *rest)
+        return left if rest.empty?
+
+        right = combine_procs_with_and(*rest)
+        Proc.new do |record|
+          left.call(record) && right.call(record)
+        end
+      end
+
+      # Recursively combines multiple matcher procs with OR logic.
+      # This method optimizes the combination of multiple matchers by building
+      # a balanced tree of OR operations.
+      #
+      # @param left [Proc] The left matcher proc to combine
+      # @param rest [Array<Proc>] The remaining matcher procs to combine
+      # @return [Proc] A new proc that combines all matchers with OR logic
+      # @example
+      #   combine_procs_with_or(proc1, proc2, proc3)
+      #   #=> proc { |record| proc1.call(record) || proc2.call(record) || proc3.call(record) }
+      def combine_procs_with_or(left = FALSE_PROC, *rest)
+        return left if rest.empty?
+
+        right = combine_procs_with_or(*rest)
+        Proc.new do |record|
+          left.call(record) || right.call(record)
+        end
+      end
     end
   end
 end

data/lib/mongory/matchers/and_matcher.rb

@@ -36,28 +36,7 @@ module Mongory
       #
       # @return [Proc] a Proc that performs the AND operation
       def raw_proc
-        return TRUE_PROC if matchers.empty?
-
-        combine_procs(*matchers.map(&:to_proc))
-      end
-
-      # Recursively combines multiple matcher procs with AND logic.
-      # This method optimizes the combination of multiple matchers by building
-      # a balanced tree of AND operations.
-      #
-      # @param left [Proc] The left matcher proc to combine
-      # @param rest [Array<Proc>] The remaining matcher procs to combine
-      # @return [Proc] A new proc that combines all matchers with AND logic
-      # @example
-      #   combine_procs(proc1, proc2, proc3)
-      #   #=> proc { |record| proc1.call(record) && proc2.call(record) && proc3.call(record) }
-      def combine_procs(left, *rest)
-        return left if rest.empty?
-
-        right = combine_procs(*rest)
-        Proc.new do |record|
-          left.call(record) && right.call(record)
-        end
+        combine_procs_with_and(*matchers.map(&:to_proc))
       end
 
       # Returns the flattened list of all matchers from each subcondition.
@@ -70,7 +49,7 @@ module Mongory
       define_instance_cache_method(:matchers) do
         @condition.flat_map do |condition|
           HashConditionMatcher.new(condition, context: @context).matchers
-        end.uniq(&:uniq_key)
+        end.uniq(&:uniq_key).sort_by(&:priority)
       end
 
       # Ensures the condition is an array of hashes.

data/lib/mongory/matchers/array_record_matcher.rb

@@ -34,28 +34,7 @@ module Mongory
       #
       # @return [Proc] a Proc that performs the array matching operation
       def raw_proc
-        return FALSE_PROC if matchers.empty?
-
-        combine_procs(*matchers.map(&:to_proc))
-      end
-
-      # Recursively combines multiple matcher procs with OR logic.
-      # This method optimizes the combination of multiple matchers by building
-      # a balanced tree of OR operations.
-      #
-      # @param left [Proc] The left matcher proc to combine
-      # @param rest [Array<Proc>] The remaining matcher procs to combine
-      # @return [Proc] A new proc that combines all matchers with OR logic
-      # @example
-      #   combine_procs(proc1, proc2, proc3)
-      #   #=> proc { |record| proc1.call(record) || proc2.call(record) || proc3.call(record) }
-      def combine_procs(left, *rest)
-        return left if rest.empty?
-
-        right = combine_procs(*rest)
-        Proc.new do |record|
-          left.call(record) || right.call(record)
-        end
+        combine_procs_with_or(*matchers.map(&:to_proc))
       end
 
       # Builds an array of matchers to evaluate the given condition against an array record.
@@ -77,7 +56,7 @@ module Mongory
                   else
                     ElemMatchMatcher.build({ '$eq' => @condition }, context: @context)
                   end
-        result
+        result.sort_by(&:priority)
       end
 
       private

data/lib/mongory/matchers/elem_match_matcher.rb

@@ -35,6 +35,10 @@ module Mongory
         end
       end
 
+      def priority
+        3 + super
+      end
+
       # Ensures the condition is a Hash.
       #
       # @raise [Mongory::TypeError] if the condition is not a Hash

data/lib/mongory/matchers/eq_matcher.rb

@@ -35,6 +35,10 @@ module Mongory
           record == condition
         end
       end
+
+      def priority
+        1
+      end
     end
 
     register(:eq, '$eq', EqMatcher)

data/lib/mongory/matchers/every_matcher.rb

@@ -36,6 +36,10 @@ module Mongory
         end
       end
 
+      def priority
+        3 + super
+      end
+
       # Ensures the condition is a Hash.
       #
       # @raise [Mongory::TypeError] if the condition is not a Hash

data/lib/mongory/matchers/exists_matcher.rb

@@ -33,6 +33,10 @@ module Mongory
         end
       end
 
+      def priority
+        2
+      end
+
       # Ensures that the condition value is a valid boolean.
       #
       # @raise [TypeError] if condition is not true or false

data/lib/mongory/matchers/field_matcher.rb

@@ -109,6 +109,10 @@ module Mongory
         end
       end
 
+      def priority
+        1 + super
+      end
+
       # Returns a unique key for this matcher, including the field name.
       # Used for deduplication in multi-matchers.
       #

data/lib/mongory/matchers/gt_matcher.rb

@@ -30,6 +30,10 @@ module Mongory
           false
         end
       end
+
+      def priority
+        3
+      end
     end
 
     register(:gt, '$gt', GtMatcher)

data/lib/mongory/matchers/gte_matcher.rb

@@ -30,6 +30,10 @@ module Mongory
           false
         end
       end
+
+      def priority
+        3
+      end
     end
 
     register(:gte, '$gte', GteMatcher)

data/lib/mongory/matchers/hash_condition_matcher.rb

@@ -32,28 +32,7 @@ module Mongory
       #
       # @return [Proc] a Proc that performs the hash condition matching operation
       def raw_proc
-        return TRUE_PROC if matchers.empty?
-
-        combine_procs(*matchers.map(&:to_proc))
-      end
-
-      # Recursively combines multiple matcher procs with AND logic.
-      # This method optimizes the combination of multiple matchers by building
-      # a balanced tree of AND operations.
-      #
-      # @param left [Proc] The left matcher proc to combine
-      # @param rest [Array<Proc>] The remaining matcher procs to combine
-      # @return [Proc] A new proc that combines all matchers with AND logic
-      # @example
-      #   combine_procs(proc1, proc2, proc3)
-      #   #=> proc { |record| proc1.call(record) && proc2.call(record) && proc3.call(record) }
-      def combine_procs(left, *rest)
-        return left if rest.empty?
-
-        right = combine_procs(*rest)
-        Proc.new do |record|
-          left.call(record) && right.call(record)
-        end
+        combine_procs_with_and(*matchers.map(&:to_proc))
       end
 
       # Returns the list of matchers for each key-value pair in the condition.
@@ -70,7 +49,7 @@ module Mongory
           else
             FieldMatcher.build(key, value, context: @context)
           end
-        end
+        end.sort_by(&:priority)
       end
 
       def check_validity!

data/lib/mongory/matchers/in_matcher.rb

@@ -24,17 +24,23 @@ module Mongory
     #
     # @see AbstractMatcher
     class InMatcher < AbstractMatcher
+      def self.build(condition, *args)
+        return super unless condition.is_a?(Range)
+
+        end_op = condition.exclude_end? ? '$lt' : '$lte'
+        head, tail = [condition.first, condition.last].sort
+        AndMatcher.build([{ '$gte' => head }, { end_op => tail }], *args)
+      end
+
       # Creates a raw Proc that performs the in-matching operation.
       # The Proc checks if any element of the record is in the condition array.
       #
       # @return [Proc] a Proc that performs the in-matching operation
       def raw_proc
-        condition = @condition
+        condition = Set.new(@condition)
 
         Proc.new do |record|
           if record.is_a?(Array)
-            return false if condition.is_a?(Range)
-
             is_present?(condition & record)
           else
             condition.include?(record)
@@ -42,13 +48,16 @@ module Mongory
         end
       end
 
+      def priority
+        1 + Math.log(@condition.size + 1, 1.5)
+      end
+
       # Ensures the condition is an array or range.
       #
       # @raise [TypeError] if condition is not an array nor a range
       # @return [void]
       def check_validity!
         return if @condition.is_a?(Array)
-        return if @condition.is_a?(Range)
 
         raise TypeError, '$in needs an array or range'
       end

data/lib/mongory/matchers/literal_matcher.rb

@@ -48,6 +48,10 @@ module Mongory
         end
       end
 
+      def priority
+        1 + dispatched_matcher.priority
+      end
+
       # Selects and returns the appropriate matcher instance for a given literal condition.
       #
       # This method analyzes the type of the raw condition (e.g., Hash, Regexp, nil)

data/lib/mongory/matchers/lt_matcher.rb

@@ -30,6 +30,10 @@ module Mongory
           false
         end
       end
+
+      def priority
+        3
+      end
     end
 
     register(:lt, '$lt', LtMatcher)

data/lib/mongory/matchers/lte_matcher.rb

@@ -30,6 +30,10 @@ module Mongory
           false
         end
       end
+
+      def priority
+        3
+      end
     end
 
     register(:lte, '$lte', LteMatcher)

data/lib/mongory/matchers/ne_matcher.rb

@@ -27,6 +27,10 @@ module Mongory
           record != condition
         end
       end
+
+      def priority
+        1
+      end
     end
 
     register(:ne, '$ne', NeMatcher)

data/lib/mongory/matchers/nin_matcher.rb

@@ -24,17 +24,23 @@ module Mongory
     #
     # @see AbstractMatcher
     class NinMatcher < AbstractMatcher
+      def self.build(condition, *args)
+        return super unless condition.is_a?(Range)
+
+        end_op = condition.exclude_end? ? '$gte' : '$gt'
+        head, tail = [condition.first, condition.last].sort
+        OrMatcher.build([{ '$lt' => head }, { end_op => tail }], *args)
+      end
+
       # Creates a raw Proc that performs the not-in matching operation.
       # The Proc checks if the record has no elements in common with the condition array.
       #
       # @return [Proc] A proc that performs not-in matching
       def raw_proc
-        condition = @condition
+        condition = Set.new(@condition)
 
         Proc.new do |record|
           if record.is_a?(Array)
-            return true if condition.is_a?(Range)
-
             is_blank?(condition & record)
           else
             !condition.include?(record)
@@ -42,15 +48,18 @@ module Mongory
         end
       end
 
+      def priority
+        1 + Math.log(@condition.size + 1, 1.5)
+      end
+
       # Ensures the condition is a valid array or range.
       #
       # @raise [TypeError] if the condition is not an array nor a range
       # @return [void]
       def check_validity!
         return if @condition.is_a?(Array)
-        return if @condition.is_a?(Range)
 
-        raise TypeError, '$nin needs an array'
+        raise TypeError, '$nin needs an array or range'
       end
     end
 

data/lib/mongory/matchers/not_matcher.rb

@@ -29,6 +29,10 @@ module Mongory
           !super_proc.call(record)
         end
       end
+
+      def priority
+        1 + super
+      end
     end
 
     register(:not, '$not', NotMatcher)

data/lib/mongory/matchers/or_matcher.rb

@@ -35,28 +35,7 @@ module Mongory
       #
       # @return [Proc] a Proc that performs the or-matching operation
       def raw_proc
-        return FALSE_PROC if matchers.empty?
-
-        combine_procs(*matchers.map(&:to_proc))
-      end
-
-      # Recursively combines multiple matcher procs with OR logic.
-      # This method optimizes the combination of multiple matchers by building
-      # a balanced tree of OR operations.
-      #
-      # @param left [Proc] The left matcher proc to combine
-      # @param rest [Array<Proc>] The remaining matcher procs to combine
-      # @return [Proc] A new proc that combines all matchers with OR logic
-      # @example
-      #   combine_procs(proc1, proc2, proc3)
-      #   #=> proc { |record| proc1.call(record) || proc2.call(record) || proc3.call(record) }
-      def combine_procs(left, *rest)
-        return left if rest.empty?
-
-        right = combine_procs(*rest)
-        Proc.new do |record|
-          left.call(record) || right.call(record)
-        end
+        combine_procs_with_or(*matchers.map(&:to_proc))
       end
 
       # Builds an array of matchers from the subconditions.
@@ -66,7 +45,7 @@ module Mongory
       define_instance_cache_method(:matchers) do
         @condition.map do |condition|
           HashConditionMatcher.build(condition, context: @context)
-        end
+        end.sort_by(&:priority)
       end
 
       # Ensures the condition is an array of hashes.

data/lib/mongory/matchers/present_matcher.rb

@@ -35,6 +35,10 @@ module Mongory
         end
       end
 
+      def priority
+        2
+      end
+
       # Ensures that the condition value is a boolean.
       #
       # @raise [TypeError] if condition is not true or false

data/lib/mongory/matchers/regex_matcher.rb

@@ -59,6 +59,10 @@ module Mongory
         end
       end
 
+      def priority
+        @condition.source.start_with?('^') ? 8 : 20
+      end
+
       # Ensures the condition is a valid regex pattern (Regexp or String).
       #
       # @raise [TypeError] if condition is not a string or Regexp

data/lib/mongory/matchers/size_matcher.rb

@@ -43,6 +43,10 @@ module Mongory
           super_proc.call(record.size)
         end
       end
+
+      def priority
+        2 + super
+      end
     end
 
     register(:size, '$size', SizeMatcher)

data/lib/mongory/utils.rb

@@ -46,7 +46,7 @@ module Mongory
       case obj
       when false, nil
         true
-      when Hash, Array, String
+      when Hash, Array, String, Set
         obj.empty?
       else
         false

data/lib/mongory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mongory
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongory
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - koten0224
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies: []
 description: A Mongo-like in-memory query DSL for Ruby
 email:
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: MongoDB-like in-memory query DSL for Ruby