csv_madness 0.0.9 → 0.0.10

data/test/test_csv_madness.rb

@@ -55,9 +55,9 @@ class TestCsvMadness < MadTestCase
             cell = "*#{cell}*"
           end
         
-          bill = @simple.fetch(:id, "2")
-          mary = @simple.fetch(:id, "1")
-        
+          bill = @simple.fetch(:id, "*2*")
+          mary = @simple.fetch(:id, "*1*")
+          
           assert_equal "*Bill*", bill.fname
           assert_equal "*Moore*", mary.lname
           assert_equal "*1*", mary.id
@@ -104,6 +104,7 @@ class TestCsvMadness < MadTestCase
         
         should "parse a date column with one invalid date" do
           @simple.set_column_type( :born, :date )
+          debugger
           born1 = @simple[0].born
           born3 = @simple[2].born
           assert_kind_of Time, born1
@@ -114,29 +115,36 @@ class TestCsvMadness < MadTestCase
         end
       
         should "successfully decorate record objects with new functionality" do
-          moduul = Module.new do
-            def full_name
-              "#{self.fname} #{self.lname}"
-            end
+
+
+          @simple.add_extra_method( :full_name ) do |record|
+            "#{record.fname} #{record.lname}"
+          end
           
-            def name_last_first
-              "#{self.lname}, #{self.fname}"
-            end
+          @simple.add_extra_method( :name_last_first ) do |record|
+            "#{record.lname}, #{record.fname}"
           end
-        
-          @simple.add_record_methods( moduul )
-        
+          
           assert @simple[0].respond_to?( :full_name )
           assert_equal "Mary Moore", @simple[0].full_name
           assert @simple[0].respond_to?( :name_last_first )
           assert_equal "Moore, Mary", @simple[0].name_last_first
         end
+        
+        should "add extra method that takes an additional argument" do
+          @simple.add_extra_method( :excited ) do |record, mark_of_excitement = "!"|
+            "#{record.fname} #{record.lname}#{mark_of_excitement}"
+          end
+        
+          
+          assert_equal "Mary Moore!", @simple[0].excited
+          assert_equal "Mary Moore?", @simple[0].excited("?")          
+        end
+        
       
         should "add methods to record objects (block form)" do
-          @simple.add_record_methods do
-            def full_name
-              "#{self.fname} #{self.lname}"
-            end
+          @simple.add_extra_method( :full_name ) do |record|
+             "#{record.fname} #{record.lname}"
           end
         
           assert @simple[0].respond_to?( :full_name )
@@ -145,6 +153,7 @@ class TestCsvMadness < MadTestCase
       
         should "return an array of objects when feeding fetch() an array" do
           records = @simple.fetch(:id, ["1","2"])
+
           assert_equal records.length, records.compact.length
           assert_equal 2, records.length
           assert_equal "1", records.first.id
@@ -202,7 +211,7 @@ class TestCsvMadness < MadTestCase
       
       should "stomp away the nils" do
         @norris = @nilsheet.fetch(:id, "4")
-        assert_equal nil, @norris.born
+        assert_nil @norris.born
         assert_equal "Chuck", @norris.fname
       
         @nilsheet.nils_are_blank_strings  # should turn every nil into a ''
@@ -244,6 +253,7 @@ class TestCsvMadness < MadTestCase
         
         should "drop column" do
           load_mary
+          
           assert @mary.respond_to?(:lname)
           assert_equal "Moore", @mary.lname
           

data/test/test_index_set.rb

@@ -0,0 +1,30 @@
+require 'helper'
+
+class TestIndexSet < MadTestCase
+  include CsvMadness
+  
+  context "testing set equality" do
+    setup do
+      @set0 = IndexSet.new( :even, true )
+      @set1 = IndexSet.new( :odd, false )
+    end    
+    
+    should "be unequal when empty" do
+      @set0 != @set1
+    end
+    
+    should "be unequal when containing the same objects" do
+      @set0.add( 0 )
+      @set1.add( 0 )
+      
+      @set0 != @set1
+    end
+    
+    _should "do a thing" do
+      1000.times do
+        ix = IndexSet.new( :even, :true )
+        puts ix.object_id
+      end
+    end
+  end
+end

data/test/test_indexer.rb

@@ -0,0 +1,50 @@
+require 'helper'
+
+class TestIndexer < MadTestCase
+  context "absolute basics" do
+    setup do
+      @ix = CsvMadness::Indexer.new
+    end    
+    
+    should "have created an Indexer" do
+      assert_kind_of CsvMadness::Indexer, @ix
+      
+      assert_respond_to @ix, :index
+      assert_respond_to @ix, :unindex
+      assert_respond_to @ix, :lookup
+    end
+    
+    should "add items to and retrieve items from an indexer" do
+      @ix.index( 5, :even?, 5.even? )
+      result = @ix.lookup( :even?, false )
+      assert_equal [5], result
+    end
+  end 
+  
+  context "testing index " do
+    setup do
+      @ix = CsvMadness::Indexer.new
+    end
+    
+    _should "add and remove items, with the lookup staying up-to-date" do
+      for i in 0..9
+        @ix.index( i, :even?, i.even? )
+        @ix.index( i, :odd?,  i.odd?  )
+      end
+      
+      assert_equal( [0,2,4,6,8], @ix.lookup( :even?, true  ) )
+      assert_equal( [1,3,5,7,9], @ix.lookup( :even?, false ) )
+      assert_equal( [0,2,4,6,8], @ix.lookup( :odd?,  false ) )
+      assert_equal( [1,3,5,7,9], @ix.lookup( :odd?,  true  ) )
+      
+      for i in 0..9
+        @ix.unindex( i )
+      end
+      
+      assert_equal( [], @ix.lookup( :even?, true  ) )
+      assert_equal( [], @ix.lookup( :even?, false ) )
+      assert_equal( [], @ix.lookup( :odd?,  true  ) )
+      assert_equal( [], @ix.lookup( :odd?,  false ) )
+    end
+  end
+end

data/test/test_reloading_spreadsheet.rb

@@ -13,9 +13,11 @@ class TestCsvMadness < MadTestCase
       assert @darwin.respond_to?(:fname)
       assert @mary.born.is_a?(String)
       
-      debugger
       muck_up_spreadsheet
-      set_person_records
+      # set_person_records
+      
+      assert_kind_of CsvMadness::Record, @mary
+      assert_kind_of CsvMadness::Record, @darwin
       
       assert !@mary.respond_to?(:lname)
       assert !@darwin.respond_to?(:fname)

data/test/test_sheet.rb

@@ -29,18 +29,21 @@ class TestSheet < MadTestCase
   end
   
   context "testing column_types" do
-    should "gracefully handle empty strings for all column_types" do
-      load_sheet("test_column_types.csv")
+    setup do
+      load_sheet("test_column_types.csv")      
       
-      for type, ignore_proc in CsvMadness::Sheet::COLUMN_TYPES
+      for type in CsvMadness::ColumnType::COLUMN_TYPE_LOOKUP.keys
         @sheet.set_column_type( type, type )
       end
+    end
+    
+    should "gracefully handle empty strings for all column_types" do
       
       record = @sheet.records[0]
       
-      assert_kind_of String, record.date
-      assert_equal nil, record.number
-      assert_equal nil, record.float
+      assert_nil record.date
+      assert_nil record.number
+      assert_nil record.float
       
       record = @sheet.records[1]
       assert_equal "12", record.id
@@ -48,6 +51,15 @@ class TestSheet < MadTestCase
       assert_equal 100, record.integer
       assert_equal Time.parse("2013-01-13"), record.date
     end
+    
+    should "convert cells to proper column type when adding record" do
+      rec = @sheet.add_record( {:id => 13, :number => "-40.7", :integer => "12", :float => "37.4", :date => "1/31/2017" } )
+      
+      assert_kind_of Float, rec.number
+      assert_equal( -40.7, rec.number )
+      assert_kind_of Integer, rec.id
+      
+    end
   end
   
   context "testing add/remove records" do
@@ -65,17 +77,38 @@ class TestSheet < MadTestCase
       end
     end
     
-    should "test remove_record" do
+    should "add record (block form)" do
+      count = @sheet.records.length
+      
+      block_ran = false
+      
+      rec = @sheet.add_record( [] ) do |r|
+        block_ran = true
+        
+        r.id    = "8"
+        r.fname = "Omaha"
+        r.lname = "Williams"
+        r.age   = "55"
+      end
+      
+      assert block_ran, "Block did not run."
+      
+      assert_equal count + 1, @sheet.length
+      assert_kind_of CsvMadness::Record, rec
+      assert_equal "8", rec.id
+    end
+    
+    should "remove_record" do
       count = @sheet.records.length
       record = @sheet.records.last
       record_id = record.id
       
-      assert @sheet.fetch(:id, record_id) != nil
+      assert_not_nil @sheet.fetch(:id, record_id)
       
       
       @sheet.remove_record( record )
       assert_equal (count - 1), @sheet.records.length
-      assert @sheet.fetch(:id, record_id) == nil
+      assert_nil @sheet.fetch(:id, record_id)
       
       count = @sheet.records.length
       record = @sheet.records[0]
@@ -88,38 +121,65 @@ class TestSheet < MadTestCase
   end
   
   context "testing blanking and splitting of spreadsheet" do
+    setup do
+      @sheet = CsvMadness.load( "splitter.csv" )
+      @blank_sheet = @sheet.blanked 
+    end
+    
+    teardown do
+      self.empty_output_folder
+    end
+    
     should "deliver me a properly blanked spreadsheet (simple)" do
-      sheet = CsvMadness.load( "splitter.csv" )
-      blank_sheet = sheet.blanked
-      
-      sheet.length.times do |i|
-        blank_sheet.add_record( sheet.remove_record( 0 ) )
+      @sheet.length.times do |i|
+        @blank_sheet.add_record( @sheet.remove_record( 0 ) )
       end
       
-      assert_zero sheet.length
-      assert_equal 10, blank_sheet.length
-      assert_nil blank_sheet.spreadsheet_file
+      assert_zero @sheet.length
+      assert_equal 10, @blank_sheet.length
+      assert_nil @blank_sheet.spreadsheet_file
     end
 
     should "deliver me a properly blanked spreadsheet (index)" do
-      load_sheet( "splitter.csv", :index => [:id] )
-      blank_sheet = @sheet.blanked
-      
-      assert_zero blank_sheet.length
-      assert_includes blank_sheet.index_columns, :id 
+      assert_zero @blank_sheet.length
+      assert_includes( @blank_sheet.index_columns, :id ) if @blank_sheet.indexing_enabled?
     end
     
     should "split splitter" do
-      load_sheet( "splitter.csv", :index => [:id, :party] )
-      
-      sheets = @sheet.split(&:party)
+      sheets = @sheet.split do |record|
+        record.party
+      end
       
       for party in %w(D I R)
         assert_equal_length sheets[party], @sheet.records.select{|r| r.party == party }
       end
       
-      assert_includes sheets["D"].index_columns, :id
-      assert_includes sheets["I"].index_columns, :party
+      
+      
+      # assert_includes sheets["D"].index_columns, :id
+      # assert_includes sheets["I"].index_columns, :party
+    end
+    
+    should "write back a blank sheet to a csv file" do
+      outpath = @csv_output_path
+      
+      blankcsv = outpath.join( "blank.csv" )
+      onerecord = outpath.join( "onerecord.csv" )
+      
+      @blank_sheet.write_to_file( blankcsv )
+      @blank_sheet.add_record( ["1","Mary","Moore","D"] )
+      @blank_sheet.write_to_file( onerecord )
+      
+      reloaded = CsvMadness.load( blankcsv )
+      assert_length 0, reloaded
+      
+      reloaded = CsvMadness.load( onerecord )
+      record = reloaded.records.first 
+      
+      assert_length 1, reloaded
+      
+      assert_equal "Mary", record.fname
+      assert_equal "1", record.id
     end
   end
   
@@ -130,4 +190,81 @@ class TestSheet < MadTestCase
       end
     end
   end
+  
+  context "testing nils in headers" do
+    should "load the sheet without errors" do
+      ss = CsvMadness.load( "nil_headers.csv" )
+      assert_kind_of( CsvMadness::Sheet, ss )
+      
+      expected_columns = [:col0, :fname, :col2, :col3, :col4]
+      
+      for col in expected_columns
+        assert_includes( ss.columns, col )
+        assert_respond_to( ss[0], col )
+      end
+    end
+  end
+  
+  context "testing sorting" do
+    setup do
+      load_sheet( "pokemon.csv" )
+      @sheet.set_column_type( :id, :integer )
+      @sheet.set_column_type( :cp, :integer )
+      @sheet.set_column_type( :hp, :integer )
+      
+      @initial_id_result = [1,2,3,4,5,6,7,8]
+    end
+    
+    should "successfully load sheet w/ proper results for :id column" do
+      assert_equal_length( @initial_id_result, @sheet.column(:id) )
+      assert_equal( @initial_id_result, @sheet.column(:id) )
+    end
+    
+    should "not alter the order when sorting by ID (already in order)" do
+      @sheet.sort( :id )
+      assert_equal_length( @initial_id_result, @sheet.column(:id) )
+      assert_equal( @initial_id_result, @sheet.column(:id) )
+    end
+    
+    should "alter order at other times" do
+      flunk
+    end
+  end
+  
+  context "testing add_blank_record" do
+    setup do
+      load_sheet "simple.csv"
+    end
+    
+    should "add_a_blank_record (block form)" do
+      rec = @sheet.add_blank_record do |record|
+        record.id    = "5"
+        record.fname = "Larry"
+        record.lname = "Wilmore"
+        record.age   = "55"
+      end
+      
+      assert_equal "Larry", @sheet.records.last.fname
+      assert_equal "55", rec.age 
+    end
+    
+    should "add_a_blank_record (no-block)" do
+      len = @sheet.length
+      rec = @sheet.add_blank_record
+      
+      assert_equal( len + 1, @sheet.length )
+      
+      rec.fname = "Bill"
+      assert_equal( "Bill", @sheet.records[len].fname )
+      
+      
+    end
+    
+    should "update via apply_update_hash" do
+      record = @sheet.add_blank_record
+      record.apply_update_hash( :id => "6", :fname => "Teddy", :lname => "Roosevelt", :age => 109 )
+      assert_equal 109, record.age
+      assert_equal "6", record.id
+    end
+  end
 end

data/test/test_utils.rb

@@ -0,0 +1,99 @@
+require 'helper'
+
+class TestUtils < MadTestCase
+  include CsvMadness::Utils
+
+  context "testing for constants" do
+    should "have all the constants" do
+      assert defined?( CsvMadness )
+      assert defined?( CsvMadness::Utils )
+      assert defined?( CsvMadness::Utils::Counter )
+      assert defined?( CsvMadness::Utils::CounterProc )
+      assert defined?( CsvMadness::Utils::ConstProc )
+    end
+    
+    should "respond to factory methods" do
+      assert_respond_to ConstProc, :proc_for
+      assert_respond_to CounterProc, :counter
+    end
+  end
+  
+  context "testing Counter" do
+    context "with a default/zero counter" do
+      setup do
+        @counter = Counter.new
+      end
+    
+      should "respond to methods" do
+        assert_respond_to @counter, :value
+        assert_respond_to @counter, :click
+        assert_respond_to @counter, :reset
+      end
+    
+      should "start at zero" do
+        assert_zero @counter.value
+      end
+    
+      should "track tick counts" do
+        300.times do |i|
+          @counter.click
+          assert_equal i + 1, @counter.value
+        end
+      
+        @counter.reset
+      
+        assert_zero @counter.value
+      end
+    end
+    
+    context "when initialized with a positive counter" do 
+      setup do
+        @counter = Counter.new(255)
+      end
+      
+      should "work okay" do
+        assert_equal 255, @counter.value
+        assert_equal 256, @counter.click
+        assert_equal 256, @counter.value
+        assert_equal 257, @counter.click
+        assert_equal 258, @counter.click
+        assert_equal 255, @counter.reset
+        assert_equal 255, @counter.value
+      end
+    end
+
+
+    context "when initialized with a negative counter" do 
+      setup do
+        @counter = Counter.new( -12 )
+      end
+      
+      should "work okay" do
+        assert_equal( -12, @counter.value )
+        assert_equal( -11, @counter.click )
+        assert_equal( -11, @counter.value )
+        assert_equal( -10, @counter.click )
+        assert_equal( -9,  @counter.click )
+        assert_equal( -12, @counter.reset )
+        assert_equal( -12, @counter.value )
+      end
+    end
+  end
+  
+  context "testing CounterProc" do
+    context "with default counter" do
+      setup do
+        @proc = CounterProc.counter
+      end
+      
+      should "start at zero and increment each time it's called" do
+        assert_zero @proc.call
+        assert_one  @proc.times_called
+        assert_one  @proc.call
+        assert_equal 2, @proc.times_called
+        @proc.reset
+        assert_zero @proc.times_called
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_madness
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Bryce Anderson
@@ -10,39 +10,39 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: csv
+  name: fun_with_gems
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: fun_with_gems
+  name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fun_with_testing
   requirement: !ruby/object:Gem::Requirement
@@ -67,36 +67,64 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- "./lib/csv_madness.rb"
-- "./lib/csv_madness/builder.rb"
-- "./lib/csv_madness/data_accessor_module.rb"
-- "./lib/csv_madness/exceptions.rb"
-- "./lib/csv_madness/gem_api.rb"
-- "./lib/csv_madness/record.rb"
-- "./lib/csv_madness/sheet.rb"
-- "./lib/csv_madness/sheet_methods/base.rb"
-- "./lib/csv_madness/sheet_methods/class_methods.rb"
-- "./lib/csv_madness/sheet_methods/column_methods.rb"
-- "./lib/csv_madness/sheet_methods/file_methods.rb"
-- "./lib/csv_madness/sheet_methods/indexing.rb"
-- "./lib/csv_madness/sheet_methods/record_methods.rb"
-- "./test/csv/forbidden_column.csv"
-- "./test/csv/simple.csv"
-- "./test/csv/splitter.csv"
-- "./test/csv/test_column_types.csv"
-- "./test/csv/with_nils.csv"
-- "./test/helper.rb"
-- "./test/test_builder.rb"
-- "./test/test_csv_madness.rb"
-- "./test/test_merging_columns.rb"
-- "./test/test_reloading_spreadsheet.rb"
-- "./test/test_sheet.rb"
+- ".document"
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/csv_madness.rb
+- lib/csv_madness/builder.rb
+- lib/csv_madness/column.rb
+- lib/csv_madness/column_methods/core_methods.rb
+- lib/csv_madness/column_methods/default_value_methods.rb
+- lib/csv_madness/column_methods/error_methods.rb
+- lib/csv_madness/column_methods/fetch_methods.rb
+- lib/csv_madness/column_methods/typing_methods.rb
+- lib/csv_madness/column_set.rb
+- lib/csv_madness/column_type.rb
+- lib/csv_madness/column_types/date.rb
+- lib/csv_madness/column_types/float.rb
+- lib/csv_madness/column_types/integer.rb
+- lib/csv_madness/column_types/string.rb
+- lib/csv_madness/data_accessor_module.rb
+- lib/csv_madness/exceptions.rb
+- lib/csv_madness/gem_api.rb
+- lib/csv_madness/index_set.rb
+- lib/csv_madness/indexer.rb
+- lib/csv_madness/record.rb
+- lib/csv_madness/record_filter.rb
+- lib/csv_madness/record_methods/method_methods.rb
+- lib/csv_madness/sheet.rb
+- lib/csv_madness/sheet_methods/base.rb
+- lib/csv_madness/sheet_methods/class_methods.rb
+- lib/csv_madness/sheet_methods/column_methods.rb
+- lib/csv_madness/sheet_methods/file_methods.rb
+- lib/csv_madness/sheet_methods/indexing.rb
+- lib/csv_madness/sheet_methods/record_methods.rb
+- lib/csv_madness/sheet_methods/sorting_methods.rb
+- lib/csv_madness/utils/const_proc.rb
+- lib/csv_madness/utils/counter.rb
+- lib/csv_madness/utils/counter_proc.rb
+- lib/csv_madness/utils/looker_upper.rb
+- test/csv/forbidden_column.csv
+- test/csv/nil_headers.csv
+- test/csv/out/.gitkeep
+- test/csv/pokemon.csv
+- test/csv/simple.csv
+- test/csv/splitter.csv
+- test/csv/test_column_types.csv
+- test/csv/with_nils.csv
+- test/helper.rb
+- test/test_builder.rb
+- test/test_csv_madness.rb
+- test/test_index_set.rb
+- test/test_indexer.rb
+- test/test_merging_columns.rb
+- test/test_reloading_spreadsheet.rb
+- test/test_sheet.rb
+- test/test_utils.rb
 homepage: http://github.com/darthschmoo/csv_madness
 licenses:
 - MIT
@@ -115,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.14
+rubygems_version: 3.6.9
 specification_version: 4
 summary: CSV Madness turns your CSV rows into happycrazy objects.
 test_files: []