factbase 0.0.56 → 0.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d26f7abaafccccb51ef4077d66fed7a4a8ef846df2a7d46191d7113b27a2a689
-  data.tar.gz: 8d0a64e42a4a695edc7ef5a7958ceb69aa6a965e53778782bd865c49a8752a4f
+  metadata.gz: 7e13671937b0df97f981c14d5dd95f18174a59694b7cae5c425de45aea36bc0e
+  data.tar.gz: ce5a4cc54e772b37cf57e379bbceba7149905e61c1e15ad87cec6a1434b394ed
 SHA512:
-  metadata.gz: 65c7a43401b8933e212dea979319cc75a0e42349123f0cd98871ee4d1493002b2f280a229820101ef481168c64a2e97333a549036dd3c88dfa3d05b4230d9085
-  data.tar.gz: 9106f2c57b7840e95de6a6dba53859f0d0c4e0bea5770b22d558c35894e847145fe0b9d5640d017441baa91be48bcbc4a09cf38ae8390ab9d0efe379b5add37b
+  metadata.gz: 5115395546357ab98c6035605667e664228a1d84a802475721eb05a35d836e5d8041f29c66ffa96fe31b02fd5f006776896e8765bb9d9535705602ed0337e0a8
+  data.tar.gz: 95d4751859aec0fb9ad1adbcaaee2b30e178f67cfd7ba95d596ee4e0337ac02fdc88697f07db330f24c7f82c4ad33b4bd4aa0a0d6e1bb0f19e28f0e2b5d0aa3e

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

@@ -97,6 +97,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/accum.rb

@@ -43,6 +43,10 @@ class Factbase::Accum
     "#{@fact} + #{@props}"
   end
 
+  def all_properties
+    @fact.all_properties
+  end
+
   others do |*args|
     k = args[0].to_s
     if k.end_with?('=')

data/lib/factbase/fact.rb

@@ -57,13 +57,19 @@ class Factbase::Fact
     "[ #{@map.map { |k, v| "#{k}: #{v}" }.join(', ')} ]"
   end
 
+  # Get a list of all props.
+  # @return [Array<String>] List of all props in the fact
+  def all_properties
+    @map.keys
+  end
+
   # When a method is missing, this method is called.
   others do |*args|
     k = args[0].to_s
     if k.end_with?('=')
       kk = k[0..-2]
       raise "Invalid prop name '#{kk}'" unless kk.match?(/^[a-z_][_a-zA-Z0-9]*$/)
-      raise "Prohibited prop name '#{kk}'" if kk == 'to_s'
+      raise "Prohibited prop name '#{kk}'" if methods.include?(kk.to_sym)
       v = args[1]
       raise "Prop value can't be nil" if v.nil?
       raise "Prop value can't be empty" if v == ''

data/lib/factbase/inv.rb

@@ -66,6 +66,10 @@ class Factbase::Inv
       @fact.to_s
     end
 
+    def all_properties
+      @fact.all_properties
+    end
+
     others do |*args|
       k = args[0].to_s
       @block.call(k[0..-2], args[1]) if k.end_with?('=')

data/lib/factbase/looged.rb

@@ -86,6 +86,14 @@ class Factbase::Looged
       @loog = loog
     end
 
+    def to_s
+      @fact.to_s
+    end
+
+    def all_properties
+      @fact.all_properties
+    end
+
     others do |*args|
       r = @fact.method_missing(*args)
       k = args[0].to_s

data/lib/factbase/rules.rb

@@ -89,6 +89,14 @@ class Factbase::Rules
       @check = check
     end
 
+    def to_s
+      @fact.to_s
+    end
+
+    def all_properties
+      @fact.all_properties
+    end
+
     others do |*args|
       r = @fact.method_missing(*args)
       k = args[0].to_s

data/lib/factbase/tee.rb

@@ -41,6 +41,10 @@ class Factbase::Tee
     @fact.to_s
   end
 
+  def all_properties
+    @fact.all_properties + (@upper.is_a?(Hash) ? @upper.keys : @upper.all_properties)
+  end
+
   others do |*args|
     if args[0].to_s == '[]' && args[1].to_s.start_with?('$')
       n = args[1].to_s

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.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.56'
+  VERSION = '0.0.58'
 
   # 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

@@ -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/test_fact.rb

@@ -110,4 +110,16 @@ class TestFact < Minitest::Test
     assert_equal(t.utc, f.foo)
     assert_equal(t.utc.to_s, f.foo.to_s)
   end
+
+  def test_some_names_are_prohibited
+    f = Factbase::Fact.new(Mutex.new, {})
+    assert_raises { f.to_s = 42 }
+    assert_raises { f.class = 42 }
+  end
+
+  def test_get_all_properties
+    f = Factbase::Fact.new(Mutex.new, {})
+    f.foo = 42
+    assert(f.all_properties.include?('foo'))
+  end
 end

data/test/factbase/test_query.rb

@@ -173,4 +173,11 @@ class TestQuery < Minitest::Test
     maps << { 'foo' => [42] }
     assert(Factbase::Query.new(maps, Mutex.new, '(as bar (plus xxx 3))').each.to_a[0]['bar'].nil?)
   end
+
+  def test_get_all_properties
+    maps = []
+    maps << { 'foo' => [42] }
+    f = Factbase::Query.new(maps, Mutex.new, '(always)').each.to_a[0]
+    assert(f.all_properties.include?('foo'))
+  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)

data/test/factbase/test_to_xml.rb

@@ -65,12 +65,10 @@ class TestToXML < Minitest::Test
     f = fb.insert
     f.type = 1
     f.f = 2
-    f.class = 3
     to = Factbase::ToXML.new(fb)
     xml = Nokogiri::XML.parse(to.xml)
     assert(!xml.xpath('/fb/f/type').empty?)
     assert(!xml.xpath('/fb/f/f').empty?)
-    assert(!xml.xpath('/fb/f/class').empty?)
   end
 
   def test_show_types_as_attributes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.0.58
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace