render_csv 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0456d41778a62cf6042dcf1afe16f46e54967ae3
-  data.tar.gz: aeae7731318782ed808fecb6b8eb43c1ac8b03ef
+  metadata.gz: 025d2659ed54a44720cc68aa22e350f491b81499
+  data.tar.gz: 9a2a6a3adb7d7d6841952f71e25a82435c4e481e
 SHA512:
-  metadata.gz: 84a934923c771e3f17aa484e95c9cc4dbfa81fef0fc6d9d4e19db8afd14b70da94b8b22b279a517353abc48f3e546f2581243c8cfc8b5a382b38f4a945b61217
-  data.tar.gz: b298832ae25962b4c9ade57b9485f63557a6a1512c0eba8f2fde6689e1a8d4e31ef3b5d45b01594fbbad6cc31ab5456dfec064436bff78f91020e13ccebf780d
+  metadata.gz: 68b2c4b8dce6649ae31858e30e393c97a76a76d54e9a00a9b3e0f10f635742de15b1a3058da4e86a128d55b3a3f302d2b937ae9e461f427231b42a77916b1186
+  data.tar.gz: 60f6154159934f898838e3b2a66a2faf73b6746d91c6866c96992421ea29e253a67eb960e8e46aa9cab567897528b7e0cdf52e965ff7431e5cd5772d983d7a6f

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
 gemfile:
   - gemfiles/Gemfile.rails-3.0.x
   - gemfiles/Gemfile.rails-3.1.x

data/CHANGELOG.md

@@ -7,6 +7,7 @@
     loaded before it tries to register itself. Should fix intermittent
     issues with it not working in production environments.
   * Use Ruby's CSV library instead of manually building strings.
+  * Does not extend the array class anymore
 
 ## 1.0.0
 

data/README.md

@@ -11,7 +11,7 @@ Rails CSV renderer for ActiveRecord collections
 
 *Rails:* 3.0.x - 4.0.x
 
-*Ruby:* 1.9.2, 1.9.3 and 2.0.0
+*Ruby:* 1.9.3, 2.0.0 and 2.1.0
 
 ## Installation
 

data/lib/render_csv/csv_renderable.rb

@@ -0,0 +1,27 @@
+require 'csv'
+
+module RenderCsv
+  module CsvRenderable
+    # Converts an array to CSV formatted string
+    # Options include:
+    # :only => [:col1, :col2] # Specify which columns to include
+    # :except => [:col1, :col2] # Specify which columns to exclude
+    # :add_methods => [:method1, :method2] # Include addtional methods that aren't columns
+    def to_csv(options = {})
+      return '' if empty?
+      return join(',') unless first.class.respond_to? :column_names
+
+      columns = first.class.column_names
+      columns &= options[:only].map(&:to_s) if options[:only]
+      columns -= options[:except].map(&:to_s) if options[:except]
+      columns += options[:add_methods].map(&:to_s) if options[:add_methods]
+
+      CSV.generate(encoding: 'utf-8') do |row|
+        row << columns
+        self.each do |obj|
+          row << columns.map { |c| obj.send(c) }
+        end
+      end
+    end
+  end
+end

data/lib/render_csv/version.rb

@@ -1,3 +1,3 @@
 module RenderCsv
-  VERSION = "2.0.0.beta1"
+  VERSION = "2.0.0.beta2"
 end

data/lib/render_csv.rb

@@ -1,11 +1,12 @@
 module RenderCsv
   class RenderCsvRailtie < ::Rails::Railtie
     config.after_initialize do
-      require 'render_csv/extension'
+      require 'render_csv/csv_renderable'
       require 'action_controller/metal/renderers'
 
       ActionController.add_renderer :csv do |csv, options|
         filename = options[:filename] || options[:template]
+        csv.extend RenderCsv::CsvRenderable
         data = csv.respond_to?(:to_csv) ? csv.to_csv(options) : csv
         send_data data, type: Mime::CSV, disposition: "attachment; filename=#{filename}.csv"
       end

data/spec/lib/csv_renderable_spec.rb

@@ -0,0 +1,69 @@
+require './spec/spec_helper'
+
+describe RenderCsv::CsvRenderable do
+  let(:csv_renderable_array) { array.extend RenderCsv::CsvRenderable }
+
+  context 'object is an array' do
+
+    context 'array is empty' do
+      let(:array) { Array.new }
+
+      it 'returns an empty string' do
+        expect(csv_renderable_array.to_csv).to eql('')
+      end
+    end
+
+    context 'object is not an instance of AR class' do
+      let(:array) { [1, 2, 3] }
+
+      it 'returns a csv of the array' do
+        expect(csv_renderable_array.to_csv).to eql('1,2,3')
+      end
+    end
+  end
+
+  context 'object is an ActiveRecord object' do
+    let(:sebastian) { Dog.create!(name: "Sebastian O'Connor", age: 3, weight: 76.8) }
+    let(:ruby) { Dog.create!(name: 'Ruby', age: 3, weight: 68.2) }
+    let(:shelby) { Dog.create!(name: 'Shelby', age: 5, weight: 64.0) }
+    let(:array) { [sebastian, ruby, shelby] }
+
+    context 'options is blank' do
+      it 'returns all columns' do
+        expect(csv_renderable_array.to_csv).to eql "id,name,age,weight\n1,Sebastian O'Connor,3,76.8\n2,Ruby,3,68.2\n3,Shelby,5,64.0\n"
+      end
+    end
+
+    context 'options with :only param' do
+      it 'returns only columns specified' do
+        options = { only: [:name, :age] }
+
+        expect(csv_renderable_array.to_csv(options)).to eql "name,age\nSebastian O'Connor,3\nRuby,3\nShelby,5\n"
+      end
+    end
+
+    context 'options with :exclude param' do
+      it 'excludes columns specified' do
+        options = { except: [:age] }
+
+        expect(csv_renderable_array.to_csv(options)).to eql "id,name,weight\n7,Sebastian O'Connor,76.8\n8,Ruby,68.2\n9,Shelby,64.0\n"
+      end
+    end
+
+    context 'options with :add_methods' do
+      it 'includes specified method values' do
+        options = { add_methods: [:human_age] }
+
+        expect(csv_renderable_array.to_csv(options)).to eql "id,name,age,weight,human_age\n10,Sebastian O'Connor,3,76.8,25\n11,Ruby,3,68.2,25\n12,Shelby,5,64.0,33\n"
+      end
+    end
+
+    context 'options with :expect and :add_methods' do
+      it 'includes method values with other options' do
+        options = { except: [:id,:name], add_methods: [:human_age] }
+
+        expect(csv_renderable_array.to_csv(options)).to eql "age,weight,human_age\n3,76.8,25\n3,68.2,25\n5,64.0,33\n"
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rails/all'
 require 'rspec/rails'
-require 'render_csv/extension'
+require 'render_csv/csv_renderable'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_csv
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Peter Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,10 +87,10 @@ files:
 - gemfiles/Gemfile.rails-3.2.x
 - gemfiles/Gemfile.rails-4.0.x
 - lib/render_csv.rb
-- lib/render_csv/extension.rb
+- lib/render_csv/csv_renderable.rb
 - lib/render_csv/version.rb
 - render_csv.gemspec
-- spec/lib/array_spec.rb
+- spec/lib/csv_renderable_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/beerlington/render_csv
 licenses:
@@ -112,10 +112,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds a custom CSV renderer to Rails applications
 test_files:
-- spec/lib/array_spec.rb
+- spec/lib/csv_renderable_spec.rb
 - spec/spec_helper.rb

data/lib/render_csv/extension.rb

@@ -1,26 +0,0 @@
-require 'csv'
-
-class Array
-
-  # Converts an array to CSV formatted string
-  # Options include:
-  # :only => [:col1, :col2] # Specify which columns to include
-  # :except => [:col1, :col2] # Specify which columns to exclude
-  # :add_methods => [:method1, :method2] # Include addtional methods that aren't columns
-  def to_csv(options={})
-    return '' if empty?
-    return join(',') unless first.class.respond_to? :column_names
-
-    columns = first.class.column_names
-    columns &= options[:only].map(&:to_s) if options[:only]
-    columns -= options[:except].map(&:to_s) if options[:except]
-    columns += options[:add_methods].map(&:to_s) if options[:add_methods]
-
-    CSV.generate(encoding: 'utf-8') do |row|
-      row << columns
-      self.each do |obj|
-        row << columns.map { |c| obj.send(c) }
-      end
-    end
-  end
-end

data/spec/lib/array_spec.rb

@@ -1,59 +0,0 @@
-require './spec/spec_helper'
-
-describe Array do
-  let(:sebastian) { Dog.create!(name: "Sebastian O'Connor", age: 3, weight: 76.8) }
-  let(:ruby) { Dog.create!(name: 'Ruby', age: 3, weight: 68.2) }
-  let(:shelby) { Dog.create!(name: 'Shelby', age: 5, weight: 64.0) }
-  let(:array) { [sebastian, ruby, shelby] }
-
-  context 'array is empty' do
-    it 'returns an empty string' do
-      expect([].to_csv).to eql('')
-    end
-  end
-
-  context 'object is not an instance of AR class' do
-    it 'returns a csv of the array' do
-      expect([1, 2, 3].to_csv).to eql('1,2,3')
-    end
-  end
-
-  context 'options is blank' do
-    it 'returns all columns' do
-      expect(array.to_csv).to eql "id,name,age,weight\n1,Sebastian O'Connor,3,76.8\n2,Ruby,3,68.2\n3,Shelby,5,64.0\n"
-    end
-  end
-
-  context 'options with :only param' do
-    it 'returns only columns specified' do
-      options = { only: [:name, :age] }
-
-      expect(array.to_csv(options)).to eql "name,age\nSebastian O'Connor,3\nRuby,3\nShelby,5\n"
-    end
-  end
-
-  context 'options with :exclude param' do
-    it 'excludes columns specified' do
-      options = { except: [:age] }
-
-      expect(array.to_csv(options)).to eql "id,name,weight\n7,Sebastian O'Connor,76.8\n8,Ruby,68.2\n9,Shelby,64.0\n"
-    end
-  end
-
-  context 'options with :add_methods' do
-    it 'includes specified method values' do
-      options = { add_methods: [:human_age] }
-
-      expect(array.to_csv(options)).to eql "id,name,age,weight,human_age\n10,Sebastian O'Connor,3,76.8,25\n11,Ruby,3,68.2,25\n12,Shelby,5,64.0,33\n"
-    end
-  end
-
-  context 'options with :expect and :add_methods' do
-    it 'includes method values with other options' do
-      options = { except: [:id,:name], add_methods: [:human_age] }
-
-      expect(array.to_csv(options)).to eql "age,weight,human_age\n3,76.8,25\n3,68.2,25\n5,64.0,33\n"
-    end
-  end
-
-end