csv_pirate 4.0.11 → 4.1.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+Version 4.1.0 2010-09-26
+- Ruby 1.9.2p0 compatible
+
 Version 4.0.11 2010-03-08
 - PirateShip now respects CsvPirate.parlay setting instead of always overwriting it.
 - CsvPirate importing actually works now

data/README.rdoc

@@ -3,7 +3,7 @@
 Easily create CSVs of any data that can be derived from your models.
 
 CsvPirate is the easy way to create a CSV of essentially anything in Ruby, in full pirate regalia.
-It works better if you are wearing a tricorne!
+It works better if you are wearing a tricorne!  Now compatible with Ruby 1.8.7 & 1.9.2
 
 Everything in the source that depended on Rails extensions of Ruby classes has been refactored to work in pure Ruby!
 
@@ -423,7 +423,9 @@ The tests are run with rspec.  The test suite is expanding.  Currently there is
 
 You will need these gems to run specs:
 
-gem install jeweler cucumber test-unit rspec fastercsv
+  gem install jeweler cucumber test-unit rspec
+
+If on a Ruby prior to Ruby 1.9 you will also need the fastercsv gem
 
 To run tests cd to where ever you have csv_pirate installed, and do:
 
@@ -448,4 +450,4 @@ TimePerks LLC (http://www.timeperks.com) - Many useful enhancements were request
 
 ----------------------------------------------------------------------------------
   Author: Peter Boling, peter.boling at gmail dot com
-  Copyright (c) 2009 Peter H. Boling of 9thBit LLC, released under the MIT license.  See LICENSE for details.
+  Copyright (c) 2009-2010 Peter H. Boling of 9thBit LLC, released under the MIT license.  See LICENSE for details.

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 0
-:patch: 11
 :major: 4
+:minor: 1
+:patch: 0
 :build: 

data/csv_pirate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csv_pirate}
-  s.version = "4.0.11"
+  s.version = "4.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Boling"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-09-26}
   s.description = %q{CsvPirate is the easy way to create a CSV of essentially anything in Ruby, in full pirate regalia.
 It works better if you are wearing a tricorne!}
   s.email = %q{peter.boling@gmail.com}
@@ -39,7 +39,7 @@ It works better if you are wearing a tricorne!}
   s.homepage = %q{http://github.com/pboling/csv_pirate}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Easily create CSVs of any data that can be derived from instance methods on your classes.}
   s.test_files = [
     "spec/csv_pirate_spec.rb",
@@ -53,7 +53,7 @@ It works better if you are wearing a tricorne!}
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
     else
       s.add_dependency(%q<fastercsv>, [">= 0"])

data/lib/csv_pirate.rb

@@ -7,12 +7,17 @@
 #Version:  1.0
 #Project owners:
 #    peter.boling (The Cap'n)
+if RUBY_VERSION.to_f >= 1.9
+else
+  require 'faster_csv'
+end
 
 class CsvPirate
 
   BOOKIE = [:counter, :timestamp, :none]
   MOP_HEADS = [:clean, :dirty]
   BRIGANTINE = [:first, :last]
+  CSV_CLASS = (defined?(CSV) ? CSV : FasterCSV)
 
   attr_accessor :waggoner         # First part of filename
   attr_accessor :chart            # directory, default is (['log','csv'])
@@ -235,7 +240,7 @@ class CsvPirate
   end
 
   def dead_mans_chest
-    self.maroon = FasterCSV.generate(:col_sep => self.shrouds) do |csv|
+    self.maroon = CSV_CLASS.generate(:col_sep => self.shrouds) do |csv|
       self.sounding(csv)
     end
     self.scrivener(self.maroon)
@@ -589,7 +594,7 @@ class CsvPirate
   # Sink other ships! Or run a block of code on each row of a CSV
   def self.broadside(galley, &block)
     return false unless block_given?
-    FasterCSV.foreach(galley, {:headers => :first_row, :return_headers => false}) do |gun|
+    CSV_CLASS.foreach(galley, {:headers => :first_row, :return_headers => false}) do |gun|
       yield gun
     end
   end

data/lib/ninth_bit/pirate_ship.rb

@@ -1,5 +1,3 @@
-require 'faster_csv' unless defined?(FasterCSV)
-
 module NinthBit
   module PirateShip
 

data/rails/init.rb

@@ -1,7 +1,12 @@
 #We might have rails...
 if defined?(Rails) && !defined?(Rake) && defined?(config) && config.respond_to?(:gems)
 
-  config.gem 'fastercsv', :lib => 'faster_csv', :version => '>=1.4.0'
+  if RUBY_VERSION.to_f >= 1.9
+    require 'csv'
+  else
+    puts "- When you upgrade to Ruby 1.9 fastercsv gem will not be a dependecy anymore"
+    config.gem 'fastercsv', :lib => 'faster_csv', :version => '>=1.4.0'
+  end
 
   require 'csv_pirate'
   require 'ninth_bit/pirate_ship'
@@ -23,13 +28,22 @@ else
   begin
 
     require 'rubygems'
-    gem 'fastercsv', '>=1.4.0', :lib => 'faster_csv'
+    if RUBY_VERSION.to_f >= 1.9
+      require 'csv'
+    else
+      puts "* When you upgrade to Ruby 1.9 fastercsv gem will not be a dependecy anymore"
+      gem 'fastercsv', '>=1.4.0', :lib => 'faster_csv'
+    end
     require 'csv_pirate'
     require 'ninth_bit/pirate_ship'
     ActiveRecord::Base.send(:extend, NinthBit::PirateShip::ActMethods) if defined?(ActiveRecord)
 
   rescue Gem::LoadError
-    puts "Install the fastercsv gem to enable CsvPirate"
+    if RUBY_VERSION.to_f >= 1.9
+      raise
+    else
+      puts "Install the fastercsv gem to enable CsvPirate"
+    end
   end
 
 end

data/spec/csv_pirate_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper' #here in this same config/ dir
 
 describe "CsvPirate" do
   describe "#initialize" do
@@ -47,7 +47,8 @@ describe "CsvPirate" do
     end
 
     it "should store export in maroon instance variable" do
-      @csv_pirate.maroon.should == "Name,Distance,Spectral type,Name hash,Name next,Name upcase,Star vowels\nProxima Centauri,4.2 LY,M5.5Vc,-1176188012,Proxima Centaurj,PROXIMA CENTAURI,Pr*x*m* C*nt**r*\nRigil Kentaurus,4.3 LY,G2V,1916094624,Rigil Kentaurut,RIGIL KENTAURUS,R*g*l K*nt**r*s\nBarnard's Star,5.9 LY,M3.8V,1003964756,Barnard's Stas,BARNARD'S STAR,B*rn*rd's St*r\nWolf 359,7.7 LY,M5.8Vc,-1717989858,Wolf 360,WOLF 359,W*lf 359\nLalande 21185,8.26 LY,M2V,466625069,Lalande 21186,LALANDE 21185,L*l*nd* 21185\nLuyten 726-8A and B,8.73 LY,M5.5 de & M6 Ve,1260790153,Luyten 726-8A and C,LUYTEN 726-8A AND B,L*yt*n 726-8A *nd B\nSirius A and B,8.6 LY,A1Vm,1177502705,Sirius A and C,SIRIUS A AND B,S*r**s A *nd B\nRoss 154,9.693 LY,M3.5,2120976706,Ross 155,ROSS 154,R*ss 154\nRoss 248,10.32 LY,M5.5V,2129428738,Ross 249,ROSS 248,R*ss 248\nEpsilon Eridani,10.5 LY,K2V,931307088,Epsilon Eridanj,EPSILON ERIDANI,Eps*l*n Er*d*n*\n"
+      @csv_pirate.maroon[0..100].should ==
+              "Name,Distance,Spectral type,Name hash,Name next,Name upcase,Star vowels\nProxima Centauri,4.2 LY,M5.5V"
     end
   end
 
@@ -72,13 +73,13 @@ describe "CsvPirate" do
     end
 
     it "should return the export as a string" do
-      @csv_pirate.hoist_mainstay.should == "Name,Distance,Spectral type,Name hash,Name next,Name upcase,Star vowels\nProxima Centauri,4.2 LY,M5.5Vc,-1176188012,Proxima Centaurj,PROXIMA CENTAURI,Pr*x*m* C*nt**r*\nRigil Kentaurus,4.3 LY,G2V,1916094624,Rigil Kentaurut,RIGIL KENTAURUS,R*g*l K*nt**r*s\nBarnard's Star,5.9 LY,M3.8V,1003964756,Barnard's Stas,BARNARD'S STAR,B*rn*rd's St*r\nWolf 359,7.7 LY,M5.8Vc,-1717989858,Wolf 360,WOLF 359,W*lf 359\nLalande 21185,8.26 LY,M2V,466625069,Lalande 21186,LALANDE 21185,L*l*nd* 21185\nLuyten 726-8A and B,8.73 LY,M5.5 de & M6 Ve,1260790153,Luyten 726-8A and C,LUYTEN 726-8A AND B,L*yt*n 726-8A *nd B\nSirius A and B,8.6 LY,A1Vm,1177502705,Sirius A and C,SIRIUS A AND B,S*r**s A *nd B\nRoss 154,9.693 LY,M3.5,2120976706,Ross 155,ROSS 154,R*ss 154\nRoss 248,10.32 LY,M5.5V,2129428738,Ross 249,ROSS 248,R*ss 248\nEpsilon Eridani,10.5 LY,K2V,931307088,Epsilon Eridanj,EPSILON ERIDANI,Eps*l*n Er*d*n*\n"
+      @csv_pirate.hoist_mainstay[0..100].should == "Name,Distance,Spectral type,Name hash,Name next,Name upcase,Star vowels\nProxima Centauri,4.2 LY,M5.5V"
     end
 
     it "should store export in maroon instance variable" do
       @csv_pirate.maroon.should == ""
       @csv_pirate.hoist_mainstay
-      @csv_pirate.maroon.should == "Name,Distance,Spectral type,Name hash,Name next,Name upcase,Star vowels\nProxima Centauri,4.2 LY,M5.5Vc,-1176188012,Proxima Centaurj,PROXIMA CENTAURI,Pr*x*m* C*nt**r*\nRigil Kentaurus,4.3 LY,G2V,1916094624,Rigil Kentaurut,RIGIL KENTAURUS,R*g*l K*nt**r*s\nBarnard's Star,5.9 LY,M3.8V,1003964756,Barnard's Stas,BARNARD'S STAR,B*rn*rd's St*r\nWolf 359,7.7 LY,M5.8Vc,-1717989858,Wolf 360,WOLF 359,W*lf 359\nLalande 21185,8.26 LY,M2V,466625069,Lalande 21186,LALANDE 21185,L*l*nd* 21185\nLuyten 726-8A and B,8.73 LY,M5.5 de & M6 Ve,1260790153,Luyten 726-8A and C,LUYTEN 726-8A AND B,L*yt*n 726-8A *nd B\nSirius A and B,8.6 LY,A1Vm,1177502705,Sirius A and C,SIRIUS A AND B,S*r**s A *nd B\nRoss 154,9.693 LY,M3.5,2120976706,Ross 155,ROSS 154,R*ss 154\nRoss 248,10.32 LY,M5.5V,2129428738,Ross 249,ROSS 248,R*ss 248\nEpsilon Eridani,10.5 LY,K2V,931307088,Epsilon Eridanj,EPSILON ERIDANI,Eps*l*n Er*d*n*\n"
+      @csv_pirate.maroon[0..100].should == "Name,Distance,Spectral type,Name hash,Name next,Name upcase,Star vowels\nProxima Centauri,4.2 LY,M5.5V"
     end
   end
 
@@ -181,14 +182,14 @@ describe "CsvPirate" do
     it "should be {humanize => '_'} by default" do
       @csv_pirate.blackjack.should == {:humanize => '_'}
       @csv_pirate.hoist_mainstay
-      @csv_pirate.maroon.should == "Name,Distance,Spectral type,Name hash,Name next,Name upcase,Star vowels\nProxima Centauri,4.2 LY,M5.5Vc,-1176188012,Proxima Centaurj,PROXIMA CENTAURI,Pr*x*m* C*nt**r*\nRigil Kentaurus,4.3 LY,G2V,1916094624,Rigil Kentaurut,RIGIL KENTAURUS,R*g*l K*nt**r*s\nBarnard's Star,5.9 LY,M3.8V,1003964756,Barnard's Stas,BARNARD'S STAR,B*rn*rd's St*r\nWolf 359,7.7 LY,M5.8Vc,-1717989858,Wolf 360,WOLF 359,W*lf 359\nLalande 21185,8.26 LY,M2V,466625069,Lalande 21186,LALANDE 21185,L*l*nd* 21185\nLuyten 726-8A and B,8.73 LY,M5.5 de & M6 Ve,1260790153,Luyten 726-8A and C,LUYTEN 726-8A AND B,L*yt*n 726-8A *nd B\nSirius A and B,8.6 LY,A1Vm,1177502705,Sirius A and C,SIRIUS A AND B,S*r**s A *nd B\nRoss 154,9.693 LY,M3.5,2120976706,Ross 155,ROSS 154,R*ss 154\nRoss 248,10.32 LY,M5.5V,2129428738,Ross 249,ROSS 248,R*ss 248\nEpsilon Eridani,10.5 LY,K2V,931307088,Epsilon Eridanj,EPSILON ERIDANI,Eps*l*n Er*d*n*\n"
+      @csv_pirate.maroon[0..100].should == "Name,Distance,Spectral type,Name hash,Name next,Name upcase,Star vowels\nProxima Centauri,4.2 LY,M5.5V"
     end
 
     it "should work as {:join => '_'}" do
       @csv_pirate.blackjack = {:join => '_'}
       @csv_pirate.blackjack.should == {:join => '_'}
       @csv_pirate.hoist_mainstay
-      @csv_pirate.maroon.should == "name,distance,spectral_type,name_hash,name_next,name_upcase,star_vowels\nProxima Centauri,4.2 LY,M5.5Vc,-1176188012,Proxima Centaurj,PROXIMA CENTAURI,Pr*x*m* C*nt**r*\nRigil Kentaurus,4.3 LY,G2V,1916094624,Rigil Kentaurut,RIGIL KENTAURUS,R*g*l K*nt**r*s\nBarnard's Star,5.9 LY,M3.8V,1003964756,Barnard's Stas,BARNARD'S STAR,B*rn*rd's St*r\nWolf 359,7.7 LY,M5.8Vc,-1717989858,Wolf 360,WOLF 359,W*lf 359\nLalande 21185,8.26 LY,M2V,466625069,Lalande 21186,LALANDE 21185,L*l*nd* 21185\nLuyten 726-8A and B,8.73 LY,M5.5 de & M6 Ve,1260790153,Luyten 726-8A and C,LUYTEN 726-8A AND B,L*yt*n 726-8A *nd B\nSirius A and B,8.6 LY,A1Vm,1177502705,Sirius A and C,SIRIUS A AND B,S*r**s A *nd B\nRoss 154,9.693 LY,M3.5,2120976706,Ross 155,ROSS 154,R*ss 154\nRoss 248,10.32 LY,M5.5V,2129428738,Ross 249,ROSS 248,R*ss 248\nEpsilon Eridani,10.5 LY,K2V,931307088,Epsilon Eridanj,EPSILON ERIDANI,Eps*l*n Er*d*n*\n"
+      @csv_pirate.maroon[0..100].should == "name,distance,spectral_type,name_hash,name_next,name_upcase,star_vowels\nProxima Centauri,4.2 LY,M5.5V"
     end
   end
 

data/spec/pirate_ship_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper' #here in this same config/ dir
 
 describe "PirateShip" do
   describe "#walk_the_plank" do
@@ -54,9 +54,9 @@ describe "PirateShip" do
 
   describe "#raise_anchor" do
     before(:each) do
-      Star.weigh_anchor({:chronometer => Date.parse("3/29/2002")})
-      Star.weigh_anchor({:chronometer => Date.parse("6/14/2004")})
-      Star.weigh_anchor({:chronometer => Date.parse("12/25/1962")})
+      Star.weigh_anchor({:chronometer => Date.parse("03.10.2002")})
+      Star.weigh_anchor({:chronometer => Date.parse("06.11.2004")})
+      Star.weigh_anchor({:chronometer => Date.parse("12.12.1962")})
     end
 
     it "should return an array of 10 Stars built from data in CSV" do

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'spec'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'init'
+require File.dirname(__FILE__) + '/../init'
 
 Spec::Runner.configure do |config|
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 4
+  - 1
   - 0
-  - 11
-  version: 4.0.11
+  version: 4.1.0
 platform: ruby
 authors: 
 - Peter Boling
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -05:00
+date: 2010-09-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fastercsv
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -68,6 +69,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -75,6 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -84,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easily create CSVs of any data that can be derived from instance methods on your classes.