bmg 0.18.7 → 0.18.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b7b4d39e83f04ee58369bef32ce396893d5ac98d357fd8c497d309fa17cc93b2
-  data.tar.gz: b36344887bb1142c4ddd3de0eb4419c0ba1821490a9c8c336668c37008e59156
+SHA1:
+  metadata.gz: eda140880e29f5e083ad334176579ed2dfad9090
+  data.tar.gz: 444a8cc5f96b80ba3bbf6d807be1438c2d26abd7
 SHA512:
-  metadata.gz: c21cc2eb5c0e0e93cb8c4afc823855140051112f6ac5bd896181634edb67f87fca9b88f4a16c0ec70da36c8ce937e3265ade2506e7077f103e4fb46409b8dded
-  data.tar.gz: b40c206ad43a6ec36e4951c8ff8d531872154e0e855f055f62059ff3af9f0d35e7d96f2443e8046bd107741c4df481aa4ebc2b680ccf1fc88181b988add1d2d6
+  metadata.gz: 96ecc393e90d3ae413655d70c4b1676fa2f9831e519ef61cbd25139b873efcd75a825745cce0597e083fc59bc331b08d30b5717b1e5b42adacb5297147a044bd
+  data.tar.gz: dc687db5b22f9f3fc53b2ccf0916722065ca7d25b8ad04b0a042c6d79fd66f40c22f2d05461da8019db8b70f54c4c104658f3dce3862f9a37b2af44c6ee25d61

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/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/sequel/translator.rb

@@ -90,11 +90,17 @@ module Bmg
       end
 
       def on_summarizer(sexpr)
-        if sexpr.summary_expr
-          ::Sequel.function(sexpr.summary_func, apply(sexpr.summary_expr))
+        func, distinct = if sexpr.summary_func == :distinct_count
+          [:count, true]
         else
-          ::Sequel.function(sexpr.summary_func).*
+          [sexpr.summary_func, false]
         end
+        f = if sexpr.summary_expr
+          ::Sequel.function(func, apply(sexpr.summary_expr))
+        else
+          ::Sequel.function(func).*
+        end
+        distinct ? f.distinct : f
       end
 
       def on_qualified_name(sexpr)

data/lib/bmg/sql/processor/summarize.rb

@@ -36,10 +36,10 @@ module Bmg
             [:select_item,
               [ :summarizer,
                 summarizer.to_summarizer_name,
-                sexpr.desaliaser[attr] ],
+                sexpr.desaliaser[summarizer.functor] ],
               [:column_name, attr.to_s] ]
           }
-          [:select_list] + by_list + group_list
+          ([:select_list] + by_list + group_list)
         end
 
       end # class Summarize

data/lib/bmg/sql/relation.rb

@@ -160,7 +160,7 @@ module Bmg
 
       def can_compile_summarization?(summarization)
         summarization.values.all?{|s|
-          [:avg, :count, :max, :min, :sum].include?(s.to_summarizer_name)
+          [:avg, :count, :max, :min, :sum, :distinct_count].include?(s.to_summarizer_name)
         }
       end
 

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

@@ -0,0 +1,36 @@
+module Bmg
+  class Summarizer
+    #
+    # Collect the count of distinct values.
+    #
+    # Example:
+    #
+    #   # direct ruby usage
+    #   Bmg::Summarizer.distinct_count(:qty).summarize(...)
+    #
+    class DistinctCount < Summarizer
+
+      # Returns [] as least value.
+      def least()
+        {}
+      end
+
+      # Adds val to the memo array
+      def _happens(memo, val)
+        memo[val] = true
+        memo
+      end
+
+      def finalize(memo)
+        memo.keys.size
+      end
+
+    end # class DistinctCount
+
+    # Factors a distinct count summarizer
+    def self.distinct_count(*args, &bl)
+      DistinctCount.new(*args, &bl)
+    end
+
+  end # class Summarizer
+end # module Bmg

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

@@ -131,7 +131,10 @@ module Bmg
 
     # Returns the canonical summarizer name
     def to_summarizer_name
-      self.class.name.downcase[/::([a-z]+)$/, 1].to_sym
+      self.class.name
+        .gsub(/[a-z][A-Z]/){|x| x.split('').join('_') }
+        .downcase[/::([a-z_]+)$/, 1]
+        .to_sym
     end
 
   protected
@@ -161,7 +164,11 @@ require_relative 'summarizer/stddev'
 require_relative 'summarizer/percentile'
 require_relative 'summarizer/collect'
 require_relative 'summarizer/distinct'
+require_relative 'summarizer/distinct_count'
 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,8 +6,12 @@ module Bmg
     end
     attr_reader :attrs
 
+    def call(t1, t2)
+      comparator.call(t1, t2)
+    end
+
     def comparator
-      ->(t1, t2) {
+      @comparator ||= ->(t1, t2) {
         attrs.each do |(attr,direction)|
           c = t1[attr] <=> t2[attr]
           return (direction == :desc ? -c : c) unless c==0

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 18
-    TINY  = 7
+    TINY  = 11
   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.7
+  version: 0.18.11
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-12-11 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
@@ -273,10 +273,14 @@ files:
 - lib/bmg/summarizer/concat.rb
 - 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
@@ -313,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.