csv_magic 0.2.4 → 0.3.0

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 1.9.3
 branches:
   only:
-    - 2.0-stable
+    - master
 before_script:
-  - "sh -c 'cd spec/dummy; RAILS_ENV=test bundle exec rake db:setup'"
+  - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:migrate'"
 script: "bundle exec rspec spec"

data/Gemfile

@@ -5,7 +5,9 @@ gemspec
 
 group :development do
 	if !ENV["CI"]
-		gem 'debugger', :platform => :ruby_19
+		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
 end

data/README.md

@@ -11,7 +11,7 @@ It includes the complete workflow:
 
 ## Requirements
 
-Rails >= 3.1.x and Ruby >= 1.9.x
+Rails >= 3.2.6 and Ruby >= 1.9.x
 
 ## Installation
 

data/csv_magic.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rails', ['~> 3.1.4']
-  s.add_development_dependency 'rspec-rails', ["~> 2.8.0"]
-  s.add_development_dependency 'sqlite3', ["~> 1.3.5"]
+  s.add_development_dependency 'rails', ['~> 3.2.6']
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'sqlite3'
 end

data/lib/csv_magic/controller_actions.rb

@@ -2,12 +2,14 @@ module CSVMagic
   module ControllerActions
 
     def self.included(base)
+      base.send(:class_attribute, :map_fields_options)
       base.extend(ClassMethods)
       base.csv_magic_config
       base.send(:include, I18nHelpers)
     end
 
     module ClassMethods
+
       def csv_magic_config( options = {} )
         defaults = {
           :action => :import,
@@ -15,7 +17,7 @@ module CSVMagic
           :file_field => :file
         }
         options = defaults.merge(options)
-        write_inheritable_attribute(:map_fields_options, options)
+        self.map_fields_options = options
       end
     end
 
@@ -63,23 +65,23 @@ module CSVMagic
         end
       #no mapping yet
       else
-        @mapper = Importer.new(params, self.class.read_inheritable_attribute(:map_fields_options))
+        @mapper = Importer.new(params, self.class.map_fields_options)
         @raw_data = @mapper.raw_data
         render 'csv_magic/mapper'
       end
     rescue MissingFileContentsError
-      flash[:error] = csv_magic_t(:please_upload_a_csv_file)
+      flash[:warning] = csv_magic_t(:please_upload_a_csv_file)
       render_csv_import_form
     rescue ::CSV::MalformedCSVError => e
-      flash[:error] = csv_magic_t(:csv_file_has_wrong_format) % {:error => e.message}
+      flash[:warning] = csv_magic_t(:csv_file_has_wrong_format) % {:error => e.message}
       render_csv_import_form
     rescue ::Errno::ENOENT
-      flash[:error] = csv_magic_t(:file_not_on_server_any_more)
+      flash[:warning] = csv_magic_t(:file_not_on_server_any_more)
       render_csv_import_form
     rescue Exception => e
-      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"))
+      flash[:warning] = e.message
+      logger.error(e.message)
+      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.2.4"
+  VERSION = "0.3.0"
 end

data/spec/importer_spec.rb

@@ -1,14 +1,14 @@
 require "spec_helper"
 
 module CSVMagic
-	describe Importer do
+  describe Importer do
 
-		describe "raw_data", :type => :request do
-			it "should return an array from the given csv-file" do
-		  		@file = fixture_file_upload('/files/file.csv', 'text/csv')
-				@importer = Importer.new({:file => @file}, {:file_field => :file})
-				@importer.raw_data.should == [["Lastname", " Given Name"], ["Doe", " John"], ["Mustermann", " Max"]]
-			end
-		end
-	end
+    describe "raw_data", :type => :request do
+      it "should return an array from the given csv-file" do
+        @file = fixture_file_upload(File.join(File.dirname(__FILE__), 'fixtures/files/file.csv'), 'text/csv')
+        @importer = Importer.new({:file => @file}, {:file_field => :file})
+        @importer.raw_data.should == [["Lastname", " Given Name"], ["Doe", " John"], ["Mustermann", " Max"]]
+      end
+    end
+  end
 end

data/spec/requests/import_action_spec.rb

@@ -12,7 +12,7 @@ describe "Controller#import action." do
 	describe "Sending a post request" do
 
 		before(:each) do
-			@file = fixture_file_upload('/files/file.csv', 'text/csv')
+			@file = fixture_file_upload(File.join(File.dirname(__FILE__), '..', 'fixtures/files/file.csv'), 'text/csv')
 		end
 
 		context "if csv is given in params" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_magic
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,39 +27,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 description: Provides controller actions, views and field mapping for data from a
   csv file.
 email:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -907811590562575980
+      hash: -2326911074991617375
 requirements: []
 rubyforge_project: csv_magic
 rubygems_version: 1.8.24