carbon 1.1.1 → 1.1.2

data/README.rdoc

@@ -240,7 +240,7 @@ This library includes a special console for performing calculations interactivel
 === Shell mode
 
 [+help+]                           Displays a list of emitter types.
-[+key+ _yourkey_]                  Set the {developer key}[http://keys.brighterplanet.com] that should be used for this session. Alternatively, put this key in <tt>~/.carbon_middleware</tt> and it will be auto-selected on console startup.
+[+key+ _yourkey_]                  Set the {developer key}[http://keys.brighterplanet.com] that should be used for this session. Alternatively, put this key in <tt>~/.brighter_planet</tt> and it will be auto-selected on console startup.
 [+_emitter_type_+]                 (e.g. +flight+) Enters emitter mode using this emitter type.
 [<tt><i>emitter_type num</i></tt>] (e.g. <tt>flight 0</tt>) Recalls a previous emitter from this session.
 [+exit+]                           Quits.

data/carbon.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakeweb'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'aruba'
+  s.add_development_dependency 'rake'
 end

data/lib/carbon.rb

@@ -6,20 +6,14 @@ require 'rest'    # provided by nap gem
 require 'active_support'
 require 'active_support/version'
 %w{
-  active_support/core_ext/module/attribute_accessors
-  active_support/core_ext/class/attribute_accessors
-  active_support/core_ext/hash/keys
-  active_support/core_ext/hash/reverse_merge
-  active_support/core_ext/object/to_query
+  active_support/core_ext
   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
+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].
@@ -42,8 +36,11 @@ require 'logger'
 #
 # Once you've mixed in <tt>Carbon</tt>, you get the method <tt>emission_estimate</tt>, which you can call at any time to request an emission estimate.
 module Carbon
+  autoload :Base, 'carbon/base'
+  autoload :EmissionEstimate, 'carbon/emission_estimate'
+  autoload :Registry, 'carbon/registry'
+  
   def self.included(klass) # :nodoc:
-    klass.cattr_accessor :carbon_base
     klass.extend ClassMethods
   end
   
@@ -82,11 +79,15 @@ module Carbon
     #     provide :make
     #   end
     def emit_as(emitter_common_name, &block)
-      self.carbon_base = ::Carbon::Base.new self, emitter_common_name
+      Registry.instance[name] = ::Carbon::Base.new emitter_common_name
       ::Blockenspiel.invoke block, carbon_base
     end
     # Third-person singular preferred.
     alias :emits_as :emit_as
+    
+    def carbon_base # :nodoc:
+      Registry.instance[name]
+    end
   end
 
   # Returns an emission estimate.

data/lib/carbon/base.rb

@@ -4,11 +4,9 @@ module Carbon
   # An instance of this appears on any class that includes <tt>Carbon</tt>.
   class Base
     include Blockenspiel::DSL
-    attr_reader :klass
     attr_reader :emitter_common_name
     
-    def initialize(klass, emitter_common_name)
-      @klass = klass
+    def initialize(emitter_common_name)
       @emitter_common_name = emitter_common_name.to_s
     end
 

data/lib/carbon/emission_estimate.rb

@@ -1,7 +1,3 @@
-require 'carbon/emission_estimate/response'
-require 'carbon/emission_estimate/request'
-require 'carbon/emission_estimate/storage'
-
 module Carbon
   # Let's start off by saying that realtime <tt>EmissionEstimate</tt> objects quack like numbers.
   #
@@ -11,8 +7,13 @@ 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
+    autoload :Response, 'carbon/emission_estimate/response'
+    autoload :Request, 'carbon/emission_estimate/request'
+    autoload :Storage, 'carbon/emission_estimate/storage'
+    
     def self.parse(str) #:nodoc:
       data = ::ActiveSupport::JSON.decode str
+      # TODO rename to timeframe
       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') and data['updated_at'].is_a?(::String)
       data

data/lib/carbon/registry.rb

@@ -0,0 +1,6 @@
+require 'singleton'
+module Carbon
+  class Registry < ::Hash
+    include ::Singleton
+  end
+end

data/lib/carbon/version.rb

@@ -1,3 +1,3 @@
 module Carbon
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,191 +1,161 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: carbon
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Derek Kastner
 - Seamus Abshere
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-04 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2162440820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2162440820
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2162440400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nap
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2162440400
+- !ruby/object:Gem::Dependency
+  name: nap
+  requirement: &2162439940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: timeframe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2162439940
+- !ruby/object:Gem::Dependency
+  name: timeframe
+  requirement: &2162439520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: blockenspiel
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2162439520
+- !ruby/object:Gem::Dependency
+  name: blockenspiel
+  requirement: &2162439100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: conversions
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2162439100
+- !ruby/object:Gem::Dependency
+  name: conversions
+  requirement: &2162438680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: brighter_planet_metadata
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2162438680
+- !ruby/object:Gem::Dependency
+  name: brighter_planet_metadata
+  requirement: &2162438260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bombshell
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2162438260
+- !ruby/object:Gem::Dependency
+  name: bombshell
+  requirement: &2162437840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2162437840
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2162437420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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 
+  version_requirements: *2162437420
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2162437000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2162437000
+- !ruby/object:Gem::Dependency
   name: aruba
+  requirement: &2152166340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2152166340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2152165920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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: 
+  prerelease: false
+  version_requirements: *2152165920
+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
-executables: 
+executables:
 - carbon
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE.txt
@@ -207,6 +177,7 @@ files:
 - lib/carbon/emission_estimate/request.rb
 - lib/carbon/emission_estimate/response.rb
 - lib/carbon/emission_estimate/storage.rb
+- lib/carbon/registry.rb
 - lib/carbon/shell.rb
 - lib/carbon/shell/emitter.rb
 - lib/carbon/version.rb
@@ -216,39 +187,37 @@ files:
 - spec/lib/carbon_spec.rb
 - spec/spec_helper.rb
 - spec/specwatchr
-has_rdoc: true
 homepage: https://github.com/brighterplanet/carbon
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: carbon
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 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: []
-
+summary: Carbon is a Ruby API wrapper for the Brighter Planet emission estimate web
+  service (http://carbon.brighterplanet.com).
+test_files:
+- 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/emission_estimate_spec.rb
+- spec/lib/carbon_spec.rb
+- spec/spec_helper.rb
+- spec/specwatchr