automobile 0.0.1 → 0.0.3

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/brighterplanet/automobile"
     gem.authors = ["Andy Rossmeissl", "Seamus Abshere", "Ian Hough", "Matt Kling"]
     gem.add_dependency 'leap'
+    gem.add_dependency 'conversions'
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/automobile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{automobile}
-  s.version = "0.0.1"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere", "Ian Hough", "Matt Kling"]
-  s.date = %q{2010-06-10}
+  s.date = %q{2010-07-06}
   s.description = %q{A software model in Ruby for the greenhouse gas emissions of an automobile}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [
@@ -44,13 +44,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<leap>, [">= 0"])
+      s.add_runtime_dependency(%q<conversions>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<leap>, [">= 0"])
+      s.add_dependency(%q<conversions>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<leap>, [">= 0"])
+    s.add_dependency(%q<conversions>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

data/lib/automobile.rb

@@ -1,3 +1,5 @@
+require 'conversions'
+
 module BrighterPlanet
   module Automobile
     def self.included(base)
@@ -155,7 +157,7 @@ module BrighterPlanet
         
         committee :speed do # returns kilometres per hour
           quorum 'from urbanity', :needs => :urbanity do |characteristics|
-            1 / (characteristics[:urbanity] / ::Automobile::RESEARCH[:city_speed] + (1 - characteristics[:urbanity]) / ::Automobile::RESEARCH[:highway_speed]) 
+            1 / (characteristics[:urbanity] / ::BrighterPlanet::Automobile::SPEEDS[:city] + (1 - characteristics[:urbanity]) / ::BrighterPlanet::Automobile::SPEEDS[:highway]) 
           end
         end
         
@@ -183,6 +185,7 @@ 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)
           end
           quorum 'from retirement', :appreciates => :retirement do |characteristics, timeframe|
@@ -198,5 +201,9 @@ module BrighterPlanet
         
       end
     end
+    SPEEDS = {
+      :highway => 57.1.miles.to(:kilometres), # https://brighterplanet.sifterapp.com/projects/30/issues/428
+      :city => 19.9.miles.to(:kilometres)     # https://brighterplanet.sifterapp.com/projects/30/issues/428
+    }
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -04:00
+date: 2010-07-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: conversions
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -42,8 +42,20 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: A software model in Ruby for the greenhouse gas emissions of an automobile
 email: andy@rossmeissl.net
 executables: []