bmg 0.20.2 → 0.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 45a80b1a3fd00fc27f88f37b41816dd11324aa70
-  data.tar.gz: 9d600dd0619e0d814a07db94c95dc093b61584b9
+SHA256:
+  metadata.gz: 0c2ddf234065e92d8491f0efc3e603522c3aabdb43d268a1e6b438f9aa9197ea
+  data.tar.gz: d985c466d1b0cc9f9117517f64fb2b00715e2e6cf41e95a10eaa5772e89c2dd3
 SHA512:
-  metadata.gz: 38fefe80ca45ddce14d3310621b82b389db5a7c11ab22bb17563c2c6f7dc769f9a54f9a3bebde6c40a2bbecbae215969857a8cf875a7363ad10261fd5b32b75f
-  data.tar.gz: 91492014f31ff3c540df388cac9e362e16555e373ca59ed178bdf32f7098d176947f7e6432df804a8bb3f34210d8a3762b92ce39d37455ff2ee2e55346bf9bce
+  metadata.gz: 13d3dd2a73eb78e4e2344da2af4f6d738c1294f15ec19affa732aad83d2d1e4aa6778e424814a833b3ccdb78f5a6abe55121d75a35448d73ce7f03591abb502f
+  data.tar.gz: 27d4c95da2fa998ef36a6fbdc08fdbd8e4cae0735a0b6450008d835a494d82c12566553b50aa222316b8e4e99c145e390e0c3c5148305aeab71c259177dac160

data/lib/bmg/operator/autowrap.rb

@@ -68,6 +68,20 @@ module Bmg
 
     protected ### optimization
 
+      def _allbut(type, butlist)
+        new_roots = wrapped_roots!
+        separator = @options[:split]
+        down = operand.type.attrlist!.select { |attr|
+          root = attr.to_s.split(separator).map(&:to_sym).first
+          butlist.include?(root)
+        }
+        r = operand.allbut(down)
+        r = r.autowrap(options) unless (butlist & new_roots == new_roots)
+        r
+      rescue UnknownAttributesError
+        super
+      end
+
       def _autowrap(type, opts)
         if same_options?(opts)
           self
@@ -122,11 +136,12 @@ module Bmg
       end
 
       def _project(type, attrlist)
-        if (wrapped_roots! & attrlist).empty?
-          operand.project(attrlist).autowrap(options)
-        else
-          super
-        end
+        separator = @options[:split]
+        to_keep = operand.type.attrlist!.select { |attr|
+          root = attr.to_s.split(separator).map(&:to_sym).first
+          attrlist.include?(root)
+        }
+        operand.project(to_keep).autowrap(options)
       rescue UnknownAttributesError
         super
       end
@@ -169,6 +184,7 @@ module Bmg
 
       def wrapped_roots_of!(r, opts)
         raise UnknownAttributesError unless r.type.knows_attrlist?
+
         Support.wrapped_roots(r.type.to_attrlist, opts[:split])
       end
 

data/lib/bmg/operator/project.rb

@@ -67,6 +67,10 @@ module Bmg
         operand.restrict(predicate).project(attrlist)
       end
 
+      def _allbut(type, butlist)
+        Project.new(type, @operand, attrlist - butlist)
+      end
+
     protected ### inspect
 
       def args

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

@@ -46,6 +46,11 @@ module Bmg
     attr_accessor :attrlist
     protected :attrlist=
 
+    def attrlist!
+      knows_attrlist!
+      attrlist
+    end
+
     def with_attrlist(attrlist)
       dup.tap{|x|
         x.attrlist = attrlist

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 2
+    TINY  = 5
   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.20.2
+  version: 0.20.5
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -320,8 +320,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.