map_fields 2.0.0.beta → 2.0.0.beta2

data/lib/map_fields/controller.rb

@@ -3,11 +3,11 @@ require 'map_fields/mapper'
 module MapFields
   module Controller
     def map_fields(fields, file, &block)
+      append_view_path File.expand_path('../../../views/', __FILE__)
       @mapper = Mapper.new(self, fields, file)
       if @mapper.mapped?
-        block.call
+        block.call(@mapper)
       else
-        append_view_path File.expand_path('../../../views/', __FILE__)
         render
       end
     end

data/lib/map_fields/mapper.rb

@@ -8,6 +8,7 @@ module MapFields
 
   class Mapper
     def initialize(controller, fields, file)
+      @controller = controller
       params = controller.params
       @fields = get_fields(controller, fields)
       @params = ParamsParser.parse(params)
@@ -18,24 +19,47 @@ module MapFields
       else
         raise MissingFileError unless controller.session[:map_fields_file] && File.exist?(controller.session[:map_fields_file])
         @mapped = true
-        @rows = map_fields(controller, params.delete(:mapped_fields), fields)
+        @rows = map_fields(controller, params.delete(:mapped_fields), @fields)
       end
     end
-    attr_reader :rows, :fields, :params
+    attr_reader :rows, :fields, :params, :mapping, :ignore_first_row
+
+    def error!
+      @mapped = false
+      @rows = parse_first_few_lines @controller.session[:map_fields_file]
+    end
 
     def mapped?
       @mapped
     end
 
-    private
-    def parse_params(params)
-      params = params.except(:controller, :action)
+    def selected_mapping(column)
+      @mapping ? @mapping.selected_mapping(column) : nil
+    end
+
+    def is_mapped?(key)
+      @mapping ? @mapping.is_mapped?(key) : false
+    end
+
+    def fields_for_select
+      result = []
+      fields.each_with_index { |i,e| result << [i, e] }
+      result
     end
 
+    def each(&block)
+      @rows.each &block
+    end
+
+    def file
+      @controller.session[:map_fields_file]
+    end
+
+    private
     def map_fields(controller, mapped_fields, fields)
-      ignore_first_row = mapped_fields.delete(:ignore_first_row)
-      mapping = Mapping.new(mapped_fields, fields)
-      CSVReader.new(controller.session[:map_fields_file], mapping, ignore_first_row)
+      @ignore_first_row = !!mapped_fields.delete(:ignore_first_row)
+      @mapping = Mapping.new(mapped_fields, fields)
+      CSVReader.new(controller.session[:map_fields_file], @mapping, @ignore_first_row)
     end
 
     def get_fields(controller, fields)
@@ -49,10 +73,12 @@ module MapFields
     end
 
     def save_file(controller, file)
-      Tempfile.open(['map_fields', '.csv']) do |tmpfile|
+      # path = Tempfile.new(['map_fields', '.csv']).path
+      path = File.join(Dir::tmpdir, "map_fields_#{Time.now.to_i}_#{$$}")
+      File.open(path, 'wb') do |tmpfile|
         tmpfile.write file.read
-        controller.session[:map_fields_file] = tmpfile.path
-        tmpfile.path
+        controller.session[:map_fields_file] = path
+        path
       end
     end
 

data/lib/map_fields/mapping.rb

@@ -5,8 +5,9 @@ module MapFields
       @fields = fields
 
       @mapping = mapping.each_with_object({}){ |arr, hash|
-        key = arr[0].to_i
-        value = arr[1].to_i
+        key = arr[1].blank? ? nil : arr[1].to_i
+        next if key.nil?
+        value = arr[0].blank? ? nil : arr[0].to_i
 
         hash[key] = value
         hash[@fields[key]] = value
@@ -18,6 +19,14 @@ module MapFields
       @mapping[index]
     end
 
+    def is_mapped?(key)
+      @mapping.has_key?(key)
+    end
+
+    def selected_mapping(column)
+      @mapping.find{|k, v| return k if v == column && k.is_a?(Numeric) }
+    end
+
     private
     def field_to_symbol(field)
       field.to_s.downcase.gsub(/[^a-z0-9]+/, '_').to_sym

data/spec/spec_helper.rb

@@ -6,6 +6,10 @@ require 'bundler'
 require File.expand_path('../../rails_app/config/environment.rb', __FILE__)
 require 'rails/test_help'
 require 'rspec/rails'
+
+require 'simplecov'
+SimpleCov.start
+
 require 'map_fields'
 
 RailsApp::Application.routes.draw do

data/views/map_fields/_mapping.erb

@@ -0,0 +1,31 @@
+<%= form_tag nil, :id => 'map_fields_form', :method => :post do -%>
+  <% @mapper.params.each do |arr| -%>
+    <%= hidden_field_tag arr[0], arr[1] %>
+  <% end -%>
+  <div class="map_fields">
+    <table cellspacing="0">
+      <thead>
+        <tr>
+          <% (0..@mapper.rows[0].size-1).each do |c| -%>
+            <th><%= select_tag "mapped_fields[#{c}]", options_for_select(@mapper.fields_for_select, @mapper.selected_mapping(c)), :include_blank => true, :class => 'field_options' %></th>
+          <% end -%>
+        </tr>
+      </thead>
+      <tbody>
+        <% @mapper.rows.each do |row| -%>
+          <tr>
+            <% row.each do |column| -%>
+              <td><%= h(column) %></td>
+            <% end -%>
+          </tr>
+        <% end -%>
+      </tbody>
+    </table>
+  </div>
+  <div class="option">
+    <%= check_box_tag 'mapped_fields[ignore_first_row]', '1', true, :id => 'ignore_first_row_option' %><label for="ignore_first_row_option">Ignore the first row (headings)</label>
+  </div>
+  <div class="action">
+    <%= submit_tag 'Import' %>
+  </div>
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: map_fields
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -25,6 +25,7 @@ files:
 - lib/map_fields/params_parser.rb
 - lib/map_fields/railtie.rb
 - lib/map_fields.rb
+- views/map_fields/_mapping.erb
 - spec/spec_helper.rb
 homepage: http://github.com/internuity/map-fields
 licenses: []
@@ -53,3 +54,4 @@ summary: Rails gem to allow a user to map the fields of a CSV to an expected lis
   of fields
 test_files:
 - spec/spec_helper.rb
+has_rdoc: