factbase 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e3aa4baba1a3e241c30002133a56627b43e9ef5ce903c46fbafe2873a8625f
-  data.tar.gz: f6fe14cbed445d1bd07e743f4b29f4eca2b65c3b46438a73c4654644626f8ae3
+  metadata.gz: 4659be0304d67fcd6639ae27a0ca2ebc065a9dc7499d45454447ca18812e0698
+  data.tar.gz: 40df86a0bd3a24b11f4124cb234683a7fc8e58fa05835bbfb7e761323c2746a7
 SHA512:
-  metadata.gz: 0b9900e9aefabc39c5a84af552c34011fa54cffaa9828f3eb84aa677ec2f006ee6a32028cb74be5d04a65a7e68e7d516f072d7b78dd89aa91a04168c67fdd561
-  data.tar.gz: 915d162e0b9ff8f533ef3f34f9b39cca0593fd1823a14918acb99f0f1f9d88aaf08016d85d5fdfd892410ebe701392a16322f8c4dc8cb16fc93e064287b29d01
+  metadata.gz: 03deff34f5739536073ec7c6fc0869a1d2a213528ebef2b7832a794ca3a086fb19642dcb497e2a8cc37305e2ed818e84765c37a7ea9b5390f6dc30b8271479bf
+  data.tar.gz: 48e1693cdea380fd71408521f6e7ec4783427f2316445361ce549c597bb9b836a75e3227b9c370e0afe4b780cd8f1ded9f38d28d17622b3cb993923ee62bdaea

data/Gemfile.lock

@@ -2,13 +2,13 @@ PATH
   remote: .
   specs:
     factbase (0.0.0)
-      backtrace (~> 0.3)
-      decoor (~> 0.0)
+      backtrace (> 0)
+      decoor (> 0)
       json (~> 2.7)
-      loog (~> 0.2)
+      loog (> 0)
       nokogiri (~> 1.10)
-      others (~> 0.0)
-      tago (~> 0.0)
+      others (> 0)
+      tago (> 0)
       yaml (~> 0.3)
 
 GEM

data/README.md

@@ -102,6 +102,9 @@ Also, some simple arithmetic:
 * `(times v1 v2)` is a multiplication of `∏v1` and `∏v2`
 * `(div v1 v2)` is a division of `∏v1` by `∏v2`
 
+It's possible to add and deduct string values to time values, like
+`(plus t '2 days')` or ``(minus t '14 hours')``.
+
 Types may be converted:
 
 * `(to_int v)` is an integer of `v`
@@ -144,6 +147,11 @@ It's also possible to use a sub-query in a shorter form than with the `agg`:
 
 * `(empty q)` is true if the subquery `q` is empty
 
+There are some system-level terms:
+
+* `(env v1 v2)` returns the value of environment variable `v1` or the string
+`v2` if it's not set
+
 ## How to contribute
 
 Read

data/factbase.gemspec

@@ -42,13 +42,13 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($RS)
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_dependency 'backtrace', '~>0.3'
-  s.add_dependency 'decoor', '~>0.0'
+  s.add_dependency 'backtrace', '>0'
+  s.add_dependency 'decoor', '>0'
   s.add_dependency 'json', '~>2.7'
-  s.add_dependency 'loog', '~>0.2'
+  s.add_dependency 'loog', '>0'
   s.add_dependency 'nokogiri', '~>1.10'
-  s.add_dependency 'others', '~>0.0'
-  s.add_dependency 'tago', '~>0.0'
+  s.add_dependency 'others', '>0'
+  s.add_dependency 'tago', '>0'
   s.add_dependency 'yaml', '~>0.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/factbase/term.rb

@@ -65,6 +65,9 @@ class Factbase::Term
   require_relative 'terms/strings'
   include Factbase::Term::Strings
 
+  require_relative 'terms/casting'
+  include Factbase::Term::Casting
+
   require_relative 'terms/meta'
   include Factbase::Term::Meta
 
@@ -77,6 +80,9 @@ class Factbase::Term
   require_relative 'terms/defn'
   include Factbase::Term::Defn
 
+  require_relative 'terms/system'
+  include Factbase::Term::System
+
   require_relative 'terms/debug'
   include Factbase::Term::Debug
 

data/lib/factbase/terms/casting.rb

@@ -0,0 +1,58 @@
+# 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_relative '../../factbase'
+
+# Casting terms.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+module Factbase::Term::Casting
+  def to_string(fact, maps)
+    assert_args(1)
+    vv = the_values(0, fact, maps)
+    return nil if vv.nil?
+    vv[0].to_s
+  end
+
+  def to_integer(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 to_time(fact, maps)
+    assert_args(1)
+    vv = the_values(0, fact, maps)
+    return nil if vv.nil?
+    Time.parse(vv[0].to_s)
+  end
+end

data/lib/factbase/terms/math.rb

@@ -51,27 +51,6 @@ 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
@@ -107,6 +86,27 @@ module Factbase::Term::Math
     rights = the_values(1, fact, maps)
     return nil if rights.nil?
     raise 'Too many values at second position, one expected' unless rights.size == 1
-    lefts[0].send(op, rights[0])
+    v = lefts[0]
+    r = rights[0]
+    if v.is_a?(Time) && r.is_a?(String)
+      (num, units) = r.split
+      num = num.to_i
+      r =
+        case units
+        when 'seconds'
+          num
+        when 'minutes'
+          num * 60
+        when 'hours'
+          num * 60 * 60
+        when 'days'
+          num * 60 * 60 * 24
+        when 'weeks'
+          num * 60 * 60 * 24 * 7
+        else
+          raise "Unknown time unit '#{units}' in '#{r}"
+        end
+    end
+    v.send(op, r)
   end
 end

data/lib/factbase/terms/system.rb

@@ -0,0 +1,36 @@
+# 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_relative '../../factbase'
+
+# System-level terms.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+module Factbase::Term::System
+  def env(fact, maps)
+    assert_args(2)
+    n = the_values(0, fact, maps)[0]
+    ENV.fetch(n.upcase) { the_values(1, fact, maps)[1] }
+  end
+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.1.1'
+  VERSION = '0.2.0'
 
   # An exception that may be thrown in a transaction, to roll it back.
   class Rollback < StandardError; end

data/test/factbase/terms/test_aggregates.rb

@@ -67,10 +67,4 @@ class TestAggregates < Minitest::Test
       assert_equal(r, t.evaluate(nil, maps), q)
     end
   end
-
-  private
-
-  def fact(map = {})
-    Factbase::Fact.new(Mutex.new, map)
-  end
 end

data/test/factbase/terms/test_aliases.rb

@@ -71,10 +71,4 @@ class TestAliases < Minitest::Test
       end
     end
   end
-
-  private
-
-  def fact(map = {})
-    Factbase::Fact.new(Mutex.new, map)
-  end
 end

data/test/factbase/terms/test_casting.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 '../../test__helper'
+require_relative '../../../lib/factbase/term'
+
+# Math test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestCasting < Minitest::Test
+  def test_to_str
+    t = Factbase::Term.new(:to_string, [Time.now])
+    assert_equal('String', t.evaluate(fact, []).class.to_s)
+  end
+
+  def test_to_integer
+    t = Factbase::Term.new(:to_integer, [[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
+
+  def test_to_time
+    t = Factbase::Term.new(:to_time, [%w[2023-01-01 hello]])
+    assert_equal('Time', t.evaluate(fact, []).class.to_s)
+  end
+end

data/test/factbase/terms/test_defn.rb

@@ -62,10 +62,4 @@ class TestDefn < Minitest::Test
     t = Factbase::Term.new(:undef, [:hello])
     assert_equal(true, t.evaluate(fact, []))
   end
-
-  private
-
-  def fact(map = {})
-    Factbase::Fact.new(Mutex.new, map)
-  end
 end

data/test/factbase/terms/test_logical.rb

@@ -69,10 +69,4 @@ class TestLogical < Minitest::Test
     assert(!t.evaluate(fact('foo' => 4), []))
     assert(t.evaluate(fact('foo' => 5, 'bar' => 5), []))
   end
-
-  private
-
-  def fact(map = {})
-    Factbase::Fact.new(Mutex.new, map)
-  end
 end

data/test/factbase/terms/test_math.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require_relative '../../test__helper'
 require_relative '../../../lib/factbase/term'
 
 # Math test.
@@ -91,30 +92,27 @@ 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
-
   def test_plus
     t = Factbase::Term.new(:plus, [:foo, 42])
     assert_equal(46, t.evaluate(fact('foo' => 4), []))
     assert(t.evaluate(fact, []).nil?)
   end
 
-  private
+  def test_plus_time
+    t = Factbase::Term.new(:plus, [:foo, '12 days'])
+    assert_equal(Time.parse('2024-01-13'), t.evaluate(fact('foo' => Time.parse('2024-01-01')), []))
+    assert(t.evaluate(fact, []).nil?)
+  end
+
+  def test_minus
+    t = Factbase::Term.new(:minus, [:foo, 42])
+    assert_equal(58, t.evaluate(fact('foo' => 100), []))
+    assert(t.evaluate(fact, []).nil?)
+  end
 
-  def fact(map = {})
-    Factbase::Fact.new(Mutex.new, map)
+  def test_minus_time
+    t = Factbase::Term.new(:minus, [:foo, '4 hours'])
+    assert_equal(Time.parse('2024-01-01T06:04'), t.evaluate(fact('foo' => Time.parse('2024-01-01T10:04')), []))
+    assert(t.evaluate(fact, []).nil?)
   end
 end

data/test/factbase/terms/test_strings.rb

@@ -50,10 +50,4 @@ class TestStrings < Minitest::Test
     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/terms/test_system.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_relative '../../test__helper'
+require_relative '../../../lib/factbase/term'
+
+# System test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestSystem < Minitest::Test
+  def test_env
+    ENV.store('FOO', 'bar')
+    t = Factbase::Term.new(:env, ['FOO', ''])
+    assert_equal('bar', t.evaluate(fact, []))
+  end
+end

data/test/factbase/test_term.rb

@@ -90,10 +90,4 @@ class TestTerm < Minitest::Test
     end.message
     assert(msg.include?('at (at)'), msg)
   end
-
-  private
-
-  def fact(map = {})
-    Factbase::Fact.new(Mutex.new, map)
-  end
 end

data/test/test__helper.rb

@@ -32,3 +32,11 @@ require 'minitest/autorun'
 
 require 'minitest/reporters'
 Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]
+
+# Default methods for all tests.
+class Minitest::Test
+  def fact(map = {})
+    require 'factbase/fact'
+    Factbase::Fact.new(Mutex.new, map)
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: decoor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: loog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +84,30 @@ dependencies:
   name: others
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tago
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yaml
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +170,7 @@ files:
 - lib/factbase/term.rb
 - lib/factbase/terms/aggregates.rb
 - lib/factbase/terms/aliases.rb
+- lib/factbase/terms/casting.rb
 - lib/factbase/terms/debug.rb
 - lib/factbase/terms/defn.rb
 - lib/factbase/terms/logical.rb
@@ -177,16 +178,19 @@ files:
 - lib/factbase/terms/meta.rb
 - lib/factbase/terms/ordering.rb
 - lib/factbase/terms/strings.rb
+- lib/factbase/terms/system.rb
 - lib/factbase/to_json.rb
 - lib/factbase/to_xml.rb
 - lib/factbase/to_yaml.rb
 - renovate.json
 - test/factbase/terms/test_aggregates.rb
 - test/factbase/terms/test_aliases.rb
+- test/factbase/terms/test_casting.rb
 - test/factbase/terms/test_defn.rb
 - test/factbase/terms/test_logical.rb
 - test/factbase/terms/test_math.rb
 - test/factbase/terms/test_strings.rb
+- test/factbase/terms/test_system.rb
 - test/factbase/test_accum.rb
 - test/factbase/test_fact.rb
 - test/factbase/test_flatten.rb