diet 0.0.13 → 0.0.14

data/features/diet_committees.feature

@@ -2,9 +2,10 @@
     The diet model should generate correct committee calculations
 
   Scenario Outline: Standard Calculations for diet classes
-    Given a diet has "diet_class.name" of "<diet_class>"
-    When emissions are calculated
-    Then the intensity committee should be close to <intensity>, +/-1
+    Given a diet emitter
+    And a characteristic "diet_class.name" of "<diet_class>"
+    When the "intensity" committee is calculated
+    Then the conclusion of the committee should be "<intensity>"
     Examples:
       | diet_class | intensity |
       |   standard |      3.78 |

data/features/diet_emissions.feature

@@ -4,7 +4,7 @@ Feature: Diet Emissions Calculations
   Scenario Outline: Standard Calculations for diet classes
     Given a diet has "diet_class.name" of "<diet_class>"
     When emissions are calculated
-    Then the emission value should be within 0.1 kgs of <emission>
+    Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
       | diet_class | emission |
       |   standard |   2966.3 |

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 => :diet
+Sniff.init File.join(File.dirname(__FILE__), '..', '..'), :earth => :diet, :cucumber => true

data/lib/diet/carbon_model.rb

@@ -1,10 +1,7 @@
-require 'leap'
-
 module BrighterPlanet
   module Diet
     module CarbonModel
       def self.included(base)
-        base.extend ::Leap::Subject
         base.decide :emission, :with => :characteristics do
           committee :emission do # returns kg CO2
             quorum 'from intensity and size', :needs => [:intensity, :size, :active_subtimeframe] do |characteristics|
@@ -30,7 +27,7 @@ module BrighterPlanet
       
           committee :size do # returns kcal food
             quorum 'default' do
-              Diet.diet_model.fallback.size
+              base.fallback.size
             end
           end
       

data/lib/diet/characterization.rb

@@ -1,10 +1,7 @@
-require 'characterizable'
-
 module BrighterPlanet
   module Diet
     module Characterization
       def self.included(base)
-        base.send :include, Characterizable
         base.characterize do
           has :diet_class
           has :red_meat_share, :trumps => :diet_class
@@ -24,7 +21,6 @@ module BrighterPlanet
             start_date.reveals :end_date
           end
         end
-        base.add_implicit_characteristics
       end
     end
   end

data/lib/diet/data.rb

@@ -1,5 +1,3 @@
-require 'data_miner'
-
 module BrighterPlanet
   module Diet
     module Data

data/lib/diet/summarization.rb

@@ -1,10 +1,7 @@
-require 'summary_judgement'
-
 module BrighterPlanet
   module Diet
     module Summarization
       def self.included(base)
-        base.extend SummaryJudgement
         base.summarize do |has|
           has.adjective lambda { |diet| "#{diet.size}-calorie" }, :if => :size
           has.adjective 'local', :if => :local?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: diet
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,51 +19,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -05:00
+date: 2010-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 299253624
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
-  type: :development
-  version_requirements: *id001
+        version: 3.0.0
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196359
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - beta
-        - 2
-        version: 1.0.0.beta.2
-  type: :development
-  version_requirements: *id002
+        version: 1.0.0
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: cucumber
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 57
         segments: 
@@ -71,15 +69,15 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -87,12 +85,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  type: :development
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +99,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: rdoc
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,15 +113,15 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: rspec
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 62196417
         segments: 
@@ -133,40 +131,39 @@ dependencies:
         - beta
         - 17
         version: 2.0.0.beta.17
-  type: :development
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: sniff
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: sniff
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
-        - 0
-        - 13
-        version: 0.0.13
-  type: :development
-  version_requirements: *id008
+        - 1
+        - 12
+        version: 0.1.12
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: emitter
+  type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: emitter
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
-        - 0
         - 1
-        version: 0.0.1
-  type: :runtime
-  version_requirements: *id009
+        - 4
+        version: 0.1.4
+  requirement: *id009
 description: A software model in Ruby for the greenhouse gas emissions of a diet
 email: andy@rossmeissl.net
 executables: []