carbon 0.0.5 → 0.0.7

data/lib/carbon.rb

@@ -18,5 +18,12 @@ module Carbon
     def base_url=(val)
       @base_url = val
     end
+
+    def debug=(val)
+      @debug = val
+    end
+    def debug
+      @debug ||= false
+    end
   end
 end

data/lib/carbon/emissions_calculation.rb

@@ -1,12 +1,16 @@
 require 'uri'
 require 'active_support/inflector'
-require 'net/http'
+require 'httparty'
 
 module Carbon
   class EmissionsCalculation
     class NotYetCalculated < StandardError; end
+    class CalculationRequestFailed < StandardError; end
 
-    attr_accessor :options, :source, :value, :methodology_url
+    include HTTParty
+
+    attr_accessor :options, :source
+    attr_reader :value, :methodology_url, :committees
 
     def initialize(options, source)
       self.options = options
@@ -26,6 +30,7 @@ module Carbon
       fetch_calculation
       @value = result['emission']
       @methodology_url = result['methodology']
+      @committees = result['committees']
     end
 
   private
@@ -34,17 +39,24 @@ module Carbon
     end
 
     def fields
-      options.characteristics.inject({}) do |hsh, characteristic|
-        hsh[characteristic.name] = source.send(characteristic.field)
+      fields_hash = options.characteristics.inject({}) do |hsh, characteristic|
+        value = source.send(characteristic.field)
+        hsh[characteristic.name.to_sym] = value if value
         hsh
       end
+      { :body => { options.emitter_type => fields_hash } }
     end
 
     def fetch_calculation
       url = URI.join(Carbon.base_url, options.emitter_type.to_s.pluralize)
-      request = Net::HTTP::Post.new(url.path, 'Accept' => 'application/json')
-      request.set_form_data(fields)
-      response = Net::HTTP.new(url.host).start { |http| http.request(request) }
+      options = fields.merge(:headers => { 'Accept' => 'application/json' }) 
+      response = self.class.post(url.to_s, options)
+
+      unless (200..399).include?(response.code)
+        raise CalculationRequestFailed, response.body
+      end
+
+      puts response.body if Carbon.debug
 
       @result = JSON.parse(response.body)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Derek Kastner
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -04:00
+date: 2010-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: active_support
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -30,7 +30,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: httparty
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -39,10 +39,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: fakeweb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -53,6 +53,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Carbon allows you to easily calculate the carbon footprint of various activities. This is an API for the Brighter Planet Carbon Middleware service.
 email: derek@brighterplanet.com
 executables: []