factbase 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff1dd0d8b331a0a2c90d6160e7e0594a186016338591d7fa3702b3fc7e29731
-  data.tar.gz: f95d83697fb8fb2aceab49547850a27548858db76a36a7a90a582257174214f0
+  metadata.gz: eb59210ccd84c6ea917eddcc142535615c2ff1e08e3a1dcf2e1236de4e2e5c24
+  data.tar.gz: dc410950e07629cb29e3d5795508e8bf4504a983adb8887ba3f375d52f87d598
 SHA512:
-  metadata.gz: 52582171bb9e9fa4be1d2c0670e3faa38de883675eb0db4a0efed94ad8d0d72437c8d1ce54d9e6442ecc4573ec68957cc99138d1a6b4580dfed7822397a863ca
-  data.tar.gz: 857be193e43d1340f7c17c9d7230322e0bcd994c228f279a56731168eda36c463d68e8e3177b350f76f6bb70a27a1391e25edf0bccc905333e1502b361423467
+  metadata.gz: 81a0cfd3732fbd9ae30e867a0633cd1497c3df52a84461c4cbadaeca44414226c4c5be727b54823d1ee7dd5ee51e1a7397b1e0d3ddbee59339c013cf5493b603
+  data.tar.gz: 35e0e6d12f83c995e05bfc3ab4709dfe0476a5e8f36b2c772ff97b13477fc8210638259408dc9cee2e2aa86e499fc8a773d7ce63adcb0443c99ff56b2d04f9c0

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.8'
+  s.version = '0.0.10'
   s.license = 'MIT'
   s.summary = 'Factbase'
   s.description = 'Fact base in memory and on disc'

data/lib/factbase/fact.rb

@@ -41,16 +41,18 @@ class Factbase::Fact
     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 "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
         before = @map[kk]
-        return if before == args[1]
+        return if before == v
         if before.nil?
-          @map[kk] = args[1]
+          @map[kk] = v
           return
         end
         @map[kk] = [@map[kk]] unless @map[kk].is_a?(Array)
-        @map[kk] << args[1]
+        @map[kk] << v
       end
       nil
     elsif k == '[]'

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.rb

@@ -101,13 +101,13 @@ class Factbase
           xml.f do
             m.each do |k, vv|
               if vv.is_a?(Array)
-                xml.send(:"#{k}") do
+                xml.send(:"#{k}_") do
                   vv.each do |v|
                     xml.send(:v, v)
                   end
                 end
               else
-                xml.send(:"#{k}", vv)
+                xml.send(:"#{k}_", vv)
               end
             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

@@ -54,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
@@ -71,12 +71,24 @@ class TestFactbase < Minitest::Test
     f = fb.insert
     f.foo = 42
     f.foo = 256
-    fb.insert
+    fb.insert.bar = 5
     xml = Nokogiri::XML.parse(fb.to_xml)
     assert(!xml.xpath('/fb[count(f) = 2]').empty?)
     assert(!xml.xpath('/fb/f/foo[v="42"]').empty?)
   end
 
+  def test_to_xml_with_short_names
+    fb = Factbase.new
+    f = fb.insert
+    f.type = 1
+    f.f = 2
+    f.class = 3
+    xml = Nokogiri::XML.parse(fb.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_to_yaml
     fb = Factbase.new
     f = fb.insert

metadata

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