bmg 0.18.11 → 0.18.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eda140880e29f5e083ad334176579ed2dfad9090
-  data.tar.gz: 444a8cc5f96b80ba3bbf6d807be1438c2d26abd7
+  metadata.gz: f6017c8a4f02206eac582bbd66801976c7beeba0
+  data.tar.gz: 5e22c7739d0a16d79ec8a0871dfc9e4a60a4bd9d
 SHA512:
-  metadata.gz: 96ecc393e90d3ae413655d70c4b1676fa2f9831e519ef61cbd25139b873efcd75a825745cce0597e083fc59bc331b08d30b5717b1e5b42adacb5297147a044bd
-  data.tar.gz: dc687db5b22f9f3fc53b2ccf0916722065ca7d25b8ad04b0a042c6d79fd66f40c22f2d05461da8019db8b70f54c4c104658f3dce3862f9a37b2af44c6ee25d61
+  metadata.gz: 6eb6a6e24b42e3b3651ea5f73d7481f3c7f22289bd8b450ec5cf5a4ab1ab07e9e63ad47c017ac3dd5d57a0c856e9c5834e2c26e4be6f7a56ece54b1045234fa4
+  data.tar.gz: 0b40fd858dbae47f1069ef1caef71357f9313a3ca0912f288f366ac65b3e32e8068cd0de4206d4822431f2156c680f5a71b18ac8dc0aee112314deb5a3435a5b

data/lib/bmg/operator/page.rb

@@ -32,7 +32,8 @@ module Bmg
       def each(&bl)
         return to_enum unless block_given?
         page_size = options[:page_size]
-        @operand.to_a
+        @operand
+          .to_a
           .sort(&comparator)
           .drop(page_size * (page_index-1))
           .take(page_size)
@@ -46,7 +47,7 @@ module Bmg
     protected ### inspect
 
       def comparator
-        Ordering.new(@ordering).comparator
+        @comparator ||= Ordering.new(@ordering).comparator
       end
 
       def args

data/lib/bmg/relation/spied.rb

@@ -24,13 +24,27 @@ module Bmg
       protected :type=
 
       def each(&bl)
-        spy.call(self) if bl
-        operand.each(&bl)
+        return enum_for(:each) unless bl
+
+        if spy.respond_to?(:measure)
+          spy.measure(self) do
+            operand.each(&bl)
+          end
+        else
+          spy.call(self)
+          operand.each(&bl)
+        end
       end
 
       def count
-        spy.call(self) if bl
-        operand.count
+        if spy.respond_to?(:measure)
+          spy.measure(self) do
+            operand.count
+          end
+        else
+          spy.call(self)
+          operand.count
+        end
       end
 
       def to_ast

data/lib/bmg/support/ordering.rb

@@ -11,13 +11,26 @@ module Bmg
     end
 
     def comparator
-      @comparator ||= ->(t1, t2) {
-        attrs.each do |(attr,direction)|
-          c = t1[attr] <=> t2[attr]
-          return (direction == :desc ? -c : c) unless c==0
+      @comparator ||= ->(t1, t2) { compare_attrs(t1, t2) }
+    end
+
+    def compare_attrs(t1, t2)
+      attrs.each do |(attr,direction)|
+        a1, a2 = t1[attr], t2[attr]
+        if a1.nil? && a2.nil?
+          0
+        elsif a1.nil?
+          return direction == :desc ? -1 : 1
+        elsif a2.nil?
+          return direction == :desc ? 1 : -1
+        elsif a1.respond_to?(:<=>)
+          c = a1 <=> a2
+          unless c.nil? || c==0
+            return direction == :desc ? -c : c
+          end
         end
-        0
-      }
+      end
+      0
     end
 
   end # class Ordering

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 18
-    TINY  = 11
+    TINY  = 12
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.18.11
+  version: 0.18.12
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate