acts_as_importable 0.4.2 → 0.4.4

data/Rakefile

@@ -9,6 +9,14 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
+task :default => :test
+
+task :test do
+  Bundler.with_clean_env do
+    system "cd test/test_acts_as_importable && bundle exec rake"
+  end
+end
+
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.4

data/acts_as_importable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_importable}
-  s.version = "0.4.2"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jagdeep Singh"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-03-01}
   s.description = %q{Use this gem to add import/export to .csv functionality to your activerecord models}
   s.email = %q{jagdeepkh@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/acts_as_importable.rb",
     "lib/import_export.rb",
     "lib/import_export/controller_methods.rb",
+    "lib/import_export/csv.rb",
     "lib/import_export/routing.rb",
     "lib/tasks/import_export.rake",
     "views/import_export/import.html.erb"
@@ -34,11 +35,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/Ennova/acts_as_importable}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Makes your model importable from .csv and exportable to .csv}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/acts_as_importable.rb

@@ -1,6 +1,5 @@
 require "active_record"
 require "action_controller"
-require "fastercsv"
 
 require 'import_export'
 ActiveRecord::Base.send :include, ImportExport::ModelMethods

data/lib/import_export.rb

@@ -1,3 +1,5 @@
+require 'import_export/csv'
+
 # ImportExport
 module ImportExport
 module ModelMethods
@@ -58,7 +60,7 @@ module ModelMethods
 
     def export
       export_fields = self.import_fields || self.export_fields
-      FasterCSV.generate do |csv|
+      ImportExport::CSV.generate do |csv|
         csv << export_fields.map{|f| f.split('.')[0]}
 
         self.find_each(:batch_size => 2000) do |element|
@@ -94,11 +96,7 @@ module ModelMethods
 
     def read_csv(filename)
       if File.exist?(filename)
-        begin
-          collection = FasterCSV.parse(File.open(filename, 'rb'))
-        rescue FasterCSV::MalformedCSVError => e
-          raise e
-        end
+        collection = ImportExport::CSV.parse(File.open(filename, 'rb'))
 
         collection = collection.map{|w| w} unless collection.nil?
         collection = [] if collection.nil?

data/lib/import_export/controller_methods.rb

@@ -48,9 +48,8 @@ module ImportExport
       end
 
       def upload
-        require 'ftools'
         if params[:csv_file] && File.extname(params[:csv_file].original_filename) == '.csv'
-          File.makedirs "#{UPLOADS_PATH}"
+          FileUtils.makedirs "#{UPLOADS_PATH}"
           File.open(upload_file_name, "wb") { |f| f.write(params[:csv_file].read)}
         else
           flash[:error] = "Error! Invalid file, please select a csv file."

data/lib/import_export/csv.rb

@@ -0,0 +1,10 @@
+module ImportExport
+end
+
+if RUBY_VERSION =~ /^1\.8\./
+  require 'faster_csv'
+  ::ImportExport::CSV = ::FasterCSV
+else
+  require 'csv'
+  ::ImportExport::CSV = ::CSV
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_importable
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors: 
 - Jagdeep Singh
@@ -15,89 +10,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +05:30
+date: 2011-03-01 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: actionpack
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: fastercsv
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
         version: 1.5.3
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  requirement: *id005
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: Use this gem to add import/export to .csv functionality to your activerecord models
 email: jagdeepkh@gmail.com
 executables: []
@@ -118,6 +88,7 @@ files:
 - lib/acts_as_importable.rb
 - lib/import_export.rb
 - lib/import_export/controller_methods.rb
+- lib/import_export/csv.rb
 - lib/import_export/routing.rb
 - lib/tasks/import_export.rake
 - views/import_export/import.html.erb
@@ -135,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 985417010415812691
       segments: 
       - 0
       version: "0"
@@ -144,14 +115,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Makes your model importable from .csv and exportable to .csv