elskwid-munger 0.1.4.1 → 0.1.4.2

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+# Gem::manage_gems
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'

data/lib/munger/data.rb

@@ -63,7 +63,7 @@ module Munger #:nodoc:
         else
           row[names] = col_data
         end
-        @data[index] = Item.ensure(row)
+        @data[index] = clean_data(row)
       end
     end
     alias :add_columns :add_column
@@ -169,16 +169,16 @@ module Munger #:nodoc:
       
       data_hash.each do |row_key, row_hash|
         new_row = {}
-        row_hash.each do |column_key, data|
+        row_hash.each do |column_key, row_data|
           column_key.each do |ckey|
-            new_row.merge!(clean_data(data[:data].data))
+            new_row.merge!(row_data[:data])
             case aggregation
             when :average
-              new_row[ckey] = (data[:sum] / data[:count])  
+              new_row[ckey] = (row_data[:sum] / row_data[:count])
             when :count
-              new_row[ckey] = data[:count]  
+              new_row[ckey] = row_data[:count]
             else            
-              new_row[ckey] = data[:sum]              
+              new_row[ckey] = row_data[:sum]
             end
             new_keys[ckey] = true
           end

data/lib/munger/render/csv.rb

@@ -12,11 +12,11 @@ module Munger #:nodoc:
         output = []
 
         # header
-        output << @report.columns.collect { |col| @report.column_title(col).to_s }.join(',')
+        output << @report.columns.collect { |col| quote(@report.column_title(col)) }.join(',')
         
         # body
         @report.process_data.each do |row|
-          output << @report.columns.collect { |col| row[:data][col].to_s }.join(',')
+          output << @report.columns.collect { |col| quote(row[:data][col]) }.join(',')
         end
         
         output.join("\n")
@@ -25,7 +25,13 @@ module Munger #:nodoc:
       def valid?
         @report.is_a? Munger::Report
       end
-    
+      
+      private
+      
+      # quote data if it contains a comma
+      def quote(data)
+        data.to_s.include?(',') ? "\"#{data}\"" : "#{data}"
+      end
     end
   end
 end

data/munger.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.platform  =  Gem::Platform::RUBY
     s.name      =  "elskwid-munger"
-    s.version   =  "0.1.4.1"
+    s.version   =  "0.1.4.2"
     s.authors   =  ['Scott Chacon', 'Brandon Mitchell', 'Don Morrison', 'Eric Lindvall']
     s.email     =  "elskwid@gmail.com"
     s.summary   =  "A reporting engine in Ruby - the elskwid fork!"

data/spec/munger/item_spec.rb

@@ -34,4 +34,10 @@ describe Munger::Item do
     item['key1'].should eql('value1')
     item[:key2].should eql('value2')
   end
+  
+  it "should return a hash after being initialized with a hash" do
+    hash = {:key1 => "value1", :key2 => "value2"}
+    Munger::Item.ensure(hash).to_hash.should be_kind_of(Hash)
+  end
+  
 end

data/spec/munger/render/csv_spec.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + "/../../spec_helper"
 describe Munger::Render::CSV do 
   include MungerSpecHelper
   
-  before(:each) do 
-    @data = Munger::Data.new(:data => test_data)
+  before(:each) do
+    @data = Munger::Data.new(:data => test_data + [{:name => 'Comma, Guy', :age => 100, :day => 0, :score => 0}])
     @report = Munger::Report.new(:data => @data)
   end
 
@@ -18,4 +18,10 @@ describe Munger::Render::CSV do
     text = @render.render
     text.split("\n").should have_at_least(count).items
   end
+  
+  it "should quote data with commas" do
+    @render = Munger::Render::CSV.new(@report.process)
+    text = @render.render
+    text.should match /"Comma, Guy"/
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'spec'
 require 'fileutils'
 require 'logger'
 require 'pp'
+require 'date'
 
 require 'rspec_hpricot_matchers'
 Spec::Runner.configure do |config|
@@ -22,7 +23,7 @@ module MungerSpecHelper
      {:name => 'Scott', :age => 23, :day => 1, :score => 31},
      {:name => 'Alice', :age => 33, :day => 1, :score => 12},
      {:name => 'Alice', :age => 34, :day => 2, :score => 12},
-     {:name => 'Alice', :age => 33, :day => 2, :score => 12},
+     {:name => 'Alice', :age => 33, :day => 2, :score => 12}
       ]
   end
   

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 4
-  - 1
-  version: 0.1.4.1
+  - 2
+  version: 0.1.4.2
 platform: ruby
 authors: 
 - Scott Chacon
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2010-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: []