bmg 0.19.1 → 0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 52f3bf703312e48ca61bb2dbc88711be1dde8a89
-  data.tar.gz: 4f5029df9dc203d7ec82c0da066771ed61fe6182
+SHA256:
+  metadata.gz: 773942a08ee8480d73b6d455ef2560c1136002223c86b38ff549beaf280e2760
+  data.tar.gz: 22043853a3d11acde72865db0ad870f2fe033a71e9474ffb1451cc4d69a58d30
 SHA512:
-  metadata.gz: e9ac87e62f17250706eefb5ce091e3e77f0b91268910ae0a9fa1446eda6adaeed4ef852d022ecab8c9869b5b5da34db678bf7af811c93de08aad1bec28a39b37
-  data.tar.gz: 7c4117b376c5a406612729c9dfb27b5e22e76ec96e269652bf3a99b53d5c890dfc38c3d269558d08267ca8d4aeaad1c60bad89bc4d24e3b0079a10fc49bff73d
+  metadata.gz: 96dc776f81d2b15093372b843e4bb20c4207e0e59a44842130cb79035fd06ab32fb633f34479c2022b7ad5c958ade798fdc10f07cdcf8db60848d382554067eb
+  data.tar.gz: fa08f7f03dc62e03302e82e68ba0b32505c1fce2f8a78c498c40894de37e1e486e60104e18a7e84761ea56b947bf6c585825ce2462a702b0e85d30601a138ac5

data/README.md

@@ -1,7 +1,5 @@
 # Bmg, a relational algebra (Alf's successor)!
 
-[![Build Status](https://travis-ci.com/enspirit/bmg.svg?branch=master)](https://travis-ci.com/enspirit/bmg)
-
 Bmg is a relational algebra implemented as a ruby library. It implements the
 [Relation as First-Class Citizen](http://www.try-alf.org/blog/2013-10-21-relations-as-first-class-citizen)
 paradigm contributed with [Alf](http://www.try-alf.org/) a few years ago.
@@ -210,6 +208,7 @@ r.autowrap(split: '_')                       # structure a flat relation, split:
 r.autosummarize([:a, :b, ...], x: :sum)      # (experimental) usual summarizers supported
 r.constants(x: 12, ...)                      # add constant attributes (sometimes useful in unions)
 r.extend(x: ->(t){ ... }, ...)               # add computed attributes
+r.extend(x: :y)                              # shortcut for r.extend(x: ->(t){ t[:y] })
 r.exclude(predicate)                         # shortcut for restrict(!predicate)
 r.group([:a, :b, ...], :x)                   # relation-valued attribute from attributes
 r.image(right, :x, [:a, :b, ...])            # relation-valued attribute from another relation

data/lib/bmg/operator/extend.rb

@@ -160,7 +160,12 @@ module Bmg
 
       def extend_it(tuple)
         @extension.each_with_object(tuple.dup) { |(k,v), memo|
-          memo[k] = v.call(tuple)
+          memo[k] = case v
+          when Symbol
+            tuple[v]
+          else
+            v.call(tuple)
+          end
           memo
         }
       end

data/lib/bmg/reader/csv.rb

@@ -39,7 +39,9 @@ module Bmg
     private
 
       def tuple(row)
-        row.to_hash.each_with_object({}){|(k,v),h| h[k.to_sym] = v }
+        row.to_hash.each_with_object({}){|(k,v),h|
+          h[k.to_sym] = v
+        }
       end
 
       def handle_type(type)

data/lib/bmg/sequel/translator.rb

@@ -81,6 +81,7 @@ module Bmg
         case sexpr.func_name
         when :cast
           to_cast = apply(sexpr.func_args.first)
+          to_cast = ::Sequel.expr(nil) if to_cast.nil?
           type = sexpr.func_args.last.last
           to_cast.cast(type)
         else

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

@@ -0,0 +1,33 @@
+module Bmg
+  module Sql
+    class Processor
+      class Extend < Processor
+
+        def initialize(extension, builder)
+          super(builder)
+          @extension = extension
+        end
+        attr_reader :extension
+
+        def on_set_operator(sexpr)
+          apply(builder.from_self(sexpr))
+        end
+        alias :on_union     :on_set_operator
+        alias :on_except    :on_set_operator
+        alias :on_intersect :on_set_operator
+
+        def on_select_star(sexpr)
+          raise NotImplementedError, "Extend on * is not supported"
+        end
+
+        def on_select_list(sexpr)
+          sexpr + extension.each_pair.map{|(k,v)|
+            desaliased = sexpr.desaliaser[v]
+            [:select_item, desaliased, [:column_name, k] ]
+          }
+        end
+
+      end # class Extend
+    end # class Processor
+  end # module Sql
+end # module Bmg

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

@@ -10,7 +10,7 @@ module Bmg
 
         def on_select_list(sexpr)
           reordered = sexpr.sexpr_body.sort{|i1,i2|
-            @indexes[i1.as_name] <=> @indexes[i2.as_name]
+            @indexes[i1.as_name.to_s] <=> @indexes[i2.as_name.to_s]
           }
           reordered.unshift(:select_list)
         end

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

@@ -39,9 +39,10 @@ module Bmg
         def falsy?(sexpr)
           return false unless sexpr.respond_to?(:predicate)
           return false if sexpr.predicate.nil?
+
           left  = Predicate.new(Predicate::Grammar.sexpr(sexpr.predicate)).unqualify
           right = Predicate.new(Predicate::Grammar.sexpr(@predicate.sexpr)).unqualify
-          return (left & right).contradiction?
+          (left & right).contradiction?
         end
 
       end # class Where

data/lib/bmg/sql/processor.rb

@@ -71,6 +71,7 @@ require_relative 'processor/distinct'
 require_relative 'processor/all'
 require_relative 'processor/clip'
 require_relative 'processor/constants'
+require_relative 'processor/extend'
 require_relative 'processor/star'
 require_relative 'processor/rename'
 require_relative 'processor/order_by'

data/lib/bmg/sql/relation.rb

@@ -57,6 +57,23 @@ module Bmg
         _instance(type, builder, expr)
       end
 
+      def _extend(type, extension)
+        supported, unsupported = {}, {}
+        extension.each_pair do |k,v|
+          (v.is_a?(Symbol) ? supported : unsupported)[k] = v
+        end
+        if supported.empty?
+          Operator::Extend.new(type, self, extension)
+        elsif unsupported.empty?
+          expr = Processor::Extend.new(supported, builder).call(self.expr)
+          _instance(type, builder, expr)
+        else
+          expr = Processor::Extend.new(supported, builder).call(self.expr)
+          operand = _instance(type.allbut(unsupported.keys), builder, expr)
+          Operator::Extend.new(type, operand, unsupported)
+        end
+      end
+
       def _join(type, right, on)
         if right_expr = extract_compatible_sexpr(right)
           right_expr = Processor::Requalify.new(builder).call(right_expr)

data/lib/bmg/support/ordering.rb

@@ -2,7 +2,13 @@ module Bmg
   class Ordering
 
     def initialize(attrs)
-      @attrs = attrs
+      @attrs = if attrs.empty?
+        []
+      elsif attrs.first.is_a?(Symbol)
+        attrs.map{|a| [a, :asc] }
+      else
+        attrs
+      end
     end
     attr_reader :attrs
 
@@ -33,5 +39,9 @@ module Bmg
       0
     end
 
+    def to_a
+      attrs.to_a
+    end
+
   end # class Ordering
 end # module Bmg

data/lib/bmg/support/output_preferences.rb

@@ -3,6 +3,7 @@ module Bmg
 
     DEFAULT_PREFS = {
       attributes_ordering: nil,
+      tuple_ordering: nil,
       extra_attributes: :after
     }
 
@@ -17,6 +18,12 @@ module Bmg
       new(arg)
     end
 
+    def tuple_ordering
+      return nil unless to = options[:tuple_ordering]
+
+      @tuple_ordering = Ordering.new(to)
+    end
+
     def attributes_ordering
       options[:attributes_ordering]
     end
@@ -25,10 +32,29 @@ module Bmg
       options[:extra_attributes]
     end
 
+    def grouping_attributes
+      options[:grouping_attributes]
+    end
+
+    def erase_redundance_in_group(before, current)
+      return [nil, current] unless ga = grouping_attributes
+      return [current, current] unless before
+
+      new_before, new_current = current.dup, current.dup
+      ga.each do |attr|
+        return [new_before, new_current] unless before[attr] == current[attr]
+        new_current[attr] = nil
+      end
+      [new_before, new_current]
+    end
+
     def order_attrlist(attrlist)
       return attrlist if attributes_ordering.nil?
+
       index = Hash[attributes_ordering.each_with_index.to_a]
-      attrlist.sort{|a,b|
+      base  = attrlist
+      base  = attrlist & attributes_ordering if extra_attributes == :ignored
+      base.sort{|a,b|
         ai, bi = index[a], index[b]
         if ai && bi
           ai <=> bi

data/lib/bmg/version.rb

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

data/lib/bmg/writer/csv.rb

@@ -16,12 +16,14 @@ module Bmg
         require 'csv'
         string_or_io, to_s = string_or_io.nil? ? [StringIO.new, true] : [string_or_io, false]
         headers, csv = infer_headers(relation.type), nil
-        relation.each do |tuple|
+        previous = nil
+        each_tuple(relation) do |tuple,i|
           if csv.nil?
             headers = infer_headers(tuple) if headers.nil?
             csv_opts = csv_options.merge(headers: headers)
             csv = CSV.new(string_or_io, **csv_opts)
           end
+          previous, tuple = output_preferences.erase_redundance_in_group(previous, tuple)
           csv << headers.map{|h| tuple[h] }
         end
         to_s ? string_or_io.string : string_or_io

data/lib/bmg/writer/xlsx.rb

@@ -6,11 +6,11 @@ module Bmg
       DEFAULT_OPTIONS = {
       }
 
-      def initialize(csv_options, output_preferences = nil)
-        @csv_options = DEFAULT_OPTIONS.merge(csv_options)
+      def initialize(xlsx_options, output_preferences = nil)
+        @xlsx_options = DEFAULT_OPTIONS.merge(xlsx_options)
         @output_preferences = OutputPreferences.dress(output_preferences)
       end
-      attr_reader :csv_options, :output_preferences
+      attr_reader :xlsx_options, :output_preferences
 
       def call(relation, path)
         require 'write_xlsx'
@@ -21,22 +21,24 @@ module Bmg
       attr_reader :workbook, :worksheet
 
       def _call(relation, path)
-        @workbook = WriteXLSX.new(path)
-        @worksheet = workbook.add_worksheet
+        @workbook = xlsx_options[:workbook] || WriteXLSX.new(path)
+        @worksheet = xlsx_options[:worksheet] || workbook.add_worksheet
 
         headers = infer_headers(relation.type)
-        relation.each_with_index do |tuple,i|
+        before = nil
+        each_tuple(relation) 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
+          before, tuple = output_preferences.erase_redundance_in_group(before, tuple)
           headers.each_with_index do |h,j|
             meth, *args = write_pair(tuple[h])
             worksheet.send(meth, 1+i, j, *args)
           end
         end
 
-        workbook.close
+        workbook.close unless xlsx_options[:workbook]
         path
       end
 

data/lib/bmg/writer.rb

@@ -12,6 +12,17 @@ module Bmg
       attrlist ? output_preferences.order_attrlist(attrlist) : nil
     end
 
+    def each_tuple(relation, &bl)
+      if ordering = output_preferences.tuple_ordering
+        relation
+          .to_a
+          .sort{|t1,t2| ordering.compare_attrs(t1, t2) }
+          .each_with_index(&bl)
+      else
+        relation.each_with_index(&bl)
+      end
+    end
+
   end # module Writer
 end # module Bmg
 require_relative 'writer/csv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.3
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -248,6 +248,7 @@ files:
 - lib/bmg/sql/processor/clip.rb
 - lib/bmg/sql/processor/constants.rb
 - lib/bmg/sql/processor/distinct.rb
+- lib/bmg/sql/processor/extend.rb
 - lib/bmg/sql/processor/flatten.rb
 - lib/bmg/sql/processor/from_self.rb
 - lib/bmg/sql/processor/join.rb
@@ -317,8 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Bmg is Alf's successor.