mem_db 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced4d270ba624c4f0c6ef2a8bcda1b7b3f9b600d6840ec05d3f1c0cc5c82f176
-  data.tar.gz: f7cd1e3f65c61dcb0eada7840165f09b4028e22af31df2d295f5c4e7d2ee2a6d
+  metadata.gz: 6677c31b83e454180efbaa876609843d9ac236c3c1c1bd0a2afafe802fce9e14
+  data.tar.gz: fd81a60ecd058c8663436b604bba25dc3368207e2e421d8bef73448cc23f8a3d
 SHA512:
-  metadata.gz: 1f2cf1d016537298f4f0ca45b509298dc6098fded738a2018f758c1aec7ab0cfe4b05a031c1ecdf22386864da6cd7e6bff7d2e751cca19e0b778c03da8930fd1
-  data.tar.gz: f3a2b7025725d9592fc89d5e85d94b2fe3a2a37c77e1518eeb9f9bb16e3a7db09bd4a676a7013d6153524145cfd2288e799201b912e07073028af3398a5cf441
+  metadata.gz: eca7be3316c79f6c1e56d33d749f449c65b19c41efa41a1c0744f6fea49b95c8c68feb5d9a67ca1e71bdaf9be542cc75b2dc84acfab087941bfcce3ae2dd5c0f
+  data.tar.gz: 5b6c349a53a7ab39b17ec929e382bf6079c0c25380b246a80ae3b22db8e450d232328268105ae368fcd25abf4b354dc4eee1c47a53f8cd722724b66b01353316

data/.github/workflows/main.yml

@@ -1,18 +1,20 @@
 name: Ruby
 
-on: [push,pull_request]
+on: [push, pull_request]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.5.5
-    - name: Run the default task
-      run: |
-        gem install bundler -v 2.2.5
-        bundle install
-        bundle exec rake
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5.5
+      - name: Install dependencies
+        run: |
+          sudo apt-get install libre2-dev
+          gem install bundler -v 2.2.5
+          bundle install
+      - name: Run
+        run: bundle exec rake

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 Gemfile.lock
+.rake_tasks~

data/README.md

@@ -88,6 +88,8 @@ MemDB::Query.new({
 
 ## Development
 
+To support the regular expression engine re2. It is necessary to install the corresponding system library. See [instructions for re2 gem](https://github.com/mudge/re2#installation)
+
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/lib/mem_db/field/pattern.rb

@@ -2,6 +2,7 @@
 
 require "mem_db/field"
 require "mem_db/field/matching"
+require "mem_db/regexp_engines/std"
 
 class MemDB
   module Field
@@ -12,11 +13,11 @@ class MemDB
         WILDCARD = "*"
 
         class Rx
-          def initialize(source)
-            parts = source.split(WILDCARD, -1).map { |part| ::Regexp.quote(part) }
+          def initialize(source, engine)
+            parts = source.split(WILDCARD, -1).map { |part| engine.quote(part) }
             parts[0] = "\\A#{parts[0]}"
             parts[-1] = "#{parts[-1]}\\z"
-            @rx = ::Regexp.new(parts.join(".*"), ::Regexp::MULTILINE)
+            @rx = engine.new(parts.join(".*"))
           end
 
           def match?(str)
@@ -54,19 +55,19 @@ class MemDB
           end
         end
 
-        def initialize(source)
+        def initialize(source, rx_engine:)
           wildcard_count = source.count(WILDCARD)
           @pat =
             if wildcard_count.zero?
               Exact.new(source)
             elsif wildcard_count > 1
-              Rx.new(source)
+              Rx.new(source, rx_engine)
             elsif source.end_with?(WILDCARD)
               Prefix.new(source[0..-2])
             elsif source.start_with?(WILDCARD)
               Suffix.new(source[1..-1])
             else # rubocop:disable Lint/DuplicateBranch
-              Rx.new(source)
+              Rx.new(source, rx_engine)
             end
         end
 
@@ -78,8 +79,8 @@ class MemDB
       class MultiMatching
         include MemDB::Field::Matching
 
-        def initialize(arr)
-          @patterns = arr.map { |source| Pattern.new(source) }
+        def initialize(arr, rx_engine:)
+          @patterns = arr.map { |source| Pattern.new(source, rx_engine: rx_engine) }
         end
 
         def match?(values)
@@ -90,8 +91,8 @@ class MemDB
       class SingleMatching
         include MemDB::Field::Matching
 
-        def initialize(el)
-          @pat = Pattern.new(el)
+        def initialize(el, rx_engine:)
+          @pat = Pattern.new(el, rx_engine: rx_engine)
         end
 
         def match?(values)
@@ -101,15 +102,16 @@ class MemDB
 
       attr_reader :field
 
-      def initialize(field)
+      def initialize(field, rx_engine: MemDB::RegexpEngines::Std)
         @field = field
+        @rx_engine = rx_engine
       end
 
       def new_matching(value)
         if value.is_a?(Array)
-          MultiMatching.new(value)
+          MultiMatching.new(value, rx_engine: @rx_engine)
         else
-          SingleMatching.new(value)
+          SingleMatching.new(value, rx_engine: @rx_engine)
         end
       end
     end

data/lib/mem_db/field/regexp.rb

@@ -2,30 +2,18 @@
 
 require "mem_db/field"
 require "mem_db/field/matching"
+require "mem_db/regexp_engines/std"
 
 class MemDB
   module Field
     class Regexp
       include MemDB::Field
 
-      class Rx
-        def initialize(source, ignore_case:)
-          opts = ::Regexp::MULTILINE
-          opts |= ::Regexp::IGNORECASE if ignore_case
-
-          @rx = ::Regexp.new(source, opts)
-        end
-
-        def match?(str)
-          @rx.match?(str)
-        end
-      end
-
       class MultiMatching
         include MemDB::Field::Matching
 
-        def initialize(arr, ignore_case:)
-          @patterns = arr.map { |source| Rx.new(source, ignore_case: ignore_case) }
+        def initialize(arr, rx_engine:, ignore_case:)
+          @patterns = arr.map { |source| rx_engine.new(source, ignore_case: ignore_case) }
         end
 
         def match?(values)
@@ -36,8 +24,8 @@ class MemDB
       class SingleMatching
         include MemDB::Field::Matching
 
-        def initialize(el, ignore_case:)
-          @pat = Rx.new(el, ignore_case: ignore_case)
+        def initialize(el, rx_engine:, ignore_case:)
+          @pat = rx_engine.new(el, ignore_case: ignore_case)
         end
 
         def match?(values)
@@ -47,16 +35,17 @@ class MemDB
 
       attr_reader :field
 
-      def initialize(field, ignore_case: false)
+      def initialize(field, rx_engine: MemDB::RegexpEngines::Std, ignore_case: false)
         @field = field
+        @rx_engine = rx_engine
         @ignore_case = ignore_case
       end
 
       def new_matching(value)
         if value.is_a?(Array)
-          MultiMatching.new(value, ignore_case: @ignore_case)
+          MultiMatching.new(value, rx_engine: @rx_engine, ignore_case: @ignore_case)
         else
-          SingleMatching.new(value, ignore_case: @ignore_case)
+          SingleMatching.new(value, rx_engine: @rx_engine, ignore_case: @ignore_case)
         end
       end
     end

data/lib/mem_db/regexp_engines/re2.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "re2"
+
+class MemDB
+  module RegexpEngines
+    class Re2
+      def self.quote(str)
+        ::RE2::Regexp.quote(str)
+      end
+
+      def initialize(source, ignore_case: false)
+        opts = {
+          one_line: false
+        }
+        opts[:case_sensitive] = false if ignore_case
+        multiline_source = "(?s:#{source})"
+
+        @rx = ::RE2::Regexp.new(multiline_source, **opts)
+      end
+
+      def match?(str)
+        @rx.match?(str)
+      end
+    end
+  end
+end

data/lib/mem_db/regexp_engines/std.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class MemDB
+  module RegexpEngines
+    class Std
+      def self.quote(str)
+        ::Regexp.quote(str)
+      end
+
+      def initialize(source, ignore_case: false)
+        opts = ::Regexp::MULTILINE
+        opts |= ::Regexp::IGNORECASE if ignore_case
+
+        @rx = ::Regexp.new(source, opts)
+      end
+
+      def match?(str)
+        @rx.match?(str)
+      end
+    end
+  end
+end

data/lib/mem_db/version.rb

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

data/mem_db.gemspec

@@ -16,10 +16,13 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/DmitryBochkarev/mem_db"
+  spec.metadata['rubygems_mfa_required'] = "true"
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "re2", ">= 1.4.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mem_db
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Bochkarev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
-dependencies: []
+date: 2022-01-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: re2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: MemDB is embedded database
 email:
 - dimabochkarev@gmail.com
@@ -58,6 +72,8 @@ files:
 - lib/mem_db/indexing_object.rb
 - lib/mem_db/out.rb
 - lib/mem_db/query.rb
+- lib/mem_db/regexp_engines/re2.rb
+- lib/mem_db/regexp_engines/std.rb
 - lib/mem_db/version.rb
 - mem_db.gemspec
 homepage: https://github.com/DmitryBochkarev/mem_db
@@ -66,6 +82,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/DmitryBochkarev/mem_db
   source_code_uri: https://github.com/DmitryBochkarev/mem_db
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -81,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: MemDB is embedded database