data_miner 1.1.0 → 1.1.1

data/Rakefile

@@ -9,6 +9,8 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+task :default => :test
+
 begin
   require 'rake/rdoctask'
   Rake::RDocTask.new do |rdoc|

data/lib/data_miner/verify.rb

@@ -1,8 +1,6 @@
 class DataMiner
   class Verify
-    attr_reader :config
-    attr_reader :description
-    attr_reader :blk
+    attr_accessor :config, :description, :blk
     
     def initialize(config, description, &blk)
       @config = config
@@ -19,7 +17,12 @@ class DataMiner
     end
 
     def run
-      unless blk.call
+      successful = begin
+        blk.call
+      rescue => e
+        false
+      end
+      unless successful
         raise VerificationFailed, "FAILED VERIFICATION: #{inspect}"
       end
       nil

data/lib/data_miner/version.rb

@@ -1,3 +1,3 @@
 class DataMiner
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/data_miner.rb

@@ -65,13 +65,14 @@ Output:
   
   def start_logging
     if logger.nil?
-      if defined? ::Rails
-        @logger = ::Rails.logger
+      if defined? Rails
+        self.logger = Rails.logger
       else
-        @logger = ::Logger.new $stdout
+        require 'logger'
+        self.logger = Logger.new $stdout
       end
     end
-    ::ActiveRecord::Base.logger = logger
+    ActiveRecord::Base.logger = logger
   end
     
   # Mine data. Defaults to all resource_names touched by DataMiner.

data/test/test_old_syntax.rb

@@ -874,7 +874,8 @@ class TestOldSyntax < Test::Unit::TestCase
     end
 
     DataMiner::Run.delete_all
-    AutomobileFuelType.run_data_miner! :from_scratch => true
-    assert DataMiner::Run.first.skipped
+    assert_raise do
+      AutomobileFuelType.run_data_miner! :from_scratch => true
+    end
   end
 end

data/test/test_verify.rb

@@ -1,29 +1,29 @@
-require 'helper'
+require File.expand_path('helper', File.dirname(__FILE__))
 
 class TestVerify < Test::Unit::TestCase
   context '#run' do
     setup do
       @run = Object.new
       check = lambda do
-        assert true
+        true
       end
-      @verify = DataMiner::Verify.new Aircraft.new.data_miner_base, 1,
-        'verification of engine type', check
+      @verify = DataMiner::Verify.new Aircraft.new.data_miner_config,
+        'verification of engine type', &check
     end
     should 'raise an exception if the verification block fails through exception' do
-      @verify.check = lambda do
+      @verify.blk = lambda do
         assert false
       end
-      assert_raise(DataMiner::VerificationFailed) { @verify.run @run }
+      assert_raise(DataMiner::VerificationFailed) { @verify.run }
     end
     should 'raise an exception if the result of the verification block is false' do
-      @verify.check = lambda do
+      @verify.blk = lambda do
         false
       end
-      assert_raise(DataMiner::VerificationFailed) { @verify.run @run }
+      assert_raise(DataMiner::VerificationFailed) { @verify.run }
     end
     should 'return true if the verification block succeeds' do
-      assert @verify.run(@run)
+      assert_nil @verify.run
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: data_miner
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -06:00
+date: 2011-01-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +27,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -44,7 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
@@ -60,7 +57,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 3
@@ -76,7 +72,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 3
@@ -92,7 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 4
@@ -108,7 +102,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 3
@@ -124,7 +117,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 3
@@ -140,7 +132,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 0
@@ -156,7 +147,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 0
@@ -172,7 +162,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -186,7 +175,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -200,21 +188,19 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: ruby-debug19
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -273,7 +259,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -282,7 +267,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -293,13 +277,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mine remote data into your ActiveRecord models.
-test_files: 
-- test/helper.rb
-- test/support/aircraft.rb
-- test/support/airport.rb
-- test/support/automobile_fuel_type.rb
-- test/support/automobile_variant.rb
-- test/support/country.rb
-- test/test_attribute.rb
-- test/test_old_syntax.rb
-- test/test_verify.rb
+test_files: []
+