data_miner 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/data_miner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{data_miner}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   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

@@ -16,9 +16,9 @@ module DataMiner
       args.each { |arg| unique_indices.add arg }
     end
     
-    def process(callback)
+    def process(method_name_or_block_description, &block)
       self.runnable_counter += 1
-      runnables << DataMiner::Process.new(self, runnable_counter, callback)
+      runnables << DataMiner::Process.new(self, runnable_counter, method_name_or_block_description, &block)
     end
 
     def import(options = {}, &block)

data/lib/data_miner/process.rb

@@ -1,20 +1,36 @@
 module DataMiner
   class Process
-    attr_accessor :configuration, :position_in_run, :callback
+    attr_accessor :configuration, :position_in_run
+    attr_accessor :method_name
+    attr_accessor :block_description, :block
     delegate :klass, :to => :configuration
 
-    def initialize(configuration, position_in_run, callback)
+    def initialize(configuration, position_in_run, method_name_or_block_description, &block)
       @configuration = configuration
       @position_in_run = position_in_run
-      @callback = callback
+      if block_given?
+        @block_description = method_name_or_block_description
+        @block = block
+      else
+        @method_name = method_name
+      end
     end
     
     def inspect
-      "Process(#{klass}) position #{position_in_run}"
+      str = "Process(#{klass}) position #{position_in_run}"
+      if block
+        str << " called :#{method_name}"
+      else
+        str << " ran block (#{block_description})"
+      end
     end
     
     def run(run)
-      klass.send callback
+      if block
+        block.call
+      else
+        klass.send method_name
+      end
       DataMiner.logger.info "ran #{inspect}"
     end
   end

data/test/data_miner_test.rb

@@ -446,7 +446,11 @@ class AutomobileVariant < ActiveRecord::Base
     # derive :automobile_model_id # creates models by name
     # associate :model_year, :key => :original_automobile_model_year_year, :foreign_key => :year
     # associate :fuel_type, :key => :original_automobile_fuel_type_code, :foreign_key => :code
-    process :set_adjusted_fuel_economy
+    
+    process 'Set adjusted fuel economy' do
+      update_all 'fuel_efficiency_city = 1 / ((0.003259 / 0.425143707) + (1.1805 / raw_fuel_efficiency_city))'
+      update_all 'fuel_efficiency_highway = 1 / ((0.001376 / 0.425143707) + (1.3466 / raw_fuel_efficiency_highway))'
+    end
   end
   
   def name
@@ -466,11 +470,6 @@ class AutomobileVariant < ActiveRecord::Base
   end
   
   class << self
-    def set_adjusted_fuel_economy
-      update_all 'fuel_efficiency_city = 1 / ((0.003259 / 0.425143707) + (1.1805 / raw_fuel_efficiency_city))'
-      update_all 'fuel_efficiency_highway = 1 / ((0.001376 / 0.425143707) + (1.3466 / raw_fuel_efficiency_highway))'
-    end
-    
     # the following matching methods are needed by the errata
     # per https://brighterplanet.sifterapp.com/projects/30/issues/750/comments
 
@@ -871,6 +870,14 @@ class DataMinerTest < Test::Unit::TestCase
     assert AutomobileVariant.first.row_hash.present?
   end
   
+  should "process a callback block instead of a method" do
+    AutomobileVariant.delete_all
+    AutomobileVariant.data_miner_config.runnables[0].run(nil)
+    assert !AutomobileVariant.first.fuel_efficiency_city.present?
+    AutomobileVariant.data_miner_config.runnables.last.run(nil)
+    assert AutomobileVariant.first.fuel_efficiency_city.present?
+  end
+  
   # should "mine multiple classes in the correct order" do
   #   DataMiner.run
   #   uy = Country.find_by_iso_3166('UY')
@@ -917,7 +924,7 @@ class DataMinerTest < Test::Unit::TestCase
     assert a != b
     assert_equal b, Country.first.data_miner_last_run
   end
-
+  
   unless ENV['FAST'] == 'true'
     should "import using a dictionary" do
       DataMiner.run :class_names => %w{ ResidentialEnergyConsumptionSurveyResponse }

metadata

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