bmg 0.20.5 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0c2ddf234065e92d8491f0efc3e603522c3aabdb43d268a1e6b438f9aa9197ea
-  data.tar.gz: d985c466d1b0cc9f9117517f64fb2b00715e2e6cf41e95a10eaa5772e89c2dd3
+SHA1:
+  metadata.gz: ef6b320621feeff681bb76b804da274ae055573c
+  data.tar.gz: 2a119b1aa5838fbb2b657332de25fd22cc10dbb6
 SHA512:
-  metadata.gz: 13d3dd2a73eb78e4e2344da2af4f6d738c1294f15ec19affa732aad83d2d1e4aa6778e424814a833b3ccdb78f5a6abe55121d75a35448d73ce7f03591abb502f
-  data.tar.gz: 27d4c95da2fa998ef36a6fbdc08fdbd8e4cae0735a0b6450008d835a494d82c12566553b50aa222316b8e4e99c145e390e0c3c5148305aeab71c259177dac160
+  metadata.gz: e33cda560cb1c3f119940745c63f45884a406d7b0bce113d08a43d2f374a9a658ab47667c63919d16d5863f6867f2d29808d23a049efe9e34487a282e29c9c82
+  data.tar.gz: ec437125ffbf4e41633b33c6ddc5eedeccef915dd2201f7d0f2a54e8ba348f272e67195ebc57cd8a8e839b07a0fa1aacb957eacf6723d34a42b03dac1d4783ec

data/lib/bmg/reader/csv.rb

@@ -39,9 +39,7 @@ 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,13 +2,7 @@ module Bmg
   class Ordering
 
     def initialize(attrs)
-      @attrs = if attrs.empty?
-        []
-      elsif attrs.first.is_a?(Symbol)
-        attrs.map{|a| [a, :asc] }
-      else
-        attrs
-      end
+      @attrs = attrs
     end
     attr_reader :attrs
 
@@ -39,9 +33,5 @@ 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,7 +3,6 @@ module Bmg
 
     DEFAULT_PREFS = {
       attributes_ordering: nil,
-      tuple_ordering: nil,
       extra_attributes: :after
     }
 
@@ -18,12 +17,6 @@ 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
@@ -32,29 +25,10 @@ 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]
-      base  = attrlist
-      base  = attrlist & attributes_ordering if extra_attributes == :ignored
-      base.sort{|a,b|
+      attrlist.sort{|a,b|
         ai, bi = index[a], index[b]
         if ai && bi
           ai <=> bi

data/lib/bmg/version.rb

@@ -1,8 +1,8 @@
 module Bmg
   module Version
     MAJOR = 0
-    MINOR = 20
-    TINY  = 5
+    MINOR = 21
+    TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/lib/bmg/writer/csv.rb

@@ -16,14 +16,12 @@ 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
-        previous = nil
-        each_tuple(relation) do |tuple,i|
+        relation.each do |tuple|
           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(xlsx_options, output_preferences = nil)
-        @xlsx_options = DEFAULT_OPTIONS.merge(xlsx_options)
+      def initialize(csv_options, output_preferences = nil)
+        @csv_options = DEFAULT_OPTIONS.merge(csv_options)
         @output_preferences = OutputPreferences.dress(output_preferences)
       end
-      attr_reader :xlsx_options, :output_preferences
+      attr_reader :csv_options, :output_preferences
 
       def call(relation, path)
         require 'write_xlsx'
@@ -21,24 +21,22 @@ module Bmg
       attr_reader :workbook, :worksheet
 
       def _call(relation, path)
-        @workbook = xlsx_options[:workbook] || WriteXLSX.new(path)
-        @worksheet = xlsx_options[:worksheet] || workbook.add_worksheet
+        @workbook = WriteXLSX.new(path)
+        @worksheet = workbook.add_worksheet
 
         headers = infer_headers(relation.type)
-        before = nil
-        each_tuple(relation) do |tuple,i|
+        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
-          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 unless xlsx_options[:workbook]
+        workbook.close
         path
       end
 

data/lib/bmg/writer.rb

@@ -12,17 +12,6 @@ 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.5
+  version: 0.21.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -320,7 +320,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Bmg is Alf's successor.