factbase 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c20d4add4664149fc5c070ec64321a79c8ac07ef81c69ae2b64bac1e9fd0c4e9
-  data.tar.gz: ff9a8f121d9cfafa6ad97a634c79fc2ec834a07ee0d17042eb3fc5fa8c529501
+  metadata.gz: 7bf5fda6f7bf7cfd9e62897b505924688938a0acfb326e0533ad80e9be8e01cd
+  data.tar.gz: 10f2a249d9e3eb5bcc560a6cf07606cec54a6d35d325c00c7c6ee17075cc92f3
 SHA512:
-  metadata.gz: 3f93283308d6f15766fca09f253da85145efc28975e51259ee88f0954cc6a7f584700de2ff604478bd5a48f1c86153243949a6280732a466412a739f38e9a1e2
-  data.tar.gz: e21602f7612821dd2389e831056389900f62a3ef3b1bf998f6ebbe722cfc9684357383c754ad0556a346534cf7a6bc76489706e0f0f58ea23336a918be71b442
+  metadata.gz: bef44475330c1835b4822894ca5460427e47271b60927d7dc920889dc77d5eb2249f77f334a9c283d87df137342642c10042ea66b41ad2de71ddfeb4a17443f9
+  data.tar.gz: 0b5d3cbfff4ac2479ea5887fae0e6b545dfe5b1dc5e008503f04a517eb6922a1604864d6348864515a87c2518ab3c227a62fa34a35659cffee73c97be7209dbd

data/Gemfile.lock

@@ -36,7 +36,7 @@ GEM
     logger (1.7.0)
     loog (0.6.1)
       logger (~> 1.0)
-    minitest (5.26.2)
+    minitest (5.27.0)
     minitest-reporters (1.7.1)
       ansi
       builder

data/lib/factbase/indexed/indexed_and.rb

@@ -42,8 +42,13 @@ class Factbase::IndexedAnd
           end
         end
       )
-      j = tuples.map { |t| entry[:index][t] || [] }.reduce(&:|)
-      r = (maps & []) | j
+      j = tuples.flat_map { |t| entry[:index][t] || [] }.uniq(&:object_id)
+      r =
+        if maps.respond_to?(:inserted)
+          Factbase::Taped.new(j, inserted: maps.inserted, deleted: maps.deleted, added: maps.added)
+        else
+          j
+        end
     else
       @term.operands.each do |o|
         n = o.predict(maps, fb, params)

data/lib/factbase/indexed/indexed_eq.rb

@@ -36,11 +36,11 @@ class Factbase::IndexedEq
       else
         [@term.operands[1]]
       end
-    if vv.empty?
-      (maps & [])
+    j = vv.flat_map { |v| entry[:index][v] || [] }.uniq(&:object_id)
+    if maps.respond_to?(:inserted)
+      Factbase::Taped.new(j, inserted: maps.inserted, deleted: maps.deleted, added: maps.added)
     else
-      j = vv.map { |v| entry[:index][v] || [] }.reduce(&:|)
-      (maps & []) | j
+      j
     end
   end
 

data/lib/factbase/indexed/indexed_factbase.rb

@@ -49,8 +49,7 @@ class Factbase::IndexedFactbase
   def query(term, maps = nil)
     term = to_term(term) if term.is_a?(String)
     q = @origin.query(term, maps)
-    q = Factbase::IndexedQuery.new(q, @idx, self) if term.abstract?
-    q
+    Factbase::IndexedQuery.new(q, @idx, self)
   end
 
   # Run an ACID transaction.

data/lib/factbase/indexed/indexed_query.rb

@@ -46,7 +46,7 @@ class Factbase::IndexedQuery
   # @param [Factbase] fb The factbase
   # @param [Hash] params Optional params accessible in the query via the "$" symbol
   # @return [String|Integer|Float|Time|Array|NilClass] The value evaluated
-  def one(fb = @fb, params = nil)
+  def one(fb = @fb, params = {})
     @origin.one(fb, params)
   end
 
@@ -54,7 +54,8 @@ class Factbase::IndexedQuery
   # @param [Factbase] fb The factbase
   # @return [Integer] Total number of facts deleted
   def delete!(fb = @fb)
+    result = @origin.delete!(fb)
     @idx.clear
-    @origin.delete!(fb)
+    result
   end
 end

data/lib/factbase/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.19.0' unless const_defined?(:VERSION)
+  VERSION = '0.19.1' unless const_defined?(:VERSION)
 end

metadata

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