smarter_csv 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: c8d2d18557f4dbffe6711681fa15d783f6521362
-  data.tar.gz: 1a9e8f007ccbd329d77d6f990f77e0073a66026d
+  metadata.gz: b8da8da62110a7342bf1607f6d971125192d79d4
+  data.tar.gz: f1e42ed0dba9a1cadb609044929bdea223874887
 SHA512: 
-  metadata.gz: 8450de646c3573ec1fc87001dedbbf6ef5b062fd7bf2ab7dc91ef3973821f21dda1e5a8a613f8912faae3e632b9da1d97c29a7708172784dd8c50c075c31a5a9
-  data.tar.gz: 77b632311d95dc2e4a4bac5f7a28c6702be0c72fc6686e90c169851ae8a8ff60e962918fdbe48acf8f3d87ac323a37826f72000c59a3c8e60d08a206d65b210c
+  metadata.gz: 2a15724a84cb1a1985b557236dcbbc732b1afe2fac044db9002f4c4df8e178fdd875aeaf5d0f69b76478aac77b7e96cc874ae069f90e0701b0d113823f3daf24
+  data.tar.gz: aced7129287273dbfea183445bf448303c0aa51af159d7880cab6e51fa79b672f8a8231cf2cfbb5a864075dae42d52e036bd5fab850298f15ca54ab27764b8f8

data/README.md

@@ -200,8 +200,12 @@ Or install it yourself as:
 
 ## Changes
 
+#### 1.0.11 (2013-09-28)
+ * bugfix : fixed issue #18 - fixing issue with last chunk not being properly returned (thanks to Jordan Running)
+ * added RSpec tests
+
 #### 1.0.10 (2013-06-26)
- * bugfix : fixed issue #14 - passing options along to CSV.parse (thank to Marcos Zimmermann)
+ * bugfix : fixed issue #14 - passing options along to CSV.parse (thanks to Marcos Zimmermann)
 
 #### 1.0.9 (2013-06-19)
  * bugfix : fixed issue #13 with negative integers and floats not being correctly converted (thanks to Graham Wetzler)
@@ -282,6 +286,7 @@ And a special thanks to those who contributed pull requests:
  * [Félix Bellanger](https://github.com/Keeguon)
  * [Graham Wetzler](https://github.com/grahamwetzler)
  * [Marcos G. Zimmermann](https://github.com/marcosgz)
+ * [Jordan Running](https://github.com/jrunning)
 
 
 ## Contributing

data/Rakefile

@@ -1,2 +1,26 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rubygems'
+require 'rake'
+
+require 'rspec/core/rake_task'
+
+desc "Run RSpec"
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = false
+end
+
+desc "Run specs for all test cases"
+task :spec_all do 
+  system "rake spec"
+end
+
+# task :spec_all do
+#   %w[active_record data_mapper mongoid].each do |model_adapter|
+#     puts "MODEL_ADAPTER = #{model_adapter}"
+#     system "rake spec MODEL_ADAPTER=#{model_adapter}"
+#   end
+# end
+
+task :default => :spec

data/lib/smarter_csv/smarter_csv.rb

@@ -121,7 +121,14 @@ module SmarterCSV
             end
             chunk_count += 1
             chunk = []  # initialize for next chunk of data
+          else
+
+            # the last chunk may contain partial data, which also needs to be returned (BUG / ISSUE-18)
+            
+
           end
+
+
           # while a chunk is being filled up we don't need to do anything else here
 
         else # no chunk handling
@@ -132,6 +139,17 @@ module SmarterCSV
           end
         end
       end
+      # last chunk:
+      if ! chunk.nil? && chunk.size > 0
+        # do something with the chunk
+        if block_given?
+          yield chunk  # do something with the hashes in the chunk in the block
+        else
+          result << chunk  # not sure yet, why anybody would want to do this without a block
+        end
+        chunk_count += 1
+        chunk = []  # initialize for next chunk of data
+      end
     ensure
       $/ = old_row_sep   # make sure this stupid global variable is always reset to it's previous value after we're done!
     end

data/lib/smarter_csv/version.rb

@@ -1,3 +1,3 @@
 module SmarterCSV
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

data/smarter_csv.gemspec

@@ -15,4 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.requirements  = ['csv'] # for CSV.parse() only needed in case we have quoted fields
   gem.version       = SmarterCSV::VERSION
+  gem.add_development_dependency "rspec"
+#  gem.add_development_dependency "guard-rspec"
 end

data/spec/fixtures/basic.csv

@@ -0,0 +1,7 @@
+first name,last name,dogs,cats,birds,fish
+Dan,McAllister,2,,,
+Lucy,Laweless,,5,,
+,,,,,
+Miles,O'Brian,,,,21
+Nancy,Homes,2,,1, 
+,,,,,

data/spec/fixtures/chunk_cornercase.csv

@@ -0,0 +1,10 @@
+a,b,c
+1,2,3
+,,
+4,5,6
+7,8,9
+,,
+10,11,12
+,,
+13,14,15
+,,

data/spec/fixtures/pets.csv

@@ -0,0 +1,5 @@
+first name,last name,dogs,cats,birds,fish
+Dan,McAllister,2,,,
+Lucy,Laweless,,5,,
+Miles,O'Brian,,,,21
+Nancy,Homes,2,,1,

data/spec/smarter_csv/chunked_reading.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+fixture_path = 'spec/fixtures'
+
+describe 'be_able_to' do
+  it 'loads_chunk_cornercase_csv_files' do 
+    (0..5).each do |chunk_size|    # test for all chunk-sizes
+    options = {:chunk_size => chunk_size, :remove_empty_hashes => true}
+    data = SmarterCSV.process("#{fixture_path}/chunk_cornercase.csv", options)
+    data.flatten.size.should == 5  # end-result must always be 5 rows
+  end
+
+end

data/spec/smarter_csv/load_basic_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+fixture_path = 'spec/fixtures'
+
+describe 'be_able_to' do
+  it 'loads_basic_csv_file' do 
+    data = SmarterCSV.process("#{fixture_path}/basic.csv")
+    data.size.should == 4
+    data.each do |h|
+      h.size.should <= 6
+    end
+  end
+
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--backtrace

data/spec/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'bundler/setup'
+
+Bundler.require(:default)
+
+require 'smarter_csv'
+
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+#  config.fixture_path = 'spec/fixtures'
+
+#  config.mock_with :rr
+#  config.before(:each) do
+#    Project.delete_all
+#    Category.delete_all
+#  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smarter_csv
 version: !ruby/object:Gem::Version 
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors: 
 - |
@@ -11,9 +11,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-26 00:00:00 Z
-dependencies: []
-
+date: 2013-09-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: Ruby Gem for smarter importing of CSV Files as Array(s) of Hashes, with optional features for processing large files in parallel, embedded comments, unusual field- and record-separators, flexible mapping of CSV-headers to Hash-keys
 email: 
 - |
@@ -37,6 +47,14 @@ files:
 - lib/smarter_csv/smarter_csv.rb
 - lib/smarter_csv/version.rb
 - smarter_csv.gemspec
+- spec/fixtures/basic.csv
+- spec/fixtures/chunk_cornercase.csv
+- spec/fixtures/pets.csv
+- spec/smarter_csv/chunked_reading.rb
+- spec/smarter_csv/load_basic_spec.rb
+- spec/spec.opts
+- spec/spec/spec_helper.rb
+- spec/spec_helper.rb
 homepage: https://github.com/tilo/smarter_csv
 licenses: []
 
@@ -49,13 +67,10 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id001 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  - *id002
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id001
+  - *id002
 requirements: 
 - csv
 rubyforge_project: 
@@ -63,5 +78,12 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby Gem for smarter importing of CSV Files (and CSV-like files), with lots of optional features, e.g. chunked processing for huge CSV files
-test_files: []
-
+test_files: 
+- spec/fixtures/basic.csv
+- spec/fixtures/chunk_cornercase.csv
+- spec/fixtures/pets.csv
+- spec/smarter_csv/chunked_reading.rb
+- spec/smarter_csv/load_basic_spec.rb
+- spec/spec.opts
+- spec/spec/spec_helper.rb
+- spec/spec_helper.rb