residence 0.0.5 → 0.0.6

data/features/residence_committees.feature

@@ -9,3 +9,11 @@ Feature: Residence Committee Calculations
     Examples:
       | full_baths | half_baths | bathrooms |
       |          2 |        0.5 |       2.5 |
+
+  Scenario Outline: Predicted annual electricity use committee
+    Given a residence has "lighting_efficiency" of "<lighting_efficiency>"
+    When emissions are calculated
+    Then the predicted_annual_electricity_use committee should be exactly <predicted_annual_electricity_use>
+    Examples:
+      | lighting_efficiency | predicted_annual_electricity_use |
+      | 0.5                 |                 14409.3456880943 |

data/lib/residence/carbon_model.rb

@@ -544,6 +544,15 @@ module BrighterPlanet
           end
         end
       end
+
+      def self.research(key)
+        case key
+        when :efficient_lightbulb_power
+          17.5 # watts https://brighterplanet.sifterapp.com/projects/30/issues/433
+        when :standard_lightbulb_power
+          67.5 # watts https://brighterplanet.sifterapp.com/projects/30/issues/433
+        end
+      end
     end
   end
 end

data/lib/test_support/residence_record.rb

@@ -22,17 +22,6 @@ class ResidenceRecord < ActiveRecord::Base
                 :occupation => 0.937, # https://brighterplanet.sifterapp.com/projects/30/issues/434
                 :green_electricity => 0.0 # crap placeholder for now
 
-  class << self
-    def research(key)
-      case key
-      when :efficient_lightbulb_power
-        17.5 # watts https://brighterplanet.sifterapp.com/projects/30/issues/433
-      when :standard_lightbulb_power
-        67.5 # watts https://brighterplanet.sifterapp.com/projects/30/issues/433
-      end
-    end
-  end
-  
   def zip_code_name=(value)
     self.zip_code = ZipCode.find_by_name(value)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: residence
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andy Rossmeissl