comma 3.0.6 → 3.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a41ecd8c05f23d5a0cdded2eccc399525d54526f
+  data.tar.gz: 9ea499094bd3469e2b731e646118bb56f9d6924b
+SHA512:
+  metadata.gz: 57cd52eada9c08da15d212f49bcb457d664ab56d01f88767f7574c0fc9d2e30c4bd7ce241b175553648d0c0810cad641ffee2e5aeebd27727a7dd1c5f2e30b33
+  data.tar.gz: 85657ca9f963219a41ad8b8e8cf47faee67bc8aaa5f4b7f700fcd44832874d4570af9d6c6ba556f0c4da0da8ee65d91203394a5a9150f9ca969a8c3592a5f14c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/active3.0.9.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/active3.1.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/active3.1.12.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/active3.2.11.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/active4.0.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.5)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/rails3.0.9.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/rails3.1.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/rails3.1.12.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/rails3.2.11.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.6)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/rails4.0.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    comma (3.0.5)
+    comma (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/comma/extractors.rb

@@ -1,15 +1,18 @@
+require 'active_support/core_ext/class/attribute'
+
 module Comma
 
   class Extractor
 
-    def initialize(instance, &block)
+    def initialize(instance, style, formats)
       @instance = instance
-      @block = block
+      @style = style
+      @formats = formats
       @results = []
     end
 
     def results
-      instance_eval &@block
+      instance_eval &@formats[@style]
       @results.map { |r| convert_to_data_value(r) }
     end
 
@@ -17,6 +20,11 @@ module Comma
       method_missing(:id, *args, &block)
     end
 
+    def __use__(style)
+      # TODO: prevent infinite recursion
+      instance_eval(&@formats[style])
+    end
+
     private
 
     def convert_to_data_value(result)
@@ -27,18 +35,26 @@ module Comma
 
   class HeaderExtractor < Extractor
 
+    class_attribute :value_humanizer
+
+    DEFAULT_VALUE_HUMANIZER = lambda do |value, model_class|
+      value.is_a?(String) ? value : value.to_s.humanize
+    end
+    self.value_humanizer = DEFAULT_VALUE_HUMANIZER
+
     def method_missing(sym, *args, &block)
-      @results << sym.to_s.humanize if args.blank?
+      model_class = @instance.class
+      @results << self.value_humanizer.call(sym, model_class) if args.blank?
       args.each do |arg|
         case arg
         when Hash
           arg.each do |k, v|
-            @results << ((v.is_a? String) ? v : v.to_s.humanize)
+            @results << self.value_humanizer.call(v, get_association_class(model_class, sym))
           end
         when Symbol
-          @results << arg.to_s.humanize
+          @results << self.value_humanizer.call(arg, get_association_class(model_class, sym))
         when String
-          @results << arg
+          @results << self.value_humanizer.call(arg, model_class)
         else
           raise "Unknown header symbol #{arg.inspect}"
         end
@@ -48,6 +64,13 @@ module Comma
     def __static_column__(header = '', &block)
       @results << header
     end
+
+    private
+
+    def get_association_class(model_class, association)
+      model_class.respond_to?(:reflect_on_association) ?
+        model_class.reflect_on_association(arg).klass : nil
+    end
   end
 
   class DataExtractor < Extractor
@@ -80,7 +103,7 @@ module Comma
     end
 
     def __static_column__(header = nil, &block)
-      @results << (block ? yield : nil)
+      @results << (block ? yield(@instance) : nil)
     end
 
     private

data/lib/comma/object.rb

@@ -7,11 +7,11 @@ class Object
 
   def to_comma(style = :default)
     raise "No comma format for class #{self.class} defined for style #{style}" unless self.comma_formats and self.comma_formats[style]
-    Comma::DataExtractor.new(self, &self.comma_formats[style]).results
+    Comma::DataExtractor.new(self, style, self.class.comma_formats).results
   end
 
   def to_comma_headers(style = :default)
     raise "No comma format for class #{self.class} defined for style #{style}" unless self.comma_formats and self.comma_formats[style]
-    Comma::HeaderExtractor.new(self, &self.comma_formats[style]).results
+    Comma::HeaderExtractor.new(self, style, self.class.comma_formats).results
   end
 end

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.0.6"
+  VERSION = "3.1.0"
 end

data/spec/comma/comma_spec.rb

@@ -225,3 +225,27 @@ describe Comma, 'to_comma data/headers object extensions' do
   end
 
 end
+
+describe Comma, '__use__ keyword' do
+  before(:all) do
+    @obj = Class.new(Struct.new(:id, :title, :description)) do
+      comma do
+        title
+        __use__ :description
+      end
+
+      comma :description do
+        __use__ :static
+        description
+      end
+
+      comma :static do
+        __static_column__ do 'Foo, Inc.' end
+      end
+    end.new(1, 'Programming Ruby', 'The Pickaxe book')
+  end
+
+  subject { @obj.to_comma }
+  its(:size) { should eq(3) }
+  it { should eq(['Programming Ruby', 'Foo, Inc.', 'The Pickaxe book']) }
+end

data/spec/comma/extractors_spec.rb

@@ -127,12 +127,13 @@ describe Comma::DataExtractor, 'with static column method' do
         __static_column__
         __static_column__ 'STATIC'
         __static_column__ 'STATIC' do '' end
+        __static_column__ 'STATIC' do |o| o.name end
       end
     end.new(1, 'John Doe').to_comma
   end
 
   it 'should extract headers' do
-    @data.should eq([nil, nil, ''])
+    @data.should eq([nil, nil, '', 'John Doe'])
   end
 end
 

data/spec/comma/rails/active_record_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe Comma, 'generating CSV from an ActiveRecord object' do
@@ -35,4 +36,34 @@ describe Comma, 'generating CSV from an ActiveRecord object' do
       Person.teenagers.to_comma
     end
   end
+
+  describe 'with custom value_humanizer' do
+    before do
+      Comma::HeaderExtractor.value_humanizer =
+        lambda do |value, model_class|
+          if model_class.respond_to?(:human_attribute_name)
+            model_class.human_attribute_name(value)
+          else
+            value.is_a?(String) ? value : value.to_s.humanize
+          end
+        end
+
+      I18n.config.backend.store_translations(:ja, {:activerecord => {:attributes => {:person => {:age => '年齢', :name => '名前'}}}})
+      @original_locale = I18n.locale
+      I18n.locale = :ja
+
+      Person.create(:age => 19, :name => 'John')
+    end
+
+    after do
+      I18n.locale = @original_locale
+
+      Comma::HeaderExtractor.value_humanizer =
+        Comma::HeaderExtractor::DEFAULT_VALUE_HUMANIZER
+    end
+
+    it 'should i18n-ize header values' do
+      Person.teenagers.to_comma.should match(/^名前,年齢/)
+    end
+  end
 end

metadata

@@ -1,128 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: comma
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 6
-  version: 3.0.6
+version: !ruby/object:Gem::Version
+  version: 3.1.0
 platform: ruby
-authors: 
+authors:
 - Marcus Crafter
 - Tom Meier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby Comma Seperated Values generation library
-email: 
+email:
 - crafterm@redartisan.com
 - tom@venombytes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Appraisals
@@ -196,39 +176,30 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/crafterm/comma
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-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 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: comma
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby Comma Seperated Values generation library
-test_files: 
+test_files:
 - spec/comma/comma_spec.rb
 - spec/comma/extractors_spec.rb
 - spec/comma/rails/active_record_spec.rb
@@ -263,4 +234,3 @@ test_files:
 - spec/rails_app/script/rails
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: