comma 3.0.0 → 3.0.1

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 .*.swp
 *~
 .bundle
+spec/rails_app/log

data/Appraisals

@@ -3,6 +3,7 @@
 
   appraise "rails#{ clean_number }" do
     gem "rails", version_number
+    gem "rspec-rails"
   end
 
   appraise "active#{ clean_number }" do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    comma (3.0.0)
+    comma (3.0.1)
 
 GEM
   remote: http://rubygems.org/
@@ -10,7 +10,8 @@ GEM
       bundler
       rake
     diff-lcs (1.1.3)
-    rake (0.9.2)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -19,6 +20,10 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.5)
 
 PLATFORMS
@@ -27,6 +32,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
-  rake (= 0.9.2)
+  rake (~> 0.9.2)
   rspec (~> 2.8.0)
+  simplecov
   sqlite3 (~> 1.3.4)

data/README.markdown

@@ -305,3 +305,9 @@ bundle exec rake appraisals spec
 
 ```
 
+When rebuilding for a new rails version, to test across controller and the stack itself, a fake rails app must be generated :
+
+```
+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/comma.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency(%q<rake>, ["0.9.2"])
+  s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
   s.add_development_dependency('sqlite3', '~> 1.3.4')
-  s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
   s.add_development_dependency(%q<appraisal>, ["~> 0.4.1"])
 
+  s.add_development_dependency('rspec', '~> 2.8.0')
+  s.add_development_dependency 'simplecov'
+
 end

data/gemfiles/active3.0.9.gemfile.lock

@@ -23,6 +23,7 @@ GEM
     builder (2.1.2)
     diff-lcs (1.1.3)
     i18n (0.5.0)
+    multi_json (1.0.4)
     rake (0.9.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -32,6 +33,10 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.5)
     tzinfo (0.3.31)
 
@@ -43,6 +48,7 @@ DEPENDENCIES
   activesupport (= 3.0.9)
   appraisal (~> 0.4.1)
   comma!
-  rake (= 0.9.2)
+  rake (~> 0.9.2)
   rspec (~> 2.8.0)
+  simplecov
   sqlite3 (~> 1.3.4)

data/gemfiles/active3.1.1.gemfile.lock

@@ -34,6 +34,9 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     sqlite3 (1.3.5)
     tzinfo (0.3.31)
 
@@ -45,6 +48,7 @@ DEPENDENCIES
   activesupport (= 3.1.1)
   appraisal (~> 0.4.1)
   comma!
-  rake (= 0.9.2)
+  rake (~> 0.9.2)
   rspec (~> 2.8.0)
+  simplecov
   sqlite3 (~> 1.3.4)

data/gemfiles/active3.2.1.gemfile.lock

@@ -34,6 +34,9 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     sqlite3 (1.3.5)
     tzinfo (0.3.31)
 
@@ -45,6 +48,7 @@ DEPENDENCIES
   activesupport (~> 3.2.1)
   appraisal (~> 0.4.1)
   comma!
-  rake (= 0.9.2)
+  rake (~> 0.9.2)
   rspec (~> 2.8.0)
+  simplecov
   sqlite3 (~> 1.3.4)

data/gemfiles/rails3.0.9.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "3.0.9"
+gem "rspec-rails"
 
 gemspec :path=>"../"

data/gemfiles/rails3.0.9.gemfile.lock

@@ -49,6 +49,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
+    multi_json (1.0.4)
     polyglot (0.3.3)
     rack (1.2.5)
     rack-mount (0.6.14)
@@ -80,6 +81,15 @@ GEM
     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.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.5)
     thor (0.14.6)
     treetop (1.4.10)
@@ -94,6 +104,8 @@ DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
   rails (= 3.0.9)
-  rake (= 0.9.2)
+  rake (~> 0.9.2)
   rspec (~> 2.8.0)
+  rspec-rails
+  simplecov
   sqlite3 (~> 1.3.4)

data/gemfiles/rails3.1.1.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "3.1.1"
+gem "rspec-rails"
 
 gemspec :path=>"../"

data/gemfiles/rails3.1.1.gemfile.lock

@@ -86,6 +86,14 @@ GEM
     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.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -105,6 +113,8 @@ DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
   rails (= 3.1.1)
-  rake (= 0.9.2)
+  rake (~> 0.9.2)
   rspec (~> 2.8.0)
+  rspec-rails
+  simplecov
   sqlite3 (~> 1.3.4)

data/gemfiles/rails3.2.1.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "~>3.2.1"
+gem "rspec-rails"
 
 gemspec :path=>"../"

data/gemfiles/rails3.2.1.gemfile.lock

@@ -84,6 +84,14 @@ GEM
     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.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -103,6 +111,8 @@ DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
   rails (~> 3.2.1)
-  rake (= 0.9.2)
+  rake (~> 0.9.2)
   rspec (~> 2.8.0)
+  rspec-rails
+  simplecov
   sqlite3 (~> 1.3.4)

data/lib/comma.rb

@@ -11,6 +11,7 @@ if defined? Rails and (Rails.version.split('.').map(&:to_i).first < 3)
 end
 
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/module/delegation'
 require 'comma/relation' if defined?(ActiveRecord::Relation)
 
 require 'comma/extractors'
@@ -21,7 +22,10 @@ require 'comma/object'
 #Load into Rails controllers
 if defined?(ActionController::Renderers) && ActionController::Renderers.respond_to?(:add)
   ActionController::Renderers.add :csv do |obj, options|
-    filename = options[:filename] || 'data'
-    send_data obj.to_comma, :type => Mime::CSV, :disposition => "attachment; filename=#{filename}.csv"
+    filename    = options[:filename] || 'data'
+    #Capture any CSV optional settings passed to comma
+    csv_options = options.slice(*CSV_HANDLER::DEFAULT_OPTIONS.merge(:write_headers => nil).keys)
+
+    send_data obj.to_comma(csv_options), :type => Mime::CSV, :disposition => "attachment; filename=#{filename}.csv"
   end
 end

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/spec/comma/{ar_spec.rb → rails/active_record_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Comma, 'generating CSV from an ActiveRecord object' do
 

data/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+if defined?(ActionController) && defined?(Rails)
+
+  describe UsersController do
+
+    describe "rails setup" do
+
+      it 'should capture the CSV renderer provided by Rails' do
+        mock_users = [mock_model(User), mock_model(User)]
+        User.stub!(:all).and_return(mock_users)
+
+        mock_users.should_receive(:to_comma).once
+
+        get :index, :format => :csv
+      end
+
+    end
+
+    describe "controller" do
+      before(:each) do
+        @user_1 = User.create!(:first_name => 'Fred', :last_name => 'Flintstone')
+        @user_2 = User.create!(:first_name => 'Wilma', :last_name => 'Flintstone')
+      end
+
+      it 'should not affect html requested' do
+        get :index
+
+        response.status.should        == 200
+        response.content_type.should  == 'text/html'
+        response.body.should          == 'Users!'
+      end
+
+      it "should return a csv when requested" do
+        get :index, :format => :csv
+
+        response.status.should            == 200
+        response.content_type.should      == 'text/csv'
+        response.header["Content-Disposition"].should include('filename=data.csv')
+
+        expected_content =<<-CSV.gsub(/^\s+/,'')
+        First name,Last name,Name
+        Fred,Flintstone,Fred Flintstone
+        Wilma,Flintstone,Wilma Flintstone
+        CSV
+
+        response.body.should              == expected_content
+      end
+
+      describe 'with custom options' do
+
+        it 'should allow a filename to be set' do
+          get :with_custom_options, :format => :csv, :custom_options => { :filename => 'my_custom_name' }
+
+          response.status.should            == 200
+          response.content_type.should      == 'text/csv'
+          response.header["Content-Disposition"].should include('filename=my_custom_name.csv')
+        end
+
+        describe 'headers' do
+
+          it 'should allow toggling on' do
+            get :with_custom_options, :format => :csv, :custom_options => { :write_headers => 'true' }
+
+            response.status.should            == 200
+            response.content_type.should      == 'text/csv'
+
+            expected_content =<<-CSV.gsub(/^\s+/,'')
+            First name,Last name,Name
+            Fred,Flintstone,Fred Flintstone
+            Wilma,Flintstone,Wilma Flintstone
+            CSV
+
+            response.body.should              == expected_content
+          end
+
+          it 'should allow toggling off' do
+            get :with_custom_options, :format => :csv, :custom_options => {:write_headers => false}
+
+            response.status.should            == 200
+            response.content_type.should      == 'text/csv'
+
+            expected_content =<<-CSV.gsub(/^\s+/,'')
+            Fred,Flintstone,Fred Flintstone
+            Wilma,Flintstone,Wilma Flintstone
+            CSV
+
+            response.body.should              == expected_content
+          end
+
+        end
+
+        it 'should allow forcing of quotes' do
+          get :with_custom_options, :format => :csv, :custom_options => { :force_quotes => true }
+
+          response.status.should            == 200
+          response.content_type.should      == 'text/csv'
+
+          expected_content =<<-CSV.gsub(/^\s+/,'')
+          "First name","Last name","Name"
+          "Fred","Flintstone","Fred Flintstone"
+          "Wilma","Flintstone","Wilma Flintstone"
+          CSV
+
+          response.body.should              == expected_content
+        end
+
+        it 'should allow combinations of options' do
+          get :with_custom_options, :format => :csv, :custom_options => { :write_headers => false, :force_quotes => true, :col_sep => '||', :row_sep => "ENDOFLINE\n" }
+
+          response.status.should            == 200
+          response.content_type.should      == 'text/csv'
+
+          expected_content =<<-CSV.gsub(/^\s+/,'')
+          "Fred"||"Flintstone"||"Fred Flintstone"ENDOFLINE
+          "Wilma"||"Flintstone"||"Wilma Flintstone"ENDOFLINE
+          CSV
+
+          response.body.should              == expected_content
+        end
+
+      end
+
+    end
+
+  end
+end

data/spec/non_rails_app/ruby_classes.rb

@@ -0,0 +1,31 @@
+class Book
+  attr_accessor :name, :description, :isbn
+
+  def initialize(name, description, isbn)
+    @name, @description, @isbn = name, description, isbn
+  end
+
+  comma do
+    name 'Title'
+    description
+
+    isbn :authority => :issuer
+    isbn :number_10 => 'ISBN-10'
+    isbn :number_13 => 'ISBN-13'
+  end
+
+  comma :brief do
+    name
+    description
+  end
+end
+
+class Isbn
+  attr_accessor :number_10, :number_13
+
+  def initialize(isbn_10, isbn_13)
+    @number_10, @number_13 = isbn_10, isbn_13
+  end
+
+  def authority; 'ISBN'; end
+end

data/spec/rails_app/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+RailsApp::Application.load_tasks

data/spec/rails_app/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/spec/rails_app/app/controllers/users_controller.rb

@@ -0,0 +1,17 @@
+class UsersController < ApplicationController
+  def index
+    respond_to do |format|
+      format.html { render :text => 'Users!' }
+      format.csv  { render :csv => User.all  }
+    end
+  end
+
+  def with_custom_options
+    render_options = {:csv => User.all}.update(params[:custom_options].symbolize_keys)
+
+    respond_to do |format|
+      format.csv  { render render_options }
+    end
+  end
+
+end

data/spec/rails_app/app/helpers/application_helper.rb

@@ -0,0 +1,3 @@
+# Methods added to this helper will be available to all templates in the application.
+module ApplicationHelper
+end

data/spec/rails_app/app/models/post.rb

@@ -0,0 +1,10 @@
+class Post < ActiveRecord::Base
+
+  comma do
+    title
+    description
+
+    user :full_name
+  end
+
+end

data/spec/rails_app/app/models/user.rb

@@ -0,0 +1,16 @@
+class User < ActiveRecord::Base
+  comma do
+    first_name
+    last_name
+    full_name "Name"
+  end
+
+  comma :brief do
+    first_name
+    last_name
+  end
+
+  def full_name
+    "#{first_name} #{last_name}".strip
+  end
+end

data/spec/rails_app/app/views/layouts/application.html.erb

@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>Comma Test App</title>
+  </head>
+  <body>
+    <div id="container">
+      <%= yield %>
+    </div>
+  </body>
+</html>

data/spec/rails_app/app/views/users/index.html.erb

@@ -0,0 +1 @@
+Users!

data/spec/rails_app/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run RailsApp::Application

data/spec/rails_app/config/application.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module RailsApp
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/spec/rails_app/config/boot.rb

@@ -0,0 +1,8 @@
+unless defined?(DEVISE_ORM)
+  DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/rails_app/config/database.yml

@@ -0,0 +1,18 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: ":memory:"
+
+production:
+  adapter: sqlite3
+  database: ":memory:"

data/spec/rails_app/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+RailsApp::Application.initialize!

data/spec/rails_app/config/environments/development.rb

@@ -0,0 +1,20 @@
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  config.active_support.deprecation = :log
+end

data/spec/rails_app/config/environments/production.rb

@@ -0,0 +1,35 @@
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  config.active_support.deprecation = :log
+end

data/spec/rails_app/config/environments/test.rb

@@ -0,0 +1,33 @@
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  config.action_dispatch.show_exceptions = false
+
+  config.active_support.deprecation = :stderr
+end

data/spec/rails_app/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+Rails.backtrace_cleaner.remove_silencers!

data/spec/rails_app/config/initializers/inflections.rb

@@ -0,0 +1,2 @@
+ActiveSupport::Inflector.inflections do |inflect|
+end

data/spec/rails_app/config/initializers/secret_token.rb

@@ -0,0 +1,2 @@
+Rails.application.config.secret_token = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'
+Rails.application.config.session_store :cookie_store, :key => "_my_app"

data/spec/rails_app/config/routes.rb

@@ -0,0 +1,8 @@
+Rails.application.routes.draw do
+  # Resources for testing
+  resources :users, :only => [:index]
+
+  match "with_custom_options", :to => "users#with_custom_options"
+
+  root :to => "users#index"
+end

data/spec/rails_app/db/migrate/20120224085510_create_tables.rb

@@ -0,0 +1,24 @@
+
+class CreateTables < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string      :first_name
+      t.string      :last_name
+
+      t.timestamps
+    end
+
+    create_table :posts do |t|
+      t.references :user
+      t.string :title
+      t.string :description
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :posts
+    drop_table :users
+  end
+end

data/spec/rails_app/db/schema.rb

@@ -0,0 +1,32 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20120224085510) do
+
+  create_table "posts", :force => true do |t|
+    t.string   "title"
+    t.string   "description",   :limit => 128
+    t.integer  "user_id"
+
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "first_name"
+    t.string   "last_name"
+
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/spec/rails_app/public/404.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </div>
+</body>
+</html>

data/spec/rails_app/public/422.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+</body>
+</html>

data/spec/rails_app/public/500.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
+  </div>
+</body>
+</html>

data/spec/rails_app/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/spec/spec_helper.rb

@@ -1,44 +1,47 @@
 require 'rubygems'
 require 'rspec'
-require 'active_record'
+require 'simplecov'
 
-ActiveRecord::ActiveRecordError # http://tinyurl.com/24f84gf
+SimpleCov.start do
+  add_filter  "spec"
+  use_merging true
+  merge_timeout 600
+end
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+begin
+  #Conditionally load rails app for controller tests if rspec-rails gem is installed
+  require "rails_app/config/environment"
+  require 'rspec/rails'
+  ENV["RAILS_ENV"] = "test"
 
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/support/database.yml'))
-ActiveRecord::Base.establish_connection(config['test'])
+  SimpleCov.command_name 'rspec:with_rails'
 
-require 'comma'
+  # Requires supporting ruby files with custom matchers and macros, etc,
+  # in spec/support/ and its subdirectories.
+  Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|file| require file }
 
-class Book
-  attr_accessor :name, :description, :isbn
+  load_schema = lambda {
+    load "#{Rails.root.to_s}/db/schema.rb" # use db agnostic schema by default
+    # ActiveRecord::Migrator.up('db/migrate') # use migrations
+  }
+  silence_stream(STDOUT, &load_schema)
 
-  def initialize(name, description, isbn)
-    @name, @description, @isbn = name, description, isbn
+  RSpec.configure do |config|
+    config.use_transactional_fixtures = true
   end
 
-  comma do
-    name 'Title'
-    description
+rescue LoadError => e
+  # Normal tests : Basic active record + support only calls
+  SimpleCov.command_name 'rspec:without_rails'
 
-    isbn :authority => :issuer
-    isbn :number_10 => 'ISBN-10'
-    isbn :number_13 => 'ISBN-13'
-  end
+  require 'active_record'
 
-  comma :brief do
-    name
-    description
-  end
+  config = YAML::load(IO.read(File.dirname(__FILE__) + '/rails_app/config/database.yml'))
+  ActiveRecord::Base.establish_connection(config['test'])
 end
 
-class Isbn
-  attr_accessor :number_10, :number_13
+$:.unshift(File.dirname(__FILE__) + '/../lib')
 
-  def initialize(isbn_10, isbn_13)
-    @number_10, @number_13 = isbn_10, isbn_13
-  end
+require 'comma'
 
-  def authority; 'ISBN'; end
-end
+require File.expand_path('../../spec/non_rails_app/ruby_classes' , __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000Z
+date: 2012-02-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70126322915060 !ruby/object:Gem::Requirement
+  requirement: &70233068053000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70126322915060
+  version_requirements: *70233068053000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70126322913740 !ruby/object:Gem::Requirement
+  requirement: &70233068052360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,21 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70126322913740
+  version_requirements: *70233068052360
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70233068051800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: *70233068051800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70126322912840 !ruby/object:Gem::Requirement
+  requirement: &70233068051240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,18 +55,18 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70126322912840
+  version_requirements: *70233068051240
 - !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: &70126322911980 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70233068050740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126322911980
+  version_requirements: *70233068050740
 description: Ruby Comma Seperated Values generation library
 email:
 - crafterm@redartisan.com
@@ -97,12 +108,41 @@ files:
 - lib/comma/object.rb
 - lib/comma/relation.rb
 - lib/comma/version.rb
-- spec/comma/ar_spec.rb
 - spec/comma/comma_spec.rb
 - spec/comma/extractors_spec.rb
+- spec/comma/rails/active_record_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/non_rails_app/ruby_classes.rb
+- spec/rails_app/Rakefile
+- spec/rails_app/app/controllers/application_controller.rb
+- spec/rails_app/app/controllers/users_controller.rb
+- spec/rails_app/app/helpers/application_helper.rb
+- spec/rails_app/app/models/post.rb
+- spec/rails_app/app/models/user.rb
+- spec/rails_app/app/views/layouts/application.html.erb
+- spec/rails_app/app/views/users/index.html.erb
+- spec/rails_app/config.ru
+- spec/rails_app/config/application.rb
+- spec/rails_app/config/boot.rb
+- spec/rails_app/config/database.yml
+- spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/development.rb
+- spec/rails_app/config/environments/production.rb
+- spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/backtrace_silencers.rb
+- spec/rails_app/config/initializers/inflections.rb
+- spec/rails_app/config/initializers/secret_token.rb
+- spec/rails_app/config/routes.rb
+- spec/rails_app/db/development.sqlite3
+- spec/rails_app/db/migrate/20120224085510_create_tables.rb
+- spec/rails_app/db/schema.rb
+- spec/rails_app/public/404.html
+- spec/rails_app/public/422.html
+- spec/rails_app/public/500.html
+- spec/rails_app/public/favicon.ico
+- spec/rails_app/script/rails
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/database.yml
 homepage: http://github.com/crafterm/comma
 licenses: []
 post_install_message: 
@@ -117,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4325782371584984549
+      hash: -3572797252536909493
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4325782371584984549
+      hash: -3572797252536909493
 requirements: []
 rubyforge_project: comma
 rubygems_version: 1.8.10
@@ -134,9 +174,38 @@ signing_key:
 specification_version: 3
 summary: Ruby Comma Seperated Values generation library
 test_files:
-- spec/comma/ar_spec.rb
 - spec/comma/comma_spec.rb
 - spec/comma/extractors_spec.rb
+- spec/comma/rails/active_record_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/non_rails_app/ruby_classes.rb
+- spec/rails_app/Rakefile
+- spec/rails_app/app/controllers/application_controller.rb
+- spec/rails_app/app/controllers/users_controller.rb
+- spec/rails_app/app/helpers/application_helper.rb
+- spec/rails_app/app/models/post.rb
+- spec/rails_app/app/models/user.rb
+- spec/rails_app/app/views/layouts/application.html.erb
+- spec/rails_app/app/views/users/index.html.erb
+- spec/rails_app/config.ru
+- spec/rails_app/config/application.rb
+- spec/rails_app/config/boot.rb
+- spec/rails_app/config/database.yml
+- spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/development.rb
+- spec/rails_app/config/environments/production.rb
+- spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/backtrace_silencers.rb
+- spec/rails_app/config/initializers/inflections.rb
+- spec/rails_app/config/initializers/secret_token.rb
+- spec/rails_app/config/routes.rb
+- spec/rails_app/db/development.sqlite3
+- spec/rails_app/db/migrate/20120224085510_create_tables.rb
+- spec/rails_app/db/schema.rb
+- spec/rails_app/public/404.html
+- spec/rails_app/public/422.html
+- spec/rails_app/public/500.html
+- spec/rails_app/public/favicon.ico
+- spec/rails_app/script/rails
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/database.yml

data/spec/support/database.yml

@@ -1,4 +0,0 @@
-test:
-  adapter: sqlite3
-  database: ":memory:"
-