hasherize_csv 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+script: "bundle exec rake test"
+env:
+  - CI=true
+rvm:
+  - 1.8.7
+  - rbx-19mode
+  - jruby-19mode
+  - jruby-head
+  - 1.9.2
+  - 1.9.3
+gemfile:
+  - Gemfile
+notifications:
+  recipients:
+    - brent@brentium.com 
+branches:
+  only:
+    - master

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+gem 'rake'
 
 # Specify your gem's dependencies in hasherize_csv.gemspec
 gemspec

data/LICENSE.txt

@@ -1,22 +1,165 @@
-Copyright (c) 2012 Brent Bradbury
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/lib/hasherize_csv/version.rb

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

data/lib/hasherize_csv.rb

@@ -1,50 +1,51 @@
 require "hasherize_csv/version"
 
 module HasherizeCsv
-   module DefaultOpts
-     SALESFORCE = { :separator => "\r", :value_pattern => /\"(.*?)\"/m }
-   end
- 
-   class Csv 
-     attr_accessor :keys, :file, :separator
-     def initialize file, opts = {}
-	@file = file
-	@separator = opts[:separator] || "\n"
-        @value_pattern = opts[:value_pattern] || /([\s\w_-]+),?/
-	@keys = []
-	next_line { |l| @keys = values_from_line l if !l.nil? }
-     end
+  module DefaultOpts
+    DEFAULT = { :separator => "\n", :value_pattern => /([^,]+[\s\w_-]+),?/ }
+    SALESFORCE = { :separator => "\r", :value_pattern => /\"(.*?)\"/m }
+  end
 
-     def next_item 
-	next_line { |l|
-          if l.nil?
-	   yield nil
-          else
-	   yield hashify_values( values_from_line l ) 
-          end
-	}
-     end
- 
-     def each
-        while(1) 
-	   self.next_item { |hash|
-	     return if hash.nil?
-             yield hash
-	   }
-        end 
-     end
+  class Csv 
+    attr_accessor :keys, :file, :separator
+    def initialize file, opts = {}
+      @file = file
+      @separator = opts[:separator] || DefaultOpts::DEFAULT[:separator]
+      @value_pattern = opts[:value_pattern] || DefaultOpts::DEFAULT[:value_pattern]
+      @keys = []
+      next_line { |l| @keys = values_from_line l if !l.nil? }
+    end
+
+    def next_item 
+      next_line { |l|
+        if l.nil?
+          yield nil
+        else
+          yield hashify_values( values_from_line l ) 
+        end
+      }
+    end
+
+    def each
+      while(1) 
+        self.next_item { |hash|
+          return if hash.nil?
+          yield hash
+        }
+      end 
+    end
 
     private 
-     def next_line
-	  yield(@file.gets(@separator)) 
-     end
+    def next_line
+      yield(@file.gets(@separator) ? $_.chomp : $_) 
+    end
 
-     def hashify_values values
-        Hash[keys.zip(values)] if !values.nil? and values.length != 0
-     end
+    def hashify_values values
+      Hash[keys.zip(values)] if !values.nil? and values.length != 0
+    end
 
-     def values_from_line line
-	line.scan(@value_pattern).flatten
-     end
-   end
+    def values_from_line line
+      line.scan(@value_pattern).flatten
+    end
+  end
 end

data/test/default_sample_csv.csv

@@ -0,0 +1,2 @@
+Heading1,Heading2,Heading3
+Item1,Item2 & Item2.5, Item3

data/test/test_hasherize_csv.rb

@@ -5,42 +5,36 @@ class HasherizeCsvTest < Test::Unit::TestCase
   def setup 
     @f = File.new(File.join(File.expand_path(File.dirname(__FILE__)),"sample_csv.csv"))
     @csv = HasherizeCsv::Csv.new(@f, HasherizeCsv::DefaultOpts::SALESFORCE)
+
+    @g = File.new(File.join(File.expand_path(File.dirname(__FILE__)),"default_sample_csv.csv"))
+    @default_csv = HasherizeCsv::Csv.new(@g)
   end
 
   def teardown
     @f.close
+    @g.close
   end
 
-  def test_keys
-        assert_equal ["Heading1", "Heading2", "H_EA_3__c"], @csv.keys
+  def test_default_csv
+    @default_csv.each { |hash|
+      assert_equal({"Heading1"=>"Item1", "Heading2"=>"Item2 & Item2.5", "Heading3"=>" Item3"}, hash) 
+    }
   end
 
-  def test_hash_file
-       @csv.next { |hash|
-         assert_equal({"Heading1"=>"Item1", "Heading2"=>"Item2", "H_EA_3__c"=>"Item3"}, hash) 
-       }
-   
-       @csv.next { |hash|
-         assert_equal({"Heading1"=>"Email",
-                       "Heading2"=> "SUP MAN\n\nWE HAVE LOTS OF MULTILINE EMAILS IN CAPS\n\nTHEY ALSO HAVE LINEBREAKS IN THEM",
-                       "H_EA_3__c"=>"FinalField"}, hash)
-       }
-
-       @csv.next { |hash| 
-	 assert_equal nil, hash 
-       }
+  def test_keys
+    assert_equal ["Heading1", "Heading2", "H_EA_3__c"], @csv.keys
   end
 
   def test_hash_file
-       result = []
-       @csv.each { |hash|
-	 result << hash
-       }
-       assert_equal [{"Heading1"=>"Item1", "Heading2"=>"Item2", "H_EA_3__c"=>"Item3"}, 
-                     {"Heading1"=>"Email", 
-                      "Heading2"=>"SUP MAN\n\nWE HAVE LOTS OF MULTILINE EMAILS IN CAPS\n\nTHEY ALSO HAVE LINEBREAKS IN THEM",
-                      "H_EA_3__c"=>"FinalField"},
-                     {"Heading1"=>"Blank1", "Heading2"=>"", "H_EA_3__c"=>""}], result
+    result = []
+    @csv.each { |hash|
+      result << hash
+    }
+    assert_equal [{"Heading1"=>"Item1", "Heading2"=>"Item2", "H_EA_3__c"=>"Item3"}, 
+      {"Heading1"=>"Email", 
+        "Heading2"=>"SUP MAN\n\nWE HAVE LOTS OF MULTILINE EMAILS IN CAPS\n\nTHEY ALSO HAVE LINEBREAKS IN THEM",
+        "H_EA_3__c"=>"FinalField"},
+        {"Heading1"=>"Blank1", "Heading2"=>"", "H_EA_3__c"=>""}], result
   end
 
 end

metadata

@@ -2,14 +2,14 @@
 name: hasherize_csv
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brent Bradbury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies: []
 description: Turns csv files into hashes without reading the entire csv into memory
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -26,6 +27,7 @@ files:
 - hasherize_csv.gemspec
 - lib/hasherize_csv.rb
 - lib/hasherize_csv/version.rb
+- test/default_sample_csv.csv
 - test/sample_csv.csv
 - test/test_hasherize_csv.rb
 homepage: https://github.com/bbradbury/hasherize_csv
@@ -53,6 +55,7 @@ signing_key:
 specification_version: 3
 summary: Hasherizes a csv file line by line
 test_files:
+- test/default_sample_csv.csv
 - test/sample_csv.csv
 - test/test_hasherize_csv.rb
 ...