decisive 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ca9f98c729ce8368e606d9e9d83da4e2a574807af3490c3f73a7203950ce585
-  data.tar.gz: 9cf78cb8f9720de00574f0171bf77324862a262646d8f3d40b5c7f36187d2d0c
+  metadata.gz: 396540579e82830745c22839f173f3dcf7886929cef16c023bd85fe2e8eff1e9
+  data.tar.gz: 49ed399702320635522c2640a52bc9b65b0563311371a0e2591dafce2b5a8865
 SHA512:
-  metadata.gz: 2f3d41825e1c28901ff15d740de4c56e00e742a1e0080290fdb80cb367540fc6546c1be9d0c0aa747f27a1a3c6a3743123a6aa9b1c9a505243131acee7e53dbd
-  data.tar.gz: 140f98ccc7ddbfaf046b4af54f87fa571b80c9cdf86a599b92c51c7724ebcdbeb9db46c3e3cb6b57f22422e2b06a911004f42f714d541ed0fee5718a71afb9f7
+  metadata.gz: 716dce8f3d55a83fed5494f9b033e2a59406758d2a948f023308758535e97075dc7a5c4e3bfe047602e6849dbeec567fc1b6939bc184c2b434528918710ca98f
+  data.tar.gz: ad89e1e17edf6fc83d6b44cdf78451d456cda767d62dde058129b06c352d43c03093c411a8fc08195eb165e1179be9b68947d1d552dacd4c37cc593ca832d8d2

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [ rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0 ]
+        ruby: [ 2.6, 2.7, '3.0' ]
+        exclude:
+          - gemfile: rails_5.1
+            ruby: 3.0
+          - gemfile: rails_5.2
+            ruby: 3.0
+          - gemfile: rails_7.0
+            ruby: 2.6
+
+    runs-on: ubuntu-latest
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake
+

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.3
+ruby-2.7.3

data/Appraisals

@@ -10,4 +10,11 @@ appraise "rails-6.0" do
   gem "actionview", "6.0"
 end
 
+appraise "rails-6.1" do
+  gem "actionview", "6.1"
+end
+
+appraise "rails-7.0" do
+  gem "actionview", "7.0"
+end
 

data/README.md

@@ -2,7 +2,7 @@
 
 DSL for rendering and streaming CSVs in Rails apps
 
-[![Build Status](https://travis-ci.org/botandrose/decisive.svg?branch=master)](https://travis-ci.org/botandrose/decisive)
+[![CI Status](https://github.com/botandrose/decisive/workflows/CI/badge.svg?branch=master)](https://github.com/botandrose/decisive/actions?query=workflow%3ACI+branch%3Amaster)
 [![Code Climate](https://codeclimate.com/github/botandrose/decisive/badges/gpa.svg)](https://codeclimate.com/github/botandrose/decisive)
 
 ## Usage

data/decisive.gemspec

@@ -24,11 +24,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "actionview"
-  spec.add_dependency "spreadsheet"
+  spec.add_dependency "rubyXL"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "simple-spreadsheet"
 end

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "byebug"
+gem "actionview", "6.1"
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "byebug"
+gem "actionview", "7.0"
+
+gemspec path: "../"

data/lib/decisive/render_csv_context.rb

@@ -0,0 +1,18 @@
+require "csv"
+require "active_support/core_ext/string/inflections"
+require "decisive/renderer"
+
+module Decisive
+  class RenderCSVContext < Struct.new(:records, :filename, :block)
+    def to_csv(*args, **kwargs)
+      Renderer.new(records, block).map do |row|
+        row.to_csv(*args, **kwargs)
+      end.join
+    end
+
+    def csv?
+      true
+    end
+  end
+end
+

data/lib/decisive/render_xls_context.rb

@@ -0,0 +1,69 @@
+require "rubyXL"
+require "decisive/renderer"
+
+module Decisive
+  class RenderXLSContext < Struct.new(:worksheets, :filename, :block)
+    class Worksheet < Struct.new(:records, :name, :block); end
+
+    def initialize *args
+      super
+
+      self.worksheets ||= []
+      if worksheets.none?
+        instance_eval &block
+
+      else
+        self.worksheets = worksheets.map do |name, records|
+          Worksheet.new(records, name, block)
+        end
+      end
+    end
+
+    def to_xls
+      workbook = RubyXL::Workbook.new
+      workbook.worksheets.pop # rm default worsheet
+      to_string(render(workbook))
+    end
+
+    def csv?
+      false
+    end
+
+    private
+
+    def worksheet records, name:, &block
+      worksheets.push Worksheet.new(records, name, block)
+    end
+
+    def render xls
+      worksheets.each do |worksheet|
+        sheet = xls.add_worksheet(sanitize_name(worksheet.name)).tap do |sheet|
+          Renderer.new(worksheet.records, worksheet.block).each.with_index do |row, row_index|
+            row.each.with_index do |cell, cell_index|
+              if cell[0] == "="
+                sheet.add_cell row_index, cell_index, nil, cell[1..]
+              else
+                sheet.add_cell row_index, cell_index, cell
+              end
+            end
+          end
+        end
+      end
+      xls
+    end
+
+    def sanitize_name name
+      name
+        .gsub(/[\[\]\*\?:\/\\\t\n\r]/, " ")
+        .gsub(/^'/, "")
+        .gsub(/'$/, "")
+        .strip
+        .slice(0,31)
+    end
+
+    def to_string xls
+      xls.stream.string
+    end
+  end
+end
+

data/lib/decisive/renderer.rb

@@ -0,0 +1,56 @@
+module Decisive
+  class Renderer < Struct.new(:records, :block)
+    include Enumerable
+
+    def each &block
+      (header + body).each(&block)
+    end
+
+    private
+
+    def header
+      [keys]
+    end
+
+    def body
+      hashes.map do |hash|
+        hash.values_at(*keys)
+      end
+    end
+
+    def keys
+      @keys ||= hashes.flat_map(&:keys).uniq
+    end
+
+    def hashes
+      @hashes ||= records.map do |record|
+        Row.new(record, block).to_hash
+      end
+    end
+
+    class Row < Struct.new(:record, :block)
+      module Nothing; end
+
+      def to_hash
+        @hash = {}
+        instance_exec record, &block
+        @hash
+      end
+
+      private
+
+      def column key, value=Nothing, &block
+        @hash[key] = if block_given?
+          block.call(record)
+        elsif value.is_a?(Symbol)
+          record.send(value)
+        elsif value == Nothing
+          record.send(key.parameterize.underscore.to_sym)
+        else
+          value
+        end.to_s
+      end
+    end
+  end
+end
+

data/lib/decisive/stream_csv_context.rb

@@ -0,0 +1,44 @@
+require "csv"
+require "active_support/core_ext/string/inflections"
+
+module Decisive
+  class StreamCSVContext < Struct.new(:records, :filename, :block)
+    class Column < Struct.new(:label, :block); end
+
+    def initialize *args
+      super
+      @columns = []
+      instance_eval &block
+    end
+
+    attr_reader :columns
+
+    def column label, value=nil, &block # field, label: field.to_s.humanize, &block
+      value ||= label.parameterize.underscore.to_sym
+      block ||= ->(record) { record.send(value) }
+      columns << Column.new(label, block)
+    end
+
+    def each
+      yield header
+
+      records.map do |record|
+        row = columns.map do |column|
+          column.block.call(record).to_s
+        end
+        yield row
+      end
+    end
+
+    def csv?
+      true
+    end
+
+    private
+
+    def header
+      columns.map(&:label)
+    end
+  end
+end
+

data/lib/decisive/template_handler.rb

@@ -1,7 +1,8 @@
-require "csv"
 require "action_view"
-require "active_support/core_ext/string/inflections"
-require "spreadsheet"
+
+require "decisive/stream_csv_context"
+require "decisive/render_csv_context"
+require "decisive/render_xls_context"
 
 module Decisive
   class TemplateHandler
@@ -33,7 +34,7 @@ module Decisive
           end
 
         else
-          response.headers["Content-Type"] = "application/vnd.ms-excel"
+          response.headers["Content-Type"] = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
           context.to_xls
         end
       RUBY
@@ -57,220 +58,14 @@ module Decisive
       if stream
         raise StreamingNotEnabledByControllerError unless controller.is_a?(ActionController::Live)
         raise StreamIncompatibleBlockArgumentError if block.arity != 0
-        StreamContext.new([], records, filename, &block)
+        StreamCSVContext.new(records, filename, block)
       else
-        RenderContext.new(records, filename, block)
+        RenderCSVContext.new(records, filename, block)
       end
     end
 
     def xls worksheets=nil, filename:, &block
-      if worksheets
-        XLSContext.new(worksheets, filename, block)
-      else
-        XLSWithWorksheetsContext.new(filename, [], &block)
-      end
-    end
-  end
-
-  class XLSWithWorksheetsContext < Struct.new(:filename, :worksheets)
-    class Worksheet < Struct.new(:records, :name, :block); end
-
-    def initialize *args, &block
-      super
-      instance_eval &block
-    end
-
-    def to_xls
-      to_string(render(Spreadsheet::Workbook.new))
-    end
-
-    def csv?
-      false
-    end
-
-    private
-
-    def worksheet records, name:, &block
-      worksheets.push Worksheet.new(records, name, block)
-    end
-
-    def render xls
-      worksheets.each do |worksheet|
-        sheet = xls.create_worksheet(name: sanitize_name(worksheet.name))
-
-        rows = to_array(worksheet)
-
-        rows.each.with_index do |row, index|
-          sheet.row(index).concat row
-        end
-      end
-      xls
-    end
-
-    def sanitize_name name
-      name
-        .gsub(/[\[\]\*\?:\/\\\t\n\r]/, " ")
-        .gsub(/^'/, "")
-        .gsub(/'$/, "")
-        .strip
-        .slice(0,31)
-    end
-
-    def to_array worksheet
-      context = RenderContext.new(worksheet.records, nil, worksheet.block)
-      context.send(:header) + context.send(:body)
-    end
-
-    def to_string xls
-      io = StringIO.new
-      xls.write(io)
-      io.rewind
-      string = io.read
-      string.force_encoding(Encoding::ASCII_8BIT)
-      string
-    end
-  end
-
-
-  class XLSContext < Struct.new(:worksheets, :filename, :block)
-    def to_xls
-      to_string(render(Spreadsheet::Workbook.new))
-    end
-
-    def csv?
-      false
-    end
-
-    private
-
-    def render xls
-      worksheets.each do |name, enumerable|
-        sheet = xls.create_worksheet(name: sanitize_name(name))
-
-        rows = to_array(enumerable)
-
-        rows.each.with_index do |row, index|
-          sheet.row(index).concat row
-        end
-      end
-      xls
-    end
-
-    def sanitize_name name
-      name
-        .gsub(/[\[\]\*\?:\/\\\t\n\r]/, " ")
-        .gsub(/^'/, "")
-        .gsub(/'$/, "")
-        .strip
-        .slice(0,31)
-    end
-
-    def to_array records
-      context = RenderContext.new(records, nil, block)
-      context.send(:header) + context.send(:body)
-    end
-
-    def to_string xls
-      io = StringIO.new
-      xls.write(io)
-      io.rewind
-      string = io.read
-      string.force_encoding(Encoding::ASCII_8BIT)
-      string
-    end
-  end
-
-  class StreamContext < Struct.new(:columns, :records, :filename)
-    class Column < Struct.new(:label, :block); end
-
-    def initialize *args, &block
-      super
-      instance_eval &block
-    end
-
-    def column label, value=nil, &block # field, label: field.to_s.humanize, &block
-      value ||= label.parameterize.underscore.to_sym
-      block ||= ->(record) { record.send(value) }
-      columns << Column.new(label, block)
-    end
-
-    def each
-      yield header
-
-      records.map do |record|
-        row = columns.map do |column|
-          column.block.call(record).to_s
-        end
-        yield row
-      end
-    end
-
-    def csv?
-      true
-    end
-
-    private
-
-    def header
-      columns.map(&:label)
-    end
-  end
-
-  class RenderContext < Struct.new(:records, :filename, :block)
-    def to_csv(*args, **kwargs)
-      (header + body).map do |row|
-        row.to_csv(*args, **kwargs)
-      end.join
-    end
-
-    def csv?
-      true
-    end
-
-    private
-
-    def header
-      [keys]
-    end
-
-    def body
-      hashes.map do |hash|
-        hash.values_at(*keys)
-      end
-    end
-
-    def keys
-      @keys ||= hashes.flat_map(&:keys).uniq
-    end
-
-    def hashes
-      @hashes ||= records.map do |record|
-        Row.new(record, block).to_hash
-      end
-    end
-
-    class Row < Struct.new(:record, :block)
-      module Nothing; end
-
-      def to_hash
-        @hash = {}
-        instance_exec record, &block
-        @hash
-      end
-
-      private
-
-      def column key, value=Nothing, &block
-        @hash[key] = if block_given?
-          block.call(record)
-        elsif value.is_a?(Symbol)
-          record.send(value)
-        elsif value == Nothing
-          record.send(key.parameterize.underscore.to_sym)
-        else
-          value
-        end.to_s
-      end
+      RenderXLSContext.new(worksheets, filename, block)
     end
   end
 end

data/lib/decisive/version.rb

@@ -1,3 +1,3 @@
 module Decisive
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/lib/decisive/xls_hasher.rb

@@ -0,0 +1,24 @@
+require "rubyXL"
+
+module Decisive
+  class XLSHasher < Struct.new(:path)
+    def to_hash
+      spreadsheet = RubyXL::Parser.parse(path)
+      spreadsheet.worksheets.reduce({}) do |hash, worksheet|
+        actual = []
+        worksheet.each do |row|
+          cells = row.cells.map do |cell|
+            if cell.formula
+              "=" + cell.formula.expression
+            else
+              cell.value
+            end
+          end
+          actual << cells
+        end
+        hash.merge worksheet.sheet_name => actual
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decisive
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simple-spreadsheet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: DSL for rendering CSVs from an array of objects
 email:
 - micah@botandrose.com
@@ -115,11 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -132,9 +118,16 @@ files:
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/decisive.rb
+- lib/decisive/render_csv_context.rb
+- lib/decisive/render_xls_context.rb
+- lib/decisive/renderer.rb
+- lib/decisive/stream_csv_context.rb
 - lib/decisive/template_handler.rb
 - lib/decisive/version.rb
+- lib/decisive/xls_hasher.rb
 homepage: https://github.com/botandrose/decisive
 licenses:
 - MIT
@@ -154,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: DSL for rendering CSVs

data/.travis.yml

@@ -1,24 +0,0 @@
----
-sudo: false
-language: ruby
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-
-before_install:
-  - gem install -v 2.0.2 bundler
-
-gemfile:
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
-
-matrix:
-  exclude:
-  - rvm: 2.4
-    gemfile: gemfiles/rails_6.0.gemfile
-  - rvm: 2.5
-    gemfile: gemfiles/rails_6.0.gemfile
-
-cache: bundler