earth 0.5.4 → 0.6.0

data/lib/earth/shipping/shipment_mode.rb

@@ -3,10 +3,33 @@ class ShipmentMode < ActiveRecord::Base
   
   has_many :carrier_modes, :foreign_key => 'mode_name', :primary_key => 'name'
   
-  force_schema do
-    string 'name'
-    float  'route_inefficiency_factor'
-    float  'transport_emission_factor'
-    string 'transport_emission_factor_units'
-  end
-end
+  col :name
+  col :route_inefficiency_factor, :type => :float
+  col :transport_emission_factor, :type => :float
+  col :transport_emission_factor_units
+  
+  # verify "Route inefficiency factor should be one or more" do
+  #   ShipmentMode.all.each do |mode|
+  #     unless mode.route_inefficiency_factor >= 1.0
+  #       raise "Invalid route inefficiency factor for ShipmentMode #{mode.name}: #{mode.route_inefficiency_factor} (should be >= 1.0)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Transport emission factor should be greater than zero" do
+  #   ShipmentMode.all.each do |mode|
+  #     unless mode.transport_emission_factor > 0
+  #       raise "Invalid transport emission factor for ShipmentMode #{mode.name}: #{mode.transport_emission_factor} (should be > 0)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Transport emission factor units should never be missing" do
+  #   ShipmentMode.all.each do |mode|
+  #     unless mode.transport_emission_factor_units.present?
+  #       raise "Missing transport emission factor units for ShipmentMode #{mode.name}"
+  #     end
+  #   end
+  # end
+  
+end

data/lib/earth/shipping/shipment_mode/data_miner.rb

@@ -19,28 +19,5 @@ ShipmentMode.class_eval do
     #   what about transport_emission_factor_units?
     # end
     
-    verify "Route inefficiency factor should be one or more" do
-      ShipmentMode.all.each do |mode|
-        unless mode.route_inefficiency_factor >= 1.0
-          raise "Invalid route inefficiency factor for ShipmentMode #{mode.name}: #{mode.route_inefficiency_factor} (should be >= 1.0)"
-        end
-      end
-    end
-    
-    verify "Transport emission factor should be greater than zero" do
-      ShipmentMode.all.each do |mode|
-        unless mode.transport_emission_factor > 0
-          raise "Invalid transport emission factor for ShipmentMode #{mode.name}: #{mode.transport_emission_factor} (should be > 0)"
-        end
-      end
-    end
-    
-    verify "Transport emission factor units should never be missing" do
-      ShipmentMode.all.each do |mode|
-        unless mode.transport_emission_factor_units.present?
-          raise "Missing transport emission factor units for ShipmentMode #{mode.name}"
-        end
-      end
-    end
   end
 end

data/lib/earth/utils.rb

@@ -0,0 +1,45 @@
+module Earth
+  module Utils
+    # MySQL's INSERT INTO is not standard SQL
+    # ::Earth::Utils.insert_ignore(
+    #   :src => AutomobileMakeModelYearVariant,
+    #   :dest => AutomobileMakeModelYear,
+    #   :cols => {
+    #     :make_model_year_name => :name,
+    #     :make_name => :make_name,
+    #     :name => :model_name,
+    #     :make_model_name => :make_model_name,
+    #     :year => :year,
+    #     :make_year_name => :make_year_name
+    #   },
+    #   :where => 'LENGTH(src.make_name) > 0 AND LENGTH(src.make_model_name) > 0'
+    # )
+    # ...executes...
+    # INSERT INTO automobile_make_model_years(name,make_name,model_name,make_model_name,year,make_year_name)
+    # SELECT MAX(src.make_model_year_name),MAX(src.make_name),MAX(src.name),MAX(src.make_model_name),MAX(src.year),MAX(src.make_year_name)
+    # FROM automobile_make_model_year_variants AS src
+    # WHERE
+    #   src.make_model_year_name IS NOT NULL
+    #   AND LENGTH(TRIM(CAST(src.make_model_year_name AS CHAR))) > 0
+    #   AND src.make_model_year_name NOT IN (SELECT dest.name FROM automobile_make_model_years AS dest)
+    #   AND (1=1)
+    # GROUP BY src.make_model_year_name
+    def self.insert_ignore(args = {})
+      dest_cols = args[:cols].values
+      dest_primary_key = args[:dest].primary_key.to_sym
+      dest_primary_key_in_src = args[:cols].key(dest_primary_key)
+      sql = %{
+        INSERT INTO #{args[:dest].table_name}(#{dest_cols.join(',')})
+        SELECT #{dest_cols.map { |dest_col| 'MAX(src.' + args[:cols].key(dest_col).to_s + ')' }.join(',')}
+        FROM #{args[:src].table_name} AS src
+        WHERE
+          src.#{dest_primary_key_in_src} IS NOT NULL
+          AND LENGTH(TRIM(CAST(src.#{dest_primary_key_in_src} AS CHAR))) > 0
+          AND src.#{dest_primary_key_in_src} NOT IN (SELECT dest.#{dest_primary_key} FROM #{args[:dest].table_name} AS dest)
+          AND (#{args[:where] || '1=1'})
+        GROUP BY src.#{dest_primary_key_in_src}
+      }
+      ::ActiveRecord::Base.connection.execute sql
+    end
+  end
+end

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

data/spec/earth/air/aircraft_spec.rb

@@ -5,7 +5,7 @@ require 'earth/air/aircraft/data_miner'
 describe Aircraft do
   describe 'import', :slow => true do
     it 'should treat empty cells as null' do
-      Aircraft.force_schema!
+      Aircraft.auto_upgrade!
       Aircraft.run_data_miner!
       Aircraft.count.should > 1
       Aircraft.where(:brighter_planet_aircraft_class_code => nil).should_not be_empty

data/vendor/clean_find_in_batches/init.rb

@@ -0,0 +1,35 @@
+# http://seejohncode.com/2011/09/16/uuids-and-find-in-batches
+module CleanFindInBatches
+  def self.included(base)
+    base.class_eval do
+      alias :old_find_in_batches :find_in_batches
+      alias :find_in_batches :replacement_find_in_batches
+    end
+  end
+
+  # Override this here because of the implementation of regular find_in_batches
+  # conflicting with this class using UUIDs
+  def replacement_find_in_batches(options = {}, &block)
+    relation = self
+    return old_find_in_batches(options, &block) if relation.primary_key.is_a?(::Arel::Attributes::Integer)
+    # Throw errors like the real thing
+    if (finder_options = options.except(:batch_size)).present?
+      raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order].present?
+      raise "You can't specify a limit, it's forced to be the batch_size"  if options[:limit].present?
+      raise 'You can\'t specify start, it\'s forced to be 0 because the ID is a string' if options.delete(:start)
+      relation = apply_finder_options(finder_options)
+    end
+    # Compute the batch size
+    batch_size = options.delete(:batch_size) || 1000
+    offset = 0
+    # Get the relation and keep going over it until there's nothing left
+    relation = relation.except(:order).order(batch_order).limit(batch_size)
+    while (results = relation.offset(offset).limit(batch_size).all).any?
+      block.call results
+      offset += batch_size
+    end
+    nil
+  end
+end
+
+::ActiveRecord::Batches.send(:include, ::CleanFindInBatches)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earth
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -15,18 +15,18 @@ date: 2011-06-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_miner
-  requirement: &2160276440 !ruby/object:Gem::Requirement
+  requirement: &2168455600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2160276440
+  version_requirements: *2168455600
 - !ruby/object:Gem::Dependency
   name: to_regexp
-  requirement: &2160276000 !ruby/object:Gem::Requirement
+  requirement: &2168455180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160276000
+  version_requirements: *2168455180
 - !ruby/object:Gem::Dependency
   name: cohort_scope
-  requirement: &2160275560 !ruby/object:Gem::Requirement
+  requirement: &2161928740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160275560
+  version_requirements: *2161928740
+- !ruby/object:Gem::Dependency
+  name: table_warnings
+  requirement: &2161928240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *2161928240
 - !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &2160275040 !ruby/object:Gem::Requirement
+  requirement: &2161927740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +67,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160275040
+  version_requirements: *2161927740
 - !ruby/object:Gem::Dependency
   name: falls_back_on
-  requirement: &2160274620 !ruby/object:Gem::Requirement
+  requirement: &2161927360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160274620
+  version_requirements: *2161927360
 - !ruby/object:Gem::Dependency
   name: fixed_width-multibyte
-  requirement: &2160274160 !ruby/object:Gem::Requirement
+  requirement: &2161926900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160274160
+  version_requirements: *2161926900
 - !ruby/object:Gem::Dependency
   name: geokit-rails
-  requirement: &2160273740 !ruby/object:Gem::Requirement
+  requirement: &2161926480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160273740
+  version_requirements: *2161926480
 - !ruby/object:Gem::Dependency
   name: loose_tight_dictionary
-  requirement: &2160273240 !ruby/object:Gem::Requirement
+  requirement: &2161925980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +111,21 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160273240
+  version_requirements: *2161925980
 - !ruby/object:Gem::Dependency
   name: weighted_average
-  requirement: &2160272780 !ruby/object:Gem::Requirement
+  requirement: &2161925480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2161925480
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2161925100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,21 +133,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160272780
+  version_requirements: *2161925100
 - !ruby/object:Gem::Dependency
-  name: force_schema
-  requirement: &2160272240 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: &2161924640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160272240
+  version_requirements: *2161924640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160271740 !ruby/object:Gem::Requirement
+  requirement: &2161924220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160271740
+  version_requirements: *2161924220
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2160271280 !ruby/object:Gem::Requirement
+  requirement: &2161923800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160271280
+  version_requirements: *2161923800
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2160270860 !ruby/object:Gem::Requirement
+  requirement: &2161923380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160270860
+  version_requirements: *2161923380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160270400 !ruby/object:Gem::Requirement
+  requirement: &2161922960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160270400
+  version_requirements: *2161922960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2160269960 !ruby/object:Gem::Requirement
+  requirement: &2161922540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +199,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160269960
+  version_requirements: *2161922540
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &2160269520 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2161922120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +210,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160269520
+  version_requirements: *2161922120
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2160269100 !ruby/object:Gem::Requirement
+  name: sqlite3-ruby
+  requirement: &2161921700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,10 +221,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160269100
+  version_requirements: *2161921700
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &2160268660 !ruby/object:Gem::Requirement
+  name: mysql
+  requirement: &2161921280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,10 +232,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160268660
+  version_requirements: *2161921280
 - !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: &2160268240 !ruby/object:Gem::Requirement
+  name: pg
+  requirement: &2161937220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -221,7 +243,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160268240
+  version_requirements: *2161937220
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables:
@@ -239,6 +261,7 @@ files:
 - LICENSE-PREAMBLE
 - README.markdown
 - Rakefile
+- TODO
 - bin/earth_tester.rb
 - earth.gemspec
 - features/automobile_fuel.feature
@@ -332,6 +355,8 @@ files:
 - lib/earth/air/aircraft_class/data_miner.rb
 - lib/earth/air/aircraft_fuel_use_equation.rb
 - lib/earth/air/aircraft_fuel_use_equation/data_miner.rb
+- lib/earth/air/aircraft_instance.rb
+- lib/earth/air/aircraft_instance_seat_class.rb
 - lib/earth/air/airline.rb
 - lib/earth/air/airline/data_miner.rb
 - lib/earth/air/airport.rb
@@ -495,6 +520,7 @@ files:
 - lib/earth/shipping/data_miner.rb
 - lib/earth/shipping/shipment_mode.rb
 - lib/earth/shipping/shipment_mode/data_miner.rb
+- lib/earth/utils.rb
 - lib/earth/version.rb
 - spec/earth/air/aircraft_spec.rb
 - spec/earth/automobile/automobile_fuel_spec.rb
@@ -506,6 +532,7 @@ files:
 - spec/earth_spec.rb
 - spec/spec_helper.rb
 - test/test_aircraft_match.rb
+- vendor/clean_find_in_batches/init.rb
 - vendor/geokit-rails/CHANGELOG.rdoc
 - vendor/geokit-rails/MIT-LICENSE
 - vendor/geokit-rails/README.markdown
@@ -569,7 +596,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Land, sky, and sea