factbase 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 453a090310ef10ace85c3ee099b85bd8744d24428923f1e896626b996d3124ca
-  data.tar.gz: 0236a9f6bb4b4dacca29bd1d61da395a8dadb084b81e915b7694a763ecf0985b
+  metadata.gz: 38ebbf43ee181a50bc4ca45d32ac3ba1394180e25ea719b41917606c2d00a6c9
+  data.tar.gz: f2e71d19bd3523a4db543b410989f88708e3120cbebde21682080b822e11c7d7
 SHA512:
-  metadata.gz: 00312f424b58cfda7eee00a7fba6792da9a5b439eab34e29745cdd481913df87afc016944387e95356ece05feddbc444d90ddb52bdf2a20d3bc4ac38e7224a79
-  data.tar.gz: 224a5b63c85cf5fc604da26f8f4205a35fe6b3ace5f8fb959b6a2a3fd71f08dc79a2804215dab823c1143e02a8ddd06de0df3154912e116de04da97233ff8795
+  metadata.gz: 802e11490eda7455f3d00ecce17c70e73f6520c5f06a25ea1ad7393ceb98a8ca67858343d4ee544183f10b695c872f140855037f091623ba057296c755fe6c13
+  data.tar.gz: d58f72e6aeabd5e99fe7424c769f56074c2f9dc95593dd76c3373ee770dcfd96c1f05dd51731c25660bfcb2aedfde2ffe8f7842679e6e46ef95532b090c3428c

data/factbase.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=2.3'
   s.name = 'factbase'
-  s.version = '0.0.7'
+  s.version = '0.0.9'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'
@@ -39,5 +39,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'json', '~> 2.7'
   s.add_runtime_dependency 'nokogiri', '~> 1.10'
+  s.add_runtime_dependency 'yaml', '~> 0.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/factbase/fact.rb

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'json'
 require_relative '../factbase'
 
 # Fact.
@@ -32,26 +33,37 @@ class Factbase::Fact
     @map = map
   end
 
+  def to_s
+    @map.to_json
+  end
+
   def method_missing(*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]+$/)
+      v = args[1]
+      raise "Prop value can't be empty" if v == ''
       @mutex.synchronize do
-        @map[kk] = [] if @map[kk].nil?
-        @map[kk] << args[1]
+        before = @map[kk]
+        return if before == v
+        if before.nil?
+          @map[kk] = v
+          return
+        end
+        @map[kk] = [@map[kk]] unless @map[kk].is_a?(Array)
+        @map[kk] << v
       end
       nil
     elsif k == '[]'
-      kk = args[1].to_s
-      @mutex.synchronize do
-        @map[kk] = [] if @map[kk].nil?
-      end
-      @map[kk]
+      @map[args[1].to_s]
     else
       v = @map[k]
-      raise "Can't find '#{k}'" if v.nil?
-      v[0]
+      if v.nil?
+        raise "Can't get '#{k}', the fact is empty" if @map.empty?
+        raise "Can't find '#{k}' attribute in [#{@map.keys.join(', ')}]"
+      end
+      v.is_a?(Array) ? v[0] : v
     end
   end
 

data/lib/factbase/query.rb

@@ -45,14 +45,4 @@ class Factbase::Query
       yield f
     end
   end
-
-  # Turn it into an array.
-  # @return [Array] All facts in an array
-  # rubocop:disable Style/MapIntoArray
-  def to_a
-    array = []
-    each { |f| array << f }
-    array
-  end
-  # rubocop:enable Style/MapIntoArray
 end

data/lib/factbase/syntax.rb

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require_relative '../factbase'
 require_relative 'fact'
 require_relative 'term'
 
@@ -72,6 +73,7 @@ class Factbase::Syntax
     [Factbase::Term.new(op, operands), at + 1]
   end
 
+  # Turns a query into an array of tokens.
   def to_tokens
     list = []
     acc = ''
@@ -108,6 +110,7 @@ class Factbase::Syntax
       if t.is_a?(Symbol)
         t
       elsif t.start_with?('\'', '"')
+        raise 'String literal can\'t be empty' if t.length <= 2
         t[1..-2]
       elsif t.match?(/^[0-9]+$/)
         t.to_i

data/lib/factbase/term.rb

@@ -84,7 +84,7 @@ class Factbase::Term
   def exists(fact)
     assert_args(1)
     k = @operands[0].to_s
-    !fact[k].empty?
+    !fact[k].nil?
   end
 
   def absent(fact)
@@ -97,8 +97,9 @@ class Factbase::Term
     assert_args(2)
     k = @operands[0].to_s
     v = fact[k]
-    return false if v.empty?
-    v.include?(@operands[1])
+    return true if v == @operands[1]
+    return v.include?(@operands[1]) if v.is_a?(Array)
+    false
   end
 
   def lt(fact)

data/lib/factbase.rb

@@ -22,6 +22,7 @@
 
 require 'json'
 require 'nokogiri'
+require 'yaml'
 
 # Factbase.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -99,10 +100,14 @@ class Factbase
         @maps.each do |m|
           xml.f do
             m.each do |k, vv|
-              xml.send(:"#{k}") do
-                vv.each do |v|
-                  xml.send(:v, v)
+              if vv.is_a?(Array)
+                xml.send(:"#{k}") do
+                  vv.each do |v|
+                    xml.send(:v, v)
+                  end
                 end
+              else
+                xml.send(:"#{k}", vv)
               end
             end
           end
@@ -110,4 +115,10 @@ class Factbase
       end
     end.to_xml
   end
+
+  # Convert the entire factbase into YAML.
+  # @return [String] The factbase in YAML format
+  def to_yaml
+    YAML.dump({ 'facts' => @maps })
+  end
 end

data/test/factbase/test_fact.rb

@@ -33,9 +33,30 @@ class TestFact < Minitest::Test
     map = {}
     f = Factbase::Fact.new(Mutex.new, map)
     f.foo = 42
-    assert_equal(42, f.foo)
+    assert_equal(42, f.foo, f.to_s)
     f.foo = 256
-    assert_equal(42, f.foo)
-    assert_equal([42, 256], f['foo'])
+    assert_equal(42, f.foo, f.to_s)
+    assert_equal([42, 256], f['foo'], f.to_s)
+  end
+
+  def test_fails_when_empty
+    f = Factbase::Fact.new(Mutex.new, {})
+    assert_raises do
+      f.something
+    end
+  end
+
+  def test_fails_when_not_found
+    f = Factbase::Fact.new(Mutex.new, {})
+    f.first = 42
+    assert_raises do
+      f.second
+    end
+  end
+
+  def test_set_by_name
+    f = Factbase::Fact.new(Mutex.new, {})
+    f.send('foo=', 42)
+    assert_equal(42, f.foo, f.to_s)
   end
 end

data/test/factbase/test_syntax.rb

@@ -92,6 +92,7 @@ class TestSyntax < Minitest::Test
       '(foo x y z (',
       '(foo x y (z t (f 42 ',
       ')foo ) y z)',
+      '(x "")',
       ")y 42 'Hey you)",
       ')',
       '"'

data/test/factbase/test_term.rb

@@ -31,14 +31,16 @@ class TestTerm < Minitest::Test
   def test_simple_matching
     t = Factbase::Term.new(:eq, ['foo', 42])
     assert(t.matches?(fact('foo' => [42])))
-    assert(!t.matches?(fact('foo' => ['Hello!'])))
+    assert(!t.matches?(fact('foo' => 'Hello!')))
     assert(!t.matches?(fact('bar' => ['Hello!'])))
   end
 
   def test_eq_matching
     t = Factbase::Term.new(:eq, ['foo', 42])
+    assert(t.matches?(fact('foo' => 42)))
     assert(t.matches?(fact('foo' => [10, 5, 6, -8, 'hey', 42, 9, 'fdsf'])))
     assert(!t.matches?(fact('foo' => [100])))
+    assert(!t.matches?(fact('foo' => [])))
   end
 
   def test_lt_matching
@@ -61,7 +63,7 @@ class TestTerm < Minitest::Test
   def test_not_exists_matching
     t = Factbase::Term.new(:not, [Factbase::Term.new(:eq, ['foo', 100])])
     assert(t.matches?(fact('foo' => [42, 12, -90])))
-    assert(!t.matches?(fact('foo' => [100])))
+    assert(!t.matches?(fact('foo' => 100)))
   end
 
   def test_or_matching

data/test/test_factbase.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require 'json'
 require 'nokogiri'
+require 'yaml'
 require_relative '../lib/factbase'
 
 # Factbase main module test.
@@ -53,7 +54,7 @@ class TestFactbase < Minitest::Test
       File.write(f.path, f1.export)
       f2.import(File.read(f.path))
     end
-    assert_equal(1, f2.query('(eq foo 42)').to_a.count)
+    assert_equal(1, f2.query('(eq foo 42)').extend(Enumerable).to_a.count)
   end
 
   def test_to_json
@@ -75,4 +76,17 @@ class TestFactbase < Minitest::Test
     assert(!xml.xpath('/fb[count(f) = 2]').empty?)
     assert(!xml.xpath('/fb/f/foo[v="42"]').empty?)
   end
+
+  def test_to_yaml
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    f.foo = 256
+    fb.insert
+    yaml = YAML.load(fb.to_yaml)
+    assert_equal(2, yaml['facts'].size)
+    assert_equal(42, yaml['facts'][0]['foo'][0])
+    assert_equal(256, yaml['facts'][0]['foo'][1])
+    assert_equal(2, yaml['facts'][1]['id'])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Fact base in memory and on disc
 email: yegor256@gmail.com
 executables: []