data_miner 0.4.7 → 0.4.8

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.add_dependency 'activesupport', '>=2.3.4'
     gem.add_dependency 'andand', '>=1.3.1'
     gem.add_dependency 'errata', '>=0.1.7'
-    gem.add_dependency 'conversions', '>=1.4.3'
+    gem.add_dependency 'conversions', '>=1.4.4'
     gem.add_dependency 'blockenspiel', '>=0.3.2'
     gem.add_dependency 'log4r', '>=1.1.7'
     gem.require_path = "lib"

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/data_miner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{data_miner}
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl"]
-  s.date = %q{2010-03-30}
+  s.date = %q{2010-04-05}
   s.description = %q{Mine remote data into your ActiveRecord models. You can also perform associations and convert units.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<andand>, [">= 1.3.1"])
       s.add_runtime_dependency(%q<errata>, [">= 0.1.7"])
-      s.add_runtime_dependency(%q<conversions>, [">= 1.4.3"])
+      s.add_runtime_dependency(%q<conversions>, [">= 1.4.4"])
       s.add_runtime_dependency(%q<blockenspiel>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<log4r>, [">= 1.1.7"])
     else
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_dependency(%q<andand>, [">= 1.3.1"])
       s.add_dependency(%q<errata>, [">= 0.1.7"])
-      s.add_dependency(%q<conversions>, [">= 1.4.3"])
+      s.add_dependency(%q<conversions>, [">= 1.4.4"])
       s.add_dependency(%q<blockenspiel>, [">= 0.3.2"])
       s.add_dependency(%q<log4r>, [">= 1.1.7"])
     end
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     s.add_dependency(%q<andand>, [">= 1.3.1"])
     s.add_dependency(%q<errata>, [">= 0.1.7"])
-    s.add_dependency(%q<conversions>, [">= 1.4.3"])
+    s.add_dependency(%q<conversions>, [">= 1.4.4"])
     s.add_dependency(%q<blockenspiel>, [">= 0.3.2"])
     s.add_dependency(%q<log4r>, [">= 1.1.7"])
   end

data/lib/data_miner.rb

@@ -17,14 +17,15 @@ require 'data_miner/run'
 module DataMiner
   class MissingHashColumn < RuntimeError; end
   
-  include Log4r unless defined? Rails
-
   mattr_accessor :logger
   
   def self.start_logging
+    return if logger
+
     if defined? Rails
       self.logger = Rails.logger
     else
+      class_eval { include Log4r }
       info_outputter = FileOutputter.new 'f1', :filename => 'data_miner.log'
       error_outputter = Outputter.stderr
       info_outputter.only_at DEBUG, INFO
@@ -33,7 +34,6 @@ module DataMiner
       self.logger = Logger.new 'data_miner'
       logger.add info_outputter, error_outputter
       ActiveRecord::Base.logger = logger
-      ActiveRecord::Base.colorize_logging = false
     end
   end
   
@@ -53,21 +53,24 @@ module DataMiner
   def self.resource_names
     DataMiner::Configuration.resource_names
   end
-  
-  def self.create_tables
-    DataMiner::Configuration.create_tables
-  end
 end
 
 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"
+  end
+  
   def self.data_miner(&block)
+    DataMiner.start_logging
+    
     unless table_exists?
       DataMiner.log_or_raise "Database table `#{table_name}` doesn't exist. DataMiner probably won't work properly until you run a migration or otherwise fix the schema."
       return
     end
     
     DataMiner.resource_names.push self.name unless DataMiner.resource_names.include? self.name
-    DataMiner.create_tables
 
     belongs_to :data_miner_last_run, :class_name => 'DataMiner::Run'
     
@@ -88,5 +91,3 @@ ActiveRecord::Base.class_eval do
     data_miner_config.after_invoke
   end
 end
-
-DataMiner.start_logging

data/lib/data_miner/configuration.rb

@@ -35,13 +35,17 @@ module DataMiner
       options.symbolize_keys!
       
       finished = false
-      run = DataMiner::Run.create! :started_at => Time.now, :resource_name => resource.name
+      if DataMiner::Run.table_exists?
+        run = DataMiner::Run.create! :started_at => Time.now, :resource_name => resource.name if DataMiner::Run.table_exists?
+      else
+        DataMiner.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
         runnables.each { |runnable| runnable.run(run) }
         finished = true
       ensure
-        run.update_attributes! :ended_at => Time.now, :finished => finished
+        run.update_attributes! :ended_at => Time.now, :finished => finished if DataMiner::Run.table_exists?
       end
       nil
     end
@@ -151,20 +155,6 @@ On the other hand, if you're working directly with create_table, this might be h
           end
         end
       end
-            
-      def create_tables
-        c = ActiveRecord::Base.connection
-        unless c.table_exists?('data_miner_runs')
-          c.create_table 'data_miner_runs', :options => 'ENGINE=InnoDB default charset=utf8' do |t|
-            t.string 'resource_name'
-            t.boolean 'finished'
-            t.datetime 'started_at'
-            t.datetime 'ended_at'
-            t.datetime 'created_at'
-            t.datetime 'updated_at'
-          end
-        end
-      end
     end
   end
 end

data/lib/data_miner/run.rb

@@ -1,7 +1,6 @@
 module DataMiner
   class Run < ActiveRecord::Base
     set_table_name 'data_miner_runs'
-    default_scope :order => 'id ASC'
     
     def resource
       resource_name.constantize
@@ -10,5 +9,19 @@ module DataMiner
     def resource_records_last_touched_by_me
       resource.scoped :conditions => { :data_miner_last_run_id => id }
     end
+    
+    class << self
+      def create_tables
+        return if table_exists?
+        connection.create_table 'data_miner_runs' do |t|
+          t.string 'resource_name'
+          t.boolean 'finished'
+          t.datetime 'started_at'
+          t.datetime 'ended_at'
+          t.datetime 'created_at'
+          t.datetime 'updated_at'
+        end
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -253,3 +253,5 @@ ActiveRecord::Schema.define(:version => 20090819143429) do
   end
   execute "ALTER TABLE residential_energy_consumption_survey_responses ADD PRIMARY KEY (department_of_energy_identifier);"
 end
+
+DataMiner::Run.create_tables

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 7
-  version: 0.4.7
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -04:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,8 +98,8 @@ dependencies:
         segments: 
         - 1
         - 4
-        - 3
-        version: 1.4.3
+        - 4
+        version: 1.4.4
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency