remote_table 0.2.30 → 0.2.31

data/Rakefile

@@ -10,10 +10,13 @@ begin
     gem.email = "seamus@abshere.net"
     gem.homepage = "http://github.com/seamusabshere/remote_table"
     gem.authors = ["Seamus Abshere", "Andy Rossmeissl"]
-    gem.add_dependency 'roo', '1.3.11' # 1.9.3 breaks
-    gem.add_dependency 'fastercsv', '>=1.5.0'
+    # sabshere [unknown date] roo 1.9.3 doesn't work, so use old 1.3 version
+    gem.add_dependency 'roo', '1.3.11'
+    # sabshere 9/30/10 depending on fastercsv when using ruby 1.9.2 results in exiting with error
+    # gem.add_dependency 'fastercsv', '>=1.5.0'
     gem.add_dependency 'activesupport', '>=2.3.4'
-    gem.add_dependency 'slither', '>=0.99.3'
+    # sabshere 9/30/10 official slither gem doesn't yet support ruby 1.9.2
+    # gem.add_dependency 'slither', '>=0.99.3'
     gem.add_dependency 'nokogiri', '>=1.4.1'
     gem.add_dependency 'escape', '>=0.0.4'
     gem.add_development_dependency 'errata', '>=0.2.0'

data/VERSION

@@ -1 +1 @@
-0.2.30
+0.2.31

data/lib/remote_table.rb

@@ -1,6 +1,7 @@
 require 'digest/md5'
 require 'uri'
 require 'tmpdir'
+require 'kconv'
 require 'active_support'
 require 'active_support/version'
 %w{
@@ -13,9 +14,30 @@ require 'active_support/version'
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
-require 'fastercsv'
+
+if RUBY_VERSION >= '1.9'
+  require 'csv'
+  FasterCSV = CSV
+else
+  begin
+    require 'fastercsv'
+  rescue LoadError
+    $stderr.puts "[remote_table gem] You probably need to manually install the fastercsv gem."
+    raise $!
+  end
+end
+
+begin
+  if RUBY_VERSION >= '1.9'
+    gem "slither-ruby19"
+  end
+  require 'slither'
+rescue LoadError
+  $stderr.puts "[remote_table gem] You probably need to manually install the #{RUBY_VERSION >= '1.9' ? 'slither-ruby19' : 'slither'} gem."
+  raise $!
+end
+
 require 'escape'
-require 'slither'
 require 'roo'
 I_KNOW_I_AM_USING_AN_OLD_AND_BUGGY_VERSION_OF_LIBXML2 = true
 require 'nokogiri'

data/lib/remote_table/file.rb

@@ -38,7 +38,7 @@ class RemoteTable
     def define_fixed_width_schema!
       raise "can't define both schema_name and schema" if !schema_name.blank?
       self.schema_name = "autogenerated_#{filename.gsub(/[^a-z0-9_]/i, '')}".to_sym
-      self.trap ||= lambda { true }
+      self.trap ||= lambda { |_| true }
       Slither.define schema_name do |d|
         d.rows do |row|
           row.trap(&trap)

data/lib/remote_table/transform.rb

@@ -21,11 +21,22 @@ class RemoteTable
       self
     end
     
-    # - convert OrderedHash to a Hash (otherwise field ordering will be saved)
+    # - convert it to a plain hash for whatever ruby version you're on
     # - dump it
     # - digest it
     def self.row_hash(row)
-      Digest::MD5.hexdigest Marshal.dump(Hash.new.replace(row))
+      plain_hsh = if RUBY_VERSION >= '1.9'
+        row.keys.sort.inject(::Hash.new) do |memo, key|
+          value = row[key]
+          key = key.to_s.toutf8
+          value = value.to_s.toutf8 if value.respond_to? :to_s
+          memo[key] = value
+          memo
+        end
+      else
+        ::Hash.new.replace(row)
+      end
+      ::Digest::MD5.hexdigest ::Marshal.dump(plain_hsh)
     end
     
     def each_row(&block)

data/remote_table.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remote_table}
-  s.version = "0.2.30"
+  s.version = "0.2.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl"]
-  s.date = %q{2010-09-08}
+  s.date = %q{2010-09-30}
   s.description = %q{Remotely open and parse Excel XLS, ODS, CSV and fixed-width tables.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [
@@ -58,26 +58,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<roo>, ["= 1.3.11"])
-      s.add_runtime_dependency(%q<fastercsv>, [">= 1.5.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<slither>, [">= 0.99.3"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.1"])
       s.add_runtime_dependency(%q<escape>, [">= 0.0.4"])
       s.add_development_dependency(%q<errata>, [">= 0.2.0"])
     else
       s.add_dependency(%q<roo>, ["= 1.3.11"])
-      s.add_dependency(%q<fastercsv>, [">= 1.5.0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<slither>, [">= 0.99.3"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
       s.add_dependency(%q<escape>, [">= 0.0.4"])
       s.add_dependency(%q<errata>, [">= 0.2.0"])
     end
   else
     s.add_dependency(%q<roo>, ["= 1.3.11"])
-    s.add_dependency(%q<fastercsv>, [">= 1.5.0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<slither>, [">= 0.99.3"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
     s.add_dependency(%q<escape>, [">= 0.0.4"])
     s.add_dependency(%q<errata>, [">= 0.2.0"])

data/test/remote_table_test.rb

@@ -202,8 +202,8 @@ class RemoteTableTest < Test::Unit::TestCase
       y[:b] = 2
       y[:a] = 1
     
-      assert Marshal.dump(x) != Marshal.dump(y)
-      assert RemoteTable::Transform.row_hash(x) == RemoteTable::Transform.row_hash(y)
+      assert_not_equal Marshal.dump(x), Marshal.dump(y)
+      assert_equal RemoteTable::Transform.row_hash(x), RemoteTable::Transform.row_hash(y)
     end
   
     should "open a Google Docs url (as a CSV)" do

data/test/test_helper.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'ruby-debug'
+# require 'ruby-debug'
 require 'errata'
 require 'active_support/all'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'remote_table'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'remote_table'))
 
 class Test::Unit::TestCase
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote_table
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 2
-  - 30
-  version: 0.2.30
+  - 31
+  version: 0.2.31
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -05:00
+date: 2010-09-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,26 +35,10 @@ dependencies:
         version: 1.3.11
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,27 +50,11 @@ dependencies:
         - 4
         version: 2.3.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: slither
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 405
-        segments: 
-        - 0
-        - 99
-        - 3
-        version: 0.99.3
-  type: :runtime
-  version_requirements: *id004
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,11 +66,11 @@ dependencies:
         - 1
         version: 1.4.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: escape
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,11 +82,11 @@ dependencies:
         - 4
         version: 0.0.4
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: errata
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,7 +98,7 @@ dependencies:
         - 0
         version: 0.2.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 description: Remotely open and parse Excel XLS, ODS, CSV and fixed-width tables.
 email: seamus@abshere.net
 executables: []