mem_db 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0576e79f06874cadbf804ca183629fbe4aaa5bb11f5f428aab5e306a3d713b9
-  data.tar.gz: f8409a01d2cc4f2e906366dd7743c53b6612b2e8e28db633f883de1c5dd47375
+  metadata.gz: ced4d270ba624c4f0c6ef2a8bcda1b7b3f9b600d6840ec05d3f1c0cc5c82f176
+  data.tar.gz: f7cd1e3f65c61dcb0eada7840165f09b4028e22af31df2d295f5c4e7d2ee2a6d
 SHA512:
-  metadata.gz: b70381b36c4d60d7f807a064c1f368f55d3febdca24ea7d291f33765089197f401b816165d608d467b37327f23c570f80342e4b9d6e390e4a1d380290fc49b46
-  data.tar.gz: b8ea9ca471be55b1c7c9b695299c03b155f262de90d158442a916430b28d1f961b33678b562770bd3d312e1ed62b4b2c1adc6a2521e139e06cd993708099b8a9
+  metadata.gz: 1f2cf1d016537298f4f0ca45b509298dc6098fded738a2018f758c1aec7ab0cfe4b05a031c1ecdf22386864da6cd7e6bff7d2e751cca19e0b778c03da8930fd1
+  data.tar.gz: f3a2b7025725d9592fc89d5e85d94b2fe3a2a37c77e1518eeb9f9bb16e3a7db09bd4a676a7013d6153524145cfd2288e799201b912e07073028af3398a5cf441

data/.rspec

@@ -1,3 +1,2 @@
---format documentation
 --color
 --require spec_helper

data/.rubocop.yml

@@ -1,9 +1,12 @@
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
+  Enabled: false
+
+Style/QuotedSymbols:
+  Enabled: false
 
 Style/StringLiteralsInInterpolation:
   Enabled: true
@@ -41,3 +44,9 @@ Metrics/BlockLength:
 
 Metrics/MethodLength:
   Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/MultilineBlockChain:
+  Enabled: false

data/Gemfile

@@ -8,4 +8,7 @@ gemspec
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.7"
+gem "rubocop-rake"
+gem "rubocop-rspec"
 gem "ruby-prof", "~> 1.4"
+gem "simplecov"

data/lib/mem_db/field/downcase.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "mem_db/field"
+require "mem_db/field/matching"
+
+class MemDB
+  module Field
+    class Downcase
+      include MemDB::Field
+
+      def initialize(original)
+        @original = original
+      end
+
+      def field
+        @original.field
+      end
+
+      def query_field
+        @original.query_field
+      end
+
+      def new_matching(value)
+        @original.new_matching(value)
+      end
+
+      def field_value(obj)
+        @original.field_value(obj).map(&:downcase)
+      end
+
+      def prepare_query(obj)
+        @original.prepare_query(obj).map(&:downcase)
+      end
+    end
+  end
+end

data/lib/mem_db/field/enum.rb

@@ -11,28 +11,24 @@ class MemDB
       class MultiMatching
         include MemDB::Field::Matching
 
-        def initialize(enum, arr)
-          @enum = enum
+        def initialize(arr)
           @arr = arr
         end
 
-        def match?(query)
-          @enum.query_value(query).any? do |el|
-            @arr.include?(el)
-          end
+        def match?(values)
+          values.any? { |el| @arr.include?(el) }
         end
       end
 
       class SingleMatching
         include MemDB::Field::Matching
 
-        def initialize(enum, el)
-          @enum = enum
+        def initialize(el)
           @el = el
         end
 
-        def match?(query)
-          @enum.query_value(query).include?(@el)
+        def match?(values)
+          values.include?(@el)
         end
       end
 
@@ -42,13 +38,11 @@ class MemDB
         @field = field
       end
 
-      def new_matching(obj)
-        val = obj[field]
-
-        if val.is_a?(Array)
-          MultiMatching.new(self, val)
+      def new_matching(value)
+        if value.is_a?(Array)
+          MultiMatching.new(value)
         else
-          SingleMatching.new(self, val)
+          SingleMatching.new(value)
         end
       end
     end

data/lib/mem_db/field/matching.rb

@@ -3,7 +3,7 @@
 class MemDB
   module Field
     module Matching
-      def match?(_query)
+      def match?(_values)
         raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
       end
     end

data/lib/mem_db/field/may_missing.rb

@@ -11,7 +11,7 @@ class MemDB
       class Any
         include MemDB::Field::Matching
 
-        def match?(_query)
+        def match?(_values)
           true
         end
       end
@@ -30,15 +30,25 @@ class MemDB
         @original.query_field
       end
 
-      def new_matching(obj)
-        v = obj[field]
-
-        if v.nil?
+      def new_matching(value)
+        if value.nil?
           ANY_MATCHING
         else
-          @original.new_matching(obj)
+          @original.new_matching(value)
         end
       end
+
+      def field_value(obj)
+        if obj[field].nil?
+          nil
+        else
+          @original.field_value(obj)
+        end
+      end
+
+      def prepare_query(obj)
+        @original.prepare_query(obj)
+      end
     end
   end
 end

data/lib/mem_db/field/negative.rb

@@ -32,8 +32,16 @@ class MemDB
         @original.query_field
       end
 
-      def new_matching(obj)
-        NegativeMatching.new(@original.new_matching(obj))
+      def new_matching(value)
+        NegativeMatching.new(@original.new_matching(value))
+      end
+
+      def field_value(obj)
+        @original.field_value(obj)
+      end
+
+      def prepare_query(obj)
+        @original.prepare_query(obj)
       end
     end
   end

data/lib/mem_db/field/pattern.rb

@@ -65,7 +65,7 @@ class MemDB
               Prefix.new(source[0..-2])
             elsif source.start_with?(WILDCARD)
               Suffix.new(source[1..-1])
-            else
+            else # rubocop:disable Lint/DuplicateBranch
               Rx.new(source)
             end
         end
@@ -78,30 +78,24 @@ class MemDB
       class MultiMatching
         include MemDB::Field::Matching
 
-        def initialize(f, arr)
-          @f = f
+        def initialize(arr)
           @patterns = arr.map { |source| Pattern.new(source) }
         end
 
-        def match?(query)
-          @f.query_value(query).each do |str|
-            return true if @patterns.any? { |pat| pat.match?(str) }
-          end
-
-          false
+        def match?(values)
+          values.any? { |str| @patterns.any? { |pat| pat.match?(str) } }
         end
       end
 
       class SingleMatching
         include MemDB::Field::Matching
 
-        def initialize(f, el)
-          @f = f
+        def initialize(el)
           @pat = Pattern.new(el)
         end
 
-        def match?(query)
-          @f.query_value(query).any? { |str| @pat.match?(str) }
+        def match?(values)
+          values.any? { |str| @pat.match?(str) }
         end
       end
 
@@ -111,13 +105,11 @@ class MemDB
         @field = field
       end
 
-      def new_matching(obj)
-        val = obj[field]
-
-        if val.is_a?(Array)
-          MultiMatching.new(self, val)
+      def new_matching(value)
+        if value.is_a?(Array)
+          MultiMatching.new(value)
         else
-          SingleMatching.new(self, val)
+          SingleMatching.new(value)
         end
       end
     end

data/lib/mem_db/field/regexp.rb

@@ -9,8 +9,11 @@ class MemDB
       include MemDB::Field
 
       class Rx
-        def initialize(source)
-          @rx = ::Regexp.new(source, ::Regexp::MULTILINE)
+        def initialize(source, ignore_case:)
+          opts = ::Regexp::MULTILINE
+          opts |= ::Regexp::IGNORECASE if ignore_case
+
+          @rx = ::Regexp.new(source, opts)
         end
 
         def match?(str)
@@ -21,46 +24,39 @@ class MemDB
       class MultiMatching
         include MemDB::Field::Matching
 
-        def initialize(field, arr)
-          @field = field
-          @patterns = arr.map { |source| Rx.new(source) }
+        def initialize(arr, ignore_case:)
+          @patterns = arr.map { |source| Rx.new(source, ignore_case: ignore_case) }
         end
 
-        def match?(query)
-          @field.query_value(query).each do |str|
-            return true if @patterns.any? { |pat| pat.match?(str) }
-          end
-
-          false
+        def match?(values)
+          values.any? { |str| @patterns.any? { |pat| pat.match?(str) } }
         end
       end
 
       class SingleMatching
         include MemDB::Field::Matching
 
-        def initialize(field, el)
-          @field = field
-          @pat = Rx.new(el)
+        def initialize(el, ignore_case:)
+          @pat = Rx.new(el, ignore_case: ignore_case)
         end
 
-        def match?(query)
-          @field.query_value(query).any? { |str| @pat.match?(str) }
+        def match?(values)
+          values.any? { |str| @pat.match?(str) }
         end
       end
 
       attr_reader :field
 
-      def initialize(field)
+      def initialize(field, ignore_case: false)
         @field = field
+        @ignore_case = ignore_case
       end
 
-      def new_matching(obj)
-        val = obj[field]
-
-        if val.is_a?(Array)
-          MultiMatching.new(self, val)
+      def new_matching(value)
+        if value.is_a?(Array)
+          MultiMatching.new(value, ignore_case: @ignore_case)
         else
-          SingleMatching.new(self, val)
+          SingleMatching.new(value, ignore_case: @ignore_case)
         end
       end
     end

data/lib/mem_db/field.rb

@@ -10,6 +10,10 @@ class MemDB
       MemDB::Field::Negative.new(self)
     end
 
+    def downcase
+      MemDB::Field::Downcase.new(self)
+    end
+
     def field
       raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
     end
@@ -23,11 +27,15 @@ class MemDB
       @query_field || field
     end
 
-    def new_matching(_obj)
+    def new_matching(_value)
       raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
     end
 
-    def query_value(query)
+    def field_value(obj)
+      obj[field]
+    end
+
+    def prepare_query(query)
       query[query_field]
     end
   end

data/lib/mem_db/fields.rb

@@ -4,13 +4,17 @@ class MemDB
   class Fields
     class Matching
       def initialize(fields, obj)
-        @matchings = fields.map { |field| field.new_matching(obj) }.reject! do |matching|
-          matching == MemDB::Field::MayMissing::ANY_MATCHING
-        end
+        @matchings = fields
+          .map do |field|
+            [field, field.new_matching(field.field_value(obj))]
+          end
+          .reject! do |_field, matching|
+            matching == MemDB::Field::MayMissing::ANY_MATCHING
+          end
       end
 
       def match?(query)
-        @matchings.all? { |matching| matching.match?(query) }
+        @matchings.all? { |field, matching| matching.match?(query.field_value(field)) }
       end
     end
 

data/lib/mem_db/idx/downcase.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class MemDB
+  module Idx
+    class Downcase
+      include MemDB::Idx
+
+      def initialize(original)
+        @original = original
+      end
+
+      def field
+        @original.field
+      end
+
+      def map_value(str)
+        @original.map_value(str.downcase)
+      end
+
+      def map_query(str)
+        @original.map_query(str.downcase)
+      end
+    end
+  end
+end

data/lib/mem_db/idx.rb

@@ -12,6 +12,10 @@ class MemDB
       default(MemDB::Idx::ANY)
     end
 
+    def downcase
+      MemDB::Idx::Downcase.new(self)
+    end
+
     def field
       raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
     end

data/lib/mem_db/indexing_object.rb

@@ -46,9 +46,7 @@ class MemDB
     def prepare_attr(attr)
       v = @params[attr]
 
-      if v == MemDB::Idx::ANY
-        v
-      elsif v.nil? || v.is_a?(Array)
+      if v == MemDB::Idx::ANY || v.nil? || v.is_a?(Array)
         v
       else
         [v]

data/lib/mem_db/query.rb

@@ -6,6 +6,7 @@ class MemDB
       @params = params
       @attrs = {}
       @idx_value = {}
+      @field_value = {}
     end
 
     def using(index)
@@ -37,6 +38,14 @@ class MemDB
       end
     end
 
+    def field_value(field)
+      if @field_value.key?(field)
+        @field_value[field]
+      else
+        @field_value[field] ||= field.prepare_query(self)
+      end
+    end
+
     def prepare_attr(attr)
       v = @params[attr]
       if v.is_a?(Array)

data/lib/mem_db/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class MemDB
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/mem_db.rb

@@ -86,6 +86,7 @@ require_relative "mem_db/idx/reverse"
 require_relative "mem_db/idx/uniq"
 require_relative "mem_db/idx/pattern"
 require_relative "mem_db/idx/default"
+require_relative "mem_db/idx/downcase"
 
 require_relative "mem_db/index/bucket"
 require_relative "mem_db/index/any"
@@ -100,3 +101,4 @@ require_relative "mem_db/field/negative"
 require_relative "mem_db/field/enum"
 require_relative "mem_db/field/pattern"
 require_relative "mem_db/field/regexp"
+require_relative "mem_db/field/downcase"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mem_db
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Bochkarev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies: []
 description: MemDB is embedded database
 email:
@@ -30,6 +30,7 @@ files:
 - lib/mem_db.rb
 - lib/mem_db/bucket.rb
 - lib/mem_db/field.rb
+- lib/mem_db/field/downcase.rb
 - lib/mem_db/field/enum.rb
 - lib/mem_db/field/matching.rb
 - lib/mem_db/field/may_missing.rb
@@ -41,6 +42,7 @@ files:
 - lib/mem_db/idx/bytes.rb
 - lib/mem_db/idx/chars.rb
 - lib/mem_db/idx/default.rb
+- lib/mem_db/idx/downcase.rb
 - lib/mem_db/idx/itself.rb
 - lib/mem_db/idx/pattern.rb
 - lib/mem_db/idx/reverse.rb