remote_table 0.2.23 → 0.2.24

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_dependency 'activesupport', '>=2.3.4'
     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'
     gem.require_path = "lib"
     gem.rdoc_options << '--line-numbers' << '--inline-source'

data/VERSION

@@ -1 +1 @@
-0.2.23
+0.2.24

data/lib/remote_table.rb

@@ -12,6 +12,7 @@ require 'active_support/version'
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
 require 'fastercsv'
+require 'escape'
 require 'slither'
 require 'roo'
 I_KNOW_I_AM_USING_AN_OLD_AND_BUGGY_VERSION_OF_LIBXML2 = true
@@ -58,11 +59,17 @@ class RemoteTable
 
   protected
   
+  def self.bang(path, cmd)
+    tmp_path = "#{path}.tmp"
+    RemoteTable.backtick_with_reporting "cat #{Escape.shell_single_word path} | #{cmd} > #{Escape.shell_single_word tmp_path}"
+    FileUtils.mv tmp_path, path
+  end
+  
   # TODO this should probably live somewhere else
-  def self.backtick_with_reporting(cmd, raise_on_error = true)
-    cmd = cmd.gsub /\s+/m, ' '
+  def self.backtick_with_reporting(cmd)
+    cmd = cmd.gsub /[ ]*\n[ ]*/m, ' '
     output = `#{cmd}`
-    if raise_on_error and not $?.success?
+    if not $?.success?
       raise %{
 From the remote_table gem...
 

data/lib/remote_table/file.rb

@@ -59,8 +59,7 @@ class RemoteTable
     
     def skip_rows!
       return unless skip
-      RemoteTable.backtick_with_reporting "cat #{path} | tail -n +#{skip + 1} > #{path}.tmp"
-      FileUtils.mv "#{path}.tmp", path
+      RemoteTable.bang path, "tail -n +#{skip + 1}"
     end
     
     USELESS_CHARACTERS = [
@@ -68,13 +67,11 @@ class RemoteTable
       '\xc2\xad'        # soft hyphen, often inserted by MS Office (html: ­)
     ]
     def remove_useless_characters!
-      RemoteTable.backtick_with_reporting "perl -pe 's/#{USELESS_CHARACTERS.join '//g; s/'}//g' #{path} > #{path}.tmp"
-      FileUtils.mv "#{path}.tmp", path
+      RemoteTable.bang path, "perl -pe 's/#{USELESS_CHARACTERS.join '//g; s/'}//g'"
     end
     
     def convert_file_to_utf8!
-      RemoteTable.backtick_with_reporting "iconv -c -f #{encoding} -t UTF-8 #{path} > #{path}.tmp"
-      FileUtils.mv "#{path}.tmp", path
+      RemoteTable.bang path, "iconv -c -f #{Escape.shell_single_word encoding} -t UTF-8"
     end
     
     def restore_file!
@@ -83,14 +80,12 @@ class RemoteTable
     
     def cut_columns!
       return unless cut
-      RemoteTable.backtick_with_reporting "cat #{path} | cut -c #{cut} > #{path}.tmp"
-      FileUtils.mv "#{path}.tmp", path
+      RemoteTable.bang path, "cut -c #{Escape.shell_single_word cut}"
     end
     
     def crop_rows!
       return unless crop
-      RemoteTable.backtick_with_reporting "cat #{path} | tail -n +#{crop.first} | head -n #{crop.last - crop.first + 1} > #{path}.tmp"
-      FileUtils.mv "#{path}.tmp", path
+      RemoteTable.bang path "tail -n +#{Escape.shell_single_word crop.first} | head -n #{crop.last - crop.first + 1}"
     end
     
     def format_from_filename

data/lib/remote_table/package.rb

@@ -28,7 +28,7 @@ class RemoteTable
       return unless compression
       cmd, args = case compression
       when :zip, :exe
-        ["unzip", "-d #{::File.dirname(path)}"]
+        ["unzip", "-d #{Escape.shell_single_word ::File.dirname(path)}"]
       when :bz2
         'bunzip2'
       when :gz
@@ -47,8 +47,9 @@ class RemoteTable
     end
     
     def move_and_process(path, extname, cmd, args)
-      FileUtils.mv path, "#{path}.#{extname}"
-      RemoteTable.backtick_with_reporting "#{cmd} #{path}.#{extname} #{args}"
+      new_path = "#{path}.#{extname}"
+      FileUtils.mv path, new_path
+      RemoteTable.backtick_with_reporting "#{cmd} #{Escape.shell_single_word new_path} #{args}"
     end
 
     # ex. A: 2007-01.csv.gz  (compression not capable of storing multiple files)

data/lib/remote_table/request.rb

@@ -16,17 +16,17 @@ class RemoteTable
     end
     
     def download
-      path = ::File.join staging_dir_path, 'REMOTE_TABLE_PACKAGE'
       if parsed_url.scheme == 'file'
         parsed_url.path
       else
+        path = ::File.join staging_dir_path, 'REMOTE_TABLE_PACKAGE'
         RemoteTable.backtick_with_reporting %{
           curl
           --header "Expect: "
           --location
-          #{"--data \"#{form_data}\"" if form_data.present?}
-          "#{parsed_url}"
-          --output "#{path}"
+          #{"--data #{Escape.shell_single_word form_data}" if form_data.present?}
+          #{Escape.shell_single_word parsed_url.to_s}
+          --output #{Escape.shell_single_word path}
           2>&1
         }
         path

data/remote_table.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remote_table}
-  s.version = "0.2.23"
+  s.version = "0.2.24"
 
   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-05-21}
+  s.date = %q{2010-05-24}
   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 = [
@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
       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"])
@@ -68,6 +69,7 @@ Gem::Specification.new do |s|
       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
@@ -76,6 +78,7 @@ Gem::Specification.new do |s|
     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
 end

data/test/remote_table_test.rb

@@ -131,6 +131,16 @@ class RemoteTableTest < Test::Unit::TestCase
   end
   
   if ENV['ALL'] == 'true' or ENV['FAST'] == 'true'
+    should "work on filenames with spaces, using globbing" do
+      t = RemoteTable.new :url => 'http://www.fueleconomy.gov/FEG/epadata/08data.zip', :glob => '/*.csv'
+      assert_equal 'ASTON MARTIN', t.rows.first['MFR']
+    end
+    
+    should "work on filenames with spaces" do
+      t = RemoteTable.new :url => 'http://www.fueleconomy.gov/FEG/epadata/08data.zip', :filename => '2008_FE_guide_ALL_rel_dates_-no sales-for DOE-5-1-08.csv'
+      assert_equal 'ASTON MARTIN', t.rows.first['MFR']
+    end
+    
     should "ignore UTF-8 byte order marks" do
       t = RemoteTable.new :url => 'http://www.freebase.com/type/exporttypeinstances/base/horses/horse_breed?page=0&filter_mode=type&filter_view=table&show%01p%3D%2Ftype%2Fobject%2Fname%01index=0&show%01p%3D%2Fcommon%2Ftopic%2Fimage%01index=1&show%01p%3D%2Fcommon%2Ftopic%2Farticle%01index=2&sort%01p%3D%2Ftype%2Fobject%2Ftype%01p%3Dlink%01p%3D%2Ftype%2Flink%2Ftimestamp%01index=false&=&exporttype=csv-8'
       assert_equal 'Tawleed', t.rows.first['name']

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 23
-  version: 0.2.23
+  - 24
+  version: 0.2.24
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -04:00
+date: 2010-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,9 +89,23 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: errata
+  name: escape
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: errata
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -101,7 +115,7 @@ dependencies:
         - 0
         version: 0.2.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Remotely open and parse Excel XLS, ODS, CSV and fixed-width tables.
 email: seamus@abshere.net
 executables: []