portable 1.0.0.pre.alpha.6 → 1.0.0.pre.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab583e6beab687062935129db41650e353f23ec7ca2af9c610f49d8ac60a4811
-  data.tar.gz: 5999aab0a2a8bb37337d0923a2c06bffe9876dd8e8b4b879b799112090b4f393
+  metadata.gz: e9a80aeca8e54c0e02bf414ee6c79b6e110e126a57fc64a3a9d3f8990481f940
+  data.tar.gz: 7ee0c481c4d15148857726d3644230a76a52f8ae178425c5e1c5defbc485c81b
 SHA512:
-  metadata.gz: b485fead56c787bc169135b0c084289fcc690c49a9bface4f5d394c5494ed1139096ea5da5916001a2a845a1817c057f40d8d498d005288958e1792ebfa96b72
-  data.tar.gz: 93a3912588240c7c3172e06f47d8226627e50016ab9444a43c4d60aa536919542e8cbf35cb6e7369a226e15796b1b25e9af77e168dcb16a3c1a8a6193a8b481b
+  metadata.gz: 2e45f20154ff8471104bcdbd5fbbc32d8cf3c892606c077f418b3d29456c8221c080bc7ae2719f63920e54a8f139ad62b2104ecfee1a39699d54467134f6a9be
+  data.tar.gz: d11bdfc431b996f82b8f6b14f53862ff98236ad08f6c7e79d87fdd3153137c42bc71687506bf2bfa544a9c1a62e745ba9658a8e1ded37eba3e9e705cb173ed49

data/lib/portable/rendering/column.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2020-present, Blue Marble Payroll, LLC
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+
+module Portable
+  module Rendering
+    class Column # :nodoc: all
+      extend Forwardable
+
+      attr_reader :column, :pipeline
+
+      def_delegators :column, :header
+
+      def_delegators :pipeline, :transform
+
+      def initialize(column, resolver: Objectable.resolver)
+        raise ArgumentError, 'column is required' unless column
+
+        @column   = column
+        @pipeline = Realize::Pipeline.new(column.transformers, resolver: resolver)
+
+        freeze
+      end
+    end
+  end
+end

data/lib/portable/rendering/row.rb

@@ -7,39 +7,36 @@
 # LICENSE file in the root directory of this source tree.
 #
 
+require_relative 'column'
+
 module Portable
   module Rendering
     # Internal intermediary class that knows how to combine columns specification
     # instances with their respective Realize pipelines.
     class Row # :nodoc: all
-      attr_reader :column_pipelines, :resolver
+      attr_reader :columns, :resolver
 
       def initialize(columns, resolver: Objectable.resolver)
         @resolver = resolver
-
-        @column_pipelines = columns.each_with_object({}) do |column, memo|
-          memo[column] = Realize::Pipeline.new(column.transformers, resolver: resolver)
-        end
+        @columns  = columns.map { |column| Column.new(column, resolver: resolver) }
 
         freeze
       end
 
       def render(object, time)
-        column_pipelines.each_with_object({}) do |(column, pipeline), memo|
-          memo[column.header] = pipeline.transform(object, time)
-        end
-      end
-
-      def columns
-        column_pipelines.keys
+        columns.map { |column| column.transform(object, time) }
       end
 
       def headers
         columns.map(&:header)
       end
 
+      def model_columns
+        columns.map(&:column)
+      end
+
       def merge(other)
-        self.class.new(columns + other.columns, resolver: resolver)
+        self.class.new(model_columns + other.model_columns, resolver: resolver)
       end
     end
   end

data/lib/portable/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Portable
-  VERSION = '1.0.0-alpha.6'
+  VERSION = '1.0.0-alpha.7'
 end

data/lib/portable/writers/csv.rb

@@ -57,7 +57,7 @@ module Portable
         csv << row_renderer.headers if sheet.include_headers?
 
         data_source.data_rows.each do |row|
-          csv << row_renderer.render(row, time).values
+          csv << row_renderer.render(row, time)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portable
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.6
+  version: 1.0.0.pre.alpha.7
 platform: ruby
 authors:
 - Matthew Ruggio
@@ -183,6 +183,7 @@ files:
 - lib/portable/modeling/options.rb
 - lib/portable/modeling/sheet.rb
 - lib/portable/rendering.rb
+- lib/portable/rendering/column.rb
 - lib/portable/rendering/row.rb
 - lib/portable/rendering/sheet.rb
 - lib/portable/util.rb