data_miner 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/data_miner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{data_miner}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl"]

data/lib/data_miner/configuration.rb

@@ -25,11 +25,7 @@ module DataMiner
       self.runnable_counter += 1
       runnables << DataMiner::Import.new(self, runnable_counter, options, &block)
     end
-    
-    def before_invoke
-      self.class.create_tables
-    end
-    
+        
     def after_invoke
       if unique_indices.empty?
         raise(MissingHashColumn, "No unique_index defined for #{klass.name}, so you need a row_hash:string column.") unless klass.column_names.include?('row_hash')
@@ -40,18 +36,20 @@ module DataMiner
 
     # Mine data for this class.
     def run
-      target = DataMiner::Target.find_or_create_by_name klass.name
+      target = DataMiner::Target.find(klass.name)
       run = target.runs.create! :started_at => Time.now
+      finished = false
       begin
         runnables.each(&:run)
+        finished = true
       ensure
-        run.update_attributes! :ended_at => Time.now
+        run.update_attributes! :ended_at => Time.now, :finished => finished
       end
       nil
     end
     
     cattr_accessor :classes
-    self.classes = []
+    self.classes = Set.new
     class << self
       # Mine data. Defaults to all classes touched by DataMiner.
       #
@@ -64,14 +62,7 @@ module DataMiner
           end
         end
       end
-      
-      # Queue up all the ActiveRecord classes that DataMiner should touch.
-      #
-      # Generally done in <tt>config/initializers/data_miner_config.rb</tt>.
-      def enqueue(&block)
-        yield self.classes
-      end
-      
+            
       def create_tables
         c = ActiveRecord::Base.connection
         unless c.table_exists?('data_miner_targets')
@@ -85,6 +76,7 @@ module DataMiner
         unless c.table_exists?('data_miner_runs')
           c.create_table 'data_miner_runs', :options => 'ENGINE=InnoDB default charset=utf8' do |t|
             t.string 'data_miner_target_id'
+            t.boolean 'finished'
             t.datetime 'started_at'
             t.datetime 'ended_at'
             t.datetime 'created_at'

data/lib/data_miner/run.rb

@@ -2,6 +2,6 @@ module DataMiner
   class Run < ActiveRecord::Base
     set_table_name 'data_miner_runs'
     default_scope :order => 'id ASC'
-    belongs_to :target
+    belongs_to :target, :class_name => '::DataMiner::Target', :foreign_key => 'data_miner_target_id'
   end
 end

data/lib/data_miner/target.rb

@@ -2,6 +2,25 @@ module DataMiner
   class Target < ActiveRecord::Base
     set_table_name 'data_miner_targets'
     set_primary_key :name
-    has_many :runs, :foreign_key => 'data_miner_target_id'
+    has_many :runs, :class_name => '::DataMiner::Run', :foreign_key => 'data_miner_target_id'
+
+    def klass
+      name.constantize
+    end
+    
+    def run
+      klass.data_miner_config.run
+    end
+
+    def included_in_list_of_targets
+      msg = "must have a data_miner block"
+      unless DataMiner.classes.include?(name.constantize)
+        errors.add :name, msg
+      end
+    rescue NameError
+      errors.add :name, msg
+    end
+    
+    validate :included_in_list_of_targets
   end
 end

data/lib/data_miner.rb

@@ -38,10 +38,6 @@ module DataMiner
     DataMiner::Configuration.run options
   end
   
-  def self.enqueue(&block)
-    DataMiner::Configuration.enqueue &block
-  end
-  
   def self.classes
     DataMiner::Configuration.classes
   end
@@ -53,11 +49,14 @@ end
 
 ActiveRecord::Base.class_eval do
   def self.data_miner(&block)
+    DataMiner.classes.add self
+    DataMiner.create_tables
+    DataMiner::Target.find_or_create_by_name name
+    
     # this is class_eval'ed here so that each ActiveRecord descendant has its own copy, or none at all
     class_eval { cattr_accessor :data_miner_config }
     self.data_miner_config = DataMiner::Configuration.new self
 
-    data_miner_config.before_invoke
     Blockenspiel.invoke block, data_miner_config
     data_miner_config.after_invoke
   end

data/test/data_miner_test.rb

@@ -590,19 +590,6 @@ class CensusRegion < ActiveRecord::Base
   end
 end
 
-DataMiner.enqueue do |queue|
-  queue << Country
-  queue << Airport
-  queue << CensusRegion
-  queue << AutomobileFuelType               # OK
-  queue << AutomobileModel                  # OK
-  queue << AutomobileMake                   # OK
-  queue << AutomobileModelYear              # OK
-  queue << AutomobileVariant                # OK
-  queue << AutomobileMakeFleetYear          # OK; third-party data not yet hosted on third-party site
-  queue << AutomobileMakeYear               # OK
-end
-
 class DataMinerTest < Test::Unit::TestCase  
   should "be idempotent" do
     Country.data_miner_config.run
@@ -648,7 +635,7 @@ class DataMinerTest < Test::Unit::TestCase
   end
   
   # should "mine multiple classes in the correct order" do
-  #   DataMiner.run :class_names => DataMiner.classes.map(&:class_name)
+  #   DataMiner.run
   #   uy = Country.find_by_iso_3166('UY')
   #   assert_equal 'Uruguay', uy.name
   # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_miner
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Seamus Abshere