csv_shaper 0.2.0 → 0.3.0

data/README.md

@@ -12,7 +12,7 @@ Annotated source: http://paulspringett.github.com/csv_shaper/
 
 ```ruby
 csv_string = CsvShaper.encode do |csv|
-  csv.header :name, :age, :gender, :pet_names
+  csv.headers :name, :age, :gender, :pet_names
   
   csv.rows @users do |csv, user|
     csv.cells :name, :age, :gender
@@ -235,6 +235,14 @@ Setting this to `false` will exclude the headers from the final CSV output.
 
 If you're using Rails you can put this in an initializer.
 
+To configure CSV output locally to change global behavior you can define a configure hash, like so:
+
+```ruby
+CsvShaper.encode(col_sep: "\t") do |csv|
+  ...
+end
+```
+
 ### Contributing
 
 1. Fork it

data/lib/csv_shaper/encoder.rb

@@ -21,13 +21,15 @@ module CsvShaper
     # a CSV String
     #
     # Returns a String
-    def to_csv
+    def to_csv(local_config = nil)
+      csv_options = options.merge(local_options(local_config))
+      
       rows = padded_rows.map do |data|
         CSV::Row.new(@header.mapped_columns, data, false)
       end
-
+      
       table = CSV::Table.new(rows)
-      table.to_csv(options)
+      table.to_csv(csv_options)
     end
     
     private
@@ -35,6 +37,10 @@ module CsvShaper
     def options
       CsvShaper::Shaper.config && CsvShaper::Shaper.config.options || {}
     end
+    
+    def local_options(local_config)
+      local_config && local_config.options || {}
+    end
 
     # Internal: make use of `CSV#values_at` to pad out the
     # cells into the correct columns for the headers

data/lib/csv_shaper/shaper.rb

@@ -8,8 +8,9 @@ module CsvShaper
       attr_accessor :config
     end
     
-    def initialize
+    def initialize(options = {})
       @rows = []
+      local_configuration(options)
       yield self if block_given?
     end
     
@@ -28,8 +29,8 @@ module CsvShaper
     # ```
     #
     # Returns a String
-    def self.encode
-      new.tap { |shaper| yield shaper }.to_csv
+    def self.encode(options = {})
+      new(options).tap { |shaper| yield shaper }.to_csv
     end
     
     # Public: creates a header row for the CSV
@@ -74,13 +75,21 @@ module CsvShaper
     #
     # Returns a String
     def to_csv
-      Encoder.new(@header, @rows).to_csv
+      Encoder.new(@header, @rows).to_csv(@local_config)
     end
 
     # Public: Create an instance of the config and cache it
     # for reference by the Encoder later
     def self.configure(&block)
-       @config ||= CsvShaper::Config.new(&block)
-     end
+      @config ||= CsvShaper::Config.new(&block)
+    end
+    
+    private
+    
+    def local_configuration(options = {})
+      @local_config = CsvShaper::Config.new do |csv|
+        options.each_pair { |k, v| csv.send("#{k}=", v) }
+      end
+    end
   end
 end

data/lib/csv_shaper/version.rb

@@ -1,3 +1,3 @@
 module CsvShaper
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/csv_shaper.rb

@@ -12,8 +12,8 @@ module CsvShaper
   class MissingHeadersError < StandardError; end
 
   # Shortcut the encode method
-  def self.encode(&block)
-    CsvShaper::Shaper.encode(&block)
+  def self.encode(options = {}, &block)
+    CsvShaper::Shaper.encode(options, &block)
   end
 
   def self.configure(&block)

data/spec/config_spec.rb

@@ -27,4 +27,20 @@ describe CsvShaper::Config do
     
     shaper.to_csv.should eq "Paul\t27\tMale\n"
   end
+  
+  it "should allow change configuration locally" do
+    CsvShaper::Shaper.config = config
+    
+    shaper = CsvShaper::Shaper.new(col_sep: ",") do |csv|
+      csv.headers :name, :age, :gender
+      
+      csv.row do |csv|
+        csv.cell :name, 'Paul'
+        csv.cell :age, '27'
+        csv.cell :gender, 'Male'
+      end
+    end
+    
+    shaper.to_csv.should eq "Paul,27,Male\n"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_shaper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2232251900 !ruby/object:Gem::Requirement
+  requirement: &70134819722080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2232251900
+  version_requirements: *70134819722080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2232251240 !ruby/object:Gem::Requirement
+  requirement: &70134819721660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2232251240
+  version_requirements: *70134819721660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2232250580 !ruby/object:Gem::Requirement
+  requirement: &70134819721200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2232250580
+  version_requirements: *70134819721200
 description: ! "\n    Creating CSV files in Ruby is painful! CSV Shaper makes life
   easier! It's\n    ideal for converting database backed models with attrbiutes into
   CSV output.\n    It can be used without Rails, but works great with ActiveRecord