easyio 0.2.0 → 0.3.0

data/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gem "jeweler"

data/LICENSE

@@ -1,5 +1,3 @@
-Copyright (c) 2009 Steve
-
 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

data/README.rdoc

@@ -1,6 +1,8 @@
 = easyio
 
-Description goes here.
+A simple library for making working with CSV files slightly easier by wrapping up default options and providing a few simple helper methods.
+
+Note: Version 0.3 and above require Ruby 1.9+, for 1.8 compatibility use Version 0.2
 
 == Note on Patches/Pull Requests
  
@@ -12,7 +14,3 @@ Description goes here.
   (if you want to have your own version, that is fine but
    bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2009 Steve. See LICENSE for details.

data/Rakefile

@@ -10,9 +10,7 @@ begin
     gem.email = "steve.eichert@gmail.com"
     gem.homepage = "http://github.com/eichert12/easyio"
     gem.authors = ["Steve Eichert"]
-    gem.add_runtime_dependency "fastercsv", ">= 1.5.0"
     gem.add_runtime_dependency "aws-s3", ">= 0.6.2"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -39,11 +37,9 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/easyio.gemspec

@@ -1,56 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{easyio}
-  s.version = "0.2.0"
+  s.name = "easyio"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Eichert"]
-  s.date = %q{2010-10-26}
-  s.description = %q{A gem for making IO tasks easy (at least for me)}
-  s.email = %q{steve.eichert@gmail.com}
+  s.date = "2012-01-04"
+  s.description = "A gem for making IO tasks easy (at least for me)"
+  s.email = "steve.eichert@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "easyio.gemspec",
-     "lib/easyio.rb",
-     "test/helper.rb",
-     "test/test_easyio.rb"
-  ]
-  s.homepage = %q{http://github.com/eichert12/easyio}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A gem for making IO tasks easy (at least for me)}
-  s.test_files = [
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "easyio.gemspec",
+    "lib/easyio.rb",
     "test/helper.rb",
-     "test/test_easyio.rb"
+    "test/test_easyio.rb"
   ]
+  s.homepage = "http://github.com/eichert12/easyio"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.13"
+  s.summary = "A gem for making IO tasks easy (at least for me)"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fastercsv>, [">= 1.5.0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<aws-s3>, [">= 0.6.2"])
     else
-      s.add_dependency(%q<fastercsv>, [">= 1.5.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
     end
   else
-    s.add_dependency(%q<fastercsv>, [">= 1.5.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
   end
 end

data/lib/easyio.rb

@@ -1,8 +1,8 @@
-require 'fastercsv'
+require 'csv'
 
 class EasyIO
   DefaultOptions = { :col_sep => ",", :headers => true, :header_converters => :symbol }
-  DefaultSource = defined?(RAILS_ENV) && RAILS_ENV == "production" ? :s3 : :file_system
+  DefaultSource = defined?(Rails.env) && Rails.env == "production" ? :s3 : :file_system
   
   def self.default_s3_bucket(bucket)
     @default_bucket = bucket
@@ -13,11 +13,11 @@ class EasyIO
   end
 
   def self.write_csv(file)
-    FasterCSV.open(file, "w") { |csv| yield csv }
+    CSV.open(file, "w") { |csv| yield csv }
   end
 
   def self.open_csv(file, options = {})
-    FasterCSV.open(file, default_options(options)) { |csv| yield csv }
+    CSV.open(file, default_options(options)) { |csv| yield csv }
   end
   
   def self.file_source(options = {})
@@ -31,7 +31,7 @@ class EasyIO
       url = AWS::S3::S3Object.url_for(file, get_s3_bucket(options))
       open(url) do |f|
         f.each_line do |line|
-          FasterCSV.parse(line, default_options(options)) do |row|
+          CSV.parse(line, default_options(options)) do |row|
             yield row
           end
         end
@@ -46,7 +46,7 @@ class EasyIO
   end
 
   def self.parse(string, options = {})
-    FasterCSV.parse(string, default_options(options)) do |row|
+    CSV.parse(string, default_options(options)) do |row|
       yield row
     end
   end

data/test/helper.rb

@@ -1,10 +1,32 @@
 require 'rubygems'
-require 'test/unit'
-require 'shoulda'
+require 'bundler'
+Bundler.setup(:default, :test)
+Bundler.require(:default, :test)
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'easyio'
+dir = File.dirname(File.expand_path(__FILE__))
+$LOAD_PATH.unshift dir + '/../lib'
+$TESTING = true
+require 'test/unit'
 
-class Test::Unit::TestCase
-end
+##
+# test/spec/mini 3
+# http://gist.github.com/25455
+# chris@ozmm.org
+#
+def context(*args, &block)
+  return super unless (name = args.first) && block
+  require 'test/unit'
+  klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do
+    def self.test(name, &block)
+      define_method("test_#{name.gsub(/\W/,'_')}", &block) if block
+    end
+    def self.xtest(*args) end
+    def self.setup(&block) define_method(:setup, &block) end
+    def self.teardown(&block) define_method(:teardown, &block) end
+  end
+  (class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
+  klass.class_eval &block
+  
+  # XXX: In 1.8.x, not all tests will run unless anonymous classes are kept in scope.
+  ($test_classes ||= []) << klass
+end

data/test/test_easyio.rb

@@ -1,40 +1,39 @@
 require 'helper'
+require 'easyio'
 
-class TestEasyio < Test::Unit::TestCase
-  context "file_source" do
-    should "use file system when running in development" do
-      assert_equal EasyIO.file_source, :file_system
-    end
+context "file_source" do
+  test "use file system when running in development" do
+    assert_equal EasyIO.file_source, :file_system
+  end
 
-    should "use provided source when specified in options" do
-      assert_equal EasyIO.file_source(:source => :foo), :foo
-    end
+  test "use provided source when specified in options" do
+    assert_equal EasyIO.file_source(:source => :foo), :foo
   end
-  
-  context "get_s3_bucket" do
-    should "get bucket from options when available" do
-      assert_equal EasyIO.get_s3_bucket(:bucket => "my-awesome-bucket"), "my-awesome-bucket"
-    end
+end
 
-    should "use bucket from options before default bucket" do
-      EasyIO.default_s3_bucket "foobar"
-      assert_equal EasyIO.get_s3_bucket(:bucket => "my-awesome-bucket"), "my-awesome-bucket"
-    end
+context "get_s3_bucket" do
+  test "get bucket from options when available" do
+    assert_equal EasyIO.get_s3_bucket(:bucket => "my-awesome-bucket"), "my-awesome-bucket"
+  end
 
-    should "get use default_s3_bucket when set" do
-      EasyIO.default_s3_bucket "foobar"
-      assert_equal EasyIO.get_s3_bucket, "foobar"
-    end
+  test "use bucket from options before default bucket" do
+    EasyIO.default_s3_bucket "foobar"
+    assert_equal EasyIO.get_s3_bucket(:bucket => "my-awesome-bucket"), "my-awesome-bucket"
   end
 
-  context "parse" do
-    should "yield each row" do
-      csv = "first,second,third\n1,2,3"
-      EasyIO.parse(csv) do |row|
-        assert_equal row[:first], "1"
-        assert_equal row[:second], "2"
-        assert_equal row[:third], "3"
-      end
+  test "get use default_s3_bucket when set" do
+    EasyIO.default_s3_bucket "foobar"
+    assert_equal EasyIO.get_s3_bucket, "foobar"
+  end
+end
+
+context "parse" do
+  test "yield each row" do
+    csv = "first,second,third\n1,2,3"
+    EasyIO.parse(csv) do |row|
+      assert_equal row[:first], "1"
+      assert_equal row[:second], "2"
+      assert_equal row[:third], "3"
     end
   end
 end

metadata

@@ -1,67 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: easyio
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Steve Eichert
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-26 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-01-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2164537200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164537200
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: &2164534060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 6
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.2
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2164534060
 description: A gem for making IO tasks easy (at least for me)
 email: steve.eichert@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -70,40 +51,31 @@ files:
 - lib/easyio.rb
 - test/helper.rb
 - test/test_easyio.rb
-has_rdoc: true
 homepage: http://github.com/eichert12/easyio
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 727100122824216758
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: A gem for making IO tasks easy (at least for me)
-test_files: 
-- test/helper.rb
-- test/test_easyio.rb
+test_files: []

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## RubyMine
-.idea/*
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC