remote_table 1.1.4 → 1.1.6

data/lib/remote_table.rb

@@ -54,6 +54,13 @@ class RemoteTable
   end
   
   def each(&blk)
+    to_a.each { |row| yield row }
+  end
+  alias :each_row :each
+  
+  def to_a
+    return @to_a if @to_a.is_a? ::Array
+    @to_a = []
     format.each do |row|
       row['row_hash'] = ::RemoteTable.hasher.hash row
       # allow the transformer to return multiple "virtual rows" for every real row
@@ -64,26 +71,26 @@ class RemoteTable
         end
         next if properties.select and !properties.select.call(virtual_row)
         next if properties.reject and properties.reject.call(virtual_row)
-        yield virtual_row
+        @to_a.push virtual_row
       end
     end
+    @to_a
   end
-  alias :each_row :each
+  alias :rows :to_a
   
   # Get a row by row number
   def [](row_number)
     to_a[row_number]
   end
   
-  # Get the whole row array back
-  def to_a
-    return @to_a if @to_a.is_a? ::Array
-    @to_a = []
-    each { |row| @to_a.push row }
-    @to_a.freeze
+  # clear the row cache to save memory
+  def free
+    @to_a.clear if @to_a.is_a?(::Array)
+    @to_a = nil
+    ::GC.start
+    nil
   end
-  alias :rows :to_a
-    
+  
   # Used internally to execute stuff in shells.
   def self.executor
     Executor.instance

data/lib/remote_table/format.rb

@@ -20,9 +20,5 @@ class RemoteTable
     def each
       raise "must be defined by format"
     end
-        
-    def delete_file!
-      ::FileUtils.rm_rf t.properties.staging_dir_path
-    end
   end
 end

data/lib/remote_table/format/delimited.rb

@@ -41,7 +41,7 @@ class RemoteTable
           yield ordered_hash if t.properties.keep_blank_rows or filled_values > 0
         end
       ensure
-        delete_file!
+        t.local_file.delete
       end
 
       private

data/lib/remote_table/format/fixed_width.rb

@@ -14,7 +14,7 @@ class RemoteTable
           yield hash if t.properties.keep_blank_rows or hash.any? { |k, v| v.present? }
         end
       ensure
-        delete_file!
+        t.local_file.delete
       end
       private
       def parser

data/lib/remote_table/format/html.rb

@@ -18,7 +18,7 @@ class RemoteTable
           yield hash if t.properties.keep_blank_rows or hash.any? { |k, v| v.present? }
         end
       ensure
-        delete_file!
+        t.local_file.delete
       end
 
       private

data/lib/remote_table/format/mixins/rooable.rb

@@ -31,6 +31,8 @@ class RemoteTable
           end
           yield ordered_hash if t.properties.keep_blank_rows or ordered_hash.any? { |k, v| v.present? }
         end
+      ensure
+        t.local_file.delete
       end
 
       private

data/lib/remote_table/local_file.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'escape'
 require 'tmpdir'
 class RemoteTable
-  class LocalFile
+  class LocalFile #:nodoc:all
     
     attr_reader :t
     
@@ -15,11 +15,25 @@ class RemoteTable
       @path
     end
     
+    def delete
+      ::FileUtils.rm_rf staging_dir_path
+      @path = nil
+      @staging_dir_path = nil
+    end
+    
     private
     
+    def staging_dir_path #:nodoc:
+      return @staging_dir_path if @staging_dir_path.is_a?(::String)
+      srand # in case this was forked by resque
+      @staging_dir_path = ::File.join ::Dir.tmpdir, 'remote_table_gem', rand.to_s
+      ::FileUtils.mkdir_p @staging_dir_path
+      @staging_dir_path
+    end
+    
     def save_locally
       return if @path.is_a?(::String)
-      @path = ::File.join(t.properties.staging_dir_path, ::File.basename(t.properties.uri.path))
+      @path = ::File.join(staging_dir_path, ::File.basename(t.properties.uri.path))
       download
       decompress
       unpack

data/lib/remote_table/properties.rb

@@ -209,13 +209,5 @@ class RemoteTable
         Format::Delimited
       end
     end
-    
-    def staging_dir_path #:nodoc:
-      return @staging_dir_path if @staging_dir_path.is_a?(::String)
-      srand # in case this was forked by resque
-      @staging_dir_path = ::File.join ::Dir.tmpdir, 'remote_table_gem', rand.to_s
-      ::FileUtils.mkdir_p @staging_dir_path
-      @staging_dir_path
-    end
   end
 end

data/lib/remote_table/version.rb

@@ -1,3 +1,3 @@
 class RemoteTable
-  VERSION = "1.1.4"
+  VERSION = "1.1.6"
 end

data/test/test_remote_table.rb

@@ -43,4 +43,20 @@ class TestRemoteTable < Test::Unit::TestCase
                          :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] }
     assert_equal '9.09%', t[0]['LDGV']
   end
+  
+  should 'not blow up if each is called twice' do
+    t = RemoteTable.new 'http://spreadsheets.google.com/pub?key=tObVAGyqOkCBtGid0tJUZrw'
+    assert_nothing_raised do
+      t.each { |row| }
+      t.each { |row| }
+    end
+  end
+  
+  should 'allow itself to be cleared for save memory' do
+    t = RemoteTable.new 'http://spreadsheets.google.com/pub?key=tObVAGyqOkCBtGid0tJUZrw'
+    t.to_a
+    assert_equal Array, t.instance_variable_get(:@to_a).class
+    t.free
+    assert_equal NilClass, t.instance_variable_get(:@to_a).class
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote_table
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -05:00
+date: 2011-03-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency