automobile 0.0.12 → 0.0.13

data/features/automobile_committees.feature

@@ -1,21 +1,36 @@
 Feature: Automobile Committee Calculations
   The automobile model should generate correct committee calculations
 
-  Scenario Outline: Acquisition committee
-    Given an automobile has "acquisition" of "<acquisition>"
-    And it has "model_year.name" "<make_model_year>"
-    When emissions are calculated
-    Then the acquisition committee should be exactly <acquisition_committee>
+  Scenario Outline: Retirement committee from acquisition
+    Given an automobile emitter
+    And a characteristic "timeframe" of "<timeframe>"
+    And a characteristic "acquisition" of "<acquisition>"
+    When the "retirement" committee is calculated
+    Then the conclusion of the committee should be "<retirement_committee>"
     Examples:
-      | make_model_year | acquisition | acquisition_committee |
-      |                 | 2007-01-30  | 2007-01-30            |
-      | Honda FIT 2008  |             | 2010-01-01            |
+      | timeframe             | acquisition | retirement_committee |
+      | 2009-03-04/2009-08-17 | 2010-04-21  | 2010-04-21           |
+      | 2009-03-04/2009-08-17 | 2007-01-30  | 2009-08-17           |
+      | 2009-03-04/2009-08-17 |             | 2009-08-17           |
 
-  Scenario Outline: Retirement committees
-    Given an automobile has "acquisition" of "<acquisition>"
-    And it has "model_year.name" "<make_model_year>"
-    When emissions are calculated
-    Then the retirement committee should be exactly <retirement_committee>
+  Scenario Outline: Acquisition committee from model year or year
+    Given an automobile emitter
+    And a characteristic "model_year.name" of "<make_model_year>"
+    And a characteristic "year" of "<year>"
+    When the "acquisition" committee is calculated
+    Then the conclusion of the committee should be "<acquisition_committee>"
     Examples:
-      | acquisition | retirement | retirement_committee |
-      | 2007-01-30  | 2009-03-04 | 2011-01-01           |
+      | make_model_year | year | acquisition_committee |
+      |                 | 2007 | 2007-01-01            |
+      | Honda FIT 2008  |      | 2008-01-01            |
+
+  Scenario Outline: Acquisition committee from retirement
+    Given an automobile emitter
+    And a characteristic "timeframe" of "<timeframe>"
+    And a characteristic "retirement" of "<retirement>"
+    When the "acquisition" committee is calculated
+    Then the conclusion of the committee should be "<acquisition_committee>"
+    Examples:
+      | timeframe             | retirement | acquisition_committee |
+      | 2010-08-10/2010-09-16 | 2007-02-03 | 2007-02-03            |
+      | 2010-08-10/2010-09-16 |            | 2010-08-10            |

data/features/automobile_emissions.feature

@@ -2,13 +2,12 @@ Feature: Automobile Emissions Calculations
   The automobile model should generate correct emission calculations
 
   Scenario Outline: Standard Calculations for automobiles
-    Given an automobile has "annual_distance_estimate" of "<annual_distance>"
-    And it has "model_year.name" "<make_model_year>"
-    And it has "acquisition" "<acquisition>"
-    And it has "retirement" "<retirement>"
+    Given an automobile has "annual_distance_estimate" of "<distance>"
+    And it has "timeframe" of "<timeframe>"
+    And it has "model_year.name" of "<make_model_year>"
     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:
-      | annual_distance | make_model_year | acquisition | retirement | emission |
-      |           30000 | Acura RSX 2003  | 2008-01-30  | 2009-05-15 |      123 |
-      |           30000 | Honda FIT 2008  | 2008-01-30  | 2009-05-15 |      123 |
+      | distance | make_model_year |  timeframe           | emission |
+      |    30000 | Acura RSX 2003  | 2008-01-30/2009-05-20|   8706.4 |
+      |    80000 | Honda FIT 2008  | 2008-01-30/2009-05-20|  23217.1 |

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

data/lib/automobile/carbon_model.rb

@@ -1,11 +1,9 @@
-require 'leap'
 require 'conversions'
 
 module BrighterPlanet
   module Automobile
     module CarbonModel
       def self.included(base)
-        base.extend ::Leap::Subject
         base.decide :emission, :with => :characteristics do
           committee :emission do # returns kg CO2
             quorum 'from fuel', :needs => [:fuel_consumed, :emission_factor], :appreciates => :fuel_type do |characteristics|
@@ -187,8 +185,11 @@ module BrighterPlanet
           
           committee :acquisition do
             quorum 'from model year or year', :appreciates => [:model_year, :year] do |characteristics|
-              puts characteristics.inspect
-              !characteristics.empty? && Date.new((characteristics[:model_year].andand.year || characteristics[:year]).to_i - 1, 1, 1)
+              if characteristics[:model_year]
+                Date.new characteristics[:model_year].year, 1, 1
+              elsif characteristics[:year]
+                Date.new characteristics[:year].to_i, 1, 1
+              end
             end
             quorum 'from retirement', :appreciates => :retirement do |characteristics, timeframe|
               [ timeframe.from, characteristics[:retirement] ].compact.min

data/lib/automobile/characterization.rb

@@ -1,10 +1,7 @@
-require 'characterizable'
-
 module BrighterPlanet
   module Automobile
     module Characterization
       def self.included(base)
-        base.send :include, Characterizable
         base.characterize do
           has :make do |make|
             make.reveals :model_year do |model_year|
@@ -35,7 +32,6 @@ module BrighterPlanet
           # has :annual_fuel_cost, :trumps => [:annual_distance_estimate, :weekly_distance_estimate, :daily_distance_estimate, :daily_duration, :weekly_fuel_cost], :measures => :cost
           # has :weekly_fuel_cost, :trumps => [:annual_distance_estimate, :weekly_distance_estimate, :daily_distance_estimate, :daily_duration, :annual_fuel_cost], :measures => :cost
         end
-        base.add_implicit_characteristics
       end
     end
   end

data/lib/automobile/data.rb

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

data/lib/automobile/summarization.rb

@@ -1,10 +1,7 @@
-require 'summary_judgement'
-
 module BrighterPlanet
   module Automobile
     module Summarization
       def self.included(base)
-        base.extend SummaryJudgement
         base.summarize do |has|
           has.adjective :model_year
           has.adjective :make

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: automobile
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -04:00
+date: 2010-09-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,15 +29,14 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        version: 3.0.0
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -46,16 +45,14 @@ dependencies:
   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
+        version: 1.0.0
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -64,7 +61,7 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 57
         segments: 
@@ -80,7 +77,7 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -124,7 +121,7 @@ dependencies:
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 62196417
         segments: 
@@ -142,14 +139,14 @@ dependencies:
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 57
         segments: 
         - 0
-        - 0
-        - 11
-        version: 0.0.11
+        - 1
+        - 17
+        version: 0.1.17
   requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -158,14 +155,14 @@ dependencies:
   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
+        - 4
+        version: 0.1.4
   requirement: *id009
 description: A software model in Ruby for the greenhouse gas emissions of an automobile
 email: andy@rossmeissl.net