diet 0.0.14 → 0.0.15

data/features/diet_committees.feature

@@ -1,7 +1,7 @@
   Feature: Diet Committee Calculations
     The diet model should generate correct committee calculations
 
-  Scenario Outline: Standard Calculations for diet classes
+  Scenario Outline: Intensity committee from diet class
     Given a diet emitter
     And a characteristic "diet_class.name" of "<diet_class>"
     When the "intensity" committee is calculated
@@ -11,3 +11,22 @@
       |   standard |      3.78 |
       |      vegan |      2.57 |
       | vegetarian |      3.01 |
+
+  Scenario Outline: Intensity committee from  food groups
+    Given a diet emitter
+    And a characteristic "red_meat_share" of "<meat>"
+    And a characteristic "poultry_share" of "<poultry>"
+    And a characteristic "fish_share" of "<fish>"
+    And a characteristic "eggs_share" of "<eggs>"
+    And a characteristic "nuts_share" of "<nuts>"
+    And a characteristic "dairy_share" of "<dairy>"
+    And a characteristic "cereals_and_grains_share" of "<cereals>"
+    And a characteristic "fruit_share" of "<fruit>"
+    And a characteristic "vegetables_share" of "<veg>"
+    And a characteristic "oils_and_sugars_share" of "<oil>"
+    When the "intensity" committee is calculated
+    Then the committee should have used quorum "from food groups"
+    And the conclusion of the committee should be "<intensity>"
+    Examples:
+      | meat | poultry | fish | eggs | nuts | dairy | cereals | fruit | veg | oil | intensity |
+      | 0.1  | 0.1     | 0.1  | 0.1  | 0.1  | 0.1   | 0.1     | 0.1   | 0.1 | 0.1 | 5         |

data/lib/diet.rb

@@ -3,15 +3,5 @@ require 'emitter'
 module BrighterPlanet
   module Diet
     extend BrighterPlanet::Emitter
-
-    def self.diet_model
-      if Object.const_defined? 'Diet'
-        ::Diet
-      elsif Object.const_defined? 'DietRecord'
-        DietRecord
-      else
-        raise 'There is no diet model'
-      end
-    end
   end
 end

data/lib/diet/carbon_model.rb

@@ -15,8 +15,8 @@ module BrighterPlanet
       
           committee :intensity do # returns grams CO2 / kcal food
             quorum 'from food groups', :needs => [:red_meat_share, :poultry_share, :fish_share, :eggs_share, :nuts_share, :dairy_share, :cereals_and_grains_share, :fruit_share, :vegetables_share, :oils_and_sugars_share] do |characteristics|
-              [:red_meat_share, :poultry_share, :fish_share, :eggs_share, :nuts_share, :dairy_share, :cereals_and_grains_share, :fruit_share, :vegetables_share, :oils_and_sugars_share].sum do |group|
-                characteristics[group] * FoodGroup[group].intensity
+              [:red_meat, :poultry, :fish, :eggs, :nuts, :dairy, :cereals_and_grains, :fruit, :vegetables, :oils_and_sugars].sum do |group|
+                characteristics["#{group}_share".to_sym].to_f * FoodGroup[group].intensity.to_f
               end
             end
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: diet
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -04:00
+date: 2010-09-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,12 +141,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 12
-        version: 0.1.12
+        - 2
+        - 0
+        version: 0.2.0
   requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -181,7 +181,6 @@ files:
 - lib/diet/characterization.rb
 - lib/diet/data.rb
 - lib/diet/summarization.rb
-- lib/test_support/db/schema.rb
 - lib/test_support/diet_record.rb
 - features/support/env.rb
 - features/diet_committees.feature
@@ -224,5 +223,4 @@ test_files:
 - features/support/env.rb
 - features/diet_committees.feature
 - features/diet_emissions.feature
-- lib/test_support/db/schema.rb
 - lib/test_support/diet_record.rb

data/lib/test_support/db/schema.rb

@@ -1,27 +0,0 @@
-require 'sniff/database'
-
-Sniff::Database.define_schema do
-  create_table "diet_records", :force => true do |t|
-    t.string   "name"
-    t.integer  "profile_id"
-    t.integer  "diet_class_id"
-    t.float    "proximity"
-    t.float    "conventionality"
-    t.integer  "size"
-    t.float    "intensity"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.float    "red_meat_share"
-    t.float    "poultry_share"
-    t.float    "fish_share"
-    t.float    "eggs_share"
-    t.float    "nuts_share"
-    t.float    "dairy_share"
-    t.float    "cereals_and_grains_share"
-    t.float    "fruit_share"
-    t.float    "vegetables_share"
-    t.float    "oils_and_sugars_share"
-    t.date     "start_date"
-    t.date     "end_date"
-  end
-end