comma 3.1.1 → 3.2.0

data/Appraisals

@@ -1,4 +1,4 @@
-['3.0.9', '3.1.1', '3.1.12', '3.2.11', '4.0.0'].each do |version_number|
+['3.0.20', '3.1.12', '3.2.14', '4.0.0'].each do |version_number|
   clean_number = version_number.gsub(/[<>~=]*/, '')
   next if RUBY_VERSION < '1.9.3' && version_number >= '4.0.0'
 
@@ -18,3 +18,8 @@ if RUBY_VERSION >= '1.9.3'
     gem 'mongoid', '3.1.4'
   end
 end
+
+appraise 'data_mapper1.2.0' do
+  gem 'data_mapper', '1.2.0'
+  gem 'dm-sqlite-adapter', '1.2.0'
+end

data/Gemfile.lock

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

data/README.markdown

@@ -10,7 +10,7 @@ The mainline of this project builds gems to the 3.x version series, and is compa
 * Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0
 * REE 1.8.7
 * RBX 1.8 mode, 1.9 mode
-* Rails 3.x (all versions, with ActiveRecord and Mongoid support)
+* Rails 3.x (all versions, with ActiveRecord, DataMapper and Mongoid support)
 
 [![Build Status](https://travis-ci.org/comma-csv/comma.png?branch=master)](https://travis-ci.org/comma-csv/comma) [![Code Climate](https://codeclimate.com/github/comma-csv/comma.png)](https://codeclimate.com/github/comma-csv/comma)
 
@@ -227,6 +227,47 @@ In the preceding example, the 2 new fields added (both based on the publisher re
 *   the first example 'publishers_contact' is loaded straight as a block. The value returned by the lambda is displayed with a header value of 'Publisher'
 *   the second example 'total_publishers_users' is sent via a hash and a custom label is set, if used in the first examples method the header would be 'Publisher', but sent as a hash the header is 'Number of publisher users'.
 
+##Using special fields
+
+###\_\_use\_\_
+
+With `__use__` field, you can reuse output formats that are defined in
+the same class. In the example below, default format (`:default`)
+includes `:minimum` format when `#to_comma` is called.
+
+```ruby
+ class Book < ActiveRecord::Base
+   comma do
+     __use__ :minimum
+
+     description
+
+     isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
+   end
+
+   comma :minimum do
+     name
+   end
+ end
+```
+
+###\_\_static_column\_\_
+
+When you want to have static value in your CSV output, you can use
+`__static__` field. You can provide values to output to blocks.
+Without block, field will become empty.
+
+```ruby
+ class Book < ActiveRecord::Base
+   comma do
+     __static_column__ 'Check' do ' ' end
+     name
+     __static_column__ 'Spacer'
+     description
+   end
+ end
+```
+
 ##USING WITH RAILS
 
 When used with Rails (ie. add 'comma' as a gem dependency), Comma automatically adds support for rendering CSV output in your controllers:
@@ -323,4 +364,3 @@ When rebuilding for a new rails version, to test across controller and the stack
 ```
 rails plugin new rails_app --full --dummy-path=spec/dummy --skip-bundle --skip-gemspec --skip-test-unit --skip-sprockets --skip-javascript --skip-gemfile --skip-git
 ```
-

data/gemfiles/{active3.2.11.gemfile → active3.0.20.gemfile}

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "fastercsv", :platforms=>:ruby_18
-gem "activesupport", "3.2.11"
-gem "activerecord", "3.2.11"
+gem "activesupport", "3.0.20"
+gem "activerecord", "3.0.20"
 
 gemspec :path=>"../"

data/gemfiles/{active3.0.9.gemfile.lock → active3.0.20.gemfile.lock}

@@ -1,32 +1,32 @@
 PATH
   remote: ..
   specs:
-    comma (3.1.0)
+    comma (3.2.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.9)
+    activesupport (3.0.20)
     appraisal (0.4.1)
       bundler
       rake
     arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.3)
-    fastercsv (1.5.4)
+    fastercsv (1.5.5)
     i18n (0.5.0)
-    multi_json (1.1.0)
-    rake (0.9.2.2)
+    multi_json (1.7.9)
+    rake (0.9.6)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -35,19 +35,19 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.6.1)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
-    tzinfo (0.3.31)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.8)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 3.0.9)
-  activesupport (= 3.0.9)
+  activerecord (= 3.0.20)
+  activesupport (= 3.0.20)
   appraisal (~> 0.4.1)
   comma!
   fastercsv

data/gemfiles/active3.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/{active3.0.9.gemfile → active3.2.14.gemfile}

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "fastercsv", :platforms=>:ruby_18
-gem "activesupport", "3.0.9"
-gem "activerecord", "3.0.9"
+gem "activesupport", "3.2.14"
+gem "activerecord", "3.2.14"
 
 gemspec :path=>"../"

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

@@ -1,22 +1,22 @@
 PATH
   remote: ..
   specs:
-    comma (3.1.0)
+    comma (3.2.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    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)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     appraisal (0.4.1)
       bundler
@@ -25,8 +25,8 @@ GEM
     builder (3.0.4)
     diff-lcs (1.1.3)
     fastercsv (1.5.5)
-    i18n (0.6.1)
-    multi_json (1.5.0)
+    i18n (0.6.5)
+    multi_json (1.7.9)
     rake (0.9.6)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -40,15 +40,15 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.35)
+    sqlite3 (1.3.8)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 3.2.11)
-  activesupport (= 3.2.11)
+  activerecord (= 3.2.14)
+  activesupport (= 3.2.14)
   appraisal (~> 0.4.1)
   comma!
   fastercsv

data/gemfiles/active4.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/gemfiles/{rails3.0.9.gemfile → data_mapper1.2.0.gemfile}

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "fastercsv", :platforms=>:ruby_18
-gem "rails", "3.0.9"
-gem "rspec-rails"
+gem "data_mapper", "1.2.0"
+gem "dm-sqlite-adapter", "1.2.0"
 
 gemspec :path=>"../"

data/gemfiles/data_mapper1.2.0.gemfile.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: ..
+  specs:
+    comma (3.2.0)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.3.5)
+    appraisal (0.4.1)
+      bundler
+      rake
+    bcrypt-ruby (3.1.2)
+    data_mapper (1.2.0)
+      dm-aggregates (~> 1.2.0)
+      dm-constraints (~> 1.2.0)
+      dm-core (~> 1.2.0)
+      dm-migrations (~> 1.2.0)
+      dm-serializer (~> 1.2.0)
+      dm-timestamps (~> 1.2.0)
+      dm-transactions (~> 1.2.0)
+      dm-types (~> 1.2.0)
+      dm-validations (~> 1.2.0)
+    data_objects (0.10.13)
+      addressable (~> 2.1)
+    diff-lcs (1.1.3)
+    dm-aggregates (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-constraints (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-core (1.2.1)
+      addressable (~> 2.3)
+    dm-do-adapter (1.2.0)
+      data_objects (~> 0.10.6)
+      dm-core (~> 1.2.0)
+    dm-migrations (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-serializer (1.2.2)
+      dm-core (~> 1.2.0)
+      fastercsv (~> 1.5)
+      json (~> 1.6)
+      json_pure (~> 1.6)
+      multi_json (~> 1.0)
+    dm-sqlite-adapter (1.2.0)
+      dm-do-adapter (~> 1.2.0)
+      do_sqlite3 (~> 0.10.6)
+    dm-timestamps (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-transactions (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-types (1.2.2)
+      bcrypt-ruby (~> 3.0)
+      dm-core (~> 1.2.0)
+      fastercsv (~> 1.5)
+      json (~> 1.6)
+      multi_json (~> 1.0)
+      stringex (~> 1.4)
+      uuidtools (~> 2.1)
+    dm-validations (1.2.0)
+      dm-core (~> 1.2.0)
+    do_sqlite3 (0.10.13)
+      data_objects (= 0.10.13)
+    fastercsv (1.5.5)
+    i18n (0.6.5)
+    json (1.8.0)
+    json_pure (1.8.0)
+    multi_json (1.7.9)
+    rake (0.9.6)
+    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)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.8)
+    stringex (1.5.1)
+    uuidtools (2.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.1)
+  comma!
+  data_mapper (= 1.2.0)
+  dm-sqlite-adapter (= 1.2.0)
+  fastercsv
+  rake (~> 0.9.2)
+  rspec (~> 2.8.0)
+  simplecov
+  sqlite3 (~> 1.3.4)

data/gemfiles/mongoid3.1.4.gemfile.lock

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

data/gemfiles/{rails3.1.1.gemfile → rails3.0.20.gemfile}

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

data/gemfiles/{rails3.0.9.gemfile.lock → rails3.0.20.gemfile.lock}

@@ -1,39 +1,39 @@
 PATH
   remote: ..
   specs:
-    comma (3.1.0)
+    comma (3.2.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
       mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
-      rack (~> 1.2.1)
+      rack (~> 1.2.5)
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
     appraisal (0.4.1)
       bundler
       rake
@@ -42,38 +42,38 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    fastercsv (1.5.4)
+    fastercsv (1.5.5)
     i18n (0.5.0)
-    json (1.6.5)
-    mail (2.2.19)
+    json (1.8.0)
+    mail (2.2.20)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.25)
+    multi_json (1.7.9)
     polyglot (0.3.3)
-    rack (1.2.5)
+    rack (1.2.8)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (0.9.6)
+    rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -88,16 +88,16 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    simplecov (0.6.1)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.8)
     thor (0.14.6)
-    treetop (1.4.10)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
@@ -106,7 +106,7 @@ DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
   fastercsv
-  rails (= 3.0.9)
+  rails (= 3.0.20)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   rspec-rails