data_miner 1.1.4 → 1.1.5

data/.gitignore

@@ -6,3 +6,5 @@ pkg
 test/test.sqlite3
 data_miner.log
 Gemfile.lock
+*.gem
+test.log

data/lib/data_miner/config.rb

@@ -1,4 +1,5 @@
 require 'blockenspiel'
+require 'benchmark'
 
 class DataMiner
   class Config
@@ -71,8 +72,9 @@ class DataMiner
       resource.delete_all if options['from_scratch']
       begin
         steps.each do |step|
-          step.run# run
+          time = ::Benchmark.realtime { step.run }
           resource.reset_column_information
+          ::DataMiner.logger.info %{Ran #{step.inspect} in #{time.to_i}}
         end
         finished = true
       rescue Finish

data/lib/data_miner/import.rb

@@ -38,7 +38,7 @@ class DataMiner
     end
 
     def inspect
-      %{#<DataMiner::Import(#{resource}) (#{description})>}
+      %{#<DataMiner::Import(#{resource}) #{description}>}
     end
     
     def store(attr_name, attr_options = {})

data/lib/data_miner/process.rb

@@ -20,14 +20,7 @@ class DataMiner
     end
     
     def inspect
-      str = %{<#Process(#{resource})}
-      if block_description
-        str << %{ called block "#{block_description}"}
-      else
-        str << %{ called method :#{method_id}}
-      end
-      str << ">"
-      str
+      %{#<DataMiner::Process(#{resource}) #{block_description || method_id}>}
     end
     
     def run

data/lib/data_miner/verify.rb

@@ -15,7 +15,7 @@ class DataMiner
     end
 
     def inspect
-      %{#<DataMiner::Verify(#{resource})  (#{description})>}
+      %{#<DataMiner::Verify(#{resource}) #{description}>}
     end
 
     def run

data/lib/data_miner/version.rb

@@ -1,3 +1,3 @@
 class DataMiner
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/lib/data_miner.rb

@@ -85,7 +85,7 @@ Output:
         self.logger = ::Rails.logger
       else
         require 'logger'
-        self.logger = ::Logger.new $stdout
+        self.logger = ::Logger.new $stderr
       end
     end
     ::ActiveRecord::Base.logger = logger

data/test/support/country.rb

@@ -2,7 +2,7 @@ class Country < ActiveRecord::Base
   set_primary_key :iso_3166
   
   data_miner do
-    import 'The official ISO country list', :url => 'http://www.iso.org/iso/list-en1-semic-3.txt', :skip => 2, :headers => false, :delimiter => ';' do
+    import 'The official ISO country list', :url => 'http://www.iso.org/iso/list-en1-semic-3.txt', :encoding => 'ISO-8859-1', :skip => 2, :headers => false, :delimiter => ';' do
       key 'iso_3166', :field_number => 1
       store 'name', :field_number => 0
     end

data/test/test_data_miner_process.rb

@@ -8,11 +8,11 @@ class TestDataMinerProcess < Test::Unit::TestCase
     end
     should 'describe a block' do
       process = DataMiner::Process.new(@config, 'something cool') { }
-      assert_match /block/, process.inspect
+      assert_match /something cool/, process.inspect
     end
     should 'describe a method' do
       process = DataMiner::Process.new @config, :something_cool
-      assert_match /method/, process.inspect
+      assert_match /something_cool/, process.inspect
     end
   end
 end

data/test/test_old_syntax.rb

@@ -665,7 +665,6 @@ class TestOldSyntax < Test::Unit::TestCase
       end
       assert_kind_of DataMiner::Import, AutomobileFuelType.data_miner_config.steps.first
       assert_equal 'http://example.com', AutomobileFuelType.data_miner_config.steps.first.table.url
-      assert_equal 1, AutomobileFuelType.data_miner_config.step_counter
     end
     should "stop and finish if it gets a DataMiner::Finish" do
       AutomobileMakeFleetYear.delete_all

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: data_miner
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -06:00
+date: 2011-03-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: data_miner
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Mine remote data into your ActiveRecord models.