tabular 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/tabular.rb

@@ -2,13 +2,12 @@ require "rubygems"
 
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
 
+require "tabular/blank"
 require "tabular/keys"
+require "tabular/zero"
 
 require "tabular/column"
 require "tabular/columns"
 require "tabular/renderer"
 require "tabular/row"
 require "tabular/table"
-
-require "tabular/support/object"
-require "tabular/support/zero"

data/lib/tabular/blank.rb

@@ -0,0 +1,21 @@
+module Tabular
+  # Don't mess with Object
+  module Blank
+    def is_blank?(object)
+      case object
+      when NilClass
+        true
+      when FalseClass
+        true
+      when TrueClass
+        true
+      when String
+        object !~ /\S/
+      when Numeric
+        false
+      else
+        object.respond_to?(:empty?) ? object.empty? : !object
+      end
+    end
+  end
+end

data/lib/tabular/column.rb

@@ -1,5 +1,7 @@
 module Tabular
   class Column
+    include Tabular::Blank
+
     attr_reader :key, :column_type
 
     # +table+ -- parent Table
@@ -69,7 +71,7 @@ module Tabular
     private
 
     def symbolize(key)
-      return nil if key.blank?
+      return nil if is_blank?(key)
 
       begin
         key.to_s.strip.gsub(/::/, '/').

data/lib/tabular/columns.rb

@@ -2,6 +2,7 @@ module Tabular
   # The Table's header: a list of Columns.
   class Columns
     include Enumerable
+    include Tabular::Blank
     include Tabular::Keys
 
     attr_accessor :renderer
@@ -19,7 +20,7 @@ module Tabular
       @columns = nil
       @columns = names.map do |column|
         new_column = Tabular::Column.new(table, self, column, @columns_map)
-        unless new_column.key.blank?
+        unless is_blank?(new_column.key)
           @column_indexes[new_column.key] = index
           @columns_by_key[new_column.key] = new_column
         end
@@ -52,7 +53,7 @@ module Tabular
     # Add a new Column with +key+
     def <<(key)
       column = Column.new(@table, self, key, @columns_map)
-      unless column.key.blank? || has_key?(key)
+      unless is_blank?(column.key) || has_key?(key)
         @column_indexes[column.key] = @columns.size
         @column_indexes[@columns.size] = column
         @columns_by_key[column.key] = column

data/lib/tabular/table.rb

@@ -2,7 +2,9 @@ module Tabular
   # Simple Enumerable list of Hashes. Use Table.read(file_path) to read file. Can also create a Table with Table.new. Either
   # pass in data or set options and then call row=.
   class Table
+    include Tabular::Blank
     include Tabular::Keys
+    include Tabular::Zero
 
     attr_reader :options, :rows
     attr_accessor :row_mapper
@@ -126,7 +128,7 @@ module Tabular
     # Remove all columns that only contain a blank string, zero, or nil
     def delete_blank_columns!
       columns.map(&:key).each do |key|
-        if rows.all? { |row| row[key].blank? || row[key].zero? }
+        if rows.all? { |row| is_blank?(row[key]) || is_zero?(row[key]) }
           delete_column key
         end
       end
@@ -190,7 +192,7 @@ module Tabular
     end
 
     def self.format_from(as_option, file_path)
-      if as_option.present?
+      if as_option
         as_option
       else
         case File.extname(file_path)

data/lib/tabular/zero.rb

@@ -0,0 +1,18 @@
+module Tabular
+  module Zero
+    def is_zero?(object)
+      if object.respond_to?(:zero?)
+        return object.zero?
+      end
+  
+      case object
+      when NilClass, FalseClass, TrueClass
+        false
+      when String
+        object == "0" || object[/^0+\.0+$/]
+      else
+        false
+      end
+    end
+  end
+end

data/tabular.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tabular"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Willson"]
-  s.date = "2013-05-05"
+  s.date = "2013-05-20"
   s.description = "Tabular is a Ruby library for reading, writing, and manipulating CSV, tab-delimited and Excel data."
   s.email = "scott.willson@gmail.cpm"
   s.extra_rdoc_files = [
@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/tabular.rb",
+    "lib/tabular/blank.rb",
     "lib/tabular/column.rb",
     "lib/tabular/columns.rb",
     "lib/tabular/keys.rb",
     "lib/tabular/renderer.rb",
     "lib/tabular/row.rb",
-    "lib/tabular/support/object.rb",
-    "lib/tabular/support/zero.rb",
     "lib/tabular/table.rb",
+    "lib/tabular/zero.rb",
     "tabular.gemspec",
     "test/column_test.rb",
     "test/columns_test.rb",

data/test/zero_test.rb

@@ -1,21 +1,23 @@
 require "helper"
 
 class ZeroTest < Test::Unit::TestCase
+  include Tabular::Zero
+
   def test_zero
-    assert 0.zero?
-    assert (0.0).zero?
-    assert "0".zero?
-    assert "0.0".zero?
-    assert "00000.00000".zero?
+    assert is_zero?(0)
+    assert is_zero?(0.0)
+    assert is_zero?("0")
+    assert is_zero?("0.0")
+    assert is_zero?("00000.00000")
 
-    assert !(1.zero?)
-    assert !(-1.zero?)
-    assert !((0.1).zero?)
-    assert !("1".zero?)
-    assert !("ABC".zero?)
-    assert !(nil.zero?)
-    assert !("".zero?)
-    assert !(false.zero?)
-    assert !(true.zero?)
+    assert !is_zero?(1)
+    assert !is_zero?(-1)
+    assert !is_zero?(0.1)
+    assert !is_zero?("1")
+    assert !is_zero?("ABC")
+    assert !is_zero?(nil)
+    assert !is_zero?("")
+    assert !is_zero?(false)
+    assert !is_zero?(true)
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: tabular
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Scott Willson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
@@ -75,14 +75,14 @@ files:
 - Rakefile
 - VERSION
 - lib/tabular.rb
+- lib/tabular/blank.rb
 - lib/tabular/column.rb
 - lib/tabular/columns.rb
 - lib/tabular/keys.rb
 - lib/tabular/renderer.rb
 - lib/tabular/row.rb
-- lib/tabular/support/object.rb
-- lib/tabular/support/zero.rb
 - lib/tabular/table.rb
+- lib/tabular/zero.rb
 - tabular.gemspec
 - test/column_test.rb
 - test/columns_test.rb
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -2217103212522653909
+      hash: 1566100413199475638
       segments:
       - 0
       version: '0'

data/lib/tabular/support/object.rb

@@ -1,59 +0,0 @@
-# Copied from Rails' ActiveSupport
-class Object
-  # An object is blank if it's false, empty, or a whitespace string.
-  # For example, "", "   ", +nil+, [], and {} are blank.
-  #
-  # This simplifies
-  #
-  #   if !address.nil? && !address.empty?
-  #
-  # to
-  #
-  #   if !address.blank?
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-    
-  # An object is present if it's not blank.
-  def present?
-    !blank?
-  end
-end
-
-class NilClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class FalseClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class TrueClass #:nodoc:
-  def blank?
-    false
-  end
-end
-
-class Array #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class Hash #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class String #:nodoc:
-  def blank?
-    self !~ /\S/
-  end
-end
-
-class Numeric #:nodoc:
-  def blank?
-    false
-  end
-end

data/lib/tabular/support/zero.rb

@@ -1,29 +0,0 @@
-class Object
-  def zero?
-    false
-  end
-end
-
-class NilClass #:nodoc:
-  def zero?
-    false
-  end
-end
-
-class FalseClass #:nodoc:
-  def zero?
-    false
-  end
-end
-
-class TrueClass #:nodoc:
-  def zero?
-    false
-  end
-end
-
-class String #:nodoc:
-  def zero?
-    self == "0" || self[/^0+\.0+$/]
-  end
-end