data_miner 0.3.6 → 0.3.7

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/data_miner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{data_miner}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   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-03-08}
+  s.date = %q{2010-03-09}
   s.description = %q{Mine remote data into your ActiveRecord models. You can also perform associations and convert units.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [

data/lib/data_miner/configuration.rb

@@ -21,9 +21,16 @@ module DataMiner
       runnables << DataMiner::Process.new(self, runnable_counter, method_name_or_block_description, &block)
     end
 
-    def import(options = {}, &block)
+    def import(*args, &block)
+      if args.length == 1
+        description = '(no description)'
+      else
+        description = args.first
+      end
+      options = args.last
+        
       self.runnable_counter += 1
-      runnables << DataMiner::Import.new(self, runnable_counter, options, &block)
+      runnables << DataMiner::Import.new(self, runnable_counter, description, options, &block)
     end
         
     def after_invoke

data/lib/data_miner/import.rb

@@ -1,12 +1,14 @@
 module DataMiner
   class Import
     attr_accessor :configuration, :position_in_run, :options, :table, :errata
+    attr_accessor :description
     delegate :klass, :to => :configuration
     delegate :unique_indices, :to => :configuration
     
-    def initialize(configuration, position_in_run, options = {}, &block)
+    def initialize(configuration, position_in_run, description, options = {}, &block)
       @configuration = configuration
       @position_in_run = position_in_run
+      @description = description
       @options = options
       yield self if block_given? # pull in attributes
       @errata = Errata.new(:url => options[:errata], :klass => klass) if options[:errata]
@@ -14,7 +16,7 @@ module DataMiner
     end
 
     def inspect
-      "Import(#{klass}) position #{position_in_run}"
+      "Import(#{klass}) position #{position_in_run} (#{description})"
     end
 
     def attributes

data/test/data_miner_test.rb

@@ -537,14 +537,12 @@ class Country < ActiveRecord::Base
   data_miner do
     unique_index 'iso_3166'
     
-    # get a complete list
-    import :url => 'http://www.iso.org/iso/list-en1-semic-3.txt', :skip => 2, :headers => false, :delimiter => ';' do |attr|
+    import 'The official ISO country list', :url => 'http://www.iso.org/iso/list-en1-semic-3.txt', :skip => 2, :headers => false, :delimiter => ';' do |attr|
       attr.store 'iso_3166', :field_number => 1
       attr.store 'name', :field_number => 0
     end
     
-    # get nicer names
-    import :url => 'http://www.cs.princeton.edu/introcs/data/iso3166.csv' do |attr|
+    import 'A Princeton dataset with better capitalization', :url => 'http://www.cs.princeton.edu/introcs/data/iso3166.csv' do |attr|
       attr.store 'iso_3166', :field_name => 'country code'
       attr.store 'name', :field_name => 'country'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_miner
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -05:00
+date: 2010-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency