fbe 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2837fa24108886b565d0b12026220b20fd305cf7376d4e551bbef3ccacb9b42b
-  data.tar.gz: a6e93af54d94cfe9c8e0b92a7833a2fc11b1d808245520c00cde309d0af4a69a
+  metadata.gz: 44dddb35ca02d476dd5dfe586952118aa9f3a4fa5387c1daf272d26c168b09bf
+  data.tar.gz: 0bf256a95f4f3cfa1fed6a131d7b247e2efb3ffe47466877ec0aad7d203cba12
 SHA512:
-  metadata.gz: e18055e38bb2900d05314b0eb41b83bbea871d5787809744ec22dc928c3906c5110d88debf0bf4a4b98d91eb3af93709783266b53f25812d05037d1027153649
-  data.tar.gz: 464d4e834e8f85a00f10929e54aceefc8159946c971288a67d7614982130336485c7b0a19f1b14e3854b9635d8fda414b3125e3b36657248b522448e5bdb071c
+  metadata.gz: c629481c01b322d26dbb23ad9831e0274a4c9abc4246e3c64311ec54885ba52b1b751fd496b877a7e5fe9bd5ef54da8ff92b4ba0b02cc77b676677a34b381878
+  data.tar.gz: 5811f6cc833dafcfb9904f094b2fa85b5c56af6b52650a68c25d03050b127fa3a106302093a79b6c592d6c71f76be9ca139cb9808a0cdcf121fd80158bb13bd3

data/.rubocop.yml

@@ -22,6 +22,8 @@ Lint/NestedMethodDefinition:
   Enabled: false
 Gemspec/RequiredRubyVersion:
   Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Style/ClassAndModuleChildren:

data/Gemfile

@@ -6,16 +6,16 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.25.4', require: false
+gem 'minitest', '5.25.5', require: false
 gem 'minitest-reporters', '>=1.7', require: false
 gem 'rake', '>=13', require: false
 gem 'rspec-rails', '>0', require: false
-gem 'rubocop', '1.73.1', require: false
+gem 'rubocop', '1.73.2', require: false
 gem 'rubocop-minitest', '>0', require: false
 gem 'rubocop-performance', '>0', require: false
 gem 'rubocop-rake', '>0', require: false
 gem 'rubocop-rspec', '>0', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
-gem 'webmock', '3.25.0', require: false
+gem 'webmock', '3.25.1', require: false
 gem 'yard', '0.9.37', require: false

data/Gemfile.lock

@@ -5,7 +5,7 @@ PATH
       backtrace (~> 0)
       baza.rb (~> 0)
       decoor (~> 0)
-      factbase (>= 0.7.4)
+      factbase (>= 0.9.1)
       faraday (~> 2)
       faraday-http-cache (~> 2)
       faraday-multipart (~> 1)
@@ -22,9 +22,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (8.0.1)
-      actionview (= 8.0.1)
-      activesupport (= 8.0.1)
+    actionpack (8.0.2)
+      actionview (= 8.0.2)
+      activesupport (= 8.0.2)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -32,13 +32,13 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (8.0.1)
-      activesupport (= 8.0.1)
+    actionview (8.0.2)
+      activesupport (= 8.0.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (8.0.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -89,14 +89,14 @@ GEM
     erubi (1.13.1)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.7.4)
-      backtrace (> 0)
-      decoor (> 0)
+    factbase (0.9.1)
+      backtrace (>= 0.4.0)
+      decoor (>= 0.0.1)
       json (~> 2.7)
-      loog (> 0)
+      loog (>= 0.6.0)
       nokogiri (~> 1.10)
-      others (> 0)
-      tago (> 0)
+      others (>= 0.0.3)
+      tago (>= 0.0.2)
       yaml (~> 0.3)
     faraday (2.12.2)
       faraday-net_http (>= 2.0, < 3.5)
@@ -117,7 +117,7 @@ GEM
     fiber-storage (1.0.0)
     gli (2.22.2)
       ostruct
-    graphql (2.4.11)
+    graphql (2.4.13)
       base64
       fiber-storage
       logger
@@ -133,13 +133,13 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iri (0.10.0)
-    json (2.10.1)
-    judges (0.34.0)
+    json (2.10.2)
+    judges (0.36.3)
       backtrace (~> 0)
       baza.rb (~> 0)
       concurrent-ruby (~> 1.2)
       elapsed (~> 0)
-      factbase (>= 0.7.0)
+      factbase (>= 0.9.1)
       gli (~> 2.21)
       iri (~> 0)
       loog (~> 0)
@@ -149,6 +149,7 @@ GEM
       retries (~> 0)
       tago (~> 0)
       timeout (~> 0)
+      total (~> 0)
       typhoeus (~> 1.3)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
@@ -158,7 +159,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     loog (0.6.0)
-    minitest (5.25.4)
+    minitest (5.25.5)
     minitest-reporters (1.7.1)
       ansi
       builder
@@ -194,7 +195,7 @@ GEM
       stringio
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.1.10)
+    rack (3.1.12)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -209,9 +210,9 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.1)
-      actionpack (= 8.0.1)
-      activesupport (= 8.0.1)
+    railties (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -243,7 +244,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.73.1)
+    rubocop (1.73.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -288,6 +289,7 @@ GEM
     tago (0.0.2)
     thor (1.3.2)
     timeout (0.4.3)
+    total (0.4.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
@@ -300,7 +302,7 @@ GEM
     verbose (0.0.2)
       loog (~> 0.2)
       tago (~> 0.0)
-    webmock (3.25.0)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -319,18 +321,18 @@ PLATFORMS
 
 DEPENDENCIES
   fbe!
-  minitest (= 5.25.4)
+  minitest (= 5.25.5)
   minitest-reporters (>= 1.7)
   rake (>= 13)
   rspec-rails (> 0)
-  rubocop (= 1.73.1)
+  rubocop (= 1.73.2)
   rubocop-minitest (> 0)
   rubocop-performance (> 0)
   rubocop-rake (> 0)
   rubocop-rspec (> 0)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
-  webmock (= 3.25.0)
+  webmock (= 3.25.1)
   yard (= 0.9.37)
 
 BUNDLED WITH

data/REUSE.toml

@@ -4,6 +4,9 @@
 version = 1
 [[annotations]]
 path = [
+    "**.json",
+    "**.md",
+    "**.txt",
     "**/*.csv",
     "**/*.fe",
     "**/*.jpg",
@@ -15,13 +18,15 @@ path = [
     "**/*.svg",
     "**/*.txt",
     "**/*.vm",
+    "**/.DS_Store",
     "**/.gitignore",
+    "**/.pdd",
     "**/CNAME",
+    "**/Gemfile.lock",
+    ".DS_Store",
     ".gitattributes",
     ".gitignore",
-    ".gitleaksignore",
     ".pdd",
-    ".xcop",
     "Gemfile.lock",
     "README.md",
     "renovate.json",

data/fbe.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'backtrace', '~>0'
   s.add_dependency 'baza.rb', '~>0'
   s.add_dependency 'decoor', '~>0'
-  s.add_dependency 'factbase', '>=0.7.4'
+  s.add_dependency 'factbase', '>=0.9.1'
   s.add_dependency 'faraday', '~>2'
   s.add_dependency 'faraday-http-cache', '~>2'
   s.add_dependency 'faraday-multipart', '~>1'

data/lib/fbe/award.rb

@@ -41,7 +41,8 @@ class Fbe::Award
   # @param [Hash] vars Hash of variables
   # @return [Fbe::Award::Bill] The bill
   def bill(vars = {})
-    term = Factbase::Syntax.new(Factbase.new, @query, term: Fbe::Award::BTerm).to_term
+    term = Factbase::Syntax.new(@query).to_term
+    term.redress!(Fbe::Award::BTerm)
     bill = Bill.new
     vars.each { |k, v| bill.set(k, v) }
     term.bill_to(bill)
@@ -51,20 +52,15 @@ class Fbe::Award
   # Build a bylaw object from this award query.
   # @return [Fbe::Award::Bylaw] The bylaw
   def bylaw
-    term = Factbase::Syntax.new(Factbase.new, @query, term: Fbe::Award::PTerm).to_term
+    term = Factbase::Syntax.new(@query).to_term
+    term.redress!(Fbe::Award::PTerm)
     bylaw = Bylaw.new
     term.publish_to(bylaw)
     bylaw
   end
 
   # A term for bill.
-  class BTerm < Factbase::Term
-    def initialize(_fb, operator, operands)
-      super(nil, nil, nil)
-      @op = operator
-      @operands = operands
-    end
-
+  module BTerm
     def to_s
       "(#{@op} #{@operands.join(' ')})"
     end
@@ -164,13 +160,7 @@ class Fbe::Award
   end
 
   # A term for bylaw.
-  class PTerm < Factbase::Term
-    def initialize(_fb, operator, operands)
-      super(nil, nil, nil)
-      @op = operator
-      @operands = operands
-    end
-
+  module PTerm
     def to_s
       case @op
       when :total

data/lib/fbe/iterate.rb

@@ -126,7 +126,7 @@ class Fbe::Iterate
         ).one
         @fb.query("(and (eq what '#{@label}') (eq where 'github') (eq repository #{rid}))").delete!
         before = before.nil? ? @since : before.first
-        nxt = @fb.query(@query).one(before:, repository: rid)
+        nxt = @fb.query(@query).one(@fb, before:, repository: rid)
         after =
           if nxt.nil?
             @loog.debug("Next element after ##{before} not suggested, re-starting from ##{@since}: #{@query}")

data/lib/fbe.rb

@@ -10,5 +10,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by +.rultor.yml+ on every release)
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/rules/basic.fe

@@ -22,7 +22,7 @@
 
 (undef explain)
 (defn explain '
-  r = @operands[0].evaluate(fact, maps);
+  r = @operands[0].evaluate(fact, maps, fb);
   if !r && !$loog.nil?
     $loog.error(\'This rule failed: \' + self.to_s)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-03-02 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement