table_importer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4235b6be7a6e1a540674326e18fd5ff08734672e
-  data.tar.gz: f0085296dac6201c7d47fe4120fec5eb70120154
+  metadata.gz: d97c5be89ed1115ef5f4ca473c650e80fc94a5c2
+  data.tar.gz: 0ce496477bfffbeb34ed62df57d584dec0e4cb9b
 SHA512:
-  metadata.gz: fd616c41592477e07e9ab682c6f4b4e40c264317a8169aa5f01cb0909bfe6516363957f73bb92153ebcadce4084138c1824c6a55ed0c42d9e7890d35eba50023
-  data.tar.gz: cdc2f3dc97445c32229fe413a196ed109d887be20e32ac28814a9a5aa984d697c4ecdfca096df2ff6af784e94186b9c28e384712a7410c7a1a718e232898a730
+  metadata.gz: 7511ab5023f3acc49988d034551173be2635edb79a6e09564ea0cfd58cfb8fd4d4618baeb2c3330666dcf4a9a89ccc001da2d69c4aec98155cc8f2dd8aa7c4d3
+  data.tar.gz: c884a44b264ddb101a7455c339e7a8a544bcfdc45ef0e0cf3d2bfc90ba757dc95ea55bd84d20fac85989d12f81e720b318a89fca3e7bb3b74a37406b6ecb91ad

data/lib/table_importer/csv.rb

@@ -17,6 +17,7 @@ module TableImporter
         end
         get_column_separator(first_line)
         raise TableImporter::EmptyFileImportError.new unless file_has_content
+        @mapping = data[:user_headers]
         @headers = @headers_present ? first_line.split(@column_separator) : default_headers(100)
       rescue ArgumentError
         @file = clean_file(@file)
@@ -114,12 +115,12 @@ module TableImporter
     end
 
     def chunks_with_headers(chunk_size)
-      key_mapping = convert_headers(SmarterCSV.process(@file.path, default_options).first.keys, @headers, @headers_present).delete_if{ |key, value| value.blank?}
+      key_mapping = convert_headers(SmarterCSV.process(@file.path, default_options).first.keys, @mapping, @headers_present).delete_if{ |key, value| value.blank?}
       SmarterCSV.process(@file.path, default_options({:chunk_size => chunk_size, :key_mapping => key_mapping, :remove_unmapped_keys => true, :user_provided_headers => nil}))
     end
 
     def chunks_without_headers(chunk_size)
-      user_provided_headers = convert_headers(SmarterCSV.process(@file.path, default_options).first.keys, @headers, @headers_present).values
+      user_provided_headers = convert_headers(SmarterCSV.process(@file.path, default_options).first.keys, @mapping, @headers_present).values
       SmarterCSV.process(@file.path, default_options({:chunk_size => chunk_size, :user_provided_headers => user_provided_headers, :remove_empty_values => true}))
     end
 

data/lib/table_importer/roo_spreadsheet_source.rb

@@ -6,10 +6,11 @@ module TableImporter
       @headers
     end
 
-    def get_preview_lines(start_point = 0, end_point = 10)
+    def get_preview_lines(start_point = 1, 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]
+        start_point += 1 if @headers_present == true
+        lines = clean_chunks([get_lines(start_point, end_point, true)], @compulsory_headers)[0][:lines]
         if lines.first.nil?
           get_preview_lines(start_point+10, end_point+10)
         else
@@ -20,12 +21,13 @@ module TableImporter
       end
     end
 
-    def get_lines(start, number_of_lines)
+    def get_lines(start, number_of_lines, preview_lines = false)
       @last_row ||= @file.last_row
       finish = [@last_row, start + number_of_lines].min
       mapped_lines = []
-      (start...finish).each do |row_number|
-        mapped_lines << Hash[@headers.zip(@file.row(row_number + 1))]
+      range = preview_lines ? (start..finish) : (start...finish)
+      range.each do |row_number|
+        mapped_lines << Hash[@headers.zip(@file.row(row_number))]
       end
       mapped_lines
     end

data/lib/table_importer/version.rb

@@ -1,3 +1,3 @@
 module TableImporter
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/sources/csv_spec.rb

@@ -6,7 +6,7 @@ describe TableImporter::Source do
 
   context 'when source is a csv file with headers' do
     before(:each) do
-      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/csv/with_headers.csv"].join), :headers_present => true, :user_headers => nil, :type => "csv", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/csv/with_headers.csv"].join), :headers_present => true, :user_headers => {"email" => "5"}, :type => "csv", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
     end
 
     it "has the correct headers" do
@@ -86,7 +86,7 @@ describe TableImporter::Source do
 
   context 'when source is a badly encoded file' do
     it 'can still get the correct chunks' do
-      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/csv/mexico2013_pressdoc.csv"].join), :headers_present => true, :user_headers => nil, :type => "csv", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/csv/mexico2013_pressdoc.csv"].join), :headers_present => true, :user_headers => {"email" => "5"}, :type => "csv", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
       source.get_chunks.first[:lines].count.should eql(49)
     end
   end
@@ -120,7 +120,7 @@ describe TableImporter::Source do
   context 'when source is badly encoded partway through the file' do
 
     before(:each) do
-      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/csv/partway.csv"].join), :headers_present => false, :user_headers => nil, :type => "csv", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
+      @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/csv/partway.csv"].join), :headers_present => false, :user_headers => {"email" => "0"}, :type => "csv", :column_separator => "", :record_separator => "", :compulsory_headers => {:email => true}})
     end
 
     it "Gets the first chunk without error" do

data/spec/sources/excel_spec.rb

@@ -38,6 +38,10 @@ describe TableImporter::Source do
         @source.get_chunks(1).count.should eql(6)
       end
 
+      it "gets the correct chunk content" do
+        expect(@source.get_chunks[0][:lines].first[:email]).to eql("darrenp@fabrikam.com")
+      end
+
       it "has the correct number of chunks" do
         @source.get_chunks(2).count.should eql(4)
       end
@@ -78,6 +82,10 @@ describe TableImporter::Source do
         @source.get_chunks(1).count.should eql(6)
       end
 
+      it "gets the correct chunk content" do
+        expect(@source.get_chunks[0][:lines].first[:email]).to eql("darrenp@fabrikam.com")
+      end
+
       it "has the correct number of chunks" do
         @source.get_chunks(2).count.should eql(4)
       end
@@ -197,4 +205,38 @@ describe TableImporter::Source do
       @source = nil
     end
   end
+
+  context "it has only one line" do
+    context "when mapping has not been set" do
+      before(:each) do
+        @source = TableImporter::Source.new({:content => File.open([Dir.pwd, "/spec/files/excel/one_line.xls"].join), :headers_present => "true", :type => "xls", :column_separator => "", :record_separator => "",
+          :compulsory_headers => {:email => true}
+        })
+      end
+
+      it 'has the correct preview lines' do
+        expect(@source.get_preview_lines.first[:Email]).to eql("mailto:john.smith@example.com")
+      end
+
+      after(:each) do
+        @source = nil
+      end
+    end
+
+    context "when mapping has been set" do
+      before(:each) do
+        @source = TableImporter::Source.new({content: File.open([Dir.pwd, "/spec/files/excel/one_line.xls"].join), headers_present: "true", type: "xls", column_separator: "", record_separator: "",
+          compulsory_headers: {email: true}, user_headers: {"email" => "13"}
+        })
+      end
+
+      it 'has the correct chunks' do
+        expect(@source.get_chunks[0][:lines].first[:email]).to eql("mailto:john.smith@example.com")
+      end
+
+      after(:each) do
+        @source = nil
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_importer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nick Dowse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -215,6 +215,7 @@ files:
 - spec/files/excel/empty_lines.xlsx
 - spec/files/excel/empty_lines_at_start.xlsx
 - spec/files/excel/no_content.xlsx
+- spec/files/excel/one_line.xls
 - spec/files/excel/premapped_1.xls
 - spec/files/excel/premapped_2.xls
 - spec/files/excel/with_headers.xls
@@ -265,6 +266,7 @@ test_files:
 - spec/files/excel/empty_lines.xlsx
 - spec/files/excel/empty_lines_at_start.xlsx
 - spec/files/excel/no_content.xlsx
+- spec/files/excel/one_line.xls
 - spec/files/excel/premapped_1.xls
 - spec/files/excel/premapped_2.xls
 - spec/files/excel/with_headers.xls