bmg 0.18.13 → 0.18.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ceadf8947aa041841941225e88396cc37ff7319
-  data.tar.gz: 9c695d3305101ff4a73bcdef5e3788648e9b2d27
+  metadata.gz: 8541ab1e17726eb751772cc29a3d198f8bc021d7
+  data.tar.gz: a4e07beb7b994d3ac6dda214e3a75822a1a3eb07
 SHA512:
-  metadata.gz: 70db4550decd609934e1d8d643983766b5b50b9f0354b2405dfdc710b9580a885e4754c907ed5011856e905308af9647c029f0dd612657e72b45af0465eaced2
-  data.tar.gz: 5ed5e7f6d1d9baa8070112a36229e8961e4b5a531acbdac808fcf1f5c008fc91ae3ceadc5c3b4c1d0ace22ca6f861074e79b6d957498740a8fba3d5e99875068
+  metadata.gz: '063179c6a79505b6baaaf800f56a35dc7084b95ac4fa2c73acc92e809bb1d164d99bb3ce6120863d3b87886f8e21b3bc3579a1043e01dc2938ff6c278a4c08c3'
+  data.tar.gz: 3fe57b85503565d547522f4a41ad608ca3839add2305e5108b212f269a4d76adb4d681da58cca01bea564c1ce24b70922215923f3df332d5a7d51dadc09a2ee8

data/lib/bmg/reader/excel.rb

@@ -10,32 +10,27 @@ module Bmg
       }
 
       def initialize(type, path, options = {})
-        @type = type
+        require 'roo'
         @path = path
         @options = DEFAULT_OPTIONS.merge(options)
+        @type = type.knows_attrlist? ? type : type.with_attrlist(infer_attrlist)
       end
 
       def each
         return to_enum unless block_given?
-        require 'roo'
-        xlsx = Roo::Spreadsheet.open(@path, @options)
-        headers = nil
-        xlsx.sheet(@options[:sheet])
-          .each
-          .drop(@options[:skip])
-          .each_with_index
-          .each do |row, i|
-            if i==0
-              headers = row.map{|c| c.to_s.strip.to_sym }
-            else
-              init = init_tuple(i)
-              tuple = (0...headers.size)
-                .each_with_object(init){|i,t|
-                  t[headers[i]] = row[i]
-                }
-              yield(tuple)
-            end
-          end
+
+        headers = type.attrlist
+        headers = headers[1..-1] if generate_row_num?
+        start_at = @options[:skip] + 2
+        end_at = spreadsheet.last_row
+        (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]
+          }
+          yield(tuple)
+        end
       end
 
       def to_ast
@@ -49,17 +44,37 @@ module Bmg
 
     private
 
-      def init_tuple(i)
+      def spreadsheet
+        @spreadsheet ||= Roo::Spreadsheet
+          .open(@path, @options)
+          .sheet(@options[:sheet])
+      end
+
+      def infer_attrlist
+        row = spreadsheet.row(1+@options[:skip])
+        attrlist = row.map{|c| c.to_s.strip.to_sym }
+        attrlist.unshift(row_num_name) if generate_row_num?
+        attrlist
+      end
+
+      def generate_row_num?
+        !!@options[:row_num]
+      end
+
+      def row_num_name
         case as = @options[:row_num]
-        when TrueClass
-          { :row_num => i }
-        when FalseClass
-          {}
-        when Symbol
-          { :"#{as}" => i }
+        when TrueClass  then :row_num
+        when Symbol     then as
+        else nil
         end
       end
 
+      def init_tuple(i)
+        return {} unless generate_row_num?
+
+        { row_num_name => i }
+      end
+
     end # class Excel
   end # module Reader
-end # module Bmg
+end # module Bmg

data/lib/bmg/relation/materialized.rb

@@ -5,6 +5,7 @@ module Bmg
 
       def initialize(operand)
         @operand = operand
+        @materialized = nil
       end
 
       def type
@@ -40,9 +41,9 @@ module Bmg
     private
 
       def _materialize
-        return @operand if @operand.is_a?(Relation::InMemory)
+        return @materialized if @materialized
 
-        @operand = Relation::InMemory.new(operand.type, operand.to_a)
+        @materialized = Relation::InMemory.new(operand.type, operand.to_a)
       end
 
     end # class Materialized

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 18
-    TINY  = 13
+    TINY  = 14
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.18.13
+  version: 0.18.14
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate