table_importer 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d3bdb6bc28dc89cfd18f3cf85fa28e126817e6
-  data.tar.gz: 2f0b9aa934e7955a4bc2c0277e4603c191569588
+  metadata.gz: 4846a1f4ca1046589631a63ca0dd6a5663e1f8df
+  data.tar.gz: a7e213f005b115da0a057cd4287712a4e49576d1
 SHA512:
-  metadata.gz: 7ab65d630b278af498ba4d2bc2950fe792d1ab41d4c69ee19cf939b48114410032bae34cfbffec98aa101c2900cdfe03d85b685bb824a44dc83a9160d1173c33
-  data.tar.gz: 0923656a555afc4ba6dd22e07422d2e53f3f93f5635b55af6ae385a69524e04cc2f034fdf804d547a2fcbe22857ca2f81ebc65b81b945f01a03684a1589aafde
+  metadata.gz: 1afd54cd4806f1506a9374d8e8d1701e25df2f88dea9fe22d4bb08c7d00767cae3a2226a352728ddcb8868a367332932f222957819bacf8cec3074d7346f4a05
+  data.tar.gz: 9fc08b213c24acd5c46d8d9223f90cf3cf40ae77e4108deb569b8e5d47fd9c48497e345bf4718d984d39049d4bc7bb1cd3aea47948ac435c34d2092199dd1094

data/lib/table_importer/excel.rb

@@ -44,11 +44,11 @@ module TableImporter
 
     def get_preview_lines(start_point = 0, end_point = 10)
       begin
+        @headers = @mapping.present? && @mapping != false ? convert_headers : @headers
         lines = clean_chunks([get_lines(start_point, end_point)], @compulsory_headers)[0][:lines]
         if lines.first.nil?
           get_preview_lines(start_point+10, end_point+10)
         else
-          @headers = @mapping.present? ? convert_headers : @headers
           lines[0..8]
         end
       rescue SystemStackError
@@ -69,8 +69,9 @@ module TableImporter
     def convert_headers
       new_headers = @headers_present ? @file.row(1) : default_headers
       new_headers = default_headers(new_headers.count)
+      return new_headers unless @mapping
       @mapping.each do |key, value|
-        if value.to_i.to_s == value
+        if value.to_i.to_s == value.to_s
           new_headers[value.to_i] = key.to_sym
         end
       end

data/lib/table_importer/source.rb

@@ -75,23 +75,7 @@ module TableImporter
       result = []
       empty_headers = chunks.first.first.keys
       chunks.each do |chunk|
-        new_chunk = { :lines => [], :errors => []}
-        chunk.each_with_index do |line, index|
-          line, line_empty = line_empty?(line)
-          no_compulsory_headers, missing_header = check_compulsory_headers?(line, compulsory_headers)
-          if line_empty || no_compulsory_headers
-            new_chunk[:errors] << format_error(line, line_empty, no_compulsory_headers, compulsory_headers, missing_header)
-          else
-            if delete_empty_columns
-              line.each do |key, value|
-                if value.present? && value.to_s.gsub(/[^A-Za-z0-9]/, '').present?
-                  empty_headers.delete(clean_item(key).to_sym)
-                end
-              end
-            end
-            new_chunk[:lines] << line
-          end
-        end
+        new_chunk, empty_headers = process_line(chunk, empty_headers, compulsory_headers, delete_empty_columns)
         result << new_chunk unless new_chunk[:lines] == [] && new_chunk[:errors] == []
       end
       if delete_empty_columns
@@ -100,64 +84,87 @@ module TableImporter
       result
     end
 
-    private
-      def line_empty?(line)
-        line = clean_line(line)
-        return line, line.all?{ |item_key, item_value| line_item_is_garbage?(item_value)} && line.all?{ |item_key, item_value| line_item_is_garbage?(item_key)}
+  private
+
+    def process_line(chunk, empty_headers, compulsory_headers, delete_empty_columns)
+      new_chunk = {:lines => [], :errors => []}
+      chunk.each_with_index do |line, index|
+        line, line_empty = line_empty?(line)
+        no_compulsory_headers, missing_header = check_compulsory_headers?(line, compulsory_headers) unless line_empty || compulsory_headers.blank?
+        if line_empty || no_compulsory_headers
+          new_chunk[:errors] << format_error(line, line_empty, no_compulsory_headers, compulsory_headers, missing_header)
+        else
+          check_empty_headers(line, empty_headers) if delete_empty_columns
+          new_chunk[:lines] << line
+        end
       end
+      return new_chunk, empty_headers
+    end
 
-      def clean_line(line)
-        map = {}
-        line.each_pair do |key,value|
-          map[clean_item(key).to_sym] = clean_item(value)
+    def check_empty_headers(line, empty_headers)
+      line.each do |key, value|
+        if value.present? && value.to_s.gsub(/[^A-Za-z0-9]/, '').present?
+          empty_headers.delete(clean_item(key).to_sym)
         end
-        map
       end
+    end
 
-      def clean_item(item)
-        item.to_s.delete("\u0000").to_s.delete("\x00")
-      end
+    def line_empty?(line)
+      line = clean_line(line)
+      return line, line.all?{ |item_key, item_value| line_item_is_garbage?(item_value)} && line.all?{ |item_key, item_value| line_item_is_garbage?(item_key)}
+    end
 
-      def check_compulsory_headers?(line, compulsory_headers)
-        if compulsory_headers.key?(:email)
-          if line.key?(:email)
-            line[:email] = clean_email(line[:email])
-            return true, "email" if line[:email].nil? || !line[:email].to_s.match(/@\S/)
-          end
-          return true, "email" if !line.values.any?{ |value| /@\S/ =~ value.to_s }
-        end
-        # here perform other checks for other compulsory headers we might have.
-        return false
+    def clean_line(line)
+      map = {}
+      line.each_pair do |key,value|
+        map[clean_item(key).to_sym] = clean_item(value)
       end
+      map
+    end
 
-      def clean_email(email)
-        if email
-          email.to_s.gsub(/\A[^A-Za-z0-9]/, '').reverse.gsub(/\A[^A-Za-z0-9]/, '').reverse
+    def clean_item(item)
+      item.to_s.delete("\u0000").to_s.delete("\x00")
+    end
+
+    def check_compulsory_headers?(line, compulsory_headers)
+      if compulsory_headers.key?(:email)
+        if line.key?(:email)
+          line[:email] = clean_email(line[:email])
+          return true, "email" if line[:email].nil? || !line[:email].to_s.match(/@\S/)
         end
+        return true, "email" if !line.values.any?{ |value| /@\S/ =~ value.to_s }
       end
+      # here perform other checks for other compulsory headers we might have.
+      return false
+    end
 
-      def line_item_is_garbage?(item_value)
-        item_value.blank?
+    def clean_email(email)
+      if email
+        email.to_s.gsub(/\A[^A-Za-z0-9]/, '').reverse.gsub(/\A[^A-Za-z0-9]/, '').reverse
       end
+    end
 
-      def format_error(line, line_empty, no_compulsory_headers, compulsory_headers, missing_header)
-        message = line_empty ? "it did not have any content" : " it did not contain this/these required headers: #{missing_header}"
-        {:level => :error, :message => "The following line was not imported because #{message}.", :data => {:line => line, :line_empty => line_empty, :headers => no_compulsory_headers}}
-      end
+    def line_item_is_garbage?(item_value)
+      item_value.blank?
+    end
 
-      def remove_empty_columns(chunks, headers)
-        chunks.each do |chunk|
-          unless chunk[:lines].empty?
-            headers.each do |header|
-              chunk[:lines][0][header] = "empty_column"
-            end
+    def format_error(line, line_empty, no_compulsory_headers, compulsory_headers, missing_header)
+      message = line_empty ? "it did not have any content" : " it did not contain this/these required headers: #{missing_header}"
+      {:level => :error, :message => "The following line was not imported because #{message}.", :data => {:line => line, :line_empty => line_empty, :headers => no_compulsory_headers}}
+    end
+
+    def remove_empty_columns(chunks, headers)
+      chunks.each do |chunk|
+        if chunk[:lines].present?
+          headers.each do |header|
+            chunk[:lines][0][header] = "empty_column"
           end
         end
-        chunks
       end
+      chunks
+    end
   end
 end
-
 require 'table_importer/csv'
 require 'table_importer/copy_and_paste'
 require 'table_importer/excel'

data/lib/table_importer/version.rb

@@ -1,3 +1,3 @@
 module TableImporter
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/sources/excel_spec.rb

@@ -5,105 +5,111 @@ require 'roo'
 describe TableImporter::Source do
 
   context 'when source is an xls file with headers' do
+    context 'when mapping has not been set' do
 
-    before(:each) do
-      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => true, :headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-    end
+      before(:each) do
+        @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => true, :user_headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      end
 
-    it "creates a source object" do
-      TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => true, :headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-    end
+      it "gets the preview lines" do
+        @source.get_preview_lines.count.should eql(5)
+      end
 
-    it "has the correct headers" do
-      @source.get_headers.should eql(([:ExternalEmailAddress, :Name, :FirstName, :LastName, :StreetAddress, :City, :StateorProvince, :PostalCode, :Phone, :MobilePhone, :Pager, :HomePhone, :Company, :Title, :OtherTelephone, :Department, :CountryOrRegion, :Fax, :Initials, :Notes, :Office, :Manager]))
-    end
+      it "has the correct type" do
+        @source.get_type.should eql("xls")
+      end
 
-    it "has the correct number of lines" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => true, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      source.get_chunks(1).count.should eql(6)
+      after(:each) do
+        @source = nil
+      end
     end
 
-    it "has the correct number of chunks" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => true, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      source.get_chunks(2).count.should eql(4)
-    end
+    context 'when mapping has been set' do
 
-    it "does not have extra spaces in the final chunk" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => true, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      last_chunk = source.get_chunks(4).last
-      (last_chunk[:lines].count + last_chunk[:errors].count).should eql(2)
-    end
+      before(:each) do
+        @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => true, :headers_present => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      end
 
-    it "gets the preview lines" do
-      @source.get_preview_lines.count.should eql(5)
-    end
+      it "has the correct headers" do
+        @source.get_headers.should eql([:ExternalEmailAddress, :Name, :FirstName, :LastName, :StreetAddress, :City, :StateorProvince, :PostalCode, :Phone, :MobilePhone, :Pager, :HomePhone, :Company, :Title, :OtherTelephone, :Department, :CountryOrRegion, :Fax, :Initials, :Notes, :Office, :Manager])
+      end
 
-    it "has the correct type" do
-      @source.get_type.should eql("xls")
-    end
+      it "has the correct number of lines" do
+        @source.get_chunks(1).count.should eql(6)
+      end
 
-    after(:each) do
-      @source = nil
+      it "has the correct number of chunks" do
+        @source.get_chunks(2).count.should eql(4)
+      end
+
+      it "does not have extra spaces in the final chunk" do
+        last_chunk = @source.get_chunks(4).last
+        (last_chunk[:lines].count + last_chunk[:errors].count).should eql(2)
+      end
+
+      after(:each) do
+        @source = nil
+      end
     end
   end
 
+
+
   context 'when source is an xls file without headers' do
+    context 'when mapping has not been set' do
+      before(:each) do
+        @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/without_headers.xls"].join), :headers_present => false, :user_headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      end
 
-    before(:each) do
-      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/without_headers.xls"].join), :headers_present => false, :headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-    end
+      it "has the correct number of columns" do
+        @source.get_headers.count.should eql(100)
+      end
 
-    it "creates a source object" do
-      TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/without_headers.xls"].join), :headers_present => false, :headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      after(:each) do
+        @source = nil
+      end
     end
 
-    it "has the correct number of columns" do
-      @source.get_headers.count.should eql(100)
-    end
+    context 'when mapping has been set' do
 
-    it "has the correct number of lines" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => false, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      source.get_chunks(1).count.should eql(7)
-    end
+      before(:each) do
+        @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/without_headers.xls"].join), :headers_present => false, :user_headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      end
 
-    it "has the correct number of chunks" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => false, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      source.get_chunks(2).count.should eql(4)
-    end
+      it "has the correct number of lines" do
+        @source.get_chunks(1).count.should eql(6)
+      end
 
-    it "does not have extra spaces in the final chunk" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/with_headers.xls"].join), :headers_present => false, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      last_chunk = source.get_chunks(4).last
-      (last_chunk[:lines].count + last_chunk[:errors].count).should eql(3)
-    end
+      it "has the correct number of chunks" do
+        @source.get_chunks(2).count.should eql(4)
+      end
 
-    after(:each) do
-      @source = nil
+      it "does not have extra spaces in the final chunk" do
+        last_chunk = @source.get_chunks(4).last
+        (last_chunk[:lines].count + last_chunk[:errors].count).should eql(2)
+      end
+
+      after(:each) do
+        @source = nil
+      end
     end
   end
 
   context 'when source is an edge-case xls file without headers' do
     before(:each) do
-      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/edge_cases.xls"].join), :headers_present => false, :headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-    end
-
-    it "creates a source object" do
-      TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/edge_cases.xls"].join), :headers_present => false, :headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/edge_cases.xls"].join), :headers_present => false, :user_headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
     end
 
     it "has the correct number of lines" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/edge_cases.xls"].join), :headers_present => false, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      source.get_chunks(1).count.should eql(13)
+      @source.get_chunks(1).count.should eql(13)
     end
 
     it "has the correct number of chunks" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/edge_cases.xls"].join), :headers_present => false, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      source.get_chunks(4).count.should eql(4)
+      @source.get_chunks(4).count.should eql(4)
     end
 
     it "does not have extra spaces in the final chunk" do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/edge_cases.xls"].join), :headers_present => false, :headers => {"first_name"=>"", "last_name"=>"", "salutation"=>"", "tag_list"=>"", "email"=>"0", "organization"=>"", "url"=>"", "phone"=>"", "job_title"=>"", "second_url"=>"", "notes"=>"", "twitter_username"=>"", "skype_username"=>"", "pinterest_username"=>"", "instagram_username"=>"", "facebook_username"=>"", "last_name_prefix"=>"", "second_email"=>"", "phone_mobile"=>"", "street"=>"", "street_number"=>"", "zipcode"=>"", "city"=>"", "country"=>""}, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
-      last_chunk = source.get_chunks(4).last
+      last_chunk = @source.get_chunks(4).last
       (last_chunk[:lines].count + last_chunk[:errors].count).should eql(1)
     end
 
@@ -115,7 +121,7 @@ describe TableImporter::Source do
   context 'when source has empty lines' do
 
     before(:each) do
-      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/empty_lines.xlsx"].join), :headers_present => false, :headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/empty_lines.xlsx"].join), :headers_present => false, :user_headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
     end
 
     it "does not throw an error" do
@@ -130,7 +136,7 @@ describe TableImporter::Source do
   context 'when source has 20 empty lines at the beginning' do
 
     before(:each) do
-      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/empty_lines_at_start.xlsx"].join), :headers_present => true, :headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/empty_lines_at_start.xlsx"].join), :headers_present => true, :user_headers => nil, :user_headers => nil, :type => "xls", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
     end
 
     it "does not throw an error" do
@@ -146,10 +152,27 @@ describe TableImporter::Source do
 
     it 'raises an error when creating a source object' do
       begin
-        TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/no_content.xlsx"].join), :headers => "false", :type => "xls", :column_separator => "", :record_separator => ""})
+        TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/no_content.xlsx"].join), :headers_present => "false", :type => "xls", :column_separator => "", :record_separator => ""})
       rescue TableImporter::EmptyFileImportError => e
         e.message
       end
     end
   end
+
+  context 'mediaprofiler' do
+
+    before(:each) do
+      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/mediaprofiler.xls"].join), :headers_present => "true", :type => "xls", :column_separator => "", :record_separator => "",
+        :user_headers => {:first_name=>0, :last_name_prefix=>1, :last_name=>2, :organization=>3, :email=>5, :second_email=>6, :phone=>7, :phone_mobile=>8, :twitter_username=>9, :url=>10, :street=>11, :street_number=>12, :zipcode=>13, :country=>18}
+      })
+    end
+
+    it "has correct mapping" do
+      @source.get_preview_lines.first.keys.first.should == :first_name
+    end
+
+    after(:each) do
+      @source = nil
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,9 +3,9 @@ require 'rubygems'
 require 'spork'
 require 'active_support/all'
 require 'coveralls'
+Coveralls.wear!
 require 'table_importer/exceptions'
 require 'table_importer/source.rb'
-Coveralls.wear!
 
 Spork.prefork do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_importer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Nick Dowse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -169,6 +169,7 @@ files:
 - spec/files/excel/edge_cases.xls
 - spec/files/excel/empty_lines.xlsx
 - spec/files/excel/empty_lines_at_start.xlsx
+- spec/files/excel/mediaprofiler.xls
 - spec/files/excel/no_content.xlsx
 - spec/files/excel/with_headers.xls
 - spec/files/excel/without_headers.xls
@@ -213,6 +214,7 @@ test_files:
 - spec/files/excel/edge_cases.xls
 - spec/files/excel/empty_lines.xlsx
 - spec/files/excel/empty_lines_at_start.xlsx
+- spec/files/excel/mediaprofiler.xls
 - spec/files/excel/no_content.xlsx
 - spec/files/excel/with_headers.xls
 - spec/files/excel/without_headers.xls