residence 0.0.11 → 0.0.12

data/features/support/env.rb

@@ -5,4 +5,4 @@ require 'cucumber'
 require 'cucumber/formatter/unicode'
 
 require 'sniff'
-Sniff.init File.join(File.dirname(__FILE__), '..', '..'), :earth => [:residence, :locality]
+Sniff.init File.join(File.dirname(__FILE__), '..', '..'), :earth => [:residence, :locality], :cucumber => true

data/lib/residence/carbon_model.rb

@@ -32,7 +32,7 @@ module BrighterPlanet
               characteristics[:reported_annual_fuel_oil_consumption] * (timeframe / timeframe.year)
             end
             quorum 'from research', :needs => [:predicted_annual_fuel_oil_consumption, :predicted_fuel_shares, :missing_annual_energy, :occupation] do |characteristics, timeframe|
-              (characteristics[:predicted_annual_fuel_oil_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:fuel_oil]).joules.to(:litres_of_fuel_oil) ) * (timeframe / timeframe.year) * characteristics[:occupation] / Residence.residence_model.fallback.occupation
+              (characteristics[:predicted_annual_fuel_oil_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:fuel_oil]).joules.to(:litres_of_fuel_oil) ) * (timeframe / timeframe.year) * characteristics[:occupation] / base.fallback.occupation
             end
           end
           
@@ -41,7 +41,7 @@ module BrighterPlanet
               characteristics[:reported_annual_natural_gas_consumption] * (timeframe / timeframe.year)
             end
             quorum 'from research', :needs => [:predicted_annual_natural_gas_consumption, :predicted_fuel_shares, :missing_annual_energy, :occupation] do |characteristics, timeframe|
-              (characteristics[:predicted_annual_natural_gas_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:natural_gas])) * (timeframe / timeframe.year) * characteristics[:occupation] / Residence.residence_model.fallback.occupation
+              (characteristics[:predicted_annual_natural_gas_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:natural_gas])) * (timeframe / timeframe.year) * characteristics[:occupation] / base.fallback.occupation
             end
           end
           
@@ -50,7 +50,7 @@ module BrighterPlanet
               characteristics[:reported_annual_propane_consumption] * (timeframe / timeframe.year)
             end
             quorum 'from research', :needs => [:predicted_annual_propane_consumption, :predicted_fuel_shares, :missing_annual_energy, :occupation] do |characteristics, timeframe|
-              (characteristics[:predicted_annual_propane_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:propane]).joules.to(:litres_of_propane)) * (timeframe / timeframe.year) * characteristics[:occupation] / Residence.residence_model.fallback.occupation
+              (characteristics[:predicted_annual_propane_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:propane]).joules.to(:litres_of_propane)) * (timeframe / timeframe.year) * characteristics[:occupation] / base.fallback.occupation
             end
           end
           
@@ -59,7 +59,7 @@ module BrighterPlanet
               characteristics[:reported_annual_biomass_consumption] * (timeframe / timeframe.year)
             end
             quorum 'from research', :needs => [:predicted_annual_biomass_consumption, :predicted_fuel_shares, :missing_annual_energy, :occupation] do |characteristics, timeframe|
-              (characteristics[:predicted_annual_biomass_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:biomass])) * (timeframe / timeframe.year) * characteristics[:occupation] / Residence.residence_model.fallback.occupation
+              (characteristics[:predicted_annual_biomass_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:biomass])) * (timeframe / timeframe.year) * characteristics[:occupation] / base.fallback.occupation
             end
           end
           
@@ -68,7 +68,7 @@ module BrighterPlanet
               characteristics[:reported_annual_kerosene_consumption] * (timeframe / timeframe.year)
             end
             quorum 'from research', :needs => [:predicted_annual_kerosene_consumption, :predicted_fuel_shares, :missing_annual_energy, :occupation] do |characteristics, timeframe|
-              (characteristics[:predicted_annual_kerosene_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:kerosene]).joules.to(:litres_of_kerosene)) * (timeframe / timeframe.year) * characteristics[:occupation] / Residence.residence_model.fallback.occupation
+              (characteristics[:predicted_annual_kerosene_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:kerosene]).joules.to(:litres_of_kerosene)) * (timeframe / timeframe.year) * characteristics[:occupation] / base.fallback.occupation
             end
           end
           
@@ -77,7 +77,7 @@ module BrighterPlanet
               characteristics[:reported_annual_coal_consumption] * (timeframe / timeframe.year)
             end
             quorum 'from research', :needs => [:predicted_annual_coal_consumption, :predicted_fuel_shares, :missing_annual_energy, :occupation] do |characteristics, timeframe|
-              (characteristics[:predicted_annual_coal_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:coal]).joules.to(:kilograms_of_coal)) * (timeframe / timeframe.year) * characteristics[:occupation] / Residence.residence_model.fallback.occupation
+              (characteristics[:predicted_annual_coal_consumption] + (characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:coal]).joules.to(:kilograms_of_coal)) * (timeframe / timeframe.year) * characteristics[:occupation] / base.fallback.occupation
             end
           end
           
@@ -89,7 +89,7 @@ module BrighterPlanet
           
           committee :green_electricity do
             quorum 'default' do
-              Residence.residence_model.fallback.green_electricity
+              base.fallback.green_electricity
             end
           end
           
@@ -105,7 +105,7 @@ module BrighterPlanet
             end
             
             quorum 'from research', :needs => [:predicted_annual_electricity_use, :predicted_fuel_shares, :missing_annual_energy, :occupation] do |characteristics, timeframe|
-              (characteristics[:predicted_annual_electricity_use] + ((characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:electricity]).joules.to(:kilowatt_hours))) * (timeframe / timeframe.year) * characteristics[:occupation] / Residence.residence_model.fallback.occupation
+              (characteristics[:predicted_annual_electricity_use] + ((characteristics[:missing_annual_energy] * characteristics[:predicted_fuel_shares][:electricity]).joules.to(:kilowatt_hours))) * (timeframe / timeframe.year) * characteristics[:occupation] / base.fallback.occupation
             end
           end
           
@@ -171,7 +171,7 @@ module BrighterPlanet
           
           committee :occupation do
             quorum 'default' do
-              Residence.residence_model.fallback.occupation
+              base.fallback.occupation
             end
           end
           
@@ -181,7 +181,7 @@ module BrighterPlanet
             end
             
             quorum 'default' do
-              Residence.residence_model.fallback.residents_before_type_cast
+              base.fallback.residents_before_type_cast
             end
           end
       
@@ -243,7 +243,7 @@ module BrighterPlanet
             end
       
             quorum 'default' do
-              Residence.residence_model.fallback.annual_fuel_oil_volume_estimate
+              base.fallback.annual_fuel_oil_volume_estimate
             end
           end
           
@@ -272,7 +272,7 @@ module BrighterPlanet
             end
       
             quorum 'default' do
-              Residence.residence_model.fallback.monthly_natural_gas_volume_estimate * 12
+              base.fallback.monthly_natural_gas_volume_estimate * 12
             end
           end
           
@@ -301,7 +301,7 @@ module BrighterPlanet
             end
       
             quorum 'default' do
-              Residence.residence_model.fallback.annual_propane_volume_estimate
+              base.fallback.annual_propane_volume_estimate
             end
           end
           
@@ -317,7 +317,7 @@ module BrighterPlanet
             end
       
             quorum 'default' do
-              Residence.residence_model.fallback.annual_kerosene_volume_estimate
+              base.fallback.annual_kerosene_volume_estimate
             end
           end
           
@@ -333,7 +333,7 @@ module BrighterPlanet
             end
       
             quorum 'default' do
-              Residence.residence_model.fallback.annual_wood_volume_estimate
+              base.fallback.annual_wood_volume_estimate
             end
           end
           
@@ -345,7 +345,7 @@ module BrighterPlanet
           
           committee :predicted_annual_coal_consumption do # returns kg
             quorum 'default' do
-              Residence.residence_model.fallback.annual_coal_volume_estimate
+              base.fallback.annual_coal_volume_estimate
             end
           end
           
@@ -443,7 +443,7 @@ module BrighterPlanet
             end
             
             quorum 'default' do
-              Residence.residence_model.fallback.monthly_electricity_use_estimate * 12
+              base.fallback.monthly_electricity_use_estimate * 12
             end
           end
           
@@ -471,14 +471,14 @@ module BrighterPlanet
           
           # This is kindof "hacky"
           # As implemented, this needs to be above floorspace committee or else cohort will always
-          # use the Residence.residence_model.fallback
+          # use the base.fallback
           committee :floorspace_estimate do
             quorum 'from cohort', :needs => :cohort do |characteristics|
               characteristics[:cohort].weighted_average :floorspace
             end
             
             quorum 'default' do
-              Residence.residence_model.fallback.floorspace_estimate
+              base.fallback.floorspace_estimate
             end
           end
           

data/lib/residence.rb

@@ -3,15 +3,5 @@ require 'emitter'
 module BrighterPlanet
   module Residence
     extend BrighterPlanet::Emitter
-
-    def self.residence_model
-      if Object.const_defined? 'Residence'
-        ::Residence
-      elsif Object.const_defined? 'ResidenceRecord'
-        ResidenceRecord
-      else
-        raise 'There is no residence model'
-      end
-    end
   end
 end

data/lib/test_support/residence_record.rb

@@ -1,4 +1,5 @@
 require 'residence'
+require 'falls_back_on'
 
 class ResidenceRecord < ActiveRecord::Base
   include Sniff::Emitter

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: residence
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 -04:00
+date: 2010-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 299253624
+        hash: -1848230024
         segments: 
         - 3
         - 0
@@ -159,12 +159,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 15
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 8
+        version: 0.0.8
   type: :runtime
   version_requirements: *id009
 description: A software model in Ruby for the greenhouse gas emissions of an residence