earth 0.6.0 → 0.6.1

data/.gitignore

@@ -22,3 +22,4 @@ log
 
 ## PROJECT::SPECIFIC
 Gemfile.lock
+*.gem

data/Gemfile

@@ -1,7 +1,3 @@
-gem 'data_miner', :path => ENV['LOCAL_DATA_MINER'] if ENV['LOCAL_DATA_MINER']
-gem 'mini_record', :path => ENV['LOCAL_MINI_RECORD'] if ENV['LOCAL_MINI_RECORD']
-gem 'force_schema', :path => ENV['LOCAL_FORCE_SCHEMA'] if ENV['LOCAL_FORCE_SCHEMA']
-
 source :rubygems
 
 gemspec :path => '.'

data/TODO

@@ -1,2 +1,3 @@
 * convert former/current verify blocks into table_warnings warn {...} blocks
 * convert tests to minitest
+* fix residence fuel price locatable stuff

data/earth.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'geokit-rails'
   s.add_runtime_dependency 'loose_tight_dictionary', '>=0.2.3'
   s.add_runtime_dependency 'weighted_average', '>=1'
-  # s.add_runtime_dependency 'mini_record' # need https://github.com/DAddYE/mini_record/pull/7 - for now install manually from https://github.com/seamusabshere/mini_record
+  s.add_runtime_dependency 'mini_record-compat' # need https://github.com/DAddYE/mini_record/pull/7
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'activerecord'
   s.add_development_dependency 'bundler'

data/lib/earth.rb

@@ -72,7 +72,7 @@ module Earth
     options = args.last.is_a?(Hash) ? args.pop.symbolize_keys : {}
     domains = args.empty? ? [ :all ] : args.map(&:to_sym)
 
-    _configure_database_connection
+    _warn_unless_mysql_ansi_mode
     _load_plugins
     _load_domains domains, options
     _decorate_resources options
@@ -81,9 +81,10 @@ module Earth
 
   private
   
-  def _configure_database_connection
+  def _warn_unless_mysql_ansi_mode
     if ActiveRecord::Base.connection.adapter_name =~ /mysql/i
-      ActiveRecord::Base.connection.execute("SET SQL_MODE = 'PIPES_AS_CONCAT'")    
+      sql_mode = ActiveRecord::Base.connection.select_value("SELECT @@GLOBAL.sql_mode") + ActiveRecord::Base.connection.select_value("SELECT @@SESSION.sql_mode")
+      $stderr.puts "[earth gem] Warning: MySQL detected, but PIPES_AS_CONCAT not set. Importing from scratch will fail. Consider setting sql-mode=ANSI in my.cnf." unless sql_mode =~ /pipes_as_concat/i
     end
   end
   

data/lib/earth/automobile/automobile_type_fuel_year_age/data_miner.rb

@@ -107,10 +107,11 @@ AutomobileTypeFuelYearAge.class_eval do
     end
     
     process "Calculate number of vehicles from total travel percent and AutomobileTypeFuelYear" do
-      AutomobileTypeFuelYearAge.all.each do |record|
-        record.vehicles = record.total_travel_percent * record.type_fuel_year.total_travel / record.annual_distance
-        record.save
-      end
+      total_travel = "(SELECT t1.total_travel FROM #{AutomobileTypeFuelYear.quoted_table_name} AS t1 WHERE t1.name = #{quoted_table_name}.type_fuel_year_name)"
+      update_all(
+        %{vehicles = total_travel_percent * #{total_travel} / annual_distance},
+        %{annual_distance > 0}
+      )
     end
   end
 end

data/lib/earth/automobile/automobile_type_year/data_miner.rb

@@ -12,12 +12,16 @@ AutomobileTypeYear.class_eval do
       AutomobileTypeFuelYear.run_data_miner!
     end
     
+    process "Set units" do
+      update_all :hfc_emission_factor_units => 'kilograms_co2e_per_litre'
+    end
+    
     process "Calculate HFC emission factor from AutomobileTypeFuelYear" do
-      AutomobileTypeYear.all.each do |record|
-        record.hfc_emission_factor = record.hfc_emissions / record.type_fuel_years.sum('fuel_consumption')
-        record.hfc_emission_factor_units = "kilograms_co2e_per_litre"
-        record.save
-      end
+      total_fuel_consumption = "(SELECT SUM(src.fuel_consumption) FROM #{AutomobileTypeFuelYear.quoted_table_name} AS src WHERE src.type_year_name = #{quoted_table_name}.name)"
+      update_all(
+        %{hfc_emission_factor = hfc_emissions / #{total_fuel_consumption}},
+        %{#{total_fuel_consumption} > 0}
+      )
     end    
   end
 end

data/lib/earth/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earth
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-06-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_miner
-  requirement: &2168455600 !ruby/object:Gem::Requirement
+  requirement: &2154695800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2168455600
+  version_requirements: *2154695800
 - !ruby/object:Gem::Dependency
   name: to_regexp
-  requirement: &2168455180 !ruby/object:Gem::Requirement
+  requirement: &2164269760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168455180
+  version_requirements: *2164269760
 - !ruby/object:Gem::Dependency
   name: cohort_scope
-  requirement: &2161928740 !ruby/object:Gem::Requirement
+  requirement: &2164269300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161928740
+  version_requirements: *2164269300
 - !ruby/object:Gem::Dependency
   name: table_warnings
-  requirement: &2161928240 !ruby/object:Gem::Requirement
+  requirement: &2164268800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2161928240
+  version_requirements: *2164268800
 - !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &2161927740 !ruby/object:Gem::Requirement
+  requirement: &2164268300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2161927740
+  version_requirements: *2164268300
 - !ruby/object:Gem::Dependency
   name: falls_back_on
-  requirement: &2161927360 !ruby/object:Gem::Requirement
+  requirement: &2164267920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161927360
+  version_requirements: *2164267920
 - !ruby/object:Gem::Dependency
   name: fixed_width-multibyte
-  requirement: &2161926900 !ruby/object:Gem::Requirement
+  requirement: &2164267460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161926900
+  version_requirements: *2164267460
 - !ruby/object:Gem::Dependency
   name: geokit-rails
-  requirement: &2161926480 !ruby/object:Gem::Requirement
+  requirement: &2164267040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161926480
+  version_requirements: *2164267040
 - !ruby/object:Gem::Dependency
   name: loose_tight_dictionary
-  requirement: &2161925980 !ruby/object:Gem::Requirement
+  requirement: &2164266540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2161925980
+  version_requirements: *2164266540
 - !ruby/object:Gem::Dependency
   name: weighted_average
-  requirement: &2161925480 !ruby/object:Gem::Requirement
+  requirement: &2164266040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,21 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *2161925480
+  version_requirements: *2164266040
+- !ruby/object:Gem::Dependency
+  name: mini_record-compat
+  requirement: &2164265660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2164265660
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161925100 !ruby/object:Gem::Requirement
+  requirement: &2164265200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +144,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161925100
+  version_requirements: *2164265200
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161924640 !ruby/object:Gem::Requirement
+  requirement: &2164264780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +155,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161924640
+  version_requirements: *2164264780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161924220 !ruby/object:Gem::Requirement
+  requirement: &2164264360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161924220
+  version_requirements: *2164264360
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2161923800 !ruby/object:Gem::Requirement
+  requirement: &2164263940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161923800
+  version_requirements: *2164263940
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2161923380 !ruby/object:Gem::Requirement
+  requirement: &2164263520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161923380
+  version_requirements: *2164263520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161922960 !ruby/object:Gem::Requirement
+  requirement: &2164263100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +199,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161922960
+  version_requirements: *2164263100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2161922540 !ruby/object:Gem::Requirement
+  requirement: &2164262680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,10 +210,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161922540
+  version_requirements: *2164262680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161922120 !ruby/object:Gem::Requirement
+  requirement: &2164262260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,10 +221,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161922120
+  version_requirements: *2164262260
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2161921700 !ruby/object:Gem::Requirement
+  requirement: &2164261840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -221,10 +232,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161921700
+  version_requirements: *2164261840
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2161921280 !ruby/object:Gem::Requirement
+  requirement: &2164277780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -232,10 +243,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161921280
+  version_requirements: *2164277780
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2161937220 !ruby/object:Gem::Requirement
+  requirement: &2164277360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -243,7 +254,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161937220
+  version_requirements: *2164277360
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables: