carbon 1.1.0 → 1.1.1

data/lib/carbon/emission_estimate.rb

@@ -26,6 +26,7 @@ module Carbon
     attr_accessor :timeframe
     attr_accessor :certified
     attr_accessor :guid
+    attr_accessor :comply
     attr_reader :emitter
     
     def initialize(emitter, options = {})
@@ -33,7 +34,7 @@ module Carbon
       take_options options unless options.empty?
     end
     
-    VALID_OPTIONS = [:callback_content_type, :key, :callback, :timeframe, :guid, :timeout, :defer, :certified]
+    VALID_OPTIONS = [:callback_content_type, :key, :callback, :timeframe, :guid, :timeout, :defer, :certified, :comply]
     
     def take_options(options) #:nodoc:
       return if options.blank?

data/lib/carbon/emission_estimate/request.rb

@@ -72,6 +72,7 @@ module Carbon
         end
         hash[:timeframe] = parent.timeframe if parent.timeframe
         hash[:key] = parent.key if parent.key
+        hash[:comply] = parent.comply if parent.comply
         hash
       end
 

data/lib/carbon/version.rb

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

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

@@ -19,6 +19,10 @@ describe Carbon::EmissionEstimate::Request do
       request.should_receive :validate
       request.params
     end
+    it 'includes compliance' do
+      emission_estimate.comply = :iso
+      request.params.should include(:comply => :iso)
+    end
   end
 
   describe '#validate' do

data/spec/lib/carbon/emission_estimate_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Carbon::EmissionEstimate do
+  describe '#take_options' do
+    it 'accepts the :comply option' do
+      estimate = Carbon::EmissionEstimate.new(RentalCar.new)
+      estimate.take_options :comply => :iso
+      estimate.comply.should == :iso
+    end
+  end
+end
+

data/spec/lib/carbon_spec.rb

@@ -89,48 +89,6 @@ FakeWeb.register_uri  :get,
 #                       }.to_json,
 #                       :headers => { 'Location' => "http://storage.carbon.brighterplanet.com/#{Digest::SHA1.hexdigest(KEY+MISSING_UNIQUE_ID)}" }
 
-class RentalCar
-  include Carbon
-  attr_accessor :model, :model_year, :fuel_economy
-  class Make
-    attr_accessor :name
-    def to_param
-      name
-    end
-  end
-  def make
-    @make ||= Make.new
-  end
-  emit_as :automobile_trip do
-    provide :make
-    provide :model
-    provide :model_year
-    provide :fuel_economy, :as => :fuel_efficiency
-  end
-end
-
-class DonutFactory
-  include Carbon
-  attr_accessor :smokestack_size, :oven_count, :employees
-  class Mixer
-    attr_accessor :upc
-    def to_param
-      raise "Use #to_characteristic instead please"
-    end
-    def to_characteristic
-      upc
-    end
-  end
-  def mixer
-    @mixer ||= Mixer.new
-  end
-  emit_as :factory do
-    provide :smokestack_size
-    provide :oven_count
-    provide :employees, :as => :personnel
-    provide :mixer, :key => :upc
-  end
-end
 
 # set up timeouts
 module Carbon
@@ -334,6 +292,11 @@ describe Carbon do
       c = RentalCar.new
       c.emission_estimate(:certified => true).should == 54321
     end
+
+    it 'complies to given standards' do
+      c = RentalCar.new
+      c.emission_estimate(:comply => :iso).request.body.should =~ /comply=iso/
+    end
   end
   
   describe 'asynchronous (queued) requests' do

data/spec/spec_helper.rb

@@ -9,3 +9,46 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'carbon'
 
 Carbon.log = Logger.new nil
+
+class RentalCar
+  include Carbon
+  attr_accessor :model, :model_year, :fuel_economy
+  class Make
+    attr_accessor :name
+    def to_param
+      name
+    end
+  end
+  def make
+    @make ||= Make.new
+  end
+  emit_as :automobile_trip do
+    provide :make
+    provide :model
+    provide :model_year
+    provide :fuel_economy, :as => :fuel_efficiency
+  end
+end
+
+class DonutFactory
+  include Carbon
+  attr_accessor :smokestack_size, :oven_count, :employees
+  class Mixer
+    attr_accessor :upc
+    def to_param
+      raise "Use #to_characteristic instead please"
+    end
+    def to_characteristic
+      upc
+    end
+  end
+  def mixer
+    @mixer ||= Mixer.new
+  end
+  emit_as :factory do
+    provide :smokestack_size
+    provide :oven_count
+    provide :employees, :as => :personnel
+    provide :mixer, :key => :upc
+  end
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carbon
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
-  version: 1.1.0
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Derek Kastner
@@ -12,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -05:00
+date: 2011-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,6 +28,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
   type: :runtime
   version_requirements: *id001
@@ -34,6 +44,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -45,6 +58,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -56,6 +72,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -67,6 +86,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -78,6 +100,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
@@ -89,6 +114,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id007
@@ -100,6 +128,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id008
@@ -111,6 +142,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -122,6 +156,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -133,6 +170,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id011
@@ -172,6 +212,7 @@ files:
 - lib/carbon/version.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
@@ -189,12 +230,18 @@ 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: []
 
@@ -203,11 +250,5 @@ 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: 
-- 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
-- spec/specwatchr
+test_files: []
+