csv_lazy 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80463bf9c65eb3d8711f447ee1755b953cb2cf01
-  data.tar.gz: b2a280caed3b92b8e284bb272fe55cf8648cb251
+  metadata.gz: 44d70601a00cdd6e1cd7c102077dadfb7b357f97
+  data.tar.gz: e22d5991b47c38d4a3bcb3e07f2283a993bede24
 SHA512:
-  metadata.gz: 611b869e291df218be3919c8aa6a46e07d24b9f188f53b1ebdb2f0dfec367e5a7b992fa4454d51b4cdee03b85b6253a967ab848c056b71e59349f69204f6fcf9
-  data.tar.gz: 5e009d83697815f04a17761da901d5745937c17b6fba584ad48105e05a3009b05145f95b0d481adf00c1a9c59ce8bb974cc6bb9cf200a894de7715de7a276f06
+  metadata.gz: 59b05b906c832804795c4c142d8d1b0951b344adf7fb44c3e0660f3c1d0e9766431c86e0c2b1750eb9119b94d0d6c08f4548a2b5e2a470e408a25ae5765f1172
+  data.tar.gz: 74f5c69080c4ae0541b6f652a7b5888977ce8196b607ed0798f79c38cda860bda5e57a7a0168aa52af6e76149572bc9a25ad33350975d40995baf82921c06d8d

data/Gemfile

@@ -4,13 +4,14 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "string-strtr", require: false
-gem "codeclimate-test-reporter", group: :test, require: nil
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 3.2.0"
-  gem "rdoc", "~> 3.12"
+group :development, :test do
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.8"
+  gem "jeweler", "2.3.9"
+end
+
+group :development, :test do
+  gem "rspec", "3.7.0"
 end

data/Gemfile.lock

@@ -1,69 +1,76 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
-    builder (3.2.2)
-    codeclimate-test-reporter (0.4.7)
-      simplecov (>= 0.7.1, < 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    git (1.2.9.1)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (3.4.1)
-    highline (1.7.1)
-    jeweler (1.8.8)
+    addressable (2.4.0)
+    builder (3.2.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.5.7)
+    highline (1.7.10)
+    jar-dependencies (0.3.12)
+    jeweler (2.3.9)
       builder
-      bundler (~> 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.7.7)
-    json (1.7.7-java)
-    jwt (1.4.1)
-    multi_json (1.11.0)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
+      semver2
+    json (1.8.6)
+    json (1.8.6-java)
+    jwt (1.5.6)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.1-java)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.0)
-    rake (10.4.2)
+      rack (>= 1.2, < 3)
+    psych (3.0.2)
+    psych (3.0.2-java)
+      jar-dependencies (>= 0.1.7)
+    rack (2.0.3)
+    rake (12.3.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    simplecov (0.9.2)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    semver2 (3.4.2)
     string-strtr (0.0.3)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
 
 PLATFORMS
   java
@@ -71,8 +78,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  codeclimate-test-reporter
-  jeweler (~> 1.8.8)
-  rdoc (~> 3.12)
-  rspec (~> 3.2.0)
+  jeweler (= 2.3.9)
+  rspec (= 3.7.0)
   string-strtr
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -1,7 +1,3 @@
-[![Build Status](https://api.shippable.com/projects/540e7b9a3479c5ea8f9ec209/badge?branchName=master)](https://app.shippable.com/projects/540e7b9a3479c5ea8f9ec209/builds/latest)
-[![Code Climate](https://codeclimate.com/github/kaspernj/csv_lazy/badges/gpa.svg)](https://codeclimate.com/github/kaspernj/csv_lazy)
-[![Test Coverage](https://codeclimate.com/github/kaspernj/csv_lazy/badges/coverage.svg)](https://codeclimate.com/github/kaspernj/csv_lazy)
-
 # csv_lazy
 
 ## Install

data/Rakefile

@@ -37,13 +37,3 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
 end
 
 task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "csv_lazy #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/csv_lazy.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: csv_lazy 0.0.9 ruby lib
+# stub: csv_lazy 0.0.10 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "csv_lazy"
-  s.version = "0.0.9"
+  s.name = "csv_lazy".freeze
+  s.version = "0.0.10"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Kasper Johansen"]
-  s.date = "2015-04-22"
-  s.description = "A small CSV lib that skips whitespace-format-bugs and more."
-  s.email = "k@spernj.org"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Kasper Johansen".freeze]
+  s.date = "2018-01-24"
+  s.description = "A small CSV lib that skips whitespace-format-bugs and more.".freeze
+  s.email = "k@spernj.org".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -29,39 +29,36 @@ Gem::Specification.new do |s|
     "VERSION",
     "csv_lazy.gemspec",
     "lib/csv_lazy.rb",
-    "shippable.yml",
+    "peak_flow.yml",
     "spec/csv_lazy_spec.rb",
     "spec/spec_helper.rb",
     "spec/test1.csv.gz",
     "spec/test2.csv"
   ]
-  s.homepage = "http://github.com/kaspernj/csv_lazy"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.0"
-  s.summary = "A small CSV lib that skips whitespace-format-bugs and more."
+  s.homepage = "http://github.com/kaspernj/csv_lazy".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "A small CSV lib that skips whitespace-format-bugs and more.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<string-strtr>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 3.2.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
+      s.add_runtime_dependency(%q<string-strtr>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
+      s.add_development_dependency(%q<rspec>.freeze, ["= 3.7.0"])
     else
-      s.add_dependency(%q<string-strtr>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 3.2.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
+      s.add_dependency(%q<string-strtr>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
+      s.add_dependency(%q<rspec>.freeze, ["= 3.7.0"])
     end
   else
-    s.add_dependency(%q<string-strtr>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 3.2.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
+    s.add_dependency(%q<string-strtr>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
+    s.add_dependency(%q<rspec>.freeze, ["= 3.7.0"])
   end
 end
 

data/lib/csv_lazy.rb

@@ -173,16 +173,9 @@ private
       col_content = ""
 
       loop do
-        match_read = read_remove_regex(@regex_read_until_quote_char)
-        if !match_read
-          if @eof
-            add_col(@buffer) unless @buffer.empty?
-            @buffer = ""
-            break
-          else
-            read_buffer
-          end
-        else
+        if read_until_quote_and_end
+          break
+        elsif match_read = read_remove_regex(@regex_read_until_quote_char)
           all = match_read[0]
           escaped_quote_char = all[-@escaped_quote.length, @escaped_quote.length]
           double_escaped_quote_char = all[-@escaped_quote_double.length, @escaped_quote_double.length]
@@ -196,6 +189,14 @@ private
             add_col(unescape(col_content))
             break
           end
+        else
+          if @eof
+            add_col(@buffer) unless @buffer.empty?
+            @buffer = ""
+            break
+          else
+            read_buffer
+          end
         end
       end
 
@@ -214,7 +215,6 @@ private
       end
     elsif match = read_remove_regex(@regex_read_until_col_sep)
       add_col(match[1])
-      return true
     elsif match = read_remove_regex(@regex_read_until_row_sep)
       puts "csv_lazy: Row seperator reached." if @debug
       add_col(match[1])
@@ -238,6 +238,18 @@ private
     retry
   end
 
+  def read_until_quote_and_end
+    if match = @buffer.match(/\A(.*?)#{Regexp.escape(@args[:quote_char])}(#{Regexp.escape(@args[:col_sep])}|#{Regexp.escape(@args[:row_sep])})/)
+      content = match[1]
+      @buffer = @buffer.gsub(/\A#{Regexp.escape(content)}#{Regexp.escape(@args[:quote_char])}/, "")
+      content = content.gsub(/\\#{Regexp.escape(@args[:quote_char])}/, @args[:quote_char]) # Remove escapes from escaped quotes
+      add_col(content)
+      true
+    else
+      false
+    end
+  end
+
   #Adds a new column to the current row.
   def add_col(str)
     @row << str

data/peak_flow.yml

@@ -0,0 +1,2 @@
+script:
+  - bundle exec rspec

data/spec/csv_lazy_spec.rb

@@ -133,7 +133,7 @@ describe "CsvLazy" do
 
     row = csv.read_row
     expect(row[0]).to eq "Test1"
-    expect(row[1]).to eq "Test2 \"Wee\""
+    expect(row[1]).to eq 'Test2 "Wee"'
     expect(row.length).to eq 2
 
     row = csv.read_row
@@ -145,4 +145,12 @@ describe "CsvLazy" do
     row = csv.read_row
     expect(row).to eq false
   end
+
+  it "can handle unescaped quotes in quote columns" do
+    col = '"EB59009";"Kokuryu"Icchorai"Ginjoshu 1.8L";"0";"412,5";"EB";"E";"Sake - Mirin - Shochu - Umeshu - Beer";"166,58";"Fejl";""'
+
+    csv = CsvLazy.new(io: StringIO.new(col))
+
+    expect(csv.to_a).to eq [["EB59009", "Kokuryu\"Icchorai\"Ginjoshu 1.8L", "0", "412,5", "EB", "E", "Sake - Mirin - Shochu - Umeshu - Beer", "166,58", "Fejl", ""]]
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_lazy
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-strtr
@@ -25,61 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.3.9
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: 3.7.0
 description: A small CSV lib that skips whitespace-format-bugs and more.
 email: k@spernj.org
 executables: []
@@ -98,7 +84,7 @@ files:
 - VERSION
 - csv_lazy.gemspec
 - lib/csv_lazy.rb
-- shippable.yml
+- peak_flow.yml
 - spec/csv_lazy_spec.rb
 - spec/spec_helper.rb
 - spec/test1.csv.gz
@@ -123,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A small CSV lib that skips whitespace-format-bugs and more.

data/shippable.yml

@@ -1,11 +0,0 @@
-language: ruby
-cache: bundler
-archive: true
-rvm:
-  - ruby 1.9.3-head
-  - ruby-2.1.2
-  - jruby-head
-script:
-  - CODECLIMATE_REPO_TOKEN=eace98ffec782ba73b18d99d6f00710e860cdb620483532d8c386a0fcf3046f8 bundle exec rspec
-notifications:
-   email: false