factbase 0.0.21 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd8e28cf7e8e84fc0364bb8780775592aa86c415a05a49d4edd88bbc9a717a80
-  data.tar.gz: ba7c821a3d229cb5f8b0e9fd1e632cd6d2e69c33eacb6b49751a5dd92902a23a
+  metadata.gz: 27e9aaa353b400d0004ccefcb53fda8fa0d1ac8f2a6d2f4eae8892dbbf2b503f
+  data.tar.gz: 746387ad73281024c9f41c3b444c8986e0a064af0bb0531b12777ef1637d0e3c
 SHA512:
-  metadata.gz: 897308019e1fb3e05bad6e47ac06c39ec91250981e1b0206600a9a5620cb03b29c9dac866640994ac077e6bc3c418b5ea8aec7878e1e2b4587bab6d77b2cffb7
-  data.tar.gz: 50172f65e3b8e40a30ec37155264c464b6a2849152ff9752270a38e8610c022506cd4b69cc1ed6869b2b8ecaa6056e3976d48a73642b067ffaedfc28ad887959
+  metadata.gz: b96169f610fc86f97ea99e646f4bbe7a5cb76b0b693699df75186327172b102f892db91f677bfd55dbddbc6c6c3bf9bd2e3481d6331bdc5197c7f7fb4c184454
+  data.tar.gz: c002777263b5e57350c0365b10033284aa6bff207b8f03e0d8d9f65504dd5a79f94aa2cdf1df5a2e4f28f840e3d27d703b3740927c7514e064aeb57411031511

data/.github/workflows/codecov.yml

@@ -31,7 +31,8 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.2
-      - run: bundle update
+          bundler-cache: true
+      - run: bundle install
       - run: bundle exec rake
       - uses: codecov/codecov-action@v4.0.0-beta.3
         with:

data/.github/workflows/rake.yml

@@ -19,7 +19,7 @@
 # SOFTWARE.
 ---
 name: rake
-on:
+'on':
   push:
     branches:
       - master
@@ -31,7 +31,7 @@ jobs:
     name: test
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-20.04, macos-12, windows-2022]
         ruby: [3.2]
     runs-on: ${{ matrix.os }}
     steps:
@@ -39,5 +39,6 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle update
+          bundler-cache: true
+      - run: bundle install
       - run: bundle exec rake

data/.gitignore

@@ -1,5 +1,4 @@
 coverage/
-Gemfile.lock
 .idea/
 *.gem
 .bundle/

data/.rubocop.yml

@@ -22,6 +22,7 @@ AllCops:
   Exclude:
     - 'bin/**/*'
     - 'assets/**/*'
+    - 'vendor/**/**'
   DisplayCopNames: true
   TargetRubyVersion: 3.2
   SuggestExtensions: false
@@ -47,3 +48,5 @@ Layout/EmptyLineAfterGuardClause:
   Enabled: false
 Naming/MethodParameterName:
   MinNameLength: 2
+Layout/EndOfLine:
+  EnforcedStyle: lf

data/Gemfile

@@ -23,10 +23,11 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.22.3', require: false
+gem 'minitest', '5.23.0', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.2', require: false
 gem 'rubocop', '1.63.5', require: false
+gem 'rubocop-performance', '1.21.0', require: false
 gem 'rubocop-rspec', '2.29.2', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false

data/Gemfile.lock

@@ -0,0 +1,195 @@
+PATH
+  remote: .
+  specs:
+    factbase (0.0.0)
+      json (~> 2.7)
+      loog (~> 0.2)
+      nokogiri (~> 1.10)
+      yaml (~> 0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.1.3.3)
+      actionview (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.3.3)
+      activesupport (= 7.1.3.3)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.3.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    builder (3.2.4)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    diff-lcs (1.5.1)
+    docile (1.4.0)
+    drb (2.2.1)
+    erubi (1.12.0)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    loog (0.5.1)
+    minitest (5.23.0)
+    mutex_m (0.2.0)
+    nokogiri (1.16.5-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x64-mingw-ucrt)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.24.0)
+    parser (3.3.1.0)
+      ast (~> 2.4.1)
+      racc
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
+    rack (3.0.11)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.7)
+      io-console (~> 0.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.1)
+    rubocop (1.63.5)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.29.2)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    stringio (3.1.0)
+    strscan (3.1.0)
+    thor (1.3.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
+    yaml (0.3.0)
+    yard (0.9.36)
+    zeitwerk (2.6.14)
+
+PLATFORMS
+  arm64-darwin-22
+  x64-mingw-ucrt
+  x86_64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  factbase!
+  minitest (= 5.23.0)
+  rake (= 13.2.1)
+  rspec-rails (= 6.1.2)
+  rubocop (= 1.63.5)
+  rubocop-performance (= 1.21.0)
+  rubocop-rspec (= 2.29.2)
+  simplecov (= 0.22.0)
+  simplecov-cobertura (= 2.1.0)
+  yard (= 0.9.36)
+
+BUNDLED WITH
+   2.4.22

data/factbase.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=2.3'
   s.name = 'factbase'
-  s.version = '0.0.21'
+  s.version = '0.0.23'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'

data/lib/factbase/looged.rb

@@ -42,7 +42,7 @@ class Factbase::Looged
 
   def insert
     f = @fb.insert
-    @loog.debug("Inserted fact ##{f.id}")
+    @loog.debug('Inserted new fact')
     Fact.new(f, @loog)
   end
 

data/lib/factbase/pre.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'loog'
+
+# A decorator of a Factbase, that runs a provided block on every +insert+.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class Factbase::Pre
+  def initialize(fb, &block)
+    @fb = fb
+    @block = block
+  end
+
+  def empty?
+    @fb.empty?
+  end
+
+  def size
+    @fb.size
+  end
+
+  def insert
+    f = @fb.insert
+    @block.call(f)
+    f
+  end
+
+  def query(query)
+    @fb.query(query)
+  end
+
+  def export
+    @fb.export
+  end
+
+  def import(bytes)
+    @fb.import(bytes)
+  end
+
+  def to_json(opt = nil)
+    @fb.to_json(opt)
+  end
+
+  def to_xml
+    @fb.to_xml
+  end
+
+  def to_yaml
+    @fb.to_yaml
+  end
+end

data/lib/factbase.rb

@@ -53,8 +53,6 @@ class Factbase
     require_relative 'factbase/fact'
     map = {}
     @mutex.synchronize do
-      f = Factbase::Fact.new(Mutex.new, map)
-      f.id = @maps.size + 1
       @maps << map
     end
     Factbase::Fact.new(@mutex, map)

data/test/factbase/test_looged.rb

@@ -34,13 +34,13 @@ class TestLooged < Minitest::Test
     fb.insert
     fb.insert.bar = 3
     found = 0
-    fb.query('(exists id)').each do |f|
-      assert(42, f.id.positive?)
+    fb.query('(exists bar)').each do |f|
+      assert(42, f.bar.positive?)
       f.foo = 42
       assert_equal(42, f.foo)
       found += 1
     end
-    assert_equal(2, found)
+    assert_equal(1, found)
     assert_equal(2, fb.size)
   end
 
@@ -72,8 +72,7 @@ class TestLooged < Minitest::Test
     fb.query('(exists bar)').each(&:to_s)
     fb.query('(not (exists bar))').delete!
     [
-      'Inserted fact #1',
-      'Inserted fact #2',
+      'Inserted new fact',
       'Set \'bar\' to "3" (Integer)',
       'Found 1 fact(s) by \'(exists bar)\'',
       'Deleted 2 fact(s) by \'(not (exists bar))\''

data/test/factbase/test_pre.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'loog'
+require_relative '../../lib/factbase/pre'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestPre < Minitest::Test
+  def test_simple_setting
+    fb = Factbase::Pre.new(Factbase.new) { |f| f.foo = 42 }
+    f = fb.insert
+    assert_equal(42, f.foo)
+  end
+end

data/test/factbase/test_spy.rb

@@ -33,12 +33,11 @@ class TestSpy < Minitest::Test
     fb = Factbase::Spy.new(Factbase.new, 'foo')
     fb.insert.foo = 42
     fb.insert.foo = 'hello'
-    fb.query('(eq foo "test")').each do |f|
-      assert(f.id.positive?)
+    fb.query('(eq foo "hello")').each do |f|
+      assert_equal('hello', f.foo)
     end
     assert_equal(3, fb.caught_keys.size)
     assert(fb.caught_keys.include?('hello'))
     assert(fb.caught_keys.include?(42))
-    assert(fb.caught_keys.include?('test'))
   end
 end

data/test/test_factbase.rb

@@ -34,15 +34,15 @@ class TestFactbase < Minitest::Test
   def test_simple_setting
     fb = Factbase.new
     fb.insert
-    fb.insert
+    fb.insert.bar = 88
     found = 0
-    fb.query('(exists id)').each do |f|
-      assert(42, f.id.positive?)
+    fb.query('(exists bar)').each do |f|
+      assert(42, f.bar.positive?)
       f.foo = 42
       assert_equal(42, f.foo)
       found += 1
     end
-    assert_equal(2, found)
+    assert_equal(1, found)
     assert_equal(2, fb.size)
   end
 
@@ -106,6 +106,5 @@ class TestFactbase < Minitest::Test
     assert_equal(2, yaml['facts'].size)
     assert_equal(42, yaml['facts'][0]['foo'][0])
     assert_equal(256, yaml['facts'][0]['foo'][1])
-    assert_equal(2, yaml['facts'][1]['id'])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.23
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -90,6 +90,7 @@ files:
 - ".simplecov"
 - ".yamllint.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -97,6 +98,7 @@ files:
 - lib/factbase.rb
 - lib/factbase/fact.rb
 - lib/factbase/looged.rb
+- lib/factbase/pre.rb
 - lib/factbase/query.rb
 - lib/factbase/spy.rb
 - lib/factbase/syntax.rb
@@ -105,6 +107,7 @@ files:
 - renovate.json
 - test/factbase/test_fact.rb
 - test/factbase/test_looged.rb
+- test/factbase/test_pre.rb
 - test/factbase/test_query.rb
 - test/factbase/test_spy.rb
 - test/factbase/test_syntax.rb