csv_magic 0.3.2 → 0.3.3

data/.gitignore

@@ -9,4 +9,5 @@ pkg/*
 !.gitkeep
 /spec/dummy/log/test.log
 .rvmrc
-spec/dummy/db/test.sqlite3
+spec/dummy/db/test.sqlite3
+rdoc

data/Rakefile

@@ -8,7 +8,7 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -17,10 +17,10 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'CSVMagicTest'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/lib/csv_magic/controller_actions.rb

@@ -70,18 +70,18 @@ module CSVMagic
         render 'csv_magic/mapper'
       end
     rescue MissingFileContentsError
-      flash[:warning] = csv_magic_t(:please_upload_a_csv_file)
+      flash[:error] = csv_magic_t(:please_upload_a_csv_file)
       render_csv_import_form
     rescue CSV_HANDLER::MalformedCSVError => e
-      flash[:warning] = csv_magic_t(:csv_file_has_wrong_format) % {:error => e.message}
+      flash[:error] = csv_magic_t(:csv_file_has_wrong_format) % {:error => e.message}
       render_csv_import_form
     rescue ::Errno::ENOENT
-      flash[:warning] = csv_magic_t(:file_not_on_server_any_more)
+      flash[:error] = csv_magic_t(:file_not_on_server_any_more)
       render_csv_import_form
     rescue Exception => e
-      flash[:warning] = e.message
-      logger.error(e.message)
-      logger.error(e.backtrace.join("\n"))
+      flash[:error] = "#{e.message[0..100]}..." # Protection from CookieOverflow errors, if large sql queries fail
+      Rails.logger.error(e.message)
+      Rails.logger.error(e.backtrace.join("\n"))
       render_csv_import_form
     end
 

data/lib/csv_magic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_magic
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3430066953355410162
+      hash: -3035827837681512313
 requirements: []
 rubyforge_project: csv_magic
 rubygems_version: 1.8.24