diet 0.0.10 → 0.0.11

data/lib/diet/carbon_model.rb

@@ -17,10 +17,10 @@ module BrighterPlanet
           end
       
           committee :intensity do # returns grams CO2 / kcal food
-            quorum 'from food group balance', :needs => :food_group_balance do |characteristics|
-              FoodGroup.names.collect do |group|
-                characteristics[:food_group_balance]["#{group}_share".to_sym] * FoodGroup.find_by_name(group).intensity
-              end.sum
+            quorum 'from food groups', :needs => FoodGroup.names.map(&:to_sym) do |characteristics|
+              FoodGroup.names.sum do |group|
+                characteristics[group] * FoodGroup[group].intensity
+              end
             end
       
             quorum 'from diet class', :needs => :diet_class do |characteristics|

data/lib/diet/characterization.rb

@@ -7,15 +7,22 @@ module BrighterPlanet
         base.send :include, Characterizable
         base.characterize do
           has :diet_class
-          has :food_group_balance, :trumps => :diet_class
+          has :red_meat_share, :trumps => :diet_class
+          has :poultry_share, :trumps => :diet_class
+          has :fish_share, :trumps => :diet_class
+          has :eggs_share, :trumps => :diet_class
+          has :nuts_share, :trumps => :diet_class
+          has :dairy_share, :trumps => :diet_class
+          has :cereals_and_grains_share, :trumps => :diet_class
+          has :fruit_share, :trumps => :diet_class
+          has :vegetables_share, :trumps => :diet_class
+          has :oils_and_sugars_share, :trumps => :diet_class
           has :size # TODO more standard unit?
           has :proximity, :measures => :percentage # impotent for now
           has :conventionality, :measures => :percentage # impotent for now
           has :start_date do |start_date|
             start_date.reveals :end_date
           end
-
-          has :retirement, :hidden => true
         end
         base.add_implicit_characteristics
       end

data/lib/test_support/db/schema.rb

@@ -21,7 +21,6 @@ Sniff::Database.define_schema do
     t.float    "fruit_share"
     t.float    "vegetables_share"
     t.float    "oils_and_sugars_share"
-    t.datetime "new_retirement"
     t.date     "start_date"
     t.date     "end_date"
   end

data/lib/test_support/diet_record.rb

@@ -36,14 +36,4 @@ class DietRecord < ActiveRecord::Base
   def size_or_fallback
     size || self.class.fallback.size
   end
-  
-  def food_group_balance
-    return unless FoodGroup.names.map {|g| "#{g}_share".to_sym}.any? {|m| send m}
-    FoodGroup.names.inject({}) { |memo, g| memo["#{g}_share".to_sym] = send("#{g}_share".to_sym); memo}
-  end
-  
-  def food_group_balance=(balance)
-    raise ArgumentError, "Can't set food_group_balance directly" unless balance.nil?
-    update_attributes FoodGroup.names.inject({}) { |memo, g| memo["#{g}_share".to_sym] = nil; memo }
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: diet
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,31 +19,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 -04:00
+date: 2010-08-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 299253624
         segments: 
         - 3
         - 0
         - 0
         - beta4
         version: 3.0.0.beta4
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,15 +55,15 @@ dependencies:
         - beta
         - 2
         version: 1.0.0.beta.2
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 57
         segments: 
@@ -72,15 +71,15 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -88,12 +87,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,12 +101,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -116,15 +115,15 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 62196417
         segments: 
@@ -134,15 +133,15 @@ dependencies:
         - beta
         - 17
         version: 2.0.0.beta.17
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: sniff
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
@@ -150,12 +149,12 @@ dependencies:
         - 0
         - 13
         version: 0.0.13
-  requirement: *id008
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: emitter
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,7 +165,8 @@ dependencies:
         - 0
         - 1
         version: 0.0.1
-  requirement: *id009
+  type: :runtime
+  version_requirements: *id009
 description: A software model in Ruby for the greenhouse gas emissions of a diet
 email: andy@rossmeissl.net
 executables: []