spreadsheet_architect 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d646197e6c3312af6863833c39540315400367bc
-  data.tar.gz: 396ee2ed11e98ba2597a5089e6b3527040d1005d
+  metadata.gz: f42b3c3c331719c8914df16900f0cda7a976fb16
+  data.tar.gz: 75602032e0744ffd5d95660b211e2d3cde828696
 SHA512:
-  metadata.gz: 01f1661665236b11978fde9e75b6cccd59871d715b7895ac65b315a8104d689ecb441e55667e04f336bb1c51e22cc139540efb55f0d6567cdd2f8f65de6e14b8
-  data.tar.gz: 352f3163770b4cc63aefad63b79b025464776fa8ec08f861d2492e2c076a4c08677633bad36c150f0b24c32903ad747a89ebf3a0abd8d1a95be394eb367f77d5
+  metadata.gz: 1ce5f2ad942a49b12aab8485dba755d86091b0529d36ad7c118f777244181d26f45a20ca01085aa8af3b1b8183cb3d530efcd7ae2a7fcc74446ec1c05aa10223
+  data.tar.gz: f44c437e1ce567701a7d01f3f1db2f98f6ce834deb49954d7481d2e754cc60b7b90e5cd086d1053f01ef1fa514f88b9b55173eaff0f07dbe9bdeb5c4b972c1ce

data/lib/spreadsheet_architect.rb

@@ -10,6 +10,18 @@ module SpreadsheetArchitect
     base.send :extend, ClassMethods
   end
 
+  class NoDataError < StandardError
+    def initialize
+      super("Missing data option or relation is empty.")
+    end
+  end
+  
+  class SpreadsheetColumnsNotDefined < StandardError
+    def initialize(klass=nil)
+      super("The spreadsheet_columns option is not defined on #{klass.name}")
+    end
+  end
+
   module Helpers
     def self.str_humanize(str, capitalize = true)
       str = str.sub(/\A_+/, '').gsub(/[_\.]/,' ').sub(' rescue nil','')
@@ -22,13 +34,15 @@ module SpreadsheetArchitect
     def self.get_options(options={}, klass)
       has_custom_columns = klass.instance_methods.include?(:spreadsheet_columns)
 
-      if !options[:data] && klass.ancestors.include?(ActiveRecord::Base)
+      if !options[:data] && defined?(ActiveRecord) && klass.ancestors.include?(ActiveRecord::Base)
         options[:data] = klass.where(options[:where]).order(options[:order]).to_a
-      else
-        raise 'No data option was defined. This is required for plain ruby objects.'
       end
 
-      if !has_custom_columns && klass.ancestors.include?(ActiveRecord::Base)
+      if !options[:data] || options[:data].empty?
+        raise SpreadsheetArchitect::NoDataError
+      end
+
+      if !has_custom_columns && defined?(ActiveRecord) && klass.ancestors.include?(ActiveRecord::Base)
         the_column_names = (klass.column_names - ["id","created_at","updated_at","deleted_at"])
         headers = the_column_names.map{|x| str_humanize(x)}
         columns = the_column_names.map{|x| x.to_sym}
@@ -46,7 +60,7 @@ module SpreadsheetArchitect
           end
         end
       else
-        raise 'No instance method `spreadsheet_columns` found on this plain ruby object'
+        raise SpreadsheetArchitect::SpreadsheetColumnsNotDefined, klass
       end
 
       data = []

data/lib/spreadsheet_architect/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetArchitect
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_architect
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx
@@ -127,7 +127,6 @@ files:
 - lib/spreadsheet_architect/version.rb
 - test/database.yml
 - test/helper.rb
-- test/spreadsheet_architect.sqlite3.db
 - test/tc_spreadsheet_architect.rb
 homepage: https://github.com/westonganger/spreadsheet_architect
 licenses: []
@@ -148,12 +147,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Spreadsheet Generator for ActiveRecord Models and Ruby Classes/Modules
 test_files:
-- test/database.yml
 - test/helper.rb
-- test/spreadsheet_architect.sqlite3.db
+- test/database.yml
 - test/tc_spreadsheet_architect.rb