data_miner 0.4.20 → 0.4.21

data/VERSION

@@ -1 +1 @@
-0.4.20
+0.4.21

data/data_miner.gemspec

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

@@ -70,6 +70,22 @@ module DataMiner
 end
 
 ActiveRecord::Base.class_eval do
+  # convenience
+  %w{
+    create_table
+    execute
+    add_column
+    rename_column
+    remove_column
+    drop_table
+  }.each do |method_name|
+    eval %{
+      def self.#{method_name}(*args, &block)
+        ActiveRecord::Base.connection.send(:#{method_name}, *args, &block)
+      end
+    }
+  end
+  
   def self.x_data_miner(&block)
     DataMiner.start_logging
     

data/lib/data_miner/configuration.rb

@@ -51,7 +51,10 @@ module DataMiner
       end
       resource.delete_all if options[:from_scratch]
       begin
-        steps.each { |step| step.run run }
+        steps.each do |step|
+          step.run run
+          resource.reset_column_information
+        end
         finished = true
       ensure
         run.update_attributes! :ended_at => Time.now, :finished => finished if DataMiner::Run.table_exists?

data/test/data_miner_test.rb

@@ -496,13 +496,12 @@ class CrosscallingCensusRegion < ActiveRecord::Base
   data_miner do
     process "derive ourselves from the census divisions table (i.e., cross call census divisions)" do
       CrosscallingCensusDivision.run_data_miner!
-      connection.drop_table :crosscalling_census_regions rescue nil
-      connection.create_table :crosscalling_census_regions, :options => 'ENGINE=InnoDB default charset=utf8', :id => false do |t|
+      create_table :crosscalling_census_regions, :options => 'ENGINE=InnoDB default charset=utf8', :id => false, :force => true do |t|
         t.column :number, :integer
         t.column :name, :string
       end
-      connection.execute 'ALTER TABLE crosscalling_census_regions ADD PRIMARY KEY (number);'
-      connection.execute %{
+      execute 'ALTER TABLE crosscalling_census_regions ADD PRIMARY KEY (number);'
+      execute %{
         INSERT IGNORE INTO crosscalling_census_regions(number, name)
         SELECT crosscalling_census_divisions.census_region_number, crosscalling_census_divisions.census_region_name FROM crosscalling_census_divisions
       }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 20
-  version: 0.4.20
+  - 21
+  version: 0.4.21
 platform: ruby
 authors: 
 - Seamus Abshere