movable_erb 0.2.5 → 0.2.6

data/Rakefile

@@ -16,6 +16,10 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
 
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
-
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/movable_erb.rb

@@ -39,20 +39,28 @@ end
 ##
 # Loads a CSV document into an array of hashes
 class MovableErb::CSV
-  require 'fastercsv'
+  if RUBY_VERSION =~ /1.9/
+    require 'csv'
+    CSV_PARSER = ::CSV
+  else
+    require 'fastercsv'
+    CSV_PARSER = FasterCSV
+  end
 
   attr_accessor :filename, :hashes
+  attr_reader :headers
 
   ##
   # Initializes and yields a new instance
   # @yield [csv] a new instance of {MovableErb::CSV}
   # @return [MovableErb::CSV]
   def self.setup(&block)
+    raise "no block given" unless block_given?
     csv = self.new
     yield csv
     csv.parse!
   end
-  
+
   ##
   # Internally calls {#to_hashes}, but returns self
   # @see to_hashes
@@ -61,24 +69,32 @@ class MovableErb::CSV
     @hashes = self.to_hashes
     self
   end
-  
+
   ##
   # Reads the CSV file into an array of hashes
   # @return [Array] an Array of Hashes
   def to_hashes
-    array_of_arrays = FasterCSV.read(filename)
-    headers = array_of_arrays.shift
-    headers.each { |h| h.downcase! && h.gsub!(/\s/,"_") } if headers
-    hashes = Array.new(array_of_arrays.length) { Hash.new }
-    array_of_arrays.each_with_index do |row,i|
-      headers.each_with_index do |header, j|
-        unless row[j].nil?
-          hashes[i][header] = [] if hashes[i][header].nil?
-          hashes[i][header] << row[j]
-        end
-      end
+    raw_arrays = CSV_PARSER.read(filename)
+    extract_headers!(raw_arrays)
+    raw_arrays.map {|row| to_hash(row) }
+  end
+
+  protected
+
+  def extract_headers!(array)
+    first_row = array.shift
+    first_row.each { |h| h.downcase! && h.gsub!(/\s/,"_") } if first_row
+    @headers = first_row
+  end
+
+  def to_hash(cells)
+    hash = Hash.new
+    headers.each_with_index do |column_name, column_index|
+      next unless cells[column_index]
+      hash[column_name] ||= []
+      hash[column_name] << cells[column_index]
     end
-    hashes
+    hash
   end
 end
 
@@ -88,14 +104,14 @@ class MovableErb::Erb
   require 'erb'
 
   attr_accessor :template, :parsed_string, :data
-  
+
   ##
   # Creates a new instance and allow manipulation of it via block.
-  # 
+  #
   # This can be used to initialize and parse quickly.
   #
   # @yield [erb] a new instance of {MovableErb::Erb}
-  # 
+  #
   # @example Create a new instance, setup and build the template
   #   @erb = MovableErb::Erb.setup do |erb|
   #     erb.data = {'hash' => 'of', 'meaningful' => 'values'}
@@ -104,6 +120,7 @@ class MovableErb::Erb
   #   end
   # @return [MovableErb::Erb]
   def self.setup
+    raise "no block given" unless block_given?
     erb = self.new
     yield erb
     erb

data/movable_erb.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{movable_erb}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Davey"]
-  s.date = %q{2009-10-17}
+  s.date = %q{2009-12-20}
   s.default_executable = %q{movable_erb}
   s.description = %q{A General-purpose CSV to ERB template formatter. Useful for converting legacy CSV data to an importable blog format.}
   s.email = %q{josh@joshuadavey.com}
@@ -66,3 +66,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<fastercsv>, [">= 1.5.0"])
   end
 end
+

data/spec/csv_spec.rb

@@ -3,6 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 TEMPLATE_FIXTURE = File.expand_path(File.dirname(__FILE__) + '/fixtures/template.erb')
 CSV_FIXTURE = File.expand_path(File.dirname(__FILE__) + '/fixtures/example.csv')
 
+
+if RUBY_VERSION =~ /1.9/
+  CSV_PARSER = ::CSV
+else
+  CSV_PARSER = FasterCSV
+end
+
 describe MovableErb do
   it "should have a CSV instance" do
     m = MovableErb.new
@@ -120,7 +127,7 @@ describe MovableErb::CSV do
    context "shortcut setup class method" do
       before(:each) do
         MovableErb::CSV.any_instance.stubs(:filename).returns("fake")
-        FasterCSV.stubs(:read).returns([])
+        CSV_PARSER.stubs(:read).returns([])
       end
 
       it "should create a new instance" do
@@ -153,7 +160,7 @@ describe MovableErb::CSV do
 
   describe "parsing" do
     before(:each) do
-      FasterCSV.stubs(:read).returns([["row1"], ["row2"]])
+      CSV_PARSER.stubs(:read).returns([["row1"], ["row2"]])
       @csv = MovableErb::CSV.new
       @csv.filename = "test.csv"
     end
@@ -169,7 +176,7 @@ describe MovableErb::CSV do
 
     context "#to_hashes" do
       it "should read from file" do
-        FasterCSV.expects(:read).with("test.csv").returns([[]])
+        CSV_PARSER.expects(:read).with("test.csv").returns([[]])
         @csv.to_hashes
       end
 
@@ -178,17 +185,17 @@ describe MovableErb::CSV do
       end
 
       it "should downcase the header row" do
-        FasterCSV.stubs(:read).returns([["Name"],["Billy Bob"]])
+        CSV_PARSER.stubs(:read).returns([["Name"],["Billy Bob"]])
         @csv.to_hashes.should == [{'name' => ['Billy Bob']}]
       end
       
       it "should convert the header row to snake_case" do
-        FasterCSV.stubs(:read).returns([["Extended Body"],["Billy Bob"]])
+        CSV_PARSER.stubs(:read).returns([["Extended Body"],["Billy Bob"]])
         @csv.to_hashes.should == [{'extended_body' => ['Billy Bob']}] 
       end
 
       it "should return an array of hashes (3 rows, 3 columns)" do
-        FasterCSV.stubs(:read).returns([["Name", "Phone", "Email"], 
+        CSV_PARSER.stubs(:read).returns([["Name", "Phone", "Email"], 
         ["John", "773-123-1234", "john@example.com"], 
         ["Abigail", nil, "abby@example.com"], 
         ["Casius", nil, nil]])
@@ -200,12 +207,12 @@ describe MovableErb::CSV do
       end
 
       it "should collect values with the same key" do
-        FasterCSV.stubs(:read).returns([["Name", "Name", "Email"], ["John", "James", "john@example.com"]]) 
+        CSV_PARSER.stubs(:read).returns([["Name", "Name", "Email"], ["John", "James", "john@example.com"]]) 
         @csv.to_hashes.should == [{'name' => ['John', 'James'],'email' => ['john@example.com']}]
       end
 
       it "should collect values with the same key (more than 2)" do
-        FasterCSV.stubs(:read).returns([["Name", "Name", "Name"], ["John", "James", "Jill"]]) 
+        CSV_PARSER.stubs(:read).returns([["Name", "Name", "Name"], ["John", "James", "Jill"]]) 
         @csv.to_hashes.should == [{'name' => ['John', 'James', 'Jill']}]
       end
     end
@@ -278,7 +285,7 @@ describe MovableErb::Erb do
 
     it "should parse a template with data given" do
       @erb.template = TEMPLATE_FIXTURE
-      @erb.data = {'name' => 'Johnny', 'email' => 'john@example.com'}
+      @erb.data = {'name' => ['Johnny'], 'email' => ['john@example.com']}
       @erb.build!
       @erb.parsed_string.should == <<-ERB.gsub(/^\s+/,'')
       Name: Johnny

data/spec/fixtures/template.erb

@@ -1,4 +1,4 @@
-Name: <%= data['name'] %>
+Name: <%= data['name'].join(" ") %>
 <% if data['email'] %>
-Email: <%= data['email'] %>
+Email: <%= data['email'].join(" ") %>
 <% end %>

data/spec/spec_helper.rb

@@ -1,5 +1,13 @@
 require 'rubygems'
 
+if RUBY_VERSION =~ /1.9/
+  require 'csv'
+  $csv_library = ::CSV
+else
+  require 'fastercsv'
+  $csv_library = FasterCSV
+end
+
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib movable_erb]))
 
 Spec::Runner.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: movable_erb
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Joshua Davey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 -05:00
+date: 2009-12-20 00:00:00 -06:00
 default_executable: movable_erb
 dependencies: 
 - !ruby/object:Gem::Dependency