loady 0.6.0 → 0.7.0

data/README.rdoc

@@ -20,7 +20,7 @@ By default, messages are logged to the standard output.
 
 Basic usage:
 
-  Loady.csv "/your/file.csv" do |row|
+  Loady.read "/your/file.csv" do |row|
     # your code to process each row goes here
     puts "#{row[0]}, #{row[1]}, etc."
   end
@@ -29,19 +29,19 @@ Skip the first row and log to a file:
 
   logger = Logger.new "/your/file.log"
 
-  Loady.csv "/your/file.csv", logger: logger, skip_first_row: true do |row|
+  Loady.read "/your/file.csv", logger: logger, skip_first_row: true do |row|
     # do some stuff for each row
   end
 
 Name your attributes:
 
-  Loady.csv "/your/file.csv"  do |row|
+  Loady.read "/your/file.csv"  do |row|
     Monkey.create row.to_attributes [:name, :year, :mom]
   end
 
 Load a tab-delimited file:
 
-  Loady.csv "/your/file.tab", col_sep: "\t"  do |row|
+  Loady.read "/your/file.tab", col_sep: "\t"  do |row|
     # go bananas 
   end
 

data/Rakefile

@@ -1,14 +1,10 @@
-require 'rubygems'
-require 'rake'
-
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 task default: [:test]
 
 Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
   t.test_files = %w(test/**/*.rb)
   t.verbose = false
 end

data/lib/loady.rb

@@ -3,8 +3,13 @@ require 'loady/csv_loader'
 require 'loady/memory_logger'
 
 module Loady
+  def read(*args, &block)
+    Loady::CsvLoader.new.read(*args, &block)
+  end
+  module_function :read
+
   def csv(*args, &block)
-    Loady::CsvLoader.read(*args, &block)
+    Loady::CsvLoader.new.read(*args, &block)
   end
   module_function :csv
 end

data/lib/loady/attribute_array.rb

@@ -12,21 +12,21 @@ module Loady
     def to_attributes(names, options={})
       options = { strip: true }.merge(options)
 
-      h = {}
+      attr_hash = {}
 
       names.each_with_index do |name, i|
         if i < self.size
           if options[:strip] && self[i]
-            h[name] = self[i].strip
+            attr_hash[name] = self[i].strip
           else
-            h[name] = self[i]
+            attr_hash[name] = self[i]
           end
         else
-          h[name] = nil
+          attr_hash[name] = nil
         end
       end
 
-      h
+      attr_hash
     end
 
   end

data/lib/loady/csv_loader.rb

@@ -3,57 +3,63 @@ require 'logger'
 
 module Loady
   class CsvLoader
+    def initialize
+      @success = 0
+      @warning = 0
+      @line_number = 0
+    end
 
     class << self
-      # valid options:
-      #   skip_first_row: true                       -- default = false
-      #   logger: Logger.new('/somewhere/file.log')  -- default = Logger.new(STDOUT)
-      #   plus any valid options you can pass to CSV.new:
-      #     see http://www.ruby-doc.org/stdlib/libdoc/csv/rdoc/classes/CSV.html#M000190
-      def read(filename, options={})
-        success = 0
-        warning = 0
-
-        logger = options.delete(:logger) || default_logger
-
-        f = File.new(filename)
-        f.readline if options.delete(:skip_first_row)
-
-        line_number = 0
-
-        begin
-          while (line = f.readline)
-            begin
-              line_number += 1
-
-              row = Loady::AttributeArray.new CSV.parse(line, options)[0]
-
-              unless row.empty?
-                yield row
-                success += 1
-              end
-            rescue Exception => message
-              warning += 1
-              logger.warn "#{message.to_s.gsub("line 1", "line #{line_number}")}\n#{line}"
-            end
-          end
-        rescue EOFError
-          f.close
-        rescue Exception => message
-          warning += 1
-          line_number += 1
-          logger.error "#{message.to_s} - at line #{line_number}\n#{line}"
-        end
+      def read(*args, &block)
+        self.new.read(*args, &block)
+      end
+    end
+
+    # valid options:
+    #   skip_first_row: true                       -- default = false
+    #   logger: Logger.new('/somewhere/file.log')  -- default = Logger.new(STDOUT)
+    #   plus any valid options you can pass to CSV.new:
+    #     see http://www.ruby-doc.org/stdlib/libdoc/csv/rdoc/classes/CSV.html#M000190
+    def read(filename, options={}, &block)
+      @logger = options.delete(:logger) || default_logger
+
+      f = File.new(filename)
+      f.readline if options.delete(:skip_first_row)
 
-        logger.info "Finished. Loaded #{success} rows. #{warning} unprocessed rows."
+      begin
+        while (line = f.readline)
+          readline(line, options, &block)
+        end
+      rescue EOFError
+        f.close
+      rescue Exception => message
+        @warning += 1
+        @line_number += 1
+        @logger.error "#{message} - at line #@line_number\n#{line}"
       end
 
-      def default_logger
-        logger = Logger.new(STDOUT)
-        logger.datetime_format = "%H:%M:%S"
-        logger
+      @logger.info "Finished. Loaded #@success rows. #@warning unprocessed rows."
+    end
+
+  private
+
+    def readline(line, options)
+      @line_number += 1
+      row = AttributeArray.new(CSV.parse(line, options)[0])
+
+      unless row.empty?
+        yield row
+        @success += 1
       end
+    rescue Exception => message
+      @warning += 1
+      @logger.warn "#{message.to_s.gsub("line 1", "line #@line_number")}\n#{line}"
+    end
 
+    def default_logger
+      logger = Logger.new(STDOUT)
+      logger.datetime_format = "%H:%M:%S"
+      logger
     end
   end
 end

data/lib/loady/version.rb

@@ -1,3 +1,3 @@
 module Loady
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/loady.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "shoulda"
+  s.add_development_dependency "mocha"
   s.add_development_dependency "rake"
+  s.add_development_dependency "shoulda"
+  s.add_development_dependency "test-unit"
 end

data/test/test_attribute_array.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'test_helper'
 
 class AttributeArrayTest < Test::Unit::TestCase
   should "respond to to_attributes" do

data/test/test_csv_loader.rb

@@ -1,11 +1,25 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'test_helper'
 
 class CsvLoaderTest < Test::Unit::TestCase
+  should "delegate Loady.csv to instance #read" do
+    Loady::CsvLoader.any_instance.expects :read
+    Loady.csv("file")
+  end
+
+  should "delegate Loady.read to instance #read" do
+    Loady::CsvLoader.any_instance.expects :read
+    Loady.read("file")
+  end
+
+  should "delegate #read to instance #read" do
+    Loady::CsvLoader.any_instance.expects :read
+    Loady::CsvLoader.read("file")
+  end
 
   should "read file1" do
     monkeys = []
 
-    Loady::CsvLoader.read "test/csv/file1.csv", skip_first_row: true do |row|
+    Loady.read "test/csv/file1.csv", skip_first_row: true do |row|
       monkeys << { name: row[0], year: row[1] }
     end
 
@@ -20,7 +34,7 @@ class CsvLoaderTest < Test::Unit::TestCase
     logger = Logger.new("/dev/null")
     monkeys = []
 
-    Loady.csv "test/csv/file2.csv", logger: logger do |row|
+    Loady.read "test/csv/file2.csv", logger: logger do |row|
       monkeys << row.to_attributes([:name, :year])
     end
 
@@ -34,7 +48,7 @@ class CsvLoaderTest < Test::Unit::TestCase
   should "read file3, a tab-delimited file" do
     monkeys = []
 
-    Loady.csv "test/csv/file3.dat", skip_first_row: true, col_sep: "\t" do |row|
+    Loady.read "test/csv/file3.dat", skip_first_row: true, col_sep: "\t" do |row|
       monkeys << { name: row[0], year: row[1] }
     end
 

data/test/test_memory_logger.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'test_helper'
 
 class MemoryLoggerTest < Test::Unit::TestCase
   context "memory logger" do
@@ -12,17 +12,17 @@ class MemoryLoggerTest < Test::Unit::TestCase
 
     should "log warning" do
       @logger.warn "message"
-      assert_equal "message", @logger.messages.first.to_s
+      assert_equal "message", @logger.messages.first
     end
 
     should "log info" do
       @logger.info "message"
-      assert_equal "message", @logger.messages.first.to_s
+      assert_equal "message", @logger.messages.first
     end
 
     should "log error" do
       @logger.error "message"
-      assert_equal "message", @logger.messages.first.to_s
+      assert_equal "message", @logger.messages.first
     end
   end
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: loady
 version: !ruby/object:Gem::Version
-  version: 0.6.0
   prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -20,13 +20,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -36,15 +52,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -52,13 +68,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
 description: CSV file loader with simple logging
 email:
 - tee@neighborland.com
@@ -95,12 +111,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 1518214605886805454
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 1518214605886805454
       version: '0'
 requirements: []
 rubyforge_project: loady