csv_magic 0.2.0 → 0.2.1

data/.gitignore

@@ -7,4 +7,6 @@ spec/dummy/db
 Gemfile.lock
 pkg/*
 
-/spec/dummy/log/test.log
+/spec/dummy/log/test.log
+.rvmrc
+spec/dummy/db/test.sqlite3

data/README.md

@@ -1,5 +1,7 @@
 ## Description
 
+[![Build Status](https://secure.travis-ci.org/magiclabs/csv_magic.png?branch=master)](http://travis-ci.org/magiclabs/csv_magic)
+
 This gem adds an import action in every controller you like to be able to handle csv imports.
 It includes the complete workflow:
 

data/app/views/csv_magic/import.html.erb

@@ -1,10 +1,10 @@
-<h1><%= t(:import_csv_file) %></h1>
+<h1><%= csv_magic_t(:import_csv_file) %></h1>
 
-<p><%= t(:please_choose_a_csv_file) %>:</p>
+<p><%= csv_magic_t(:please_choose_a_csv_file) %>:</p>
 
 <%= form_tag(url_for(:action => 'import'), :multipart => true) do %>
   <div class="field">
     <%= file_field_tag 'file' %>
-    <%= submit_tag t(:import) %>
+    <%= submit_tag csv_magic_t(:import) %>
   </div>
 <% end %>

data/app/views/csv_magic/import_errors.html.erb

@@ -1,5 +1,5 @@
 <div class="csv_magic_import_errros">
-  <h2><%= t(:import_errors) %>:</h2>
+  <h2><%= csv_magic_t(:import_errors) %>:</h2>
   <ol>
     <%- @csv_import_errors.each do |error| -%>
     <li><%= error.full_messages %></li>

data/app/views/csv_magic/mapper.html.erb

@@ -1,6 +1,6 @@
-<h1><%= t(:import_csv_file) %></h1>
+<h1><%= csv_magic_t(:import_csv_file) %></h1>
 
-<p><%= t(:please_map_columns) %></p>
+<p><%= csv_magic_t(:please_map_columns) %></p>
 
 <%= form_tag nil, :id => 'map_fields_form', :method => :post do -%>
   <%= hidden_field_tag :filename, @mapper.filename %>
@@ -33,10 +33,10 @@
   <div class="option">
     <p>
       <%= check_box_tag 'ignore_first_row', '1', true %>
-      <%= label_tag 'ignore_first_row', t(:ignore_first_row) %>
+      <%= label_tag 'ignore_first_row', csv_magic_t(:ignore_first_row) %>
     </p>
   </div>
   <div class="action">
-    <%= submit_tag t(:import) %>
+    <%= submit_tag csv_magic_t(:import) %>
   </div>
 <%- end -%>

data/csv_magic.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
   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 'capybara', ['>= 0.4.0']
 end

data/lib/csv_magic/controller_actions.rb

@@ -55,10 +55,10 @@ module CSVMagic
       if params[:fields]
         create_resource_items_from_csv(resource_class)
         if @csv_import_errors.empty?
-          flash[:notice] = t(:successfully_imported_data)
+          flash[:notice] = csv_magic_t(:successfully_imported_data)
           redirect_to :action => :index
         else
-          flash[:warning] = t(:errors_while_importing)
+          flash[:warning] = csv_magic_t(:errors_while_importing)
           render 'csv_magic/import_errors'
         end
       #no mapping yet
@@ -68,13 +68,13 @@ module CSVMagic
         render 'csv_magic/mapper'
       end
     rescue MissingFileContentsError
-      flash[:warning] = 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[:warning] = 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[:warning] = 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[:warning] = e.message

data/lib/csv_magic/i18n_helpers.rb

@@ -3,7 +3,7 @@ module CSVMagic
 
 		def self.included(controller)
 			if controller.respond_to?(:helper_method)
-				controller.send(:helper_method, [:t])
+				controller.send(:helper_method, [:csv_magic_t])
 			end
 		end
 
@@ -14,7 +14,7 @@ module CSVMagic
 		# The keys are scoped into +csv_magic+ namespace.
 		# Even if you pass a scope this is scoped under +csv_magic+.
 		# 
-		def t(key, options={})
+		def csv_magic_t(key, options={})
 			scope = options[:scope].blank? ? 'csv_magic' : "csv_magic.#{options.delete(:scope)}"
 			::I18n.t(key, {:scope => scope, :default => key.to_s.humanize}.merge(options))
 		end

data/lib/csv_magic/version.rb

@@ -1,3 +1,3 @@
 module CSVMagic
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/dummy/app/models/person.rb

@@ -1,2 +1,3 @@
 class Person < ActiveRecord::Base
+	validates_presence_of :lastname
 end

data/spec/fixtures/files/file.csv

@@ -0,0 +1,3 @@
+Lastname; Given Name
+Doe; John
+Mustermann; Max

data/spec/importer_spec.rb

@@ -1,9 +1,14 @@
-require "rspec"
-require 'csv_magic/importer'
+require "spec_helper"
 
-describe CSVMagic::Importer do
+module CSVMagic
+	describe Importer do
 
-  describe "raw_data" do
-    it "should return an array from the given csv-file"
-  end
-end
+		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
+end

data/spec/integration/resource_integration_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe CSVMagic do
-  include Capybara::DSL
 
   it "should be valid" do
     CSVMagic.should be_a(Module)

data/spec/requests/import_action_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+
+describe "Controller#import action." do
+
+	describe "Sending a get request" do
+		it "renders the import form." do
+			get 'people/import'
+			response.body.should match(/please choose a csv file/i)
+		end
+	end
+
+	describe "Sending a post request" do
+
+		before(:each) do
+			@file = fixture_file_upload('/files/file.csv', 'text/csv')
+		end
+
+		context "if csv is given in params" do
+			it "it renders the mapper view." do
+				post 'people/import', {:file => @file}
+				response.body.should match(/Please map columns/)
+			end
+		end
+
+		context "if mapping is given in params" do
+			it "it redirects to index view." do
+				@file_handler = CSVMagic::FileHandler.new
+				@file_handler.save_temp_file(@file)
+				post 'people/import', {:filename => @file_handler.filename, :fields => {"1" => "Firstname", "2" => "Lastname"}}
+				response.code.should == "302"
+				response.should redirect_to(people_path)
+			end
+		end
+
+		context "if wrong mapping is given in params" do
+			it "it shows the import errors view." do
+				@file_handler = CSVMagic::FileHandler.new
+				@file_handler.save_temp_file(@file)
+				post 'people/import', {:filename => @file_handler.filename, :fields => {"1" => "Firstname"}}
+				response.body.should match /import errors/i
+			end
+		end
+
+	end
+
+end

data/spec/spec_helper.rb

@@ -11,13 +11,9 @@ ActionMailer::Base.default_url_options[:host] = "test.com"
 
 Rails.backtrace_cleaner.remove_silencers!
 
-# Configure capybara for integration testing
-require "capybara/rails"
-Capybara.default_driver   = :rack_test
-Capybara.default_selector = :css
-
 # Run any available migration
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+ActionController::TestCase.fixture_path = File.join(File.dirname(__FILE__), 'fixtures')
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_magic
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70288960293000 !ruby/object:Gem::Requirement
+  requirement: &70132287098180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.4
   type: :development
   prerelease: false
-  version_requirements: *70288960293000
+  version_requirements: *70132287098180
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70288960308400 !ruby/object:Gem::Requirement
+  requirement: &70132287096580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70288960308400
+  version_requirements: *70132287096580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70288960306880 !ruby/object:Gem::Requirement
+  requirement: &70132287112120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,18 +44,7 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70288960306880
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &70288960305660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: *70288960305660
+  version_requirements: *70132287112120
 description: Provides controller actions, views and field mapping for data from a
   csv file.
 email:
@@ -107,7 +96,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110808105053_create_people.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/log/production.log
 - spec/dummy/log/server.log
 - spec/dummy/public/404.html
@@ -124,10 +112,10 @@ files:
 - spec/dummy/script/rails
 - spec/dummy_data.csv
 - spec/file_handler_spec.rb
+- spec/fixtures/files/file.csv
 - spec/importer_spec.rb
-- spec/integration/get_request_spec.rb
-- spec/integration/post_request_spec.rb
 - spec/integration/resource_integration_spec.rb
+- spec/requests/import_action_spec.rb
 - spec/spec_helper.rb
 - spec/test.file
 homepage: https://github.com/magiclabs/csv_magic
@@ -144,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 246439835387247952
+      hash: -983402596518867676
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 246439835387247952
+      hash: -983402596518867676
 requirements: []
 rubyforge_project: csv_magic
 rubygems_version: 1.8.15

data/spec/integration/get_request_spec.rb

@@ -1 +0,0 @@
-require "spec_helper"

data/spec/integration/post_request_spec.rb

@@ -1,13 +0,0 @@
-require "rspec"
-
-describe CSVMagic do
-  context "when csv is given as param" do
-    it "renders the mapper view"
-  end
-  context "when mapping and filename is given as param" do
-    it "saves the csv-lines as resource-objects"
-  end
-  context "when csv has been imported" do
-    it "redirects to resources index"
-  end
-end