data_miner 0.4.10 → 0.4.11

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/data_miner.gemspec

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

@@ -46,6 +46,10 @@ module DataMiner
     end
   end
   
+  def self.log_info(message)
+    logger.info "[data_miner gem] #{message}"
+  end
+  
   def self.run(options = {})
     DataMiner::Configuration.run options
   end
@@ -59,7 +63,7 @@ ActiveRecord::Base.class_eval do
   def self.x_data_miner(&block)
     DataMiner.start_logging
     
-    DataMiner.logger.info "Skipping data_miner block in #{self.name} because called as x_data_miner"
+    DataMiner.log_info "Skipping data_miner block in #{self.name} because called as x_data_miner"
   end
   
   def self.data_miner(&block)

data/lib/data_miner/attribute.rb

@@ -69,7 +69,7 @@ module DataMiner
       
       what_it_is = record.send name
       if what_it_is.nil? and !what_it_should_be.nil?
-        DataMiner.logger.info "ActiveRecord didn't like trying to set #{resource}.#{name} = #{what_it_should_be} (it came out as nil)"
+        DataMiner.log_info "ActiveRecord didn't like trying to set #{resource}.#{name} = #{what_it_should_be} (it came out as nil)"
         nil
       elsif what_it_is == what_it_was
         false

data/lib/data_miner/configuration.rb

@@ -38,7 +38,7 @@ module DataMiner
       if DataMiner::Run.table_exists?
         run = DataMiner::Run.create! :started_at => Time.now, :resource_name => resource.name if DataMiner::Run.table_exists?
       else
-        DataMiner.logger.info "Not logging individual runs. Please run DataMiner::Run.create_tables if you want to enable this."
+        DataMiner.log_info "Not logging individual runs. Please run DataMiner::Run.create_tables if you want to enable this."
       end
       resource.delete_all if options[:from_scratch]
       begin
@@ -95,6 +95,16 @@ You need to supply one of #{COMPLETE_UNIT_DEFINITIONS.map(&:inspect).to_sentence
     
     def suggest_missing_column_migrations
       missing_columns = Array.new
+      non_essential_missing_columns = Array.new
+      unless resource.column_names.include?('data_miner_touch_count')
+        non_essential_missing_columns << 'data_miner_touch_count'
+        DataMiner.log_info "Not counting how many times a row has been touched by data_miner."
+      end
+      unless resource.column_names.include?('data_miner_last_run_id')
+        non_essential_missing_columns << 'data_miner_last_run_id'
+        DataMiner.log_info "Not recording which run touched a row."
+      end
+      
       import_runnables.each do |runnable|
         runnable.attributes.each do |_, attribute|
           DataMiner.log_or_raise "You can't have an attribute column that ends in _units (reserved): #{resource.table_name}.#{attribute.name}" if attribute.name.ends_with? '_units'
@@ -123,16 +133,19 @@ and **replace** the resulting file with this:
   class AddMissingColumnsTo#{resource.name} < ActiveRecord::Migration
     def self.up
 #{missing_columns.map { |column_name| "      add_column :#{resource.table_name}, :#{column_name}, :#{column_name.ends_with?('_units') ? 'string' : 'FIXME_WHAT_COLUMN_TYPE_AM_I' }" }.join("\n") }
+#{non_essential_missing_columns.map { |column_name| "      add_column :#{resource.table_name}, :#{column_name}, :integer #optional" }.join("\n") }
     end
     
     def self.down
 #{missing_columns.map { |column_name| "      remove_column :#{resource.table_name}, :#{column_name}" }.join("\n") }
+#{non_essential_missing_columns.map { |column_name| "      remove_column :#{resource.table_name}, :#{column_name} #optional" }.join("\n") }
     end
   end
 
 On the other hand, if you're working directly with create_table, this might be helpful:
 
 #{missing_columns.map { |column_name| "t.#{column_name.ends_with?('_units') ? 'string' : 'FIXME_WHAT_COLUMN_TYPE_AM_I' } '#{column_name}'" }.join("\n") }
+#{non_essential_missing_columns.map { |column_name| "t.integer '#{column_name}' #optional" }.join("\n") }
 
 ================================
         }

data/lib/data_miner/import.rb

@@ -40,6 +40,10 @@ module DataMiner
 
     def run(run)
       begin; ActiveRecord::Base.connection.execute("SET NAMES 'utf8'"); rescue; end
+      
+      increment_counter = resource.column_names.include?('data_miner_touch_count')
+      log_run = resource.column_names.include?('data_miner_last_run_id')
+      
       table.each_row do |row|
         if errata
           next if errata.rejects?(row)
@@ -48,14 +52,13 @@ module DataMiner
         
         record = resource.send "find_or_initialize_by_#{@key}", attributes[@key].value_from_row(row)
         changes = attributes.map { |_, attr| attr.set_record_from_row record, row }
-        record.data_miner_touch_count ||= 0
         if changes.any?
-          record.data_miner_touch_count += 1
-          record.data_miner_last_run = run
+          record.increment :data_miner_touch_count if increment_counter
+          record.data_miner_last_run = run if log_run
         end
         record.save!
       end
-      DataMiner.logger.info "performed #{inspect}"
+      DataMiner.log_info "performed #{inspect}"
     end
   end
 end

data/lib/data_miner/process.rb

@@ -31,7 +31,7 @@ module DataMiner
       else
         resource.send method_name
       end
-      DataMiner.logger.info "ran #{inspect}"
+      DataMiner.log_info "ran #{inspect}"
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Seamus Abshere