factbase 0.0.57 → 0.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec35b6880c4cfe0224107a19dd60c4b2e9ca6316b87331897b06d339f1e0f39
-  data.tar.gz: c096effe0c1789dae54ad5da35c9ca603f279c55f93597871f0c03846c04e457
+  metadata.gz: c62bd0cae1b70119954f0f2c1eef5ef9ff92e7073dc5f86492cc1f048456580c
+  data.tar.gz: 7cfd0410d94217f51b84e41707c1bfecd493f022a840507f18a2d92fd9bb3d9c
 SHA512:
-  metadata.gz: 6b2b85cf88fe6f5857fd51d5f58989f4ef078829749bf565b41184b15472b6247c9fa9f901848fcdfc0cc2dfe04be32098e43351e887ea546cbc2817171f0d44
-  data.tar.gz: 1d720b58f13c156e8ee1a8c2c81d88f27339a5924fdfac8a362341a6c0324524d540c82ce1fb2df09e05d7ca7c01e5ca77369b8a35861f8aa131f06eb40018be
+  metadata.gz: 46d98f86cc24e7ca8db4c543fe34080c2571009e0715699be377fdd4a4589d0a99165c9d45ae2e2fbc432d2592231be7122d0c1c45bc77c5d351c497d1fee703
+  data.tar.gz: d8f0f6e49e6d5c7740f3d70f46860a425f1f9de3a91bdf927cec4579f87aac4357e5e0a6e148d7d9d58ed34a99ddc1ad57c40c0018e735110083f30a594d1ee4

data/Gemfile

@@ -23,7 +23,7 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.24.0', require: false
+gem 'minitest', '5.24.1', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.3', require: false
 gem 'rubocop', '1.64.1', require: false

data/Gemfile.lock

@@ -64,8 +64,8 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    loog (0.5.1)
-    minitest (5.24.0)
+    loog (0.5.2)
+    minitest (5.24.1)
     mutex_m (0.2.0)
     nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
@@ -113,7 +113,7 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.3.0)
+    rexml (3.3.1)
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
@@ -180,7 +180,7 @@ PLATFORMS
 
 DEPENDENCIES
   factbase!
-  minitest (= 5.24.0)
+  minitest (= 5.24.1)
   rake (= 13.2.1)
   rspec-rails (= 6.1.3)
   rubocop (= 1.64.1)

data/README.md

@@ -72,6 +72,11 @@ or `b1` is `false`
 * `(gt v1 v2)` — if any `v1` is greater than any `v2`
 * `(many v)` — if `v` has many values
 * `(one v)` — if `v` has one value
+
+There are string manipulators:
+
+* `(concat v1 v2 v3 ...)` — concatenates all `v`
+* `(sprintf v v1 v2 ...)` — creates a string by `v` format with params
 * `(matches v s)` — if any `v` matches the `s` regular expression
 
 There are a few terms that return non-boolean values:
@@ -97,6 +102,12 @@ Also, some simple arithmetic:
 * `(times v1 v2)` is a multiplication of `∏v1` and `∏v2`
 * `(div v1 v2)` is a division of `∏v1` by `∏v2`
 
+Types may be converted:
+
+* `(to_int v)` is an integer of `v`
+* `(to_str v)` is a string of `v`
+* `(to_float v)` is a float of `v`
+
 One term is for meta-programming:
 
 * `(defn f "self.to_s")` defines a new term using Ruby syntax and returns `true`

data/lib/factbase/tee.rb

@@ -42,7 +42,7 @@ class Factbase::Tee
   end
 
   def all_properties
-    @fact.all_properties
+    @fact.all_properties + (@upper.is_a?(Hash) ? @upper.keys : @upper.all_properties)
   end
 
   others do |*args|

data/lib/factbase/term.rb

@@ -95,7 +95,7 @@ class Factbase::Term
   def evaluate(fact, maps)
     send(@op, fact, maps)
   rescue NoMethodError => e
-    raise "Term '#{@op}' is not defined at #{self}:\n#{Backtrace.new(e)}"
+    raise "Probably the term '#{@op}' is not defined at #{self}:\n#{Backtrace.new(e)}"
   rescue StandardError => e
     raise "#{e.message} at #{self}:\n#{Backtrace.new(e)}"
   end

data/lib/factbase/terms/math.rb

@@ -51,6 +51,27 @@ module Factbase::Term::Math
     vv.any? { |v| (v.is_a?(Integer) || v.is_a?(Float)) && v.zero? }
   end
 
+  def to_str(fact, maps)
+    assert_args(1)
+    vv = the_values(0, fact, maps)
+    return nil if vv.nil?
+    vv[0].to_s
+  end
+
+  def to_int(fact, maps)
+    assert_args(1)
+    vv = the_values(0, fact, maps)
+    return nil if vv.nil?
+    vv[0].to_i
+  end
+
+  def to_float(fact, maps)
+    assert_args(1)
+    vv = the_values(0, fact, maps)
+    return nil if vv.nil?
+    vv[0].to_f
+  end
+
   def eq(fact, maps)
     cmp(:==, fact, maps)
   end

data/lib/factbase/terms/ordering.rb

@@ -36,10 +36,10 @@ module Factbase::Term::Ordering
     before
   end
 
-  def unique(fact, _maps)
+  def unique(fact, maps)
     @uniques = [] if @uniques.nil?
     assert_args(1)
-    vv = by_symbol(0, fact)
+    vv = the_values(0, fact, maps)
     return false if vv.nil?
     vv = [vv] unless vv.is_a?(Array)
     vv.each do |v|

data/lib/factbase/terms/strings.rb

@@ -28,6 +28,16 @@ require_relative '../../factbase'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 module Factbase::Term::Strings
+  def concat(fact, maps)
+    (0..@operands.length - 1).map { |i| the_values(i, fact, maps)[0] }.join
+  end
+
+  def sprintf(fact, maps)
+    fmt = the_values(0, fact, maps)[0]
+    ops = (1..@operands.length - 1).map { |i| the_values(i, fact, maps)[0] }
+    format(*([fmt] + ops))
+  end
+
   def matches(fact, maps)
     assert_args(2)
     str = the_values(0, fact, maps)

data/lib/factbase.rb

@@ -81,7 +81,7 @@ require 'yaml'
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.57'
+  VERSION = '0.0.59'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/terms/test_aliases.rb

@@ -32,13 +32,14 @@ require_relative '../../../lib/factbase/accum'
 class TestAliases < Minitest::Test
   def test_aliases
     maps = [
-      { 'x' => [1], 'y' => [0] },
-      { 'x' => [2], 'y' => [42] }
+      { 'x' => [1], 'y' => [0], 't1' => [Time.now], 't2' => [Time.now] },
+      { 'x' => [2], 'y' => [42], 't' => [Time.now] }
     ]
     {
       '(as foo (plus x 1))' => '(exists foo)',
       '(as foo (plus x y))' => '(gt foo 0)',
-      '(as foo (plus bar 1))' => '(absent foo)'
+      '(as foo (plus bar 1))' => '(absent foo)',
+      '(as foo (minus t1 t2))' => '(when (exists foo) (eq "Float" (type foo)))'
     }.each do |q, r|
       t = Factbase::Syntax.new(q).to_term
       maps.each do |m|

data/test/factbase/terms/test_math.rb

@@ -23,7 +23,7 @@
 require 'minitest/autorun'
 require_relative '../../../lib/factbase/term'
 
-# Aggregates test.
+# Math test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
@@ -91,6 +91,21 @@ class TestMath < Minitest::Test
     assert(!t.evaluate(fact('bar' => [100]), []))
   end
 
+  def test_to_str
+    t = Factbase::Term.new(:to_str, [Time.now])
+    assert_equal('String', t.evaluate(fact, []).class.to_s)
+  end
+
+  def test_to_int
+    t = Factbase::Term.new(:to_int, [[42, 'hello']])
+    assert_equal('Integer', t.evaluate(fact, []).class.to_s)
+  end
+
+  def test_to_float
+    t = Factbase::Term.new(:to_float, [[3.14, 'hello']])
+    assert_equal('Float', t.evaluate(fact, []).class.to_s)
+  end
+
   private
 
   def fact(map = {})

data/test/factbase/terms/test_strings.rb

@@ -0,0 +1,51 @@
+# 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_relative '../../../lib/factbase/term'
+
+# Strings test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestStrings < Minitest::Test
+  def test_concat
+    t = Factbase::Term.new(:concat, [42, 'hi', 3.14, Time.now])
+    assert(t.evaluate(fact, []).start_with?('42hi3.14'))
+  end
+
+  def test_concat_empty
+    t = Factbase::Term.new(:concat, [])
+    assert_equal('', t.evaluate(fact, []))
+  end
+
+  def test_sprintf
+    t = Factbase::Term.new(:sprintf, ['hi, %s!', 'Jeff'])
+    assert_equal('hi, Jeff!', t.evaluate(fact, []))
+  end
+
+  private
+
+  def fact(map = {})
+    Factbase::Fact.new(Mutex.new, map)
+  end
+end

data/test/factbase/test_tee.rb

@@ -31,16 +31,25 @@ require_relative '../../lib/factbase/fact'
 # License:: MIT
 class TestTee < Minitest::Test
   def test_two_facts
-    map = {}
-    prim = Factbase::Fact.new(Mutex.new, map)
+    prim = Factbase::Fact.new(Mutex.new, {})
     prim.foo = 42
-    upper = Factbase::Fact.new(Mutex.new, map)
+    upper = Factbase::Fact.new(Mutex.new, {})
     upper.bar = 13
     t = Factbase::Tee.new(prim, upper)
     assert_equal(42, t.foo)
     assert_equal([13], t['$bar'])
   end
 
+  def test_all_properties
+    prim = Factbase::Fact.new(Mutex.new, {})
+    prim.foo = 42
+    upper = Factbase::Fact.new(Mutex.new, {})
+    upper.bar = 13
+    t = Factbase::Tee.new(prim, upper)
+    assert(t.all_properties.include?('foo'))
+    assert(t.all_properties.include?('bar'))
+  end
+
   def test_recursively
     map = {}
     prim = Factbase::Fact.new(Mutex.new, map)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.57
+  version: 0.0.59
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-29 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -184,6 +184,7 @@ files:
 - test/factbase/terms/test_aggregates.rb
 - test/factbase/terms/test_aliases.rb
 - test/factbase/terms/test_math.rb
+- test/factbase/terms/test_strings.rb
 - test/factbase/test_accum.rb
 - test/factbase/test_fact.rb
 - test/factbase/test_flatten.rb