spreadsheet_architect 3.0.0 → 3.1.0

data/test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-07-06,2018-07-06 10:57:53 -0700
+123,2018-08-19,2018-08-19 14:25:09 -0700

data/test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/empty.csv

@@ -0,0 +1 @@
+

data/test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/instances.csv

@@ -1,6 +1,6 @@
 Name,Content,Created At
-0,2,2018-07-06 10:57:52 -0700
-1,3,2018-07-06 10:57:52 -0700
-2,4,2018-07-06 10:57:52 -0700
-3,5,2018-07-06 10:57:52 -0700
-4,6,2018-07-06 10:57:52 -0700
+0,2,2018-08-19 14:25:08 -0700
+1,3,2018-08-19 14:25:08 -0700
+2,4,2018-08-19 14:25:08 -0700
+3,5,2018-08-19 14:25:08 -0700
+4,6,2018-08-19 14:25:08 -0700

data/test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/data.csv

@@ -0,0 +1,3 @@
+row1,test1
+123.456,,123
+123,2018-08-19,2018-08-19 14:25:09 -0700

data/test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/instances.csv

@@ -0,0 +1,6 @@
+Name,The Content,Created At,Created At Date,asd
+0,2,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa
+1,3,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa
+2,4,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa
+3,5,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa
+4,6,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa

data/test/dummy_app/tmp/axlsx-master/models/CustomPost/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-07-06,2018-07-06 10:57:53 -0700
+123,2018-08-19,2018-08-19 14:25:09 -0700

data/test/dummy_app/tmp/axlsx-master/models/CustomPost/empty.csv

@@ -0,0 +1 @@
+

data/test/dummy_app/tmp/axlsx-master/models/CustomPost/instances.csv

@@ -1,6 +1,6 @@
 Name,The Content,Created At,Created At Date,asd
-0,2,2018-07-06 17:57:52 UTC,2018-07-06,tadaaa
-1,3,2018-07-06 17:57:52 UTC,2018-07-06,tadaaa
-2,4,2018-07-06 17:57:52 UTC,2018-07-06,tadaaa
-3,5,2018-07-06 17:57:52 UTC,2018-07-06,tadaaa
-4,6,2018-07-06 17:57:52 UTC,2018-07-06,tadaaa
+0,2,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa
+1,3,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa
+2,4,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa
+3,5,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa
+4,6,2018-08-19 21:25:08 UTC,2018-08-19,tadaaa

data/test/dummy_app/tmp/axlsx-master/models/LegacyPlainRubyObject/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-07-06,2018-07-06 10:57:53 -0700
+123,2018-08-19,2018-08-19 14:25:09 -0700

data/test/dummy_app/tmp/axlsx-master/models/LegacyPlainRubyObject/instances.csv

@@ -1,6 +1,6 @@
 Name,Content,Object ID
-0,2,70145457610500
-1,3,70145457610460
-2,4,70145457610380
-3,5,70145457610280
-4,6,70145457610240
+0,2,70214747733820
+1,3,70214747733780
+2,4,70214747733740
+3,5,70214747733700
+4,6,70214747733660

data/test/dummy_app/tmp/axlsx-master/models/PlainRubyObject/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-07-06,2018-07-06 10:57:53 -0700
+123,2018-08-19,2018-08-19 14:25:09 -0700

data/test/dummy_app/tmp/axlsx-master/models/PlainRubyObject/instances.csv

@@ -1,6 +1,6 @@
 Name,Content,Object ID
-0,2,70145444278840
-1,3,70145444278800
-2,4,70145444278760
-3,5,70145444278720
-4,6,70145444278680
+0,2,70214747728140
+1,3,70214747728080
+2,4,70214747728020
+3,5,70214747727980
+4,6,70214747727940

data/test/dummy_app/tmp/axlsx-master/models/Post/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-07-06,2018-07-06 10:57:53 -0700
+123,2018-08-19,2018-08-19 14:25:09 -0700

data/test/dummy_app/tmp/axlsx-master/models/Post/empty.csv

@@ -0,0 +1 @@
+Id,Name,Content,Age,Created At,Updated At

data/test/dummy_app/tmp/axlsx-master/models/Post/instances.csv

@@ -0,0 +1,6 @@
+Id,Name,Content,Age,Created At,Updated At
+,0,2,,2018-08-19 14:25:08 -0700,
+,1,3,,2018-08-19 14:25:08 -0700,
+,2,4,,2018-08-19 14:25:08 -0700,
+,3,5,,2018-08-19 14:25:08 -0700,
+,4,6,,2018-08-19 14:25:08 -0700,

data/test/models/all_models_test.rb

@@ -18,7 +18,15 @@ class AllModelsTest < ActiveSupport::TestCase
     FileUtils.mkdir_p(@path)
   end
 
-  models = [SpreadsheetArchitect, ActiveModelObject, PlainRubyObject, LegacyPlainRubyObject, Post, CustomPost]
+  models = []
+
+  models_folder = File.expand_path('../../dummy_app/app/models', __FILE__)
+  Dir[File.join(models_folder, '*.rb')].each do |filename|
+    klass = filename.split('/').last.gsub('.rb', '').titleize.gsub(' ','').constantize
+    unless [ApplicationRecord].include?(klass)
+      models.push(klass)
+    end
+  end
 
   models.each do |klass|
     instances = 5.times.map{|i| 
@@ -31,30 +39,27 @@ class AllModelsTest < ActiveSupport::TestCase
 
     ['csv', 'ods', 'xlsx'].each do |format|
 
-      if klass.instance_methods.include?(:spreadsheet_columns) || klass.instance_methods.include?(:column_names)
-
-        test ":instances #{klass} #{format}" do
-          set_path(klass)
+      test ":instances #{klass} #{format}" do
+        set_path(klass)
 
-          method = "to_#{format}"
-          which = klass.respond_to?(method) ? klass : SpreadsheetArchitect
+        method = "to_#{format}"
+        which = klass.respond_to?(method) ? klass : SpreadsheetArchitect
 
-          data = which.send(method, instances: instances)
+        data = which.send(method, instances: instances)
 
-          File.open(File.join(@path, "instances.#{format}"), 'w+b') do |f|
-            f.write data
-          end
+        File.open(File.join(@path, "instances.#{format}"), 'w+b') do |f|
+          f.write data
         end
+      end
 
-        test "Empty :instances #{klass} #{format}" do
-          set_path(klass)
+      test "Empty :instances #{klass} #{format}" do
+        set_path(klass)
 
-          method = "to_#{format}"
-          which = klass.respond_to?(method) ? klass : SpreadsheetArchitect
+        method = "to_#{format}"
+        which = klass.respond_to?(method) ? klass : SpreadsheetArchitect
 
-          File.open(File.join(@path, "empty.#{format}"),'w+b') do |f|
-            f.write which.send(method, instances: [])
-          end
+        File.open(File.join(@path, "empty.#{format}"),'w+b') do |f|
+          f.write which.send(method, instances: [])
         end
       end
 

data/test/test_helper.rb

@@ -19,7 +19,11 @@ class ActiveSupport::TestCase
 end
 
 require 'minitest/reporters'
-Minitest::Reporters.use!
+Minitest::Reporters.use!(
+  Minitest::Reporters::DefaultReporter.new,
+  ENV,
+  Minitest.backtrace_filter
+)
 
 require 'custom_assertions'
 

data/test/unit/exceptions_test.rb

@@ -2,6 +2,25 @@ require 'test_helper'
 
 class ExceptionsTest < ActiveSupport::TestCase
 
+  test "ArgumentError" do
+    error = SpreadsheetArchitect::Exceptions::ArgumentError
+
+    assert_raise error do
+      conditional_row_styles = [{}]
+      SpreadsheetArchitect::Utils::XLSX.conditional_styles_for_row(conditional_row_styles, true, true)
+    end
+
+    assert_raise error do
+      conditional_row_styles = [{if: true, unless: true, styles: {}}]
+      SpreadsheetArchitect::Utils::XLSX.conditional_styles_for_row(conditional_row_styles, true, true)
+    end
+
+    assert_raise error do
+      conditional_row_styles = [{if: true, styles: false}]
+      SpreadsheetArchitect::Utils::XLSX.conditional_styles_for_row(conditional_row_styles, true, true)
+    end
+  end
+
   test "NoDataError" do
     error = SpreadsheetArchitect::Exceptions::NoDataError
 
@@ -22,16 +41,12 @@ class ExceptionsTest < ActiveSupport::TestCase
     end
   end
 
-  test "InvalidTypeError" do
-    error = SpreadsheetArchitect::Exceptions::InvalidTypeError
+  test "OptionTypeError" do
+    error = SpreadsheetArchitect::Exceptions::OptionTypeError
 
     assert error.new(:foobar_option).message
-
-    assert_raise error do
-      SpreadsheetArchitect.to_csv(spreadsheet_columns: :foo)
-    end
     assert_raise error do
-      SpreadsheetArchitect.to_csv(data: :foo)
+      SpreadsheetArchitect.to_csv(data: {})
     end
     assert_raise error do
       SpreadsheetArchitect.to_csv(instances: :foo)

data/test/unit/kitchen_sink_test.rb

@@ -33,6 +33,21 @@ class KitchenSinkTest < ActiveSupport::TestCase
         {range: {rows: :all, columns: (3..4)}, styles: {color: "999999"}}
       ],
 
+      conditional_row_styles: [
+        {
+          if: Proc.new{|row_data, row_index|
+            row_index == 0 || row_data[0].to_i == 2
+          }, 
+          styles: {font_size: 18}
+        },
+        {
+          unless: Proc.new{|row_data, row_index|
+            row_index <= 10 || row_data[0].to_i == 15
+          }, 
+          styles: {align: :right}
+        },
+      ],
+
       borders: [
         {range: "B2:C4"},
         {range: "D6:D7", border_styles: {style: :dashDot, color: "333333"}},

data/test/unit/utils_test.rb

@@ -139,7 +139,7 @@ class UtilsTest < ActiveSupport::TestCase
 
     klass.check_option_type(@options, :foo, Array)
 
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidTypeError do
+    assert_raise SpreadsheetArchitect::Exceptions::OptionTypeError do
       klass.check_option_type({foo: :bar}, :foo, Array)
     end
   end
@@ -147,7 +147,7 @@ class UtilsTest < ActiveSupport::TestCase
   test "verify_option_types" do
     klass.verify_option_types(@options)
 
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidTypeError do
+    assert_raise SpreadsheetArchitect::Exceptions::OptionTypeError do
       klass.verify_option_types(@options.merge({column_widths: :foobar}))
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_architect
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx
@@ -199,6 +199,7 @@ files:
 - test/dummy_app/app/controllers/spreadsheets_controller.rb
 - test/dummy_app/app/models/active_model_object.rb
 - test/dummy_app/app/models/application_record.rb
+- test/dummy_app/app/models/custom_columns_method_post.rb
 - test/dummy_app/app/models/custom_post.rb
 - test/dummy_app/app/models/legacy_plain_ruby_object.rb
 - test/dummy_app/app/models/plain_ruby_object.rb
@@ -353,6 +354,15 @@ files:
 - test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/instances.csv
 - test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/instances.ods
 - test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/instances.xlsx
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/data.csv
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/data.ods
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/data.xlsx
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/empty.csv
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/empty.ods
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/empty.xlsx
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/instances.csv
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/instances.ods
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/instances.xlsx
 - test/dummy_app/tmp/axlsx-master/models/CustomPost/data.csv
 - test/dummy_app/tmp/axlsx-master/models/CustomPost/data.ods
 - test/dummy_app/tmp/axlsx-master/models/CustomPost/data.xlsx
@@ -386,12 +396,9 @@ files:
 - test/dummy_app/tmp/axlsx-master/models/Post/empty.csv
 - test/dummy_app/tmp/axlsx-master/models/Post/empty.ods
 - test/dummy_app/tmp/axlsx-master/models/Post/empty.xlsx
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/data.csv
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/data.ods
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/data.xlsx
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/empty.csv
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/empty.ods
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/empty.xlsx
+- test/dummy_app/tmp/axlsx-master/models/Post/instances.csv
+- test/dummy_app/tmp/axlsx-master/models/Post/instances.ods
+- test/dummy_app/tmp/axlsx-master/models/Post/instances.xlsx
 - test/dummy_app/tmp/axlsx-master/multi_sheet.ods
 - test/dummy_app/tmp/axlsx-master/multi_sheet.xlsx
 - test/integration/application_test.rb
@@ -437,6 +444,7 @@ test_files:
 - test/dummy_app/app/controllers/spreadsheets_controller.rb
 - test/dummy_app/app/models/active_model_object.rb
 - test/dummy_app/app/models/application_record.rb
+- test/dummy_app/app/models/custom_columns_method_post.rb
 - test/dummy_app/app/models/custom_post.rb
 - test/dummy_app/app/models/legacy_plain_ruby_object.rb
 - test/dummy_app/app/models/plain_ruby_object.rb
@@ -592,6 +600,15 @@ test_files:
 - test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/instances.csv
 - test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/instances.ods
 - test/dummy_app/tmp/axlsx-master/models/ActiveModelObject/instances.xlsx
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/data.csv
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/data.ods
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/data.xlsx
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/empty.csv
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/empty.ods
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/empty.xlsx
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/instances.csv
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/instances.ods
+- test/dummy_app/tmp/axlsx-master/models/CustomColumnsMethodPost/instances.xlsx
 - test/dummy_app/tmp/axlsx-master/models/CustomPost/data.csv
 - test/dummy_app/tmp/axlsx-master/models/CustomPost/data.ods
 - test/dummy_app/tmp/axlsx-master/models/CustomPost/data.xlsx
@@ -625,12 +642,9 @@ test_files:
 - test/dummy_app/tmp/axlsx-master/models/Post/empty.csv
 - test/dummy_app/tmp/axlsx-master/models/Post/empty.ods
 - test/dummy_app/tmp/axlsx-master/models/Post/empty.xlsx
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/data.csv
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/data.ods
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/data.xlsx
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/empty.csv
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/empty.ods
-- test/dummy_app/tmp/axlsx-master/models/SpreadsheetArchitect/empty.xlsx
+- test/dummy_app/tmp/axlsx-master/models/Post/instances.csv
+- test/dummy_app/tmp/axlsx-master/models/Post/instances.ods
+- test/dummy_app/tmp/axlsx-master/models/Post/instances.xlsx
 - test/dummy_app/tmp/axlsx-master/multi_sheet.ods
 - test/dummy_app/tmp/axlsx-master/multi_sheet.xlsx
 - test/integration/application_test.rb