csv_magic 0.3.0 → 0.3.2

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
+  - 1.8.7
   - 1.9.2
   - 1.9.3
 branches:
   only:
-    - master
+    - ruby1.8
 before_script:
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:migrate'"
 script: "bundle exec rspec spec"

data/Gemfile

@@ -3,11 +3,11 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in csv_magic.gemspec
 gemspec
 
+gem 'faster_csv', :github => 'glennfu/faster_csv', :platform => :ruby_18
+
 group :development do
-	if !ENV["CI"]
-		gem 'ruby-debug-base19', '~> 0.11.26', :platform => :ruby_19
-		gem 'linecache19', '~> 0.5.13', :platform => :ruby_19
-		gem 'ruby-debug19', '~> 0.11.6', :require => 'ruby-debug', :platform => :ruby_19
-		gem 'ruby-debug', :platform => :ruby_18
-	end
+  if !ENV["CI"]
+    gem 'debugger', :platform => :ruby_19
+    gem 'ruby-debug', :platform => :ruby_18
+  end
 end

data/README.md

@@ -11,7 +11,9 @@ It includes the complete workflow:
 
 ## Requirements
 
-Rails >= 3.2.6 and Ruby >= 1.9.x
+Rails >= 3.2.6 and Ruby >= 1.8.7*
+
+*) If you want to use CSV magic with Ruby 1.8.7 you have to add `gem 'faster_csv'` to your `Gemfile`
 
 ## Installation
 
@@ -22,6 +24,8 @@ Install as gem:
 Or in your apps `Gemfile`:
 
     gem 'csv_magic', :git => 'git://github.com/magiclabs/csv_magic.git'
+    # Uncomment next line if you want to use csv_magic with Ruby 1.8
+    # gem 'faster_csv', :github => 'glennfu/faster_csv', :platform => :ruby_18
 
 ## Usage
 

data/csv_magic.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Adds some CSV magic into your app.}
   s.description = %q{Provides controller actions, views and field mapping for data from a csv file.}
   s.rubyforge_project = "csv_magic"
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 1.8.7'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

data/lib/csv_magic.rb

@@ -1,5 +1,6 @@
 require 'csv'
 require "csv_magic/version"
+require "csv_magic/csv_handler"
 require 'csv_magic/i18n_helpers'
 require 'csv_magic/controller_actions'
 require 'csv_magic/engine'

data/lib/csv_magic/controller_actions.rb

@@ -72,7 +72,7 @@ module CSVMagic
     rescue MissingFileContentsError
       flash[:warning] = csv_magic_t(:please_upload_a_csv_file)
       render_csv_import_form
-    rescue ::CSV::MalformedCSVError => e
+    rescue CSV_HANDLER::MalformedCSVError => e
       flash[:warning] = csv_magic_t(:csv_file_has_wrong_format) % {:error => e.message}
       render_csv_import_form
     rescue ::Errno::ENOENT

data/lib/csv_magic/csv_handler.rb

@@ -0,0 +1,8 @@
+module CSVMagic
+  if RUBY_VERSION =~ /^1\.8/
+    require 'faster_csv'
+    CSV_HANDLER = ::FCSV
+  else
+  	CSV_HANDLER = ::CSV
+  end
+end

data/lib/csv_magic/importer.rb

@@ -13,7 +13,7 @@ module CSVMagic
     end
 
     def raw_data
-      ::CSV.read(@file_handler.file_path, CSVMagic.options)
+      CSV_HANDLER.read(@file_handler.file_path, CSVMagic.options)
     end
 
   private

data/lib/csv_magic/reader.rb

@@ -1,6 +1,6 @@
 module CSVMagic
   class Reader
-    
+
     def initialize(params)
       @file_handler = FileHandler.new
       @file_handler.load_file(params[:filename])
@@ -14,10 +14,10 @@ module CSVMagic
         end
       end
     end
-    
+
     def each
       row_number = 1
-      ::CSV.foreach(@file_path, CSVMagic.options) do |csv_row|
+      CSV_HANDLER.foreach(@file_path, CSVMagic.options) do |csv_row|
         unless row_number == 1 && @ignore_first_row
           row = {}
           @mapping.each do |k, v|

data/lib/csv_magic/version.rb

@@ -1,3 +1,3 @@
 module CSVMagic
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_magic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,6 +82,7 @@ files:
 - csv_magic.gemspec
 - lib/csv_magic.rb
 - lib/csv_magic/controller_actions.rb
+- lib/csv_magic/csv_handler.rb
 - lib/csv_magic/engine.rb
 - lib/csv_magic/file_handler.rb
 - lib/csv_magic/i18n_helpers.rb
@@ -145,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2326911074991617375
+      hash: -3430066953355410162
 requirements: []
 rubyforge_project: csv_magic
 rubygems_version: 1.8.24