bmg 0.23.5 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb0b47d8dbd6924eb1f4fb7e773635a5d1fc83fc09b09c60ead3ac913bbd2051
-  data.tar.gz: ad0919fc045b59b5299254d0f476b31390069b6d39e086334cd55790eedf56e0
+  metadata.gz: 1cf55d89350451dc43a50e85413570b8525fdb1af1467cf33c854d65cd885324
+  data.tar.gz: a0a665602f3e4deceacfa6bc1bf301dd91e9344d96d93f3cc1df462e3b364fb1
 SHA512:
-  metadata.gz: 1fa7c3dfa036762e82dd86275c522af811eba747901f288e8b1804388ddee0094350374795527b0884cf8d5355eea649f9c3ce4a66ec7c9742eeaef5fff81a16
-  data.tar.gz: 5cee0487c9e70df6a049791ef48d93fda5ff516d769b7f8d25f9ea6f29d9d780bec8aebca78a8e88e435113acde6860fc1c7dbbbb2c9bb7f70edf88d22bfe739
+  metadata.gz: 2cf7cfe088705ba0ac9b90aaa47c457d2f5fbd7dc9d28f8dc246b91e8dbd4d492ff6ef0e892385d2fb6098998e9d07859d355b68f833154d4c4dbd2f6db87149
+  data.tar.gz: bd120334a2e20ff7b20cd15d4d96ac3c3651fac5011aadc3dc6f3acf301f9b5f1245fc8e46571f7ab67ed8db4a45d463728605172c0e8d4213b753289d64959e

data/lib/bmg/database/data_folder.rb

@@ -3,7 +3,9 @@ module Bmg
     class DataFolder < Database
 
       DEFAULT_OPTIONS = {
-        data_extensions: ['json', 'yml', 'yaml', 'csv']
+        data_extensions: ['json', 'yml', 'yaml', 'csv'],
+        relname_from_file: ->(file) { file.basename.rm_ext.to_sym },
+        filename_from_relname: ->(relname) { relname },
       }
 
       def initialize(folder, options = {})
@@ -25,15 +27,21 @@ module Bmg
           next unless @options[:data_extensions].find {|ext|
             path.ext == ".#{ext}" || path.ext == ext
           }
-          yield(path.basename.rm_ext.to_sym, read_file(path))
+          yield(@options[:relname_from_file].call(path), read_file(path))
         end
       end
 
-      def self.dump(database, path, ext = :json)
+      def self.dump(database, path, ext = :json, options = DEFAULT_OPTIONS)
+        options = DEFAULT_OPTIONS.merge(options)
         path = Path(path)
         path.mkdir_p
         database.each_relation_pair do |name, rel|
-          (path/"#{name}.#{ext}").write(rel.public_send(:"to_#{ext}"))
+          filename = options[:filename_from_relname].call(name)
+          if ext === :json
+            (path/"#{filename}.#{ext}").write(JSON.pretty_generate(rel))
+          else
+            (path/"#{filename}.#{ext}").write(rel.public_send(:"to_#{ext}"))
+          end
         end
         path
       end
@@ -56,8 +64,8 @@ module Bmg
       def find_file(name)
         exts = @options[:data_extensions]
         exts.each do |ext|
-          target = @folder/"#{name}.#{ext}"
-          return target if target.file?
+          target = @folder.glob("*#{name}.#{ext}")
+          return target.first if target&.first&.file?
         end
         raise NotSuchRelationError, "#{@folder}/#{name}.#{exts.join(',')}"
       end

data/lib/bmg/database/xlsx.rb

@@ -3,12 +3,13 @@ module Bmg
     class Xlsx < Database
 
       DEFAULT_OPTIONS = {
+        reader_options: {}
       }
 
       def initialize(path, options = {})
         path = Path(path) if path.is_a?(String)
         @path = path
-        @options = options.merge(DEFAULT_OPTIONS)
+        @options = DEFAULT_OPTIONS.merge(options)
       end
 
       def method_missing(name, *args, &bl)
@@ -33,7 +34,9 @@ module Bmg
       end
 
       def rel_for(sheet_name)
-        Bmg.excel(@path, { sheet: sheet_name.to_s })
+        Bmg.excel(@path, @options[:reader_options].merge({
+          sheet: sheet_name.to_s
+        }))
       end
 
     end # class Sequel

data/lib/bmg/database.rb

@@ -24,6 +24,7 @@ module Bmg
     end
 
     def to_data_folder(*args)
+      require_relative 'database/data_folder'
       DataFolder.dump(self, *args)
     end
 
@@ -31,5 +32,9 @@ module Bmg
       raise NotImplementedError
     end
 
+    def output_preferences_for(name)
+      nil
+    end
+
   end # class Database
 end # module Bmg

data/lib/bmg/reader/xlsx.rb

@@ -6,7 +6,8 @@ module Bmg
       DEFAULT_OPTIONS = {
         sheet: 0,
         skip: 0,
-        row_num: true
+        row_num: true,
+        grouping_character: nil,
       }
 
       def initialize(type, path, options = {})
@@ -23,13 +24,16 @@ module Bmg
         headers = headers[1..-1] if generate_row_num?
         start_at = @options[:skip] + 2
         end_at = spreadsheet.last_row
+
+        previous = {}
         (start_at..end_at).each do |i|
           row = spreadsheet.row(i)
           init = init_tuple(i - start_at + 1)
           tuple = (0...headers.size).each_with_object(init){|i,t|
-            t[headers[i]] = row[i]
+            t[headers[i]] = extract_value(headers[i], row[i], previous)
           }
           yield(tuple)
+          previous = tuple
         end
       end
 
@@ -75,6 +79,12 @@ module Bmg
         { row_num_name => i }
       end
 
+      def extract_value(attribute, value, previous)
+        return value unless c = @options[:grouping_character]
+
+        value == c ? previous[attribute] : value
+      end
+
     end # class Excel
   end # module Reader
 end # module Bmg

data/lib/bmg/sequel/translator.rb

@@ -70,13 +70,21 @@ module Bmg
         case kind = sexpr.left.first
         when :qualified_name
           left.column == right.value ? left : ::Sequel.as(left, right)
-        when :literal, :summarizer, :func_call
+        when :literal, :summarizer, :func_call, :case_when
           ::Sequel.as(left, right)
         else
           raise NotImplementedError, "Unexpected select item `#{kind}`"
         end
       end
 
+      def on_case_when(sexpr)
+        operand = apply(sexpr[1])
+        mapping = sexpr[2..-1].each_slice(2).each_with_object({}){|(w, t), h|
+          h[w.last] = t.last
+        }
+        ::Sequel.case(mapping, nil, operand)
+      end
+
       def on_func_call(sexpr)
         case sexpr.func_name
         when :cast

data/lib/bmg/sql/grammar.rb

@@ -48,3 +48,4 @@ require_relative "nodes/inner_join"
 require_relative "nodes/left_join"
 require_relative "nodes/summarizer"
 require_relative "nodes/func_call"
+require_relative "nodes/case_when"

data/lib/bmg/sql/grammar.sexp.yml

@@ -81,6 +81,9 @@ rules:
     - summarizer
     - func_call
     - literal
+    - case_when
+  case_when:
+    - [ scalar_exp, literal+ ]
   a_name:
     - qualified_name
     - column_name

data/lib/bmg/sql/nodes/case_when.rb

@@ -0,0 +1,33 @@
+module Bmg
+  module Sql
+    module CaseWhen
+      include Expr
+
+      def operand
+        self[1]
+      end
+
+      def whens
+        self[2..-1].each_slice(2).to_a
+      end
+
+      def is_computed?
+        true
+      end
+
+      def to_sql(buffer, dialect)
+        buffer << "CASE "
+        operand.to_sql(buffer, dialect)
+        whens.each do |(when_val, then_val)|
+          buffer << " WHEN "
+          when_val.to_sql(buffer, dialect)
+          buffer << " THEN "
+          then_val.to_sql(buffer, dialect)
+        end
+        buffer << " END"
+        buffer
+      end
+
+    end # module CaseWhen
+  end # module Sql
+end # module Bmg

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

@@ -50,6 +50,14 @@ module Bmg
           SplitSupported.split_supported(*args, &bl)
         end
 
+        # An SQL-able element the transform can emit verbatim: an object that
+        # carries its own SQL (the predicate gem's `:sql`/`:sql_literal`
+        # convention) or a Sequel expression (rendered through `Sequel.expr`).
+        def self.sql_expr?(x)
+          x.respond_to?(:sql_literal) || x.respond_to?(:sql) ||
+            (defined?(::Sequel::SQL::Expression) && x.is_a?(::Sequel::SQL::Expression))
+        end
+
         def on_select_list(sexpr)
           sexpr.each_with_index.map{|child,index|
             index == 0 ? child : apply(child)
@@ -66,8 +74,17 @@ module Bmg
               func_call_node(sexpr, Array(t).reverse),
               sexpr[2]
             ])
+          when Hash
+            sexpr([:select_item,
+              case_when_node(sexpr, t),
+              sexpr[2]
+            ])
           else
-            raise NotSupportedError
+            # An SQL-able value (e.g. a Sequel expression) carries its own SQL
+            # — including the column reference — so it rides through as a
+            # literal, which the Sequel translator emits verbatim.
+            raise NotSupportedError unless Transform.sql_expr?(t)
+            sexpr([:select_item, [:literal, t], sexpr[2]])
           end
         end
 
@@ -89,6 +106,15 @@ module Bmg
             [ :literal, head ] ]
         end
 
+        def case_when_node(sexpr, mapping)
+          node = [:case_when, sexpr[1]]
+          mapping.each do |when_val, then_val|
+            node << [:literal, when_val]
+            node << [:literal, then_val]
+          end
+          node
+        end
+
         def transformation_for(as)
           case t = transformation
           when Class then t

data/lib/bmg/sql/relation.rb

@@ -167,7 +167,8 @@ module Bmg
       def _transform(type, transformation, options)
         expr = before_use(self.expr)
         sup, unsup = Processor::Transform.split_supported(transformation){|x|
-          [String, Integer, Float, Date, DateTime].include?(x)
+          [String, Integer, Float, Date, DateTime].include?(x) || x.is_a?(Hash) ||
+            Processor::Transform.sql_expr?(x)
         }
         return super if sup.nil?
         expr = Processor::Transform.new(sup, options, builder).call(expr)

data/lib/bmg/support/output_preferences.rb

@@ -4,6 +4,7 @@ module Bmg
     DEFAULT_PREFS = {
       attributes_ordering: nil,
       tuple_ordering: nil,
+      grouping_attributes: nil,
       extra_attributes: :after
     }
 
@@ -36,14 +37,20 @@ module Bmg
       options[:grouping_attributes]
     end
 
+    def grouping_character
+      options[:grouping_character]
+    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
+        unless before[attr] == current[attr]
+          return [new_before, new_current]
+        end
+        new_current[attr] = grouping_character
       end
       [new_before, new_current]
     end

data/lib/bmg/version.rb

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

data/lib/bmg/writer/xlsx.rb

@@ -25,7 +25,7 @@ module Bmg
           rel.to_xlsx({
             workbook: workbook,
             worksheet: worksheet,
-          })
+          }, nil, database.output_preferences_for(name))
         end
         workbook.close
       end
@@ -39,31 +39,48 @@ module Bmg
         @worksheet = workbook.add_worksheet(@worksheet) if @worksheet.is_a?(String)
 
         headers = infer_headers(relation.type)
+        max_widths = Hash.new{|h,k| h[k] = 5 }
         before = nil
+
+        write_headers(headers, worksheet, max_widths) unless headers.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
+          if headers.nil?
+            headers = infer_headers(tuple)
+            write_headers(headers, worksheet, max_widths)
+          end
           before, tuple = output_preferences.erase_redundance_in_group(before, tuple)
           headers.each_with_index do |h,j|
-            meth, *args = write_pair(tuple[h])
+            meth, args, approx_width = write_pair(tuple[h])
             worksheet.send(meth, 1+i, j, *args)
+            max_widths[j] = [max_widths[j], approx_width].max
           end
         end
 
+        max_widths.each_pair do |col, width|
+          worksheet.set_column(col, col, [1+width, 100].min)
+        end
+        worksheet.freeze_panes(1, 0)
         workbook.close unless xlsx_options[:workbook]
         path
       end
 
+      def write_headers(headers, worksheet, max_widths)
+        header_format = workbook.add_format(bold: true)
+        headers.each_with_index do |h,i|
+          worksheet.write_string(0, i, h, header_format)
+          max_widths[i] = [max_widths[i], h.to_s.size].max
+        end
+      end
+
       def write_pair(value)
         case value
         when Numeric
-          [:write_number, value]
+          [:write_number, [value], value.to_s.size]
         when Date
-          [:write_date_time, value, date_format]
+          [:write_date_time, [value, date_format], value.to_s.size]
         else
-          [:write_string, value.to_s]
+          [:write_string, [value.to_s], value.to_s.size]
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.24.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2026-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -233,6 +233,7 @@ files:
 - lib/bmg/sql/ext/predicate/tautology.rb
 - lib/bmg/sql/grammar.rb
 - lib/bmg/sql/grammar.sexp.yml
+- lib/bmg/sql/nodes/case_when.rb
 - lib/bmg/sql/nodes/column_name.rb
 - lib/bmg/sql/nodes/cross_join.rb
 - lib/bmg/sql/nodes/except.rb
@@ -347,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Bmg is Alf's successor.