comma 3.2.2 → 3.2.3

data/gemfiles/rails4.2.1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "coveralls", :require=>false
+gem "fastercsv", :platforms=>:ruby_18
+gem "rest-client", "> 1.6.2", "< 1.7", :require=>false
+gem "rails", "4.2.1"
+gem "rspec-rails"
+
+gemspec :path=>"../"

data/gemfiles/rails4.2.1.gemfile.lock

@@ -0,0 +1,156 @@
+PATH
+  remote: ../
+  specs:
+    comma (3.2.3)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (6.0.0)
+    builder (3.2.2)
+    colorize (0.7.5)
+    coveralls (0.5.8)
+      colorize
+      json
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    diff-lcs (1.1.3)
+    docile (1.1.5)
+    erubis (2.7.0)
+    fastercsv (1.5.5)
+    globalid (0.3.3)
+      activesupport (>= 4.1.0)
+    hike (1.2.3)
+    i18n (0.7.0)
+    json (1.8.2)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (1.25.1)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.0)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (0.9.6)
+    rdoc (4.2.0)
+      json (~> 1.4)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.1)
+  comma!
+  coveralls
+  fastercsv
+  rails (= 4.2.1)
+  rake (~> 0.9.2)
+  rest-client (> 1.6.2, < 1.7)
+  rspec (~> 2.8.0)
+  rspec-rails
+  sqlite3 (~> 1.3.4)

data/lib/comma/object.rb

@@ -3,10 +3,20 @@ require 'comma/data_extractor'
 require 'comma/header_extractor'
 
 class Object
-  class_attribute :comma_formats
+  class << self
+    def comma(style = :default, &block)
+      (@comma_formats ||= {})[style] = block
+    end
 
-  def self.comma(style = :default, &block)
-    (self.comma_formats ||= {})[style] = block
+    def comma_formats
+      @comma_formats ||= begin
+        if self == Object
+          {}
+        else
+          self.superclass.comma_formats
+        end
+      end
+    end
   end
 
   def to_comma(style = :default)
@@ -21,10 +31,12 @@ class Object
 
   def extract_with(extractor_class, style = :default)
     raise_unless_style_exists(style)
-    extractor_class.new(self, style, self.class.comma_formats).results
+    formats = respond_to?(:comma_formats) ? self.comma_formats : self.class.comma_formats
+    extractor_class.new(self, style, formats).results
   end
 
   def raise_unless_style_exists(style)
-    raise "No comma format for class #{self.class} defined for style #{style}" unless self.comma_formats && self.comma_formats[style]
+    formats = respond_to?(:comma_formats) ? self.comma_formats : self.class.comma_formats
+    raise "No comma format for class #{self.class} defined for style #{style}" unless formats && formats[style]
   end
 end

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.2.2"
+  VERSION = '3.2.3'
 end

data/spec/comma/comma_spec.rb

@@ -14,6 +14,18 @@ describe Comma do
     Object.should respond_to(:to_comma_headers)
   end
 
+  describe '.to_comma_header' do
+    it 'should not crash (#94)' do
+      klass = Class.new do
+        attr_accessor :name
+
+        comma :brief do
+          name
+        end
+      end
+      expect { klass.to_comma_headers(:brief) }.to_not raise_error
+    end
+  end
 end
 
 describe Comma, 'generating CSV' do
@@ -224,6 +236,43 @@ describe Comma, 'to_comma data/headers object extensions' do
 
   end
 
+  describe 'on objects using Single Table Inheritance' do
+
+    before do
+      class MySuperClass
+        attr_accessor :content
+        comma do; content end
+
+        def initialize(content)
+          @content = 'super-' + content
+        end
+      end
+
+      class ChildClassComma < MySuperClass
+        comma do; content end
+
+        def initialize(content)
+          @content = 'sub-' + content
+        end
+      end
+
+      class ChildClassNoComma < MySuperClass
+      end
+
+      @childComma = ChildClassComma.new('content')
+      @childNoComma = ChildClassNoComma.new('content')
+    end
+
+    it 'should return and array of data content, as defined in comma block in child class' do
+      @childComma.to_comma.should == %w(sub-content)
+    end
+
+    it 'should return and array of data content, as defined in comma block in super class, if not present in child' do
+      @childNoComma.to_comma.should == %w(super-content)
+    end
+
+  end
+
 end
 
 describe Comma, '__use__ keyword' do

data/spec/comma/rails/active_record_spec.rb

@@ -149,4 +149,49 @@ if defined? ActiveRecord
     end
   end
 
+  describe Comma, 'generating CSV from an ActiveRecord object using Single Table Inheritance' do
+
+    class Animal < ActiveRecord::Base
+      comma do;
+        name 'Name' do |name|
+          'Super-' + name
+        end
+      end
+    end
+
+    class Dog < Animal
+      comma do
+        name 'Name' do |name|
+          'Dog-' + name
+        end
+      end
+    end
+
+    class Cat < Animal
+    end
+
+    before(:all) do
+      #Setup AR model in memory
+      ActiveRecord::Base.connection.create_table :animals, :force => true do |table|
+        table.column :name, :string
+        table.column :type, :string
+      end
+
+      @dog = Dog.new(:name => 'Rex')
+      @dog.save!
+      @cat = Cat.new(:name => 'Kitty')
+      @cat.save!
+    end
+
+    it 'should return and array of data content, as defined in comma block in child class' do
+      @dog.to_comma.should == %w(Dog-Rex)
+    end
+
+    #FIXME: this one is failing - the comma block from Dog is executed instead of the one from the super class
+    it 'should return and array of data content, as defined in comma block in super class, if not present in child' do
+      @cat.to_comma.should == %w(Super-Kitty)
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -2,14 +2,17 @@
 require 'rubygems'
 $LOAD_PATH.unshift(File.expand_path(File.join(*%w{.. .. lib}), __FILE__))
 
-require 'bundler/setup'
-Bundler.require
+require 'coveralls'
+Coveralls.wear!
 
 begin
   require 'rails'
 rescue LoadError
 end
 
+require 'bundler/setup'
+Bundler.require
+
 %w{data_mapper mongoid active_record}.each do |orm|
   begin
     require orm

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Marcus Crafter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,47 +26,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
 description: Ruby Comma Seperated Values generation library
 email:
 - crafterm@redartisan.com
@@ -103,6 +89,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -119,10 +106,12 @@ files:
 - gemfiles/active3.1.12.gemfile.lock
 - gemfiles/active3.2.20.gemfile
 - gemfiles/active3.2.20.gemfile.lock
-- gemfiles/active4.0.11.gemfile
-- gemfiles/active4.0.11.gemfile.lock
-- gemfiles/active4.1.7.gemfile
-- gemfiles/active4.1.7.gemfile.lock
+- gemfiles/active4.0.13.gemfile
+- gemfiles/active4.0.13.gemfile.lock
+- gemfiles/active4.1.10.gemfile
+- gemfiles/active4.1.10.gemfile.lock
+- gemfiles/active4.2.1.gemfile
+- gemfiles/active4.2.1.gemfile.lock
 - gemfiles/data_mapper1.2.0.gemfile
 - gemfiles/data_mapper1.2.0.gemfile.lock
 - gemfiles/mongoid3.1.6.gemfile
@@ -133,10 +122,12 @@ files:
 - gemfiles/rails3.1.12.gemfile.lock
 - gemfiles/rails3.2.20.gemfile
 - gemfiles/rails3.2.20.gemfile.lock
-- gemfiles/rails4.0.11.gemfile
-- gemfiles/rails4.0.11.gemfile.lock
-- gemfiles/rails4.1.7.gemfile
-- gemfiles/rails4.1.7.gemfile.lock
+- gemfiles/rails4.0.13.gemfile
+- gemfiles/rails4.0.13.gemfile.lock
+- gemfiles/rails4.1.10.gemfile
+- gemfiles/rails4.1.10.gemfile.lock
+- gemfiles/rails4.2.1.gemfile
+- gemfiles/rails4.2.1.gemfile.lock
 - init.rb
 - lib/comma.rb
 - lib/comma/array.rb