remote_table 1.0.2 → 1.0.3

data/lib/remote_table.rb

@@ -4,6 +4,7 @@ require 'active_support/version'
   active_support/core_ext/hash
   active_support/core_ext/string
   active_support/core_ext/module
+  active_support/core_ext/array/wrap
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ::ActiveSupport::VERSION::MAJOR == 3
@@ -46,17 +47,12 @@ class RemoteTable
   # See the <tt>Properties</tt> object for the sorts of options you can pass.
   def initialize(*args)
     @options = args.last.is_a?(::Hash) ? args.last.dup : {}
-    if args.first.is_a? ::String
-      @url = args.first.dup
+    @options.stringify_keys!
+    @url = if args.first.is_a? ::String
+      args.first.dup
     else
-      @url = @options['url'] || @options[:url]
-    end
-    # deprecated
-    if options[:transform]
-      transformer.legacy_transformer = options[:transform][:class].new options[:transform].except(:class)
-      transformer.legacy_transformer.add_hints! @options
+      @options['url'].dup
     end
-    @options.stringify_keys!
     @url.freeze
     @options.freeze
     at_exit { ::RemoteTable.cleaner.cleanup }
@@ -66,7 +62,7 @@ class RemoteTable
     format.each do |row|
       row['row_hash'] = ::RemoteTable.hasher.hash row
       # allow the transformer to return multiple "virtual rows" for every real row
-      transformer.transform(row).each do |virtual_row|
+      ::Array.wrap(transformer.transform(row)).each do |virtual_row|
         if properties.errata
           next if properties.errata.rejects? virtual_row
           properties.errata.correct! virtual_row
@@ -85,9 +81,13 @@ class RemoteTable
   end
   
   # Get the whole row array back
-  def rows
-    to_a
+  def to_a
+    return @to_a if @to_a.is_a? ::Array
+    @to_a = []
+    each { |row| @to_a.push row }
+    @to_a.freeze
   end
+  alias :rows :to_a
   
   # Used internally as a sort of garbage collector.
   def self.cleaner

data/lib/remote_table/transformer.rb

@@ -1,7 +1,6 @@
 class RemoteTable
   class Transformer
     attr_reader :t
-    attr_accessor :legacy_transformer
     def initialize(t)
       @t = t
     end
@@ -10,8 +9,15 @@ class RemoteTable
       if legacy_transformer
         legacy_transformer.apply row
       else
-        [ row ]
+        row
       end
     end
+    def legacy_transformer
+      return @legacy_transformer if @legacy_transformer
+      return unless t.options['transform']
+      transform_options = t.options['transform'].dup
+      transform_options.stringify_keys!
+      @legacy_transformer = transform_options['class'].new transform_options.except('class')
+    end
   end
 end

data/lib/remote_table/version.rb

@@ -1,3 +1,3 @@
 class RemoteTable
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote_table
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -06:00
+date: 2011-01-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency