csv_pirate 5.0.4 → 5.0.6.pre1

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.gitignore

@@ -0,0 +1,61 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+Gemfile.lock
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+.DS_Store
+
+# For IDEs:
+#
+.project
+.project/*
+.idea
+.idea/*
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+
+# Other
+*.gem
+*.sw?
+spec/csv/*

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - jruby-19mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head

data/{CHANGELOG.txt → CHANGELOG}

@@ -1,3 +1,13 @@
+Version 5.0.5 2012-08-20
+- Updated to tests to latest rspec
+- Fixed specs to be able to run on other machines that don't have y cruft (like travis-ci!)
+- Moved railtie to it's own file
+- Switched configuration hook to :before_initialize so it will work with rake tasks
+- Switched from jeweler to gem-release
+- Updated version.rb to work with gem-release, and maintain previous functionality
+- Added new specs
+- refactored some bits of logic
+
 Version 5.0.4 2011-06-16
 - File Cleanup
 

data/Gemfile

@@ -1,14 +1,3 @@
-source :rubygems
+source "http://rubygems.org"
 
-#FasterCSV became the built-in CSV library in Ruby 1.9, so is only required if using Ruby 1.8
-if RUBY_VERSION =~ /^1\.8\.\d*/
-  gem 'fastercsv', '>= 1.4.0'
-end
-
-group :development do
-  gem 'rspec', '~> 2.6'
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.2"
-  gem "rcov", ">= 0"
-end
+gemspec

data/{LICENSE.txt → LICENSE}

@@ -1,4 +1,6 @@
-Copyright (c) 2008 Peter H. Boling
+Copyright (c) 2008-2012 Peter H. Boling (http://peterboling.com)
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,5 +1,7 @@
 == CsvPirate
 
+{<img src="https://secure.travis-ci.org/pboling/csv_pirate.png?branch=master" alt="Build Status" />}[http://travis-ci.org/pboling/csv_pirate] <= This cake is a lie.  I am not sure why Travis is failing me.
+
 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.
@@ -11,7 +13,7 @@ My goal is to have it do EVERYTHING it possibly can for me, since almost every p
 
 CsvPirate only works for commissions of swag OR grub!
 
-Initialize method (a.k.a new()) takes a hash of parameters:
+Initialize method (a.k.a new()) takes a hash of parameters, and creates the blank CSV file, and the instance can be modified prior to writing out to CSV:
 
   # CsvPirate only works for commissions of swag OR grub!
   # :swag           the ARrr collection of swag to work on (optional)
@@ -37,46 +39,19 @@ Initialize method (a.k.a new()) takes a hash of parameters:
   #   {:join => '-'}    joins the method names called to get hte data for that column with '_' underscores.
   #   {:humanize =>'-'} first joins as above, then humanizes the string (this is the default)
   #   {:array => ['col1',col2','col3'] Uses the column names provided.  If the array's length is less than the booty array's length it reverts to :humanize =>'_'
-  # check the source to see if there anything else hiding in there!  There are a few new options in the 4.0.0 release, which are as yet undocumented.
 
-The create method has the same parameters, and actually creates the CSV.
+Check the source to see if there anything else hiding in there!  (HINT: There a bunch more undocumented options)
+
+The create method has the same parameters, and actually writes the data to the CSV.
 
 Avast! Here be pirates! To brush up on pirate coding naming conventions:
 
   http://www.privateerdragons.com/pirate_dictionary.html
 
-== On The Web
-
-Source:
-  http://github.com/pboling/csv_pirate
-
-Release Announcement:
-  http://galtzo.blogspot.com/2009/03/csv-pirate.html
-
-
-== Install as a RubyGem from source
+== Install
 
   [sudo] gem install csv_pirate
 
-Gem Using Git building from source:
-
-  mkdir -p ~/src
-  cd ~/src
-  git clone git://github.com/pboling/csv_pirate.git
-  cd csv_pirate
-  gem build csv_pirate.gemspec
-  sudo gem install csv_pirate-5.0.4.gem # (Or whatever version gets built)
-
-== Install as a Plugin
-
-Plugin using Git:
-
-  ruby script/plugin install git://github.com/pboling/csv_pirate.git
-
-== Install as a Git Submodule (plugin)
-
-  git submodule add git://github.com/pboling/csv_pirate.git vendor/plugins/csv_pirate
-
 == Upgrading
 
   From version prior to 5.0
@@ -419,10 +394,6 @@ This allows you to modify the csv_pirate object before creating the csv like thi
 
 The tests are run with rspec.  The test suite is expanding.  Currently there is ample coverage of basic functionality.
 
-You will need these gems to run specs:
-
-  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:
@@ -449,6 +420,13 @@ http://www.bradino.com/misc/sylk-file-format-is-not-valid/
 * Make sure to add tests, rspec preferred, for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or change log. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+== On The Web
+
+Source:
+  http://github.com/pboling/csv_pirate
+
+Release Announcement:
+  http://galtzo.blogspot.com/2009/03/csv-pirate.html
 
 == Thanks
 
@@ -460,4 +438,4 @@ Thanks go to:
 
 ----------------------------------------------------------------------------------
   Author: Peter Boling, peter.boling at gmail dot com
-  Copyright (c) 2009-2011 Peter H. Boling of 9thBit LLC, released under the MIT license.  See LICENSE for details.
+  Copyright (c) 2008-2012 Peter H. Boling of 9thBit LLC, released under the MIT license.  See LICENSE for details.

data/Rakefile

@@ -1,80 +1,46 @@
 # encoding: utf-8
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'rake'
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
-require 'rake'
+
+require 'reek/rake/task'
+Reek::Rake::Task.new do |t|
+  t.fail_on_error = true
+  t.verbose = false
+  t.source_files = 'lib/**/*.rb'
+end
+
+require 'roodi'
+require 'roodi_task'
+RoodiTask.new do |t|
+  t.verbose = false
+end
+
+task :default => :spec
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "csv_pirate"
-    gemspec.summary = "Easily create CSVs of any data that can be derived from instance methods on your classes."
-    gemspec.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!}
-    gemspec.email = "peter.boling@gmail.com"
-    gemspec.homepage = "http://github.com/pboling/csv_pirate"
-    gemspec.authors = ["Peter Boling"]
-    gemspec.files = ["README.rdoc",
-             "csv_pirate.gemspec",
-             "install.rb",
-             "uninstall.rb",
-             "lib/csv_pirate.rb",
-             "lib/csv_pirate/pirate_ship.rb",
-             "lib/csv_pirate/the_capn.rb",
-             "lib/csv_pirate/version.rb",
-             "spec/csv_pirate_spec.rb",
-             "spec/pirate_ship_spec.rb",
-             "spec/the_capn_spec.rb",
-             "spec/spec.opts",
-             "spec/spec_helper.rb",
-             "spec/spec_helpers/glowing_gas_ball.rb",
-             "spec/spec_helpers/star.rb",
-             "Rakefile",
-             "Gemfile",
-             "init.rb",
-             "LICENSE.txt",
-             "CHANGELOG.txt",
-             "VERSION.yml"]
-  end
-  Jeweler::RubygemsDotOrgTasks.new
+  require 'rdoc/task'
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
 end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "csv_pirate2 #{version}"
+  rdoc.title    = "CacheableFlash #{version}"
+  rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-# require 'spec/rake/spectask'
-# Spec::Rake::SpecTask.new(:spec) do |t|
-#   t.libs << 'lib' << 'spec'
-#   t.spec_files = FileList['spec/**/*_spec.rb']
-# end
-#
-# Spec::Rake::SpecTask.new(:rcov) do |t|
-#   t.libs << 'lib' << 'spec'
-#   t.spec_files = FileList['spec/**/*_spec.rb']
-#   t.rcov = true
-# end
-#
-#begin
-#  require 'cucumber/rake/task'
-#  Cucumber::Rake::Task.new(:features)
-#rescue LoadError
-#  puts "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-#end
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 
-task :default => :spec
+Bundler::GemHelper.install_tasks

data/csv_pirate.gemspec

@@ -1,75 +1,36 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/csv_pirate/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{csv_pirate}
-  s.version = "5.0.4"
+  s.version = CsvPirate::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Boling"]
-  s.date = %q{2011-06-16}
   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}
   s.extra_rdoc_files = [
-    "LICENSE.txt",
+    "LICENSE",
     "README.rdoc"
   ]
-  s.files = [
-    "CHANGELOG.txt",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION.yml",
-    "csv_pirate.gemspec",
-    "install.rb",
-    "lib/csv_pirate.rb",
-    "lib/csv_pirate/pirate_ship.rb",
-    "lib/csv_pirate/the_capn.rb",
-    "lib/csv_pirate/version.rb",
-    "spec/csv_pirate_spec.rb",
-    "spec/pirate_ship_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "spec/spec_helpers/glowing_gas_ball.rb",
-    "spec/spec_helpers/star.rb",
-    "spec/the_capn_spec.rb",
-    "uninstall.rb"
-  ]
+  s.files         = `git ls-files`.split($\)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.homepage = %q{http://github.com/pboling/csv_pirate}
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   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.}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fastercsv>, [">= 1.4.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.6"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.6"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+  #FasterCSV became the built-in CSV library in Ruby 1.9, so is only required if using Ruby 1.8
+  if RUBY_VERSION =~ /^1\.8\.\d*/
+    s.add_runtime_dependency(%q<fastercsv>, [">= 1.4.0"])
   end
+  s.add_development_dependency(%q<rspec>, [">= 2.11.0"])
+  s.add_development_dependency(%q<shoulda>, [">= 0"])
+  s.add_development_dependency(%q<rdoc>, [">= 3.12"])
+  s.add_development_dependency(%q<reek>, [">= 1.2.8"])
+  s.add_development_dependency(%q<roodi>, [">= 2.1.0"])
+  s.add_development_dependency(%q<rake>, [">= 0"])
 end
-

data/features/csv_pirate.feature

@@ -0,0 +1,9 @@
+Feature: something something
+  In order to something something
+  A user something something
+  something something something
+
+  Scenario: something something
+    Given inspiration
+    When I create a sweet new gem
+    Then everyone should see how awesome I am

data/features/support/env.rb

@@ -0,0 +1,11 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'csv_pirate'
+
+#require 'spec/expectations'
+
+require 'test/unit/assertions'
+
+World do |world|
+  
+  world
+end

data/lib/csv_pirate.rb

@@ -1,12 +1,11 @@
 # CsvPirate
-#Copyright ©2009 Peter H. Boling of 9thBit LLC, released under the MIT license
-#Gem / Plugin for Rails / Active Record: Easily make CSVs of anything that can be derived from your models
-#Language: Ruby (written by a pirate)
-#License:  MIT License
-#Labels:   Ruby, Rails, Gem, Plugin
-#Version:  1.0
-#Project owners:
-#    peter.boling (The Cap'n)
+# Copyright ©2008-2012 Peter H. Boling of 9thBit LLC, released under the MIT license
+# Gem / Plugin for Rails / Active Record: Easily make CSVs of anything that can be derived from your models
+# Language: Ruby (written by a pirate)
+# License:  MIT License
+# Labels:   Ruby, Rails, Gem, Plugin
+# Project owners:
+#    Peter Boling (The Cap'n)
 require 'yaml'
 
 if RUBY_VERSION.to_f >= 1.9
@@ -15,6 +14,10 @@ else
   require 'faster_csv'
 end
 
+require 'csv_pirate/version.rb'
+require 'csv_pirate/the_capn.rb'
+require 'csv_pirate/pirate_ship.rb'
+
 module CsvPirate
   # If you are using this on a vanilla Ruby class (no rails or active record) then extend your class like this:
   #  MyClass.send(:extend, NinthBit::PirateShip::ActMethods) if defined?(MyClass)
@@ -23,36 +26,15 @@ module CsvPirate
   #     extend NinthBit::PirateShip::ActMethods
   #   end
   # If you are using ActiveRecord then it is done for you :)
-
   if defined?(Rails) && defined?(ActiveRecord)
     if defined?(Rails::Railtie)
-      # namespace our plugin and inherit from Rails::Railtie
-      # to get our plugin into the initialization process
-      class Railtie < Rails::Railtie
-        # Add a to_prepare block which is executed once in production
-        # and before each request in development
-        config.to_prepare do
-          ActiveRecord::Base.send(:extend, CsvPirate::PirateShip::ActMethods)
-        end
-      end
+      require 'csv_pirate/railtie'
     else
-      if !defined?(Rake) && defined?(config) && config.respond_to?(:gems)
-        #Not sure if this is ever executed...
-        config.to_prepare do
-          ActiveRecord::Base.send(:extend, CsvPirate::PirateShip::ActMethods)
-        end
-      else
-        #This one cleans up that mess...
-        ActiveRecord::Base.send(:extend, CsvPirate::PirateShip::ActMethods)
-      end
+      ActiveRecord::Base.send(:extend, CsvPirate::PirateShip::ActMethods)
     end
   end
 end
 
-require 'csv_pirate/version.rb'
-require 'csv_pirate/the_capn.rb'
-require 'csv_pirate/pirate_ship.rb'
-
 # Support the old (< v5.0.0) API
 module NinthBit
   module PirateShip

data/lib/csv_pirate/railtie.rb

@@ -0,0 +1,7 @@
+module CsvPirate
+  class Railtie < Rails::Railtie
+    config.before_initialize do
+      ActiveRecord::Base.send(:extend, CsvPirate::PirateShip::ActMethods)
+    end
+  end
+end

data/lib/csv_pirate/the_capn.rb

@@ -3,7 +3,7 @@ module CsvPirate
 
     BOOKIE = [:counter, :timestamp, :none]
     MOP_HEADS = [:clean, :dirty]
-    BRIGANTINE = [:first, :last]
+    BRIGANTINE_OPTIONS = [:first, :last]
     CSV_CLASS = (defined?(CSV) ? CSV : FasterCSV)
 
     attr_accessor :waggoner         # First part of filename
@@ -45,7 +45,7 @@ module CsvPirate
                                     #   {:array => ['col1',col2','col3'] Uses the column names provided in the array.  If the array provided is too short defaults to :humanize =>'_'
 
     attr_accessor :brigantine       # the complete file path
-    attr_accessor :pinnacle       # the complete file path
+    attr_accessor :pinnacle         # an array of strings for CSV header based on blackjack
     class << self
        attr_accessor :parlay        # verbosity on a scale of 0 - 3 (0=:none, 1=:error, 2=:info, 3=:debug, 0 being no screen output, 1 is default
      end
@@ -131,7 +131,7 @@ module CsvPirate
       @pinnacle = self.block_and_tackle
 
       # Initialize doesn't write anything to a CSV,
-      #   but does create the traverse_board and opens the waggoner for reading / writing
+      #   but does create the traverse_board (file) and opens it for reading / writing
       self.northwest_passage unless self.astrolabe
 
       # This will contain the text of the csv from this particular execution
@@ -144,7 +144,6 @@ module CsvPirate
 
       @nocturnal = File.basename(self.brigantine)
 
-
       # Then open the rhumb_lines
       self.rhumb_lines = File.open(File.expand_path(self.brigantine),self.astrolabe ? "r" : "a")
     end
@@ -214,6 +213,7 @@ module CsvPirate
     end
 
     # Sail through your db looking for buried treasure!
+    # Creates the CSV file and returns the text of the CSV
     # - restricted to loot that can be seen through spyglasses (if provided)!
     def hoist_mainstay
 
@@ -275,7 +275,7 @@ module CsvPirate
 
     #complete file path
     def poop_deck(brig)
-      if BRIGANTINE.include?(brig)
+      if BRIGANTINE_OPTIONS.include?(brig) && !self.flies.empty?
         self.old_csv_dump(brig)
       elsif brig.is_a?(String)
         "#{self.analemma}#{brig}"
@@ -318,15 +318,9 @@ module CsvPirate
     #TODO: This is a nasty method.  Just a quick hack to GTD.  Needs to be rethought and refactored. --pboling
     def to_memory(permanence = {:new => :new}, exclude_id = true, exclude_timestamps = true)
       return nil unless self.grub
-      begin
-        example = self.grub.new
-      rescue Exception
-        puts "cannot instantiate instance of #{self.grub} with #{self.grub}.new.  CsvPirate#to_memory works most reliably when #{self.grub}.new works with no arguments." if TheCapn.parlance(1)
-        example = nil
-      end
       buccaneers = []
       self.scuttle do |row|
-        data_hash = self.data_hash_from_row(row, exclude_id, exclude_timestamps, example)
+        data_hash = self.data_hash_from_row(row, exclude_id, exclude_timestamps)
         case permanence
           when {:new => :new} then
             buccaneers << self.grub.new(data_hash)
@@ -397,6 +391,7 @@ module CsvPirate
       if obj
         puts "#{self.grub}.#{find_aye(columns)}(#{self.find_aye_arr(data_hash, columns).inspect}): found id = #{obj.id}" if TheCapn.parlance(2)
       end
+      obj
     end
 
     def find_aye(columns)
@@ -409,36 +404,38 @@ module CsvPirate
       end
     end
 
-    def data_hash_from_row(row, exclude_id = true, exclude_timestamps = true, example = nil)
+    def data_hash_from_row(row, exclude_id = true, exclude_timestamps = true)
       plunder = {}
+      method_check = self.grub.instance_methods - Object.methods
+      method_check = method_check.select {|x| "#{x}" =~ /=$/}
       my_booty = self.booty.reject {|x| x.is_a?(Hash)}
       my_booty = exclude_id ? my_booty.reject {|x| a = x.to_sym; [:id, :ID,:dbid, :DBID, :db_id, :DB_ID].include?(a)} : self.booty
       my_booty = exclude_timestamps ? my_booty.reject {|x| a = x.to_sym; [:created_at, :updated_at, :created_on, :updated_on].include?(a)} : self.booty
-      my_booty = my_booty.reject {|x| !example.respond_to?("#{x}=".to_sym)} unless example.nil?
+      my_booty = my_booty.select {|x| method_check.include?("#{x}=".to_sym)} if method_check
       my_booty.each do |method|
         plunder = plunder.merge({method => row[self.pinnacle[self.booty.index(method)]]})
       end
       plunder
     end
 
-    def data_hash_from_row(row, exclude_id = true, exclude_timestamps = true, example = nil)
-      data_hash = {}
-      my_booty = self.booty.reject {|x| x.is_a?(Hash)}
-      my_booty = exclude_id ? my_booty.reject {|x| a = x.to_sym; [:id, :ID,:dbid, :DBID, :db_id, :DB_ID].include?(a)} : self.booty
-      my_booty = exclude_timestamps ? my_booty.reject {|x| a = x.to_sym; [:created_at, :updated_at, :created_on, :updated_on].include?(a)} : self.booty
-      my_booty = my_booty.reject {|x| !example.respond_to?("#{x}=".to_sym)} unless example.nil?
-      my_booty.each do |method|
-        data_hash = data_hash.merge({method => row[self.pinnacle[self.booty.index(method)]]})
-      end
-      data_hash
-    end
-
     # Grab an old CSV dump (first or last)
     def old_csv_dump(brig)
-      file = Dir.entries(self.traverse_board).reject {|x| x.match(/^\./)}.sort.send(brig)
+      file = self.flies.send(brig)
       "#{self.traverse_board}#{file}"
     end
 
+    def flies
+      Dir.entries(self.traverse_board).select {|x| x.match(self.unfurl)}.sort
+    end
+
+    # Regex for matching dumped CSVs
+    def unfurl
+      wibbly = self.waggoner == '' ? '' : Regexp.escape(self.waggoner)
+      timey = self.sand_glass == '' ? '' : '\.\d+'
+      wimey = self.gibbet == '' ? '' : Regexp.escape(self.gibbet)
+      Regexp.new("#{wibbly}#{timey}#{wimey}")
+    end
+
     protected
 
     # create the header of the CSV (column/method names)
@@ -596,6 +593,8 @@ module CsvPirate
       end
     end
 
+    # !!!EXPERIMENTAL!!!
+    #
     # During a mutiny things are a little different!
     # Essentially you are using an existing CSV to drive queries to create a second CSV cased on the first
     # The capn hash is:
@@ -619,21 +618,21 @@ module CsvPirate
     #   :astrolabe  => false (false is the default for astrolabe, so we could leave it off the first_mate)
     #
     # Example:
-  #   capn      = {:grub => User,:spyglasses => [:inactive],:booty => ['id','login','status'],:waggoner => 'orig',:chart => ['log','csv'],:astrolabe => false}
-  #   make_orig = CsvPirate.new(capn)
-  #   make_orig.hoist_mainstay
-  #   make_orig.weigh_anchor
-  #
-  #   first_mate = {:grub => 'account',:booty => ["id","number","name","created_at"],:waggoner => 'fake',:chart => ['log','csv']}
-  #  OR
-  #   # for same class, we re-use the object loaded from first CSV and make the booty [method] calls on it
-  #   first_mate = {:grub => User,:booty => ["id","login","visits_count"],:waggoner => 'fake',:chart => ['log','csv']}
-  #  OR
-  #   first_mate = {:grub => Account,:spyglasses => 'id',:swag=>'user_id',:booty => ["id","name","number"],:waggoner => 'fake',:chart => ['log','csv']}
-  #  AND
-  #   capn       = {:grub => User,:spyglasses => 'login',:swag => 1,:waggoner => 'orig',:chart => ['log','csv'],:astrolabe => true}
-  #   after_mutiny = CsvPirate.mutiny(capn, first_mate)
-  #
+    #   capn      = {:grub => User,:spyglasses => [:inactive],:booty => ['id','login','status'],:waggoner => 'orig',:chart => ['log','csv'],:astrolabe => false}
+    #   make_orig = CsvPirate.new(capn)
+    #   make_orig.hoist_mainstay
+    #   make_orig.weigh_anchor
+    #
+    #   first_mate = {:grub => 'account',:booty => ["id","number","name","created_at"],:waggoner => 'fake',:chart => ['log','csv']}
+    #  OR
+    #   # for same class, we re-use the object loaded from first CSV and make the booty [method] calls on it
+    #   first_mate = {:grub => User,:booty => ["id","login","visits_count"],:waggoner => 'fake',:chart => ['log','csv']}
+    #  OR
+    #   first_mate = {:grub => Account,:spyglasses => 'id',:swag=>'user_id',:booty => ["id","name","number"],:waggoner => 'fake',:chart => ['log','csv']}
+    #  AND
+    #   capn       = {:grub => User,:spyglasses => 'login',:swag => 1,:waggoner => 'orig',:chart => ['log','csv'],:astrolabe => true}
+    #   after_mutiny = CsvPirate.mutiny(capn, first_mate)
+    #
     def self.mutiny(capn, first_mate)
       carrack = TheCapn.new(capn)
       cutthroat = TheCapn.new(first_mate)

data/lib/csv_pirate/version.rb

@@ -1,11 +1,12 @@
 module CsvPirate
 
-  @@conf = YAML::load( File.read( File.join( File.dirname(__FILE__), '..', '..', 'VERSION.yml') ) )
+  VERSION = "5.0.6.pre1"
 
-  MAJOR = @@conf[:major]
-  MINOR = @@conf[:minor]
-  PATCH = @@conf[:patch]
-  BUILD = @@conf[:build]
+  VERSION_ARRAY = VERSION.split('.')
+
+  MAJOR = VERSION_ARRAY[0].to_i
+  MINOR = VERSION_ARRAY[2].to_i
+  PATCH = VERSION_ARRAY[3].to_i
+  BUILD = VERSION_ARRAY[4]
 
-  VERSION = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
 end

data/spec/{the_capn_spec.rb → csv_pirate/the_capn_spec.rb}

@@ -106,10 +106,10 @@ describe CsvPirate::TheCapn do
     end
   end
 
-  describe "#old_csv_dump" do
-
+  describe "dated dumps" do
     before(:each) do
-      ["1/1/1998","2/2/2002","1/2/2003","3/2/2001","2/1/2007"].map {|x| Date.parse(x)}.each do |date|
+      ["1/1/1998","2/2/2002","1/2/2003","3/2/2001","2/1/2007"].each do |x|
+        date = Date.parse(x)
         @csv_pirate = CsvPirate::TheCapn.new({
               :grub => GlowingGasBall,
               :spyglasses => [:get_stars],
@@ -123,66 +123,89 @@ describe CsvPirate::TheCapn do
       end
     end
 
-    it "should find first (oldest) dump" do
-      @new_csv_pirate = CsvPirate::TheCapn.new({
-            :grub => GlowingGasBall,
-            :spyglasses => [:get_stars],
-            :chart => ["spec","csv","GlowingGasBall","dumps"],
-            :booty => [:name, :distance, :spectral_type, {:name => :hash}, {:name => :next}, {:name => :upcase}, :star_vowels ],
-            :chronometer => false,
-            :brigantine => :first,
-            :swab => :none,
-            :mop => :clean
-      })
-      @new_csv_pirate.brigantine.should == "spec/csv/GlowingGasBall/dumps/GlowingGasBall.19980101.export.csv"
+    describe "#flies" do
+      it "should list exported files" do
+        @csv_pirate.flies.include?("GlowingGasBall.19980101.export.csv").should be_true
+        @csv_pirate.flies.include?("GlowingGasBall.20010203.export.csv").should be_true
+        @csv_pirate.flies.include?("GlowingGasBall.20020202.export.csv").should be_true
+        @csv_pirate.flies.include?("GlowingGasBall.20030201.export.csv").should be_true
+        @csv_pirate.flies.include?("GlowingGasBall.20070102.export.csv").should be_true
+      end
     end
 
-    it "should find last (newest) dump" do
-      @new_csv_pirate = CsvPirate::TheCapn.new({
-            :grub => GlowingGasBall,
-            :spyglasses => [:get_stars],
-            :chart => ["spec","csv","GlowingGasBall","dumps"],
-            :booty => [:name, :distance, :spectral_type, {:name => :hash}, {:name => :next}, {:name => :upcase}, :star_vowels ],
-            :chronometer => false,
-            :brigantine => :last,
-            :swab => :none,
-            :mop => :clean
-      })
-      @new_csv_pirate.brigantine.should == "spec/csv/GlowingGasBall/dumps/GlowingGasBall.20070201.export.csv"
-    end
-  end
+    describe "#old_csv_dump" do
+      it "should find first (oldest) dump" do
+        @new_csv_pirate = CsvPirate::TheCapn.new({
+              :grub => GlowingGasBall,
+              :spyglasses => [:get_stars],
+              :chart => ["spec","csv","GlowingGasBall","dumps"],
+              :booty => [:name, :distance, :spectral_type, {:name => :hash}, {:name => :next}, {:name => :upcase}, :star_vowels ],
+              :chronometer => Date.parse('18/4/2011'),
+              :brigantine => :first,
+              :swab => :none,
+              :mop => :clean
+        })
+        @new_csv_pirate.brigantine.should == "spec/csv/GlowingGasBall/dumps/GlowingGasBall.19980101.export.csv"
+      end
 
-  describe "#to_memory" do
+      it "should find last (newest) dump" do
+        @new_csv_pirate = CsvPirate::TheCapn.new({
+              :grub => GlowingGasBall,
+              :spyglasses => [:get_stars],
+              :chart => ["spec","csv","GlowingGasBall","dumps"],
+              :booty => [:name, :distance, :spectral_type, {:name => :hash}, {:name => :next}, {:name => :upcase}, :star_vowels ],
+              :chronometer => nil,
+              :brigantine => :last,
+              :swab => :none,
+              :mop => :clean
+        })
+        @new_csv_pirate.brigantine.should == "spec/csv/GlowingGasBall/dumps/GlowingGasBall.20070102.export.csv"
+      end
+    end
 
-    before(:each) do
-      ["1/1/1998","2/2/2002","1/2/2003","3/2/2001","2/1/2007"].map {|x| Date.parse(x)}.each do |date|
-        @csv_pirate = CsvPirate::TheCapn.new({
+    describe "#to_memory" do
+      it "should return an array of 10 grubs built from data in CSV" do
+        @new_csv_pirate = CsvPirate::TheCapn.new({
               :grub => GlowingGasBall,
               :spyglasses => [:get_stars],
               :chart => ["spec","csv","GlowingGasBall","dumps"],
               :booty => [:name, :distance, :spectral_type, {:name => :hash}, {:name => :next}, {:name => :upcase}, :star_vowels ],
-              :chronometer => date,
+              :chronometer => false,
+              :brigantine => :last,
               :swab => :none,
               :mop => :clean
         })
-        @csv_pirate.hoist_mainstay
+        @new_csv_pirate.brigantine.should == "spec/csv/GlowingGasBall/dumps/GlowingGasBall.export.csv"
+        @new_csv_pirate.to_memory.class.should == Array
+        @new_csv_pirate.hoist_mainstay
+        # After the CSV is written we should have an array of stuff
+        @new_csv_pirate.to_memory.length.should == 10
       end
     end
 
-    it "should return an array of 10 grubs built from data in CSV" do
-      @new_csv_pirate = CsvPirate::TheCapn.new({
-            :grub => GlowingGasBall,
-            :spyglasses => [:get_stars],
-            :chart => ["spec","csv","GlowingGasBall","dumps"],
-            :booty => [:name, :distance, :spectral_type, {:name => :hash}, {:name => :next}, {:name => :upcase}, :star_vowels ],
-            :chronometer => false,
-            :brigantine => :last,
-            :swab => :none,
-            :mop => :clean
-      })
-      @new_csv_pirate.brigantine.should == "spec/csv/GlowingGasBall/dumps/GlowingGasBall.20070201.export.csv"
-      @new_csv_pirate.to_memory.class.should == Array
-      @new_csv_pirate.to_memory.length.should == 10
+    context "protected methods" do
+      before(:each) do
+        @new_csv_pirate = CsvPirate::TheCapn.new({
+              :grub => GlowingGasBall,
+              :spyglasses => [:get_stars],
+              :chart => ["spec","csv","GlowingGasBall","dumps"],
+              :booty => [:name, :distance, :spectral_type, {:name => :hash}, {:name => :next}, {:name => :upcase}, :star_vowels ],
+              :chronometer => false,
+              :swab => :none,
+              :mop => :clean
+        })
+      end
+
+      describe "#lantern" do
+        it "should be a glob" do
+          @new_csv_pirate.send(:lantern).should == "spec/csv/GlowingGasBall/dumps/GlowingGasBall.export.*"
+        end
+      end
+      describe "#merchantman" do
+        it "should be" do
+          @new_csv_pirate.send(:merchantman).should == "GlowingGasBall.export"
+        end
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,12 +1,23 @@
-#require 'spec'
-require 'rspec/core'
 require 'csv_pirate'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+# The above does not require the files in the right order on travis-ci, so:
+require 'support/glowing_gas_ball'
+require 'support/star'
 
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  #config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
 end
 
-# require all files inside spec_helpers
-Dir[File.join(File.dirname(__FILE__), "spec_helpers/*.rb")].each { |file| require file }

data/spec/{spec_helpers → support}/star.rb

@@ -1,3 +1,5 @@
+require 'support/glowing_gas_ball'
+
 class Star < GlowingGasBall
   
   extend CsvPirate::PirateShip::ActMethods

data/tasks/csv_pirate_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :csv_pirate do
+#   # Task goes here
+# end

metadata

@@ -1,179 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: csv_pirate
-version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
-  segments: 
-  - 5
-  - 0
-  - 4
-  version: 5.0.4
+version: !ruby/object:Gem::Version
+  version: 5.0.6.pre1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Peter Boling
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-16 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+date: 2012-08-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
   prerelease: false
-  name: fastercsv
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
   prerelease: false
-  name: shoulda
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.8
   type: :development
   prerelease: false
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+- !ruby/object:Gem::Dependency
+  name: roodi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :development
   prerelease: false
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
-        version: 1.6.2
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-description: |-
-  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!
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! '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!'
 email: peter.boling@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
+extra_rdoc_files:
+- LICENSE
 - README.rdoc
-files: 
-- CHANGELOG.txt
+files:
+- .document
+- .gitignore
+- .travis.yml
+- CHANGELOG
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - csv_pirate.gemspec
+- features/csv_pirate.feature
+- features/steps/csv_pirate_steps.rb
+- features/support/env.rb
 - install.rb
 - lib/csv_pirate.rb
 - lib/csv_pirate/pirate_ship.rb
+- lib/csv_pirate/railtie.rb
 - lib/csv_pirate/the_capn.rb
 - lib/csv_pirate/version.rb
-- spec/csv_pirate_spec.rb
-- spec/pirate_ship_spec.rb
+- spec/csv_pirate/csv_pirate_spec.rb
+- spec/csv_pirate/pirate_ship_spec.rb
+- spec/csv_pirate/the_capn_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/spec_helpers/glowing_gas_ball.rb
-- spec/spec_helpers/star.rb
-- spec/the_capn_spec.rb
+- spec/support/glowing_gas_ball.rb
+- spec/support/star.rb
+- tasks/csv_pirate_tasks.rake
 - uninstall.rb
-has_rdoc: true
 homepage: http://github.com/pboling/csv_pirate
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Easily create CSVs of any data that can be derived from instance methods on your classes.
-test_files: []
-
+summary: Easily create CSVs of any data that can be derived from instance methods
+  on your classes.
+test_files:
+- features/csv_pirate.feature
+- features/steps/csv_pirate_steps.rb
+- features/support/env.rb
+- spec/csv_pirate/csv_pirate_spec.rb
+- spec/csv_pirate/pirate_ship_spec.rb
+- spec/csv_pirate/the_capn_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/glowing_gas_ball.rb
+- spec/support/star.rb

data/VERSION.yml

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