bmg 0.17.7 → 0.18.3

data/lib/bmg/summarizer/distinct.rb

@@ -0,0 +1,36 @@
+module Bmg
+  class Summarizer
+    #
+    # Collect the distinct values as an array.
+    #
+    # Example:
+    #
+    #   # direct ruby usage
+    #   Bmg::Summarizer.distinct(:qty).summarize(...)
+    #
+    class Distinct < 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
+      end
+
+    end # class Distinct
+
+    # Factors a distinct summarizer
+    def self.distinct(*args, &bl)
+      Distinct.new(*args, &bl)
+    end
+
+  end # class Summarizer
+end # module Bmg

data/lib/bmg/summarizer/multiple.rb

@@ -0,0 +1,46 @@
+module Bmg
+  class Summarizer
+    #
+    # A summarizer that collects multiple summarization as a wrapped
+    # tuple.
+    #
+    # Example:
+    #
+    #   # direct ruby usage
+    #   Bmg::Summarizer.multiple(x: ..., y: ...).summarize(...)
+    #
+    class Multiple < Summarizer
+
+      def initialize(defs)
+        @summarization = Summarizer.summarization(defs)
+      end
+
+      # Returns [] as least value.
+      def least()
+        @summarization.each_pair.each_with_object({}){|(k,v),memo|
+          memo[k] = v.least
+        }
+      end
+
+      # Adds val to the memo array
+      def happens(memo, val)
+        @summarization.each_pair.each_with_object({}){|(k,v),memo2|
+          memo2[k] = v.happens(memo[k], val)
+        }
+      end
+
+      def finalize(memo)
+        @summarization.each_pair.each_with_object({}){|(k,v),memo2|
+          memo2[k] = v.finalize(memo[k])
+        }
+      end
+
+    end # class Multiple
+
+    # Factors a distinct summarizer
+    def self.multiple(defs)
+      Multiple.new(defs)
+    end
+
+  end # class Summarizer
+end # module Bmg

data/lib/bmg/summarizer/percentile.rb

@@ -0,0 +1,47 @@
+module Bmg
+  class Summarizer
+    #
+    # Percentile summarizer.
+    #
+    # Example:
+    #
+    #   # direct ruby usage
+    #   Bmg::Summarizer.percentile(:qty, 50).summarize(...)
+    #
+    class Percentile < Summarizer
+
+      def initialize(attribute = nil, nth = 50, &bl)
+        attribute, nth = nil, attribute if attribute.is_a?(Integer)
+        super(*[attribute].compact, &bl)
+        @nth = nth
+      end
+
+      # Returns [] as least value.
+      def least()
+        []
+      end
+
+      # Collects the value
+      def _happens(memo, val)
+        memo << val
+      end
+
+      # Finalizes the computation.
+      def finalize(memo)
+        return nil if memo.empty?
+        index = memo.size * (@nth / 100.0)
+        above = [[index.ceil - 1, memo.size - 1].min, 0].max
+        below = [index.floor - 1, 0].max
+        sorted = memo.sort
+        (sorted[above] + sorted[below]) / 2
+      end
+
+    end # class Avg
+
+    # Factors an average summarizer
+    def self.percentile(*args, &bl)
+      Percentile.new(*args, &bl)
+    end
+
+  end # class Summarizer
+end # module Bmg

data/lib/bmg/support.rb

@@ -1,3 +1,5 @@
 require_relative 'support/tuple_algebra'
 require_relative 'support/tuple_transformer'
 require_relative 'support/keys'
+require_relative 'support/ordering'
+require_relative 'support/output_preferences'

data/lib/bmg/support/ordering.rb

@@ -0,0 +1,20 @@
+module Bmg
+  class Ordering
+
+    def initialize(attrs)
+      @attrs = attrs
+    end
+    attr_reader :attrs
+
+    def comparator
+      ->(t1, t2) {
+        attrs.each do |(attr,direction)|
+          c = t1[attr] <=> t2[attr]
+          return (direction == :desc ? -c : c) unless c==0
+        end
+        0
+      }
+    end
+
+  end # class Ordering
+end # module Bmg

data/lib/bmg/support/output_preferences.rb

@@ -0,0 +1,44 @@
+module Bmg
+  class OutputPreferences
+
+    DEFAULT_PREFS = {
+      attributes_ordering: nil,
+      extra_attributes: :after
+    }
+
+    def initialize(options)
+      @options = DEFAULT_PREFS.merge(options)
+    end
+    attr_reader :options
+
+    def self.dress(arg)
+      return arg if arg.is_a?(OutputPreferences)
+      arg = {} if arg.nil?
+      new(arg)
+    end
+
+    def attributes_ordering
+      options[:attributes_ordering]
+    end
+
+    def extra_attributes
+      options[:extra_attributes]
+    end
+
+    def order_attrlist(attrlist)
+      return attrlist if attributes_ordering.nil?
+      index = Hash[attributes_ordering.each_with_index.to_a]
+      attrlist.sort{|a,b|
+        ai, bi = index[a], index[b]
+        if ai && bi
+          ai <=> bi
+        elsif ai
+          extra_attributes == :after ? -1 : 1
+        else
+          extra_attributes == :after ? 1 : -1
+        end
+      }
+    end
+
+  end # class OutputPreferences
+end # module Bmg

data/lib/bmg/support/tuple_algebra.rb

@@ -19,5 +19,11 @@ module Bmg
     end
     module_function :rename
 
+    def symbolize_keys(h)
+      return h if h.empty?
+      h.each_with_object({}){|(k,v),h| h[k.to_sym] = v }
+    end
+    module_function :symbolize_keys
+
   end # module TupleAlgebra
 end # module Bmg

data/lib/bmg/support/tuple_transformer.rb

@@ -26,11 +26,7 @@ module Bmg
 
       def transform_tuple(tuple, with)
         case with
-        when Symbol
-          tuple.each_with_object({}){|(k,v),dup|
-            dup[k] = transform_attr(v, with)
-          }
-        when Proc
+        when Symbol, Proc, Regexp
           tuple.each_with_object({}){|(k,v),dup|
             dup[k] = transform_attr(v, with)
           }
@@ -51,6 +47,9 @@ module Bmg
         case with
         when Symbol
           value.send(with)
+        when Regexp
+          m = with.match(value.to_s)
+          m.nil? ? m : m.to_s
         when Proc
           with.call(value)
         when Hash

data/lib/bmg/version.rb

@@ -1,8 +1,8 @@
 module Bmg
   module Version
     MAJOR = 0
-    MINOR = 17
-    TINY  = 7
+    MINOR = 18
+    TINY  = 3
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/lib/bmg/writer.rb

@@ -1 +1,17 @@
+module Bmg
+  module Writer
+
+  protected
+
+    def infer_headers(from)
+      attrlist = if from.is_a?(Type) && from.knows_attrlist?
+        from.to_attrlist
+      elsif from.is_a?(Hash)
+        from.keys
+      end
+      attrlist ? output_preferences.order_attrlist(attrlist) : nil
+    end
+
+  end # module Writer
+end # module Bmg
 require_relative 'writer/csv'

data/lib/bmg/writer/csv.rb

@@ -6,20 +6,20 @@ module Bmg
       DEFAULT_OPTIONS = {
       }
 
-      def initialize(options)
-        @options = DEFAULT_OPTIONS.merge(options)
+      def initialize(csv_options, output_preferences = nil)
+        @csv_options = DEFAULT_OPTIONS.merge(csv_options)
+        @output_preferences = OutputPreferences.dress(output_preferences)
       end
-      attr_reader :options
+      attr_reader :csv_options, :output_preferences
 
       def call(relation, string_or_io = nil)
         require 'csv'
         string_or_io, to_s = string_or_io.nil? ? [StringIO.new, true] : [string_or_io, false]
-        headers = relation.type.to_attrlist if relation.type.knows_attrlist?
-        csv = nil
+        headers, csv = infer_headers(relation.type), nil
         relation.each do |tuple|
           if csv.nil?
-            headers = tuple.keys if headers.nil?
-            csv = CSV.new(string_or_io, options.merge(headers: headers))
+            headers = infer_headers(tuple) if headers.nil?
+            csv = CSV.new(string_or_io, csv_options.merge(headers: headers))
           end
           csv << headers.map{|h| tuple[h] }
         end

data/lib/bmg/writer/xlsx.rb

@@ -0,0 +1,68 @@
+module Bmg
+  module Writer
+    class Xlsx
+      include Writer
+
+      DEFAULT_OPTIONS = {
+      }
+
+      def initialize(csv_options, output_preferences = nil)
+        @csv_options = DEFAULT_OPTIONS.merge(csv_options)
+        @output_preferences = OutputPreferences.dress(output_preferences)
+      end
+      attr_reader :csv_options, :output_preferences
+
+      def call(relation, path)
+        require 'write_xlsx'
+        dup._call(relation, path)
+      end
+
+    protected
+      attr_reader :workbook, :worksheet
+
+      def _call(relation, path)
+        @workbook = WriteXLSX.new(path)
+        @worksheet = workbook.add_worksheet
+
+        headers = infer_headers(relation.type)
+        relation.each_with_index do |tuple,i|
+          headers = infer_headers(tuple) if headers.nil?
+          headers.each_with_index do |h,i|
+            worksheet.write_string(0, i, h)
+          end if i == 0
+          headers.each_with_index do |h,j|
+            meth, *args = write_pair(tuple[h])
+            worksheet.send(meth, 1+i, j, *args)
+          end
+        end
+
+        workbook.close
+        path
+      end
+
+      def write_pair(value)
+        case value
+        when Numeric
+          [:write_number, value]
+        when Date
+          [:write_date_time, value, date_format]
+        else
+          [:write_string, value.to_s]
+        end
+      end
+
+      def date_format
+        @date_format ||= workbook.add_format(:num_format => 'yyyy-mm-dd')
+      end
+
+    end # class Xlsx
+  end # module Writer
+  module Relation
+
+    def to_xlsx(options = {}, path = nil, preferences = nil)
+      options, path = {}, options unless options.is_a?(Hash)
+      Writer::Xlsx.new(options, preferences).call(self, path)
+    end
+
+  end # module Relation
+end # module Bmg

data/tasks/test.rake

@@ -6,17 +6,24 @@ namespace :test do
   desc "Runs unit tests"
   RSpec::Core::RakeTask.new(:unit) do |t|
     t.pattern = "spec/unit/**/test_*.rb"
-    t.rspec_opts = ["-Ilib", "-Ispec/unit", "--fail-fast", "--color", "--backtrace", "--format=progress"]
+    t.rspec_opts = ["-Ilib", "-Ispec/unit", "--color", "--backtrace", "--format=progress"]
   end
   tests << :unit
 
   desc "Runs integration tests"
   RSpec::Core::RakeTask.new(:integration) do |t|
     t.pattern = "spec/integration/**/test_*.rb"
-    t.rspec_opts = ["-Ilib", "-Ispec/integration", "--fail-fast", "--color", "--backtrace", "--format=progress"]
+    t.rspec_opts = ["-Ilib", "-Ispec/integration", "--color", "--backtrace", "--format=progress"]
   end
   tests << :integration
 
+  desc "Runs github regression tests"
+  RSpec::Core::RakeTask.new(:regression) do |t|
+    t.pattern = "spec/regression/**/test_*.rb"
+    t.rspec_opts = ["-Ilib", "-Ispec/regression", "--color", "--backtrace", "--format=progress"]
+  end
+  tests << :regression
+
   task :all => tests
 end
 

metadata

@@ -1,49 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.17.7
+  version: 0.18.3
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: write_xlsx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +168,7 @@ files:
 - lib/bmg/reader.rb
 - lib/bmg/reader/csv.rb
 - lib/bmg/reader/excel.rb
+- lib/bmg/reader/text_file.rb
 - lib/bmg/relation.rb
 - lib/bmg/relation/empty.rb
 - lib/bmg/relation/in_memory.rb
@@ -250,22 +265,29 @@ files:
 - lib/bmg/sql/version.rb
 - lib/bmg/summarizer.rb
 - lib/bmg/summarizer/avg.rb
+- lib/bmg/summarizer/by_proc.rb
 - lib/bmg/summarizer/collect.rb
 - lib/bmg/summarizer/concat.rb
 - lib/bmg/summarizer/count.rb
+- lib/bmg/summarizer/distinct.rb
 - lib/bmg/summarizer/max.rb
 - lib/bmg/summarizer/min.rb
+- lib/bmg/summarizer/multiple.rb
+- lib/bmg/summarizer/percentile.rb
 - lib/bmg/summarizer/stddev.rb
 - lib/bmg/summarizer/sum.rb
 - lib/bmg/summarizer/variance.rb
 - lib/bmg/support.rb
 - lib/bmg/support/keys.rb
+- lib/bmg/support/ordering.rb
+- lib/bmg/support/output_preferences.rb
 - lib/bmg/support/tuple_algebra.rb
 - lib/bmg/support/tuple_transformer.rb
 - lib/bmg/type.rb
 - lib/bmg/version.rb
 - lib/bmg/writer.rb
 - lib/bmg/writer/csv.rb
+- lib/bmg/writer/xlsx.rb
 - tasks/gem.rake
 - tasks/test.rake
 homepage: http://github.com/enspirit/bmg
@@ -287,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Bmg is Alf's successor.