csv_in_zip 0.0.2 → 0.0.3

data/lib/csv_in_zip.rb

@@ -7,32 +7,70 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object/blank'
 
 module CsvInZip
+  
+  class CsvFile
+    def initialize(options = {}, &block)
+      if options[:change_headers].present?
+        options[:headers] = options[:change_headers]
+        options[:remove_header_line] = true
+      end
+      @options = options
+      
+      @tempfile = Tempfile.open("csv_in_zip")
+      if options[:headers].present?
+        @tempfile.puts Array(options[:headers]).join(",")
+      end
+      
+      instance_eval(&block)
+    ensure
+      @tempfile.close
+    end
+    
+    private
+    
+      def add(csv_content)
+        csv_lines = csv_content.gsub("\r\n", "\n").split("\n")
+        csv_lines = csv_lines[1..-1] if @options[:remove_header_line]
+        @tempfile.puts csv_lines.join("\n").toutf8
+      end
+
+      def to_csv
+        @tempfile.close
+        CSV.parse(File.read(@tempfile.path), :headers => true)
+      end
+      
+  end
+  
   class << self
+
+    def skip?(entry)
+      file_name = entry.to_s
+      file_name =~ /^__MACOSX/ || File.extname(file_name) != ".csv"
+    end
     
     def extract(target_zip, options = {})
-      Tempfile.open("csv_in_zip") do |output|
-        if options[:change_headers].present?
-          options[:headers] = options[:change_headers]
-          options[:remove_header_line] = true
-        end
-        
-        if options[:headers].present?
-          output.puts Array(options[:headers]).join(",")
-        end
-
+      CsvFile.new(options) do 
         zip_file = Zip::ZipFile.open(target_zip)
         Zip::ZipFile.foreach(target_zip) do |entry|
-          next if entry.to_s =~ /^__MACOSX/
-          next unless File.extname(entry.to_s) == ".csv"
+          next if CsvInZip.skip?(entry)
           
-          csv_lines = zip_file.read(entry).gsub("\r\n", "\n").split("\n")
-          csv_lines = csv_lines[1..-1] if options[:remove_header_line]
-          output.write csv_lines.join("\n").toutf8
+          add zip_file.read(entry)
         end
         
-        output.close
+        to_csv.each{|row| yield row}
+      end
+    end
+    
+    def extract_each(target_zip, options = {})
+      zip_file = Zip::ZipFile.open(target_zip)
+      Zip::ZipFile.foreach(target_zip) do |entry|
+        next if CsvInZip.skip?(entry)
         
-        CSV.parse(File.read(output.path), :headers => true).each{|row| yield row}
+        CsvFile.new(options) do 
+          add zip_file.read(entry)
+          csv = to_csv
+          yield csv, csv.headers
+        end
       end
     end
     

data/lib/csv_in_zip/version.rb

@@ -1,3 +1,3 @@
 module CsvInZip
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/csv_in_zip_spec.rb

@@ -10,49 +10,70 @@ describe CsvInZip do
     @utf8_zip = File.join(base, "utf8.csv.zip")
     @sjis_zip = File.join(base, "sjis.csv.zip")
     @multi_files_zip = File.join(base, "multi_files.zip")
-  end
-  
-  it "should add headers" do
-    headers = %w[header1 header2]
-    CsvInZip.extract(@no_headers_zip, :headers => headers) do |row|
-      row.headers.should == headers
-    end
+    @sjis_utf8_zip = File.join(base, "sjis+utf8.zip")
   end
 
-  it "should add headers" do
-    CsvInZip.extract(@multi_data_zip, :remove_header_line => true) do |row|
-      row.headers.should == %w[データ1 データ2]
+  describe "extract" do
+    it "should add headers" do
+      headers = %w[header1 header2]
+      CsvInZip.extract(@no_headers_zip, :headers => headers) do |row|
+        row.headers.should == headers
+      end
     end
-  end
-  
-  it "should change headers, part1" do
-    changed_headers = %w[changed1 changed2]
-    CsvInZip.extract(@utf8_zip, :headers => changed_headers, :remove_header_line => true) do |row|
-      row.headers.should == changed_headers
+    
+    it "should add headers" do
+      CsvInZip.extract(@multi_data_zip, :remove_header_line => true) do |row|
+        row.headers.should == %w[データ1 データ2]
+      end
     end
-  end
-
-  it "should change headers, part2" do
-    changed_headers = %w[changed1 changed2]
-    CsvInZip.extract(@utf8_zip, :change_headers => changed_headers) do |row|
-      row.headers.should == changed_headers
+    
+    it "should change headers, part1" do
+      changed_headers = %w[changed1 changed2]
+      CsvInZip.extract(@utf8_zip, :headers => changed_headers, :remove_header_line => true) do |row|
+        row.headers.should == changed_headers
+      end
     end
-  end
-
-  it "should open sjis file in utf8" do
-    CsvInZip.extract(@sjis_zip) do |row|
-      row["sjis-header"].should == "データ1"
-      row["日本語ヘッダー"].should == "データ2"
+    
+    it "should change headers, part2" do
+      changed_headers = %w[changed1 changed2]
+      CsvInZip.extract(@utf8_zip, :change_headers => changed_headers) do |row|
+        row.headers.should == changed_headers
+      end
+    end
+    
+    it "should open sjis file in utf8" do
+      CsvInZip.extract(@sjis_zip) do |row|
+        row["sjis-header"].should == "データ1"
+        row["日本語ヘッダー"].should == "データ2"
+      end
+    end
+    
+    describe "multi files" do
+      it "should open only csv files" do
+        count = 0
+        CsvInZip.extract(@multi_files_zip) do |row|
+          count += 1
+        end
+        count.should == utf8_csv_has_only_one_row = 1
+      end
+    end
+    
+    it "should join files and read as one csv" do
+      count = 0
+      CsvInZip.extract(@sjis_utf8_zip, :change_headers => %w|header1 header2|) do |row|
+        count += 1
+      end
+      count.should == 2
     end
   end
   
-  describe "multi files" do
-    it "should open only csv files" do
+  describe "extract_each" do
+    it "should return each csv" do
       count = 0
-      CsvInZip.extract(@multi_files_zip) do |row|
+      CsvInZip.extract_each(@sjis_utf8_zip) do |csv, headers|
         count += 1
       end
-      count.should == utf8_csv_has_only_one_row = 1
+      count.should == 2
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_in_zip
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -131,6 +131,7 @@ files:
 - spec/support/data/multi_files.zip
 - spec/support/data/no_headers.csv
 - spec/support/data/no_headers.csv.zip
+- spec/support/data/sjis+utf8.zip
 - spec/support/data/sjis.csv
 - spec/support/data/sjis.csv.zip
 - spec/support/data/utf8.csv
@@ -168,6 +169,7 @@ test_files:
 - spec/support/data/multi_files.zip
 - spec/support/data/no_headers.csv
 - spec/support/data/no_headers.csv.zip
+- spec/support/data/sjis+utf8.zip
 - spec/support/data/sjis.csv
 - spec/support/data/sjis.csv.zip
 - spec/support/data/utf8.csv