carbon 1.0.4 → 1.1.0

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 Gemfile.lock
+*.gem

data/README.rdoc

@@ -154,7 +154,7 @@ It's telling you that a flight in 2009 did not result in any 2011 emissions (the
 
 So, 850 kilograms emitted in 2009.
 
-== Attribute serialization
+== Association serialization
 
 Your objects' attributes are serialized via <tt>#to_characteristic</tt> or <tt>#to_param</tt> (in that order of preference) before being submitted to the web service. 
 
@@ -180,6 +180,12 @@ Without <tt>AutomobileMake#to_characteristic</tt>, the library would have no way
     
 Runs a realtime request but allows timing out the network call. Raises <tt>Timeout::Error</tt> if timeout is exceeded.
 
+== Certified calculations
+
+You can run {certified calculations}[http://brighterplanet.com/certified] by setting <tt>certified</tt> to true.
+
+    > RentalCar.new.emission_estimate :certified => true
+
 == Persisted queries
 
 You can specify that the result be persisted in low-latency storage so that future identical requests can use the same estimate:
@@ -241,8 +247,12 @@ This library includes a special console for performing calculations interactivel
   
 === Emitter mode
 
+In Emitter mode, the prompt displays the emitter type in use. If a timeframe has been set, the timeframe is also included in the prompt.
+
 [+help+]                               Displays a list of characteristics for this emitter type.
 [<tt><i>characteristic value</i></tt>] (e.g. <tt>origin_airport 'lax'</tt>) Provide a characteristic. Remember, this is Ruby we're dealing with, so strings must be quoted.
+[+timeframe+]                          Display the current timeframe in effect on the emission estimate.
+[<tt>timeframe <i>timeframe</i></tt>]  (e.g. <tt>timeframe '2009-01-01/2010-01-01'</tt> or just <tt>timeframe '2009'</tt>) Set a timeframe on the emission estimate.
 [+emission+]                           Displays the current emission in kilograms CO2e for this emitter.
 [+lbs+, +pounds+, or +tons+]           Display the emission using different units.
 [+characteristics+]                    Lists the characteristics you have provided so far.

data/Rakefile

@@ -8,7 +8,8 @@ RSpec::Core::RakeTask.new('examples') do |c|
   c.rspec_opts = '-Ispec'
 end
 
-task :default => :examples
+task :test => [:examples, :cucumber]
+task :default => :test
 
 desc "Run specs with RCov"
 RSpec::Core::RakeTask.new(:examples_with_coverage) do |t|
@@ -26,3 +27,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new
+

data/bin/carbon

@@ -3,15 +3,5 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(_
 
 require 'rubygems'
 require 'carbon'
-require 'carbon/cli'
-begin
-  # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
-  failure = Carbon::Cli.execute(ARGV.dup)
-  Kernel.exit(failure ? 1 : 0)
-rescue SystemExit => e
-  Kernel.exit(e.status)
-rescue Exception => e
-  STDERR.puts("#{e.message} (#{e.class})")
-  STDERR.puts(e.backtrace.join("\n"))
-  Kernel.exit(1)
-end
+require 'carbon/shell'
+Bombshell.launch(Carbon::Shell)

data/carbon.gemspec

@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'timeframe'
   s.add_dependency 'blockenspiel'
   s.add_dependency 'conversions'
+  s.add_dependency 'brighter_planet_metadata'
+  s.add_dependency 'bombshell'
   s.add_development_dependency 'fakeweb'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'aruba'
 end

data/features/shell.feature

@@ -0,0 +1,186 @@
+Feature: Shell
+
+  In order to explore the CM1 API
+  As a potential client
+  I want to make simple calculations from an interactive console
+  
+  Scenario: Running the shell
+    When I run `carbon` interactively
+    And I type "exit"
+    Then the output should contain:
+      """
+      carbon->
+      """
+
+  Scenario: Setting a key
+    When I run `carbon` interactively
+    And I type "key 'abc'"
+    And I type "exit"
+    Then the output should contain:
+      """
+      Using key abc
+      """
+
+  Scenario: Seeing a list of emitters
+    When I run `carbon` interactively
+    And I type "help"
+    And I type "exit"
+    Then the output should contain:
+      """
+      Computation
+      """
+
+  Scenario: Getting a calculation
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      kg CO2e
+      """
+
+  Scenario: Seeing a list of characteristics
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "help"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      duration
+      """
+
+  Scenario: Setting a characteristic
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "duration 10"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      kg CO2e
+      """
+
+  Scenario: Retrieving the default timeframe
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "timeframe"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      (defaults to current year)
+      """
+
+  Scenario: Setting the timeframe
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "timeframe '2009'"
+    And I type "timeframe"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      => 2009
+      """
+
+  Scenario: Getting the current emission
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "emission"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      kg CO2e
+      """
+
+  Scenario: Using a different unit
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "lbs"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      lbs CO2e
+      """
+
+  Scenario: Retrieving default characteristics
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "characteristics"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      (none)
+      """
+
+  Scenario: Retrieving set characteristics
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "duration 10; characteristics; done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      duration: 10
+      """
+
+  Scenario: Retrieving default methodology
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "methodology"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      duration: default
+      """
+
+  Scenario: Retrieving customized methodology
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "duration 10; methodology; done"
+    And I type "exit"
+    Then the output should not contain:
+      """
+      duration:
+      """
+
+  Scenario: Retrieving reports
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "reports"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      power_usage_effectiveness: 1.5
+      """
+
+  Scenario: Retrieving methodology URL
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "duration 10"
+    And I type "url"
+    And I type "done"
+    And I type "exit"
+    Then the output should contain:
+      """
+      http://carbon.brighterplanet.com/computations.json?duration=10
+      """
+
+  Scenario: Retrieving stored emitter
+    When I run `carbon` interactively
+    And I type "computation"
+    And I type "duration 10; done"
+    And I type "computation 0; characteristics; done"
+    And I type "exit"
+    Then the output should not contain:
+      """
+      duration: 10
+      """
+
+

data/features/support/env.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'aruba/cucumber'
+require 'fileutils'
+require 'rspec/expectations'
+require 'carbon'
+require 'conversions'
+
+Before do
+  @aruba_io_wait_seconds = 2
+  @aruba_timeout_seconds = 5
+  @dirs = [File.join(ENV['HOME'], 'carbon_features')]
+end

data/lib/carbon.rb

@@ -11,13 +11,16 @@ require 'active_support/version'
   active_support/core_ext/hash/keys
   active_support/core_ext/hash/reverse_merge
   active_support/core_ext/object/to_query
+  active_support/inflector
   active_support/inflector/inflections
   active_support/json/decoding
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
+
 require 'carbon/base'
 require 'carbon/emission_estimate'
+require 'logger'
 
 # A module (aka mixin) that lets you estimate carbon emissions by querying the {Brighter Planet carbon middleware emission estimate web service}[http://carbon.brighterplanet.com].
 #
@@ -44,10 +47,6 @@ module Carbon
     klass.extend ClassMethods
   end
   
-  REALTIME_URL = 'http://carbon.brighterplanet.com'
-  ASYNC_URL = 'https://queue.amazonaws.com/121562143717/cm1_production_incoming'
-  STORAGE_URL = 'http://storage.carbon.brighterplanet.com'
-  
   class RealtimeEstimateFailed < RuntimeError # :nodoc:
   end
   class QueueingFailed < RuntimeError # :nodoc:
@@ -59,6 +58,16 @@ module Carbon
 
   # The api key obtained from http://keys.brighterplanet.com
   mattr_accessor :key
+
+  mattr_accessor :log
+
+  def self.log #:nodoc:
+    @log ||= Logger.new STDOUT
+  end
+  
+  def self.warn(msg) #:nodoc:
+    log.warn msg
+  end
     
   # You will probably never access this module directly. Instead, you'll use it through the DSL.
   #

data/lib/carbon/base.rb

@@ -6,6 +6,7 @@ module Carbon
     include Blockenspiel::DSL
     attr_reader :klass
     attr_reader :emitter_common_name
+    
     def initialize(klass, emitter_common_name)
       @klass = klass
       @emitter_common_name = emitter_common_name.to_s
@@ -21,7 +22,7 @@ module Carbon
       @translation_table ||= Hash.new
     end
     
-    def reset_translation_table!
+    def reset_translation_table! #:nodoc:
       @translation_table = Hash.new
     end
 

data/lib/carbon/emission_estimate.rb

@@ -11,10 +11,10 @@ module Carbon
   #
   # At the same time, they contain all the data you get back from the emission estimate web service. For example, you could say <tt>puts my_donut_factor.emission_estimate.oven_count</tt> (see the tests) and you'd get back the oven count used in the calculation, if any.
   class EmissionEstimate
-    def self.parse(str)
+    def self.parse(str) #:nodoc:
       data = ::ActiveSupport::JSON.decode str
       data['active_subtimeframe'] = ::Timeframe.interval(data['active_subtimeframe']) if data.has_key? 'active_subtimeframe'
-      data['updated_at'] = ::Time.parse(data['updated_at']) if data.has_key? 'updated_at'
+      data['updated_at'] = ::Time.parse(data['updated_at']) if data.has_key?('updated_at') and data['updated_at'].is_a?(::String)
       data
     end
 
@@ -24,6 +24,7 @@ module Carbon
     attr_writer :defer
     attr_accessor :callback
     attr_accessor :timeframe
+    attr_accessor :certified
     attr_accessor :guid
     attr_reader :emitter
     
@@ -32,8 +33,9 @@ module Carbon
       take_options options unless options.empty?
     end
     
-    VALID_OPTIONS = [:callback_content_type, :key, :callback, :timeframe, :guid, :timeout, :defer]
-    def take_options(options)
+    VALID_OPTIONS = [:callback_content_type, :key, :callback, :timeframe, :guid, :timeout, :defer, :certified]
+    
+    def take_options(options) #:nodoc:
       return if options.blank?
       options.slice(*VALID_OPTIONS).each do |k, v|
         instance_variable_set "@#{k}", v
@@ -66,7 +68,7 @@ module Carbon
       end
     end
     
-    def data
+    def data #:nodoc:
       if storage.present?
         storage.data
       else
@@ -74,18 +76,18 @@ module Carbon
       end
     end
 
-    def storage
+    def storage #:nodoc:
       @storage ||= {}
       return @storage[guid] if @storage.has_key? guid
       @storage[guid] = Storage.new self
     end
 
-    def request
+    def request #:nodoc:
       @request ||= Request.new self
     end
 
     # Here's where caching takes place.
-    def response
+    def response #:nodoc:
       current_params = request.params
       @response ||= {}
       return @response[current_params] if @response.has_key? current_params
@@ -94,15 +96,19 @@ module Carbon
       @response[current_params] = response_object
     end
 
-    def defer?
+    def certified? #:nodoc:
+      !!certified
+    end
+
+    def defer? #:nodoc:
       @defer == true
     end
 
-    def async?
+    def async? #:nodoc:
       callback or defer?
     end
 
-    def mode
+    def mode #:nodoc:
       async? ? :async : :realtime
     end
 

data/lib/carbon/emission_estimate/request.rb

@@ -1,6 +1,6 @@
 module Carbon
   class EmissionEstimate
-    class Request
+    class Request #:nodoc:all
       attr_reader :parent
 
       def initialize(parent)
@@ -12,10 +12,18 @@ module Carbon
       end
 
       def params
-        send "#{parent.mode}_params"
+        params = send "#{parent.mode}_params"
+        validate params
+        params
       end
 
-      def async_params # :nodoc:
+      def validate(params_hash)
+        unless params_hash.key? :key
+          Carbon.warn 'You have not specified an API key. Please obtain a key from http://keys.brighterplanet.com.'
+        end
+      end
+
+      def async_params
         raise ::ArgumentError, "When using :callback you cannot specify :defer" if parent.defer? and parent.callback
         raise ::ArgumentError, "When using :defer => true you must specify :guid" if parent.defer? and parent.guid.blank?
         hash = _params
@@ -30,7 +38,7 @@ module Carbon
         }
       end
 
-      def realtime_params # :nodoc:
+      def realtime_params
         _params
       end
 
@@ -67,12 +75,20 @@ module Carbon
         hash
       end
 
-      def realtime_url # :nodoc:
-        "#{::Carbon::REALTIME_URL}/#{parent.emitter.class.carbon_base.emitter_common_name.pluralize}.json"
+      def realtime_url
+        uri = ::URI.parse ''
+        uri.scheme = 'http'
+        uri.host = parent.certified? ? 'certified.carbon.brighterplanet.com' : 'carbon.brighterplanet.com'
+        uri.path = "/#{parent.emitter.class.carbon_base.emitter_common_name.pluralize}.json"
+        uri.to_s
       end
 
-      def async_url # :nodoc:
-        ::Carbon::ASYNC_URL
+      def async_url
+        uri = ::URI.parse ''
+        uri.scheme = 'https'
+        uri.host = 'queue.amazonaws.com'
+        uri.path = parent.certified? ? '/121562143717/cm1_production_incoming_certified' : '/121562143717/cm1_production_incoming'
+        uri.to_s
       end
 
       def url

data/lib/carbon/emission_estimate/response.rb

@@ -1,6 +1,6 @@
 module Carbon
   class EmissionEstimate
-    class Response
+    class Response #:nodoc:all
       attr_reader :parent
       attr_reader :data
       attr_reader :raw_request
@@ -15,7 +15,7 @@ module Carbon
       end
 
     private
-      def load_realtime_data # :nodoc:
+      def load_realtime_data
         attempts = 0
         response = nil
         begin
@@ -34,13 +34,13 @@ module Carbon
         @data = ::Carbon::EmissionEstimate.parse response.body
       end
 
-      def load_async_data # :nodoc:
+      def load_async_data
         response = perform
         raise ::Carbon::QueueingFailed unless response.success? #TODO: should we expect 300s as well as 200s? Also, we may want to include response code and body in our exception.
         @data = {}
       end
 
-      def perform # :nodoc:
+      def perform
         response = nil
         if parent.timeout
           Timeout.timeout(parent.timeout) do
@@ -52,7 +52,7 @@ module Carbon
         response
       end
 
-      def perform_request # :nodoc:
+      def perform_request
         @raw_request = ::REST::Request.new :post, ::URI.parse(parent.request.url), parent.request.body, {'Content-Type' => 'application/x-www-form-urlencoded; charset=utf-8'}
         @raw_response = raw_request.perform
       end

data/lib/carbon/emission_estimate/storage.rb

@@ -1,6 +1,6 @@
 module Carbon
   class EmissionEstimate
-    class Storage
+    class Storage #:nodoc:all
       attr_accessor :parent
       attr_reader :raw_request
       attr_reader :raw_response
@@ -10,7 +10,7 @@ module Carbon
       end
 
       def url
-        "#{::Carbon::STORAGE_URL}/#{::Digest::SHA1.hexdigest(parent.key+parent.guid)}"
+        "http://storage.carbon.brighterplanet.com/#{::Digest::SHA1.hexdigest(parent.key+parent.guid)}"
       end
 
       def present?

data/lib/carbon/shell.rb

@@ -0,0 +1,51 @@
+require 'brighter_planet_metadata'
+require 'bombshell'
+require 'conversions'
+module Carbon
+  class Shell < Bombshell::Environment
+    include Bombshell::Shell
+    
+    before_launch do
+      $emitters = {}
+      emitters.map(&:underscore).each do |e|
+        define_method e.to_sym do |*args|
+          if args.any? and num = args.first and saved = $emitters[e.to_sym][num]
+            emitter e.to_sym, saved
+          else
+            emitter e.to_sym
+          end
+        end
+      end
+    end
+    
+    prompt_with 'carbon-'
+
+    def help
+      puts "  => #{self.class.emitters.join ', '}"
+    end
+
+    def key(k)
+      ::Carbon.key = k
+      puts "  => Using key #{::Carbon.key}"
+    end
+
+    def emitter(e, saved = {})
+      Emitter.launch e, saved
+    end
+
+    class << self
+      def emitters
+        ::BrighterPlanet.metadata.emitters
+      end
+    end
+  end
+end
+
+if File.exist?(dotfile = File.join(ENV['HOME'], '.brighter_planet'))
+  if (key = File.read(dotfile).strip).present?
+    ::Carbon.key = key
+  end
+end
+
+require 'carbon/shell/emitter'
+

data/lib/carbon/{cli → shell}/emitter.rb

@@ -1,7 +1,9 @@
 module Carbon
-  module Cli
-    class Emitter < Environment
+  class Shell
+    class Emitter < Bombshell::Environment
+      include Bombshell::Shell
       include Carbon
+      
       def initialize(name, input = {})
         @emitter = name
         @input = input
@@ -38,8 +40,10 @@ module Carbon
         if t
           @timeframe = t
           emission
+        elsif @timeframe
+          puts '  => ' + @timeframe
         else
-          @timeframe
+          puts '  => (defaults to current year)'
         end
       end
       
@@ -116,8 +120,20 @@ module Carbon
         puts "  => #{@characteristics.keys.join ', '}"
       end
       
-      def to_s
-        "#{@emitter}*"
+      prompt_with do |emitter|
+        if emitter._timeframe
+          "#{emitter._name}[#{emitter._timeframe}]*"
+        else          
+          "#{emitter._name}*"
+        end
+      end
+      
+      def _name
+        @emitter
+      end
+      
+      def _timeframe
+        @timeframe
       end
       
       def inspect
@@ -128,7 +144,13 @@ module Carbon
         $emitters[@emitter] ||= []
         $emitters[@emitter] << @input
         puts "  => Saved as #{@emitter} ##{$emitters[@emitter].length - 1}"
-        throw :IRB_EXIT
+        quit
+      end
+      
+      class << self
+        def emitter_name
+          @name
+        end
       end
     end
   end

data/lib/carbon/version.rb

@@ -1,3 +1,3 @@
 module Carbon
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

data/spec/lib/carbon/emission_estimate/request_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Carbon::EmissionEstimate::Request do
+  let(:emitter) do
+    mock Object,
+      :class => mock(Object,
+                     :carbon_base => mock(Object,
+                                          :emitter_common_name => 'dirigible',
+                                          :translation_table => []))
+  end
+  let(:emission_estimate) { Carbon::EmissionEstimate.new emitter }
+  let(:request) { Carbon::EmissionEstimate::Request.new emission_estimate }
+
+  describe '#params' do
+    it 'returns a hash of params' do
+      request.params.should be_a_kind_of(Hash)
+    end
+    it 'validates the params' do
+      request.should_receive :validate
+      request.params
+    end
+  end
+
+  describe '#validate' do
+    it 'warns the user if no key is given' do
+      Carbon.should_receive :warn
+      request.validate({})
+    end
+    it 'does nothing if all parameters are OK' do
+      Carbon.should_not_receive :warn
+      request.validate(
+        :key => 'ABC123'
+      )
+    end
+  end
+end
+

data/spec/lib/carbon_spec.rb

@@ -7,7 +7,7 @@ MISSING_UNIQUE_ID = 'd09joijdoijaloijdoais'
 OTHER_UNIQUE_ID = '1092fjoid;oijsao;ga'
 
 FakeWeb.register_uri  :post,
-                      /carbon.brighterplanet.com.automobiles/,
+                      %r{http://carbon.brighterplanet.com/automobile_trips},
                       :status => ["200", "OK"],
                       :body => {
                         'emission' => '134.599',
@@ -16,6 +16,16 @@ FakeWeb.register_uri  :post,
                         'active_subtimeframe' => Timeframe.new(:year => 2008)
                       }.to_json
 #
+FakeWeb.register_uri  :post,
+                      %r{http://certified.carbon.brighterplanet.com/automobile_trips},
+                      :status => ["200", "OK"],
+                      :body => {
+                        'emission' => '54321',
+                        'emission_units' => 'kilograms',
+                        'methodology' => 'http://certified.carbon.brighterplanet.com/something',
+                        'active_subtimeframe' => Timeframe.new(:year => 2008)
+                      }.to_json
+#
 FakeWeb.register_uri  :post,
                       /carbon.brighterplanet.com.factories/,
                       :status => ["200", "OK"],
@@ -91,7 +101,7 @@ class RentalCar
   def make
     @make ||= Make.new
   end
-  emit_as :automobile do
+  emit_as :automobile_trip do
     provide :make
     provide :model
     provide :model_year
@@ -313,6 +323,17 @@ describe Carbon do
       c.emission_estimate.request.body.should_not include('&&')
       c.emission_estimate.request.body.should_not =~ /=[^a-z0-9]/i
     end
+    
+    it 'should do certified calculations' do
+      c = RentalCar.new
+      c.emission_estimate.certified = true
+      c.emission_estimate.should == 54321
+    end
+    
+    it 'should do certified calculations (inline)' do
+      c = RentalCar.new
+      c.emission_estimate(:certified => true).should == 54321
+    end
   end
   
   describe 'asynchronous (queued) requests' do
@@ -322,6 +343,19 @@ describe Carbon do
       c.emission_estimate.request.url.should =~ /queue.amazonaws.com/
     end
     
+    it 'should default to non-certified' do
+      c = RentalCar.new
+      c.emission_estimate.callback = CALLBACK_URL
+      c.emission_estimate.request.url.should_not =~ /certified/
+    end
+
+    it 'should accept certified' do
+      c = RentalCar.new
+      c.emission_estimate.callback = CALLBACK_URL
+      c.emission_estimate.certified = true
+      c.emission_estimate.request.url.should =~ /certified/
+    end
+    
     it 'should have nil data in its response' do
       c = RentalCar.new
       c.emission_estimate.callback = CALLBACK_URL

data/spec/spec_helper.rb

@@ -7,3 +7,5 @@ require 'fakeweb'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'carbon'
+
+Carbon.log = Logger.new nil

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: carbon
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Derek Kastner
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -06:00
+date: 2011-04-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,11 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
         version: 2.3.5
   type: :runtime
   version_requirements: *id001
@@ -44,9 +34,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -58,9 +45,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -72,9 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -86,9 +67,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -100,40 +78,64 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: brighter_planet_metadata
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bombshell
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: Carbon is a Ruby API wrapper for the Brighter Planet emission estimate web service (http://carbon.brighterplanet.com). By querying the web service, it can estimate the carbon emissions of many real-life objects, such as cars and houses, based on particular attributes that they may have.
 email: 
 - derek.kastner@brighterplanet.com
@@ -157,19 +159,18 @@ files:
 - doc/timeout-error.png
 - doc/with-committee-reports.png
 - doc/without-committee-reports.png
+- features/shell.feature
+- features/support/env.rb
 - lib/carbon.rb
 - lib/carbon/base.rb
-- lib/carbon/cli.rb
-- lib/carbon/cli/emitter.rb
-- lib/carbon/cli/environment.rb
-- lib/carbon/cli/irb.rb
-- lib/carbon/cli/shell.rb
 - lib/carbon/emission_estimate.rb
 - lib/carbon/emission_estimate/request.rb
 - lib/carbon/emission_estimate/response.rb
 - lib/carbon/emission_estimate/storage.rb
+- lib/carbon/shell.rb
+- lib/carbon/shell/emitter.rb
 - lib/carbon/version.rb
-- spec/lib/carbon/cli/shell_spec.rb
+- spec/lib/carbon/emission_estimate/request_spec.rb
 - spec/lib/carbon/emission_estimate/response_spec.rb
 - spec/lib/carbon_spec.rb
 - spec/spec_helper.rb
@@ -188,28 +189,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: carbon
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Carbon is a Ruby API wrapper for the Brighter Planet emission estimate web service (http://carbon.brighterplanet.com).
 test_files: 
-- spec/lib/carbon/cli/shell_spec.rb
+- features/shell.feature
+- features/support/env.rb
+- spec/lib/carbon/emission_estimate/request_spec.rb
 - spec/lib/carbon/emission_estimate/response_spec.rb
 - spec/lib/carbon_spec.rb
 - spec/spec_helper.rb

data/lib/carbon/cli.rb

@@ -1,22 +0,0 @@
-module Carbon
-  module Cli
-    def execute(*)
-      Shell.init
-      $emitters = {}
-      IRB.start_session(Shell.new.get_binding)
-    end 
-    module_function :execute
-  end
-end
-
-require 'carbon/cli/environment'
-require 'carbon/cli/shell'
-require 'carbon/cli/emitter'
-require 'carbon/cli/irb'
-require 'conversions'
-
-if File.exist?(dotfile = File.join(ENV['HOME'], '.carbon_middleware'))
-  if (key = File.read(dotfile).strip).present?
-    ::Carbon.key = key
-  end
-end

data/lib/carbon/cli/environment.rb

@@ -1,16 +0,0 @@
-module Carbon
-  module Cli
-    class Environment
-      instance_methods.each do |m|
-        undef_method(m) if m.to_s !~ /(?:^__|^nil\?$|^send$|^instance_eval$|^define_method$|^class$|^object_id$)/
-      end
-
-      def get_binding() binding end
-      
-      def method_missing(*args)
-        return if [:extend, :respond_to?].include? args.first
-        puts "Unknown command #{args.first}"
-      end
-    end
-  end
-end

data/lib/carbon/cli/irb.rb

@@ -1,34 +0,0 @@
-# encoding: utf-8
-
-require 'irb'
-
-module IRB # :nodoc:
-  def self.start_session(binding)
-    unless @__initialized
-      args = ARGV
-      ARGV.replace(ARGV.dup)
-      IRB.setup(nil)
-      ARGV.replace(args)
-      @__initialized = true
-    end
-
-    workspace = WorkSpace.new(binding)
-
-    @CONF[:PROMPT][:CARBON] = {
-      :PROMPT_I => "%m> ",
-      :PROMPT_S => "%m\"> ",
-      :PROMPT_C => "%m…>",
-      :PROMPT_N => "%m→>",
-      :RETURN => ''
-    }
-    @CONF[:PROMPT_MODE] = :CARBON
-
-    irb = Irb.new(workspace)
-
-    @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
-    @CONF[:MAIN_CONTEXT] = irb.context
-    catch(:IRB_EXIT) do
-      irb.eval_input
-    end
-  end
-end

data/lib/carbon/cli/shell.rb

@@ -1,46 +0,0 @@
-require 'carbon/cli/environment'
-
-module Carbon
-  module Cli
-    class Shell < Environment
-      cattr_accessor :emitters
-      
-      def self.init
-        emitters_url = "http://carbon.brighterplanet.com/models.json"
-        response = REST.get(emitters_url)
-        if true || response.ok?
-          self.emitters = ActiveSupport::JSON.decode response.body
-          emitters.map(&:underscore).each do |e|
-            define_method e.to_sym do |*args|
-              if args.any? and num = args.first and saved = $emitters[e.to_sym][num]
-                emitter e.to_sym, saved
-              else
-                emitter e.to_sym
-              end
-            end
-          end
-        else
-          puts "  => Sorry, emitter types couldn't be retrieved (via #{emitters_url})"
-          done
-        end
-      end
-      
-      def help
-        puts "  => #{self.class.emitters.join ', '}"
-      end
-      
-      def to_s
-        'carbon-'
-      end
-      
-      def key(k)
-        ::Carbon.key = k
-        puts "  => Using key #{::Carbon.key}"
-      end
-
-      def emitter(e, saved = {})
-        ::IRB.start_session(Emitter.new(e, saved).get_binding)
-      end
-    end
-  end
-end

data/spec/lib/carbon/cli/shell_spec.rb

@@ -1,30 +0,0 @@
-require 'spec_helper'
-require 'carbon/cli/shell'
-
-describe Carbon::Cli::Shell do
-  let(:json) { %{
-["Automobile","AutomobileTrip","BusTrip","Computation","Diet","Flight","FuelPurchase","Lodging","Meeting","Motorcycle","Pet","Purchase","RailTrip","Residence"]
-  } }
-  let(:mock_response) { mock(REST, :ok? => true, :body => json) }
-  let(:shell) { Carbon::Cli::Shell.new }
-
-
-  before(:each) do
-    REST.stub!(:get).and_return mock_response
-  end
-
-  describe '.init' do
-    it 'should create methods for each model' do
-      Carbon::Cli::Shell.init
-      Carbon::Cli::Shell.instance_methods.should include('automobile')
-    end
-    it 'should exit if the models cannot be fetched' do
-      pending
-
-      mock_response.stub!(:ok?).and_return false
-      Carbon::Cli::Shell.should_receive :done
-      Carbon::Cli::Shell.init
-    end
-  end
-end
-