csv_pirate 3.3.1 → 3.3.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+Version 3.3.2 2009-10-11
+- You can now declare has_csv_pirate_ship in a model whose migration has not been run yet without making the app barf.
+- Cleaned up Gem Dependency (faster_csv)
+
 Version 3.3.1 2009-10-06
 - Oops! Declaring has_csv_pirate_ship with no options was broken.
 

data/Rakefile

@@ -10,6 +10,7 @@ It works better if you are wearing a tricorne!}
     gemspec.email = "peter.boling@gmail.com"
     gemspec.homepage = "http://github.com/pboling/csv_pirate"
     gemspec.authors = ["Peter Boling"]
+    gemspec.add_dependency 'faster_csv'
     gemspec.files = ["README.rdoc",
              "csv_pirate.gemspec",
              "init.rb",

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 3
 :minor: 3

data/csv_pirate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csv_pirate}
-  s.version = "3.3.1"
+  s.version = "3.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Boling"]
-  s.date = %q{2009-10-06}
+  s.date = %q{2009-10-11}
   s.description = %q{CsvPirate is the easy way to create a CSV of essentially anything in Rails, in full pirate regalia.
 It works better if you are wearing a tricorne!}
   s.email = %q{peter.boling@gmail.com}
@@ -45,8 +45,11 @@ It works better if you are wearing a tricorne!}
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<faster_csv>, [">= 0"])
     else
+      s.add_dependency(%q<faster_csv>, [">= 0"])
     end
   else
+    s.add_dependency(%q<faster_csv>, [">= 0"])
   end
 end

data/lib/csv_pirate.rb

@@ -7,7 +7,7 @@
 #Version:  1.0
 #Project owners:
 #    peter.boling (The Cap'n)
-require 'fastercsv'
+require 'faster_csv' unless defined?(FasterCSV)
 
 class CsvPirate
 

data/lib/ninth_bit/pirate_ship.rb

@@ -1,9 +1,14 @@
+require 'faster_csv' unless defined?(FasterCSV)
+
 module NinthBit
   module PirateShip
 
     module ActMethods
       #coding tyle is adopted from attachment_fu
       def has_csv_pirate_ship(options = {})
+        # If you aren't using ActiveRecord (you are outside rails) then you must declare your :booty
+        # If you are using ActiveRecord then you only want ot check for booty if the table exists so it won't fail pre-migration
+        check_booty = defined?(ActiveRecord) && self.is_a?(ActiveRecord::Base) ? ActiveRecord::Base.connection.tables.include?(self.table_name) : true
 
         options[:chart]         ||= ['log','csv']
         options[:aft]           ||= '.csv'
@@ -17,7 +22,8 @@ module NinthBit
         options[:shrouds]       ||= ','
         options[:grub]          ||= self if options[:swag].nil?
         options[:spyglasses]    ||= [:all]
-        options[:booty]         ||= self.column_names
+        # Have to protect against model definitions pre-migration, since column names will fail if
+        options[:booty]         ||= check_booty ? self.column_names : []
         options[:bury_treasure] ||= true
         options[:parlay]        ||= 1
 
@@ -29,7 +35,7 @@ module NinthBit
         raise ArgumentError, ":mop is #{options[:mop].inspect}, but must be one of #{CsvPirate::MOP_HEADS.inspect}" unless CsvPirate::MOP_HEADS.include?(options[:mop])
         raise ArgumentError, ":gibbet is #{options[:gibbet].inspect}, and does not contain a '.' character, which is required when using iterative filenames (set :swab => :none to turn off iterative filenames)" if options[:swab] != :none && (options[:gibbet].nil? || !options[:gibbet].include?('.'))
         raise ArgumentError, ":waggoner is #{options[:waggoner].inspect}, and must be a string at least one character long" if options[:waggoner].nil? || options[:waggoner].length < 1
-        raise ArgumentError, ":booty is #{options[:booty].inspect}, and must be an array of methods to call on a class for CSV data" if options[:booty].nil? || !options[:booty].is_a?(Array) || options[:booty].empty?
+        raise ArgumentError, ":booty is #{options[:booty].inspect}, and must be an array of methods to call on a class for CSV data" if check_booty && (options[:booty].nil? || !options[:booty].is_a?(Array) || options[:booty].empty?)
         raise ArgumentError, ":chart is #{options[:chart].inspect}, and must be an array of directory names, which will become the filepath for the csv file" if options[:chart].nil? || !options[:chart].is_a?(Array) || options[:chart].empty?
         raise ArgumentError, ":shrouds is #{options[:shrouds].inspect}, and must be a string (e.g. ',' or '\t'), which will be used as the delimeter for the csv file" if options[:shrouds].nil? || !options[:shrouds].is_a?(String)
 

data/rails/init.rb

@@ -1,3 +1,4 @@
+require 'faster_csv'
 require 'csv_pirate'
 require 'ninth_bit/pirate_ship'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: csv_pirate
 version: !ruby/object:Gem::Version 
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors: 
 - Peter Boling
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -04:00
+date: 2009-10-11 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: faster_csv
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: |-
   CsvPirate is the easy way to create a CSV of essentially anything in Rails, in full pirate regalia.
   It works better if you are wearing a tricorne!