bmg 0.18.8 → 0.18.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9489f2f59b1f3fc644c4a29ee53ba08662f9671ebda9cc6b0340a98c6daf20d9
-  data.tar.gz: f0506ba0dbea31d5d3a1c3f4e3edbdf0ea9ef88e40b386445494f6cd61f759c1
+SHA1:
+  metadata.gz: f6017c8a4f02206eac582bbd66801976c7beeba0
+  data.tar.gz: 5e22c7739d0a16d79ec8a0871dfc9e4a60a4bd9d
 SHA512:
-  metadata.gz: a3de98440bf031b653d2ef9f7cc6f89ab44969304ca6fdd04cadc514e617a17d5b8b5bfeb791bc03de576acac5431a1d85a52a413f59932aae77ee3f41175ff3
-  data.tar.gz: b583e4ade1f71740afaf2a43c5a0dad8eb27557de533b4cbd61c7f632e79d612a85340897e01ed571a91572acd4f2ab65c00d2b9e00d4d8a8cc8b97919c46102
+  metadata.gz: 6eb6a6e24b42e3b3651ea5f73d7481f3c7f22289bd8b450ec5cf5a4ab1ab07e9e63ad47c017ac3dd5d57a0c856e9c5834e2c26e4be6f7a56ece54b1045234fa4
+  data.tar.gz: 0b40fd858dbae47f1069ef1caef71357f9313a3ca0912f288f366ac65b3e32e8068cd0de4206d4822431f2156c680f5a71b18ac8dc0aee112314deb5a3435a5b

data/lib/bmg/operator/autowrap.rb

@@ -22,6 +22,7 @@ module Bmg
 
       DEFAULT_OPTIONS = {
         :postprocessor => :none,
+        :postprocessor_condition => :all,
         :split => "_"
       }
 
@@ -167,7 +168,7 @@ module Bmg
 
       def normalize_options(options)
         opts = DEFAULT_OPTIONS.merge(options)
-        opts[:postprocessor] = NoLeftJoinNoise.new(opts[:postprocessor])
+        opts[:postprocessor] = NoLeftJoinNoise.new(opts[:postprocessor], opts[:postprocessor_condition])
         opts
       end
 
@@ -209,17 +210,17 @@ module Bmg
       class NoLeftJoinNoise
 
         REMOVERS = {
-          nil:    ->(t,k){ t[k] = nil  },
-          delete: ->(t,k){ t.delete(k) },
-          none:   ->(t,k){ t           }
+          nil:       ->(t,k){ t[k] = nil  },
+          delete:    ->(t,k){ t.delete(k) },
+          none:      ->(t,k){ t           }
         }
 
-        def self.new(remover)
+        def self.new(remover, remover_condition = :all)
           return remover if remover.is_a?(NoLeftJoinNoise)
           super
         end
 
-        def initialize(remover)
+        def initialize(remover, remover_condition = :all)
           @remover_to_s = remover
           @remover = case remover
           when NilClass then REMOVERS[:none]
@@ -229,22 +230,35 @@ module Bmg
           else
             raise "Invalid remover `#{remover}`"
           end
+          @remover_condition = case remover_condition
+          when :all then ->(tuple){ all_nil?(tuple) }
+          when :id  then ->(tuple){ id_nil?(tuple) }
+          else
+            raise "Invalid remover condition `#{remover_condition}`"
+          end
         end
         attr_reader :remover
 
         def call(tuple)
           tuple.each_key do |k|
             call(tuple[k]) if tuple[k].is_a?(Hash)
-            @remover.call(tuple, k) if tuple[k].is_a?(Hash) && all_nil?(tuple[k])
+            @remover.call(tuple, k) if tuple[k].is_a?(Hash) && @remover_condition.call(tuple[k])
           end
           tuple
         end
 
         def all_nil?(tuple)
           return false unless tuple.is_a?(Hash)
+
           tuple.all?{|(k,v)| v.nil? || all_nil?(tuple[k]) }
         end
 
+        def id_nil?(tuple)
+          return false unless tuple.is_a?(Hash)
+
+          tuple[:id].nil?
+        end
+
         def inspect
           @remover_to_s.inspect
         end

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/reader/excel.rb

@@ -4,6 +4,7 @@ module Bmg
       include Reader
 
       DEFAULT_OPTIONS = {
+        sheet: 0,
         skip: 0,
         row_num: true
       }
@@ -19,7 +20,7 @@ module Bmg
         require 'roo'
         xlsx = Roo::Spreadsheet.open(@path, @options)
         headers = nil
-        xlsx.sheet(0)
+        xlsx.sheet(@options[:sheet])
           .each
           .drop(@options[:skip])
           .each_with_index

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/sql/support/from_clause_orderer.rb

@@ -213,8 +213,7 @@ module Bmg
         def _collect_joins(sexpr, joins)
           case sexpr.first
           when :and
-            _collect_joins(sexpr[1], joins)
-            _collect_joins(sexpr[2], joins)
+            sexpr[1..-1].each{ |term| _collect_joins(term, joins) }
           when :eq
             joins << sexpr
           else

data/lib/bmg/summarizer/first.rb

@@ -0,0 +1,25 @@
+module Bmg
+  class Summarizer
+    #
+    # First summarizer.
+    #
+    # Example:
+    #
+    #   # direct ruby usage
+    #   Bmg::Summarizer.first(:qty, :order => [:id]).summarize(...)
+    #
+    class First < Positional
+
+      def choose(t1, t2)
+        t1
+      end
+
+    end # class First
+
+    # Factors a first summarizer
+    def self.first(*args, &bl)
+      First.new(*args, &bl)
+    end
+
+  end # class Summarizer
+end # module Bmg

data/lib/bmg/summarizer/last.rb

@@ -0,0 +1,25 @@
+module Bmg
+  class Summarizer
+    #
+    # Last summarizer.
+    #
+    # Example:
+    #
+    #   # direct ruby usage
+    #   Bmg::Summarizer.last(:qty, :order => [:id]).summarize(...)
+    #
+    class Last < Positional
+
+      def choose(t1, t2)
+        t2
+      end
+
+    end # class Last
+
+    # Factors a last summarizer
+    def self.last(*args, &bl)
+      Last.new(*args, &bl)
+    end
+
+  end # class Summarizer
+end # module Bmg

data/lib/bmg/summarizer/positional.rb

@@ -0,0 +1,33 @@
+module Bmg
+  class Summarizer
+    # See First and Last
+    class Positional < Summarizer
+
+      def initialize(*args, &block)
+        super
+        raise ArgumentError, "Missing order" unless options[:order]
+        @ordering = Ordering.new(options[:order])
+      end
+      attr_reader :ordering
+
+      def least
+        nil
+      end
+
+      def happens(memo, tuple)
+        if memo.nil?
+          tuple
+        else
+          c = ordering.call(memo, tuple)
+          c <= 0 ? choose(memo, tuple) : choose(tuple, memo)
+        end
+      end
+
+      def finalize(memo)
+        return nil if memo.nil?
+        extract_value(memo)
+      end
+
+    end # class Positional
+  end # class Summarizer
+end # module Bmg

data/lib/bmg/summarizer.rb

@@ -169,3 +169,6 @@ require_relative 'summarizer/concat'
 require_relative 'summarizer/by_proc'
 require_relative 'summarizer/multiple'
 require_relative 'summarizer/value_by'
+require_relative 'summarizer/positional'
+require_relative 'summarizer/first'
+require_relative 'summarizer/last'

data/lib/bmg/support/ordering.rb

@@ -6,14 +6,31 @@ module Bmg
     end
     attr_reader :attrs
 
+    def call(t1, t2)
+      comparator.call(t1, t2)
+    end
+
     def 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  = 8
+    TINY  = 12
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.18.8
+  version: 0.18.12
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
@@ -274,10 +274,13 @@ files:
 - lib/bmg/summarizer/count.rb
 - lib/bmg/summarizer/distinct.rb
 - lib/bmg/summarizer/distinct_count.rb
+- lib/bmg/summarizer/first.rb
+- lib/bmg/summarizer/last.rb
 - lib/bmg/summarizer/max.rb
 - lib/bmg/summarizer/min.rb
 - lib/bmg/summarizer/multiple.rb
 - lib/bmg/summarizer/percentile.rb
+- lib/bmg/summarizer/positional.rb
 - lib/bmg/summarizer/stddev.rb
 - lib/bmg/summarizer/sum.rb
 - lib/bmg/summarizer/value_by.rb
@@ -314,7 +317,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Bmg is Alf's successor.