comma 3.1.1 → 3.2.0

data/gemfiles/rails3.1.12.gemfile.lock

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

data/gemfiles/{rails3.2.11.gemfile → rails3.2.14.gemfile}

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "fastercsv", :platforms=>:ruby_18
-gem "rails", "3.2.11"
+gem "rails", "3.2.14"
 gem "rspec-rails"
 
 gemspec :path=>"../"

data/gemfiles/{rails3.2.11.gemfile.lock → rails3.2.14.gemfile.lock}

@@ -1,38 +1,38 @@
 PATH
   remote: ..
   specs:
-    comma (3.1.0)
+    comma (3.2.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     appraisal (0.4.1)
       bundler
@@ -42,41 +42,40 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     fastercsv (1.5.5)
-    hike (1.2.1)
-    i18n (0.6.1)
+    hike (1.2.3)
+    i18n (0.6.5)
     journey (1.0.4)
-    json (1.7.6)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    json (1.8.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.20.1)
-    multi_json (1.5.0)
+    mime-types (1.25)
+    multi_json (1.7.9)
     polyglot (0.3.3)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (0.9.6)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -100,13 +99,13 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.17.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    sqlite3 (1.3.8)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
@@ -115,7 +114,7 @@ DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
   fastercsv
-  rails (= 3.2.11)
+  rails (= 3.2.14)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   rspec-rails

data/gemfiles/rails4.0.0.gemfile.lock

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

data/lib/comma.rb

@@ -28,11 +28,13 @@ require 'active_support/lazy_load_hooks'
 ActiveSupport.on_load(:active_record) do
   require 'comma/relation' if defined?(ActiveRecord::Relation)
 end
+
 ActiveSupport.on_load(:mongoid) do
   require 'comma/mongoid'
 end
 
-require 'comma/extractors'
+require 'comma/data_mapper_collection' if defined? DataMapper
+
 require 'comma/generator'
 require 'comma/array'
 require 'comma/object'

data/lib/comma/data_extractor.rb

@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+require 'comma/extractor'
+
+module Comma
+
+  class DataExtractor < Extractor
+
+    class ExtractValueFromInstance
+      def initialize(instance)
+        @instance = instance
+      end
+
+      def extract(sym, &block)
+        yield_block_with_value(extract_value(sym), &block)
+      end
+
+      private
+
+      def yield_block_with_value(value, &block)
+        block ? yield(value) : value
+      end
+
+      def extract_value(method)
+        extraction_object.send(method)
+      end
+
+      def extraction_object
+        @instance
+      end
+    end
+
+    class ExtractValueFromAssociationOfInstance < ExtractValueFromInstance
+      def initialize(instance, association_name)
+        super(instance)
+        @association_name = association_name
+      end
+
+      private
+
+      def extraction_object
+        @instance.send(@association_name) || null_association
+      end
+
+      def null_association
+        @null_association ||= Class.new(Class.const_defined?(:BasicObject) ? ::BasicObject : ::Object) do
+          def method_missing(symbol, *args, &block)
+            nil
+          end
+        end.new
+      end
+    end
+
+    def method_missing(sym, *args, &block)
+      if args.blank?
+        @results << ExtractValueFromInstance.new(@instance).extract(sym, &block)
+      end
+
+      args.each do |arg|
+        case arg
+        when Hash
+          arg.each do |k, v|
+            @results << ExtractValueFromAssociationOfInstance.new(@instance, sym).extract(k, &block)
+          end
+        when Symbol
+          @results << ExtractValueFromAssociationOfInstance.new(@instance, sym).extract(arg, &block)
+        when String
+          @results << ExtractValueFromInstance.new(@instance).extract(sym, &block)
+        else
+          raise "Unknown data symbol #{arg.inspect}"
+        end
+      end
+    end
+
+    def __static_column__(header = nil, &block)
+      @results << (block ? yield(@instance) : nil)
+    end
+  end
+end

data/lib/comma/data_mapper_collection.rb

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+class DataMapper::Collection
+  def to_comma(style = :default)
+    Comma::Generator.new(self, style).run(:each)
+  end
+end

data/lib/comma/extractor.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+module Comma
+
+  class Extractor
+
+    def initialize(instance, style, formats)
+      @instance = instance
+      @style = style
+      @formats = formats
+      @results = []
+    end
+
+    def results
+      instance_eval &@formats[@style]
+      @results.map { |r| convert_to_data_value(r) }
+    end
+
+    def id(*args, &block)
+      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)
+      result.nil? ? result : result.to_s
+    end
+
+  end
+
+end

data/lib/comma/header_extractor.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+require 'comma/extractor'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
+
+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)
+      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 << self.value_humanizer.call(v, get_association_class(model_class, sym))
+          end
+        when Symbol
+          @results << self.value_humanizer.call(arg, get_association_class(model_class, sym))
+        when String
+          @results << self.value_humanizer.call(arg, model_class)
+        else
+          raise "Unknown header symbol #{arg.inspect}"
+        end
+      end
+    end
+
+    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(association).klass : nil
+    end
+  end
+end

data/lib/comma/object.rb

@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+require 'comma/data_extractor'
+require 'comma/header_extractor'
+
 class Object
   class_attribute :comma_formats
 

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.1.1"
+  VERSION = "3.2.0"
 end

data/spec/comma/{extractors_spec.rb → data_extractor_spec.rb}

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+# -*- coding: utf-8 -*-
+require 'spec_helper'
 
 # comma do
 #   name 'Title'
@@ -7,65 +8,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 #   isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
 # end
 
-describe Comma::HeaderExtractor do
-
-  before do
-    @isbn = Isbn.new('123123123', '321321321')
-    @book = Book.new('Smalltalk-80', 'Language and Implementation', @isbn)
-
-    @headers = @book.to_comma_headers
-  end
-
-  describe 'when no parameters are provided' do
-
-    it 'should use the method name as the header name, humanized' do
-      @headers.should include('Description')
-    end
-  end
-
-  describe 'when given a string description as a parameter' do
-
-    it 'should use the string value, unmodified' do
-      @headers.should include('Title')
-    end
-  end
-
-  describe 'when an hash is passed as a parameter' do
-
-    describe 'with a string value' do
-
-      it 'should use the string value, unmodified' do
-        @headers.should include('ISBN-10')
-      end
-    end
-
-    describe 'with a non-string value' do
-
-      it 'should use the non string value converted to a string, humanized' do
-        @headers.should include('Issuer')
-      end
-    end
-
-  end
-
-end
-
-describe Comma::HeaderExtractor, 'with static column method' do
-  before do
-    @headers = Class.new(Struct.new(:id, :name)) do
-      comma do
-        __static_column__
-        __static_column__ 'STATIC'
-        __static_column__ 'STATIC' do '' end
-      end
-    end.new(1, 'John Doe').to_comma_headers
-  end
-
-  it 'should extract headers' do
-    @headers.should eq(['', 'STATIC', 'STATIC'])
-  end
-end
-
 describe Comma::DataExtractor do
 
   before do