factbase 0.0.47 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b16ed7e90c154dfde3992d7a812c124caf6492c4f3600da01e93069e82be50f
-  data.tar.gz: 8cc18bca8d1a1eb3b52fdb314b38f87818796faf93d05395764d5968aa615a93
+  metadata.gz: 56a6a221e2344538c324a601f49ad655f4d5e3b6682b5e717e8f798a6eb46030
+  data.tar.gz: 94bb595173fbea968c4a8e8af2b8d6cf08689127e2dfd2c2c296420659da5304
 SHA512:
-  metadata.gz: 9376cb5f9cecf2fc5fb47296512285b8105b08fbe9683f3722995aac7bab5440a417d443f378dfc62c300f3b79d136f6365835843aabb3559eaf09f203404880
-  data.tar.gz: 59f4f461487d02b604b0614d571bbc10405a15c4d86ec92dedd8633d5b12a01bd92d546622aad23bd3d4caf65ff4a27ce7a18a6b1a65c6e2d54cbc0874f41d91
+  metadata.gz: fe4eb95604ae3ba22d24ef01a4c86b1dcdf4c9b3ff38969cbc459653a6a72a201d317bdf86f71c22206c771deebb5511ba1c64ce014c77fdf995e18926646fa2
+  data.tar.gz: b48c9c7243f74713bcf5b9fbad3f0ef901aa79d107d7be78e3d08d9970e898a21f9bb4938cfaac5057edc11c53150b0934a46b125019c132906114a702c90d89

data/lib/factbase/flatten.rb

@@ -29,8 +29,9 @@ require_relative '../factbase'
 # License:: MIT
 class Factbase::Flatten
   # Constructor.
-  def initialize(maps)
+  def initialize(maps, sorter = '_id')
     @maps = maps
+    @sorter = sorter
   end
 
   # Improve the maps.

data/lib/factbase/term.rb

@@ -260,6 +260,7 @@ class Factbase::Term
     assert_args(1)
     v = by_symbol(0, fact)
     return 'nil' if v.nil?
+    v = v[0] if v.is_a?(Array) && v.size == 1
     v.class.to_s
   end
 

data/lib/factbase/to_json.rb

@@ -45,6 +45,6 @@ class Factbase::ToJSON
   # Convert the entire factbase into JSON.
   # @return [String] The factbase in JSON format
   def json
-    Factbase::Flatten.new(Marshal.load(@fb.export)).it.to_json
+    Factbase::Flatten.new(Marshal.load(@fb.export), @sorter).it.to_json
   end
 end

data/lib/factbase/to_xml.rb

@@ -53,7 +53,7 @@ class Factbase::ToXML
     }
     Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
       xml.fb(meta) do
-        Factbase::Flatten.new(Marshal.load(bytes)).it.each do |m|
+        Factbase::Flatten.new(Marshal.load(bytes), @sorter).it.each do |m|
           xml.f_ do
             m.sort.to_h.each do |k, vv|
               if vv.is_a?(Array)

data/lib/factbase/to_yaml.rb

@@ -45,6 +45,6 @@ class Factbase::ToYAML
   # Convert the entire factbase into YAML.
   # @return [String] The factbase in YAML format
   def yaml
-    YAML.dump(Factbase::Flatten.new(Marshal.load(@fb.export)).it)
+    YAML.dump(Factbase::Flatten.new(Marshal.load(@fb.export), @sorter).it)
   end
 end

data/lib/factbase.rb

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

data/test/factbase/test_query.rb

@@ -46,7 +46,7 @@ class TestQuery < Minitest::Test
     maps = []
     maps << { 'num' => 42, 'name' => 'Jeff' }
     maps << { 'pi' => 3.14, 'num' => [42, 66, 0], 'name' => 'peter' }
-    maps << { 'time' => Time.now - 100, 'num' => 0 }
+    maps << { 'time' => Time.now - 100, 'num' => 0, 'hi' => [4] }
     {
       '(eq num 444)' => 0,
       '(eq time 0)' => 0,
@@ -56,6 +56,7 @@ class TestQuery < Minitest::Test
       '(eq pi +3.14)' => 1,
       '(not (exists hello))' => 3,
       '(eq "Integer" (type num))' => 2,
+      '(eq "Integer" (type hi))' => 1,
       '(when (eq num 0) (exists time))' => 2,
       '(unique num)' => 2,
       '(unique name)' => 2,

data/test/factbase/test_term.rb

@@ -120,6 +120,7 @@ class TestTerm < Minitest::Test
   def test_type_matching
     t = Factbase::Term.new(:type, [:foo])
     assert_equal('Integer', t.evaluate(fact('foo' => 42), []))
+    assert_equal('Integer', t.evaluate(fact('foo' => [42]), []))
     assert_equal('Array', t.evaluate(fact('foo' => [1, 2, 3]), []))
     assert_equal('String', t.evaluate(fact('foo' => 'Hello, world!'), []))
     assert_equal('Float', t.evaluate(fact('foo' => 3.14), []))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.48
 platform: ruby
 authors:
 - Yegor Bugayenko