carbon 2.0.2 → 2.0.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.0.3 / 2012-03-13
+
+* Enhancements
+
+  * Automatically skip redundant queries and cache things for an hour (in-process, unless you set up CacheMethod.config.storage = $memcached or something)
+
 2.0.2 / 2012-03-13
 
 * Bug fixes

data/carbon.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'multi_json'
   s.add_runtime_dependency 'hashie'
+  s.add_runtime_dependency 'cache_method'
 
   # CLI
   s.add_runtime_dependency 'bombshell'

data/developer_notes/REDUCE_HTTP_CONNECTIONS.markdown

@@ -17,30 +17,30 @@ One way to reduce the number of connections by a constant... but it makes it slo
         end
         multi.callback do
           multi.responses[:callback].each do |query_idx, http|
-            response = ::Hashie::Mash.new
-            response.status = http.response_header.status
-            if (200..299).include?(response.status)
-              response.success = true
-              response.merge! ::MultiJson.decode(http.response)
+            result = ::Hashie::Mash.new
+            result.status = http.response_header.status
+            if (200..299).include?(result.status)
+              result.success = true
+              result.merge! ::MultiJson.decode(http.response)
             else
-              response.success = false
-              response.errors = [http.response]
+              result.success = false
+              result.errors = [http.response]
             end
-            unsorted[query_idx] = response
+            unsorted[query_idx] = result
           end
           multi.responses[:errback].each do |query_idx, http|
-            response = ::Hashie::Mash.new
-            response.status = http.response_header.status
-            response.success = false
-            response.errors = ['Timeout or other network error.']
-            unsorted[query_idx] = response
+            result = ::Hashie::Mash.new
+            result.status = http.response_header.status
+            result.success = false
+            result.errors = ['Timeout or other network error.']
+            unsorted[query_idx] = result
           end
           ::EventMachine.stop
         end
       end
       unsorted.sort_by do |query_idx, _|
         query_idx
-      end.map do |_, response|
-        response
+      end.map do |_, result|
+        result
       end
     end

data/lib/carbon.rb

@@ -1,9 +1,7 @@
-require 'net/http'
-require 'hashie/mash'
-require 'multi_json'
 require 'active_support/core_ext'
 
 require 'carbon/registry'
+require 'carbon/future'
 
 module Carbon
   DOMAIN = 'http://impact.brighterplanet.com'
@@ -17,14 +15,14 @@ module Carbon
   # @param [String] key The alphanumeric key.
   #
   # @return [nil]
-  def self.key=(key)
+  def Carbon.key=(key)
     @@key = key
   end
 
   # Get the key you've set.
   #
   # @return [String] The key you set.
-  def self.key
+  def Carbon.key
     @@key
   end
 
@@ -39,39 +37,24 @@ module Carbon
   # @option params [Array<Symbol>] :comply ([]) What {http://impact.brighterplanet.com/protocols.json calculation protocols} to require.
   # @option params [String, Numeric] _characteristic_ Pieces of data about an emitter. The {http://impact.brighterplanet.com/flights/options Flight characteristics API} lists valid keys like +:aircraft+, +:origin_airport+, etc.
   #
-  # @return [Hashie::Mash] An {file:README.html#API_response API response as documented in the README}
+  # @return [Hashie::Mash, Carbon::Future] An {file:README.html#API_response API response as documented in the README}
   #
   # @example A flight taken in 2009
   #   Carbon.query('Flight', :origin_airport => 'MSN', :destination_airport => 'ORD', :date => '2009-01-01', :timeframe => Timeframe.new(:year => 2009), :comply => [:tcr])
-  def self.query(emitter, params = {})
-    params ||= {}
-    params = params.reverse_merge(:key => key) if key
-    uri = ::URI.parse("#{DOMAIN}/#{emitter.underscore.pluralize}.json")
-    raw_response = ::Net::HTTP.post_form(uri, params)
-    response = ::Hashie::Mash.new
-    case raw_response
-    when ::Net::HTTPSuccess
-      response.status = raw_response.code.to_i
-      response.success = true
-      response.merge! ::MultiJson.decode(raw_response.body)
-    else
-      response.status = raw_response.code.to_i
-      response.success = false
-      response.error_body = raw_response.respond_to?(:body) ? raw_response.body : ''
-      response.errors = [raw_response.class.name]
-    end
-    response
+  def Carbon.query(emitter, params = {})
+    future = Future.new emitter, params
+    future.result
   end
 
-  # Perform many queries in parallel. Can be >90% faster than doing them serially (one after the other).
+  # Perform many queries in parallel. Can be *more than 90% faster* than doing them serially (one after the other).
   #
   # See the {file:README.html#API_response section about API responses} for an explanation of +Hashie::Mash+.
   #
   # @param [Array<Array>] queries Multiple queries like you would pass to {Carbon.query}
   #
-  # @return [Array<Hashie::Mash>] An array of {file:README.html#API_response API responses} in the same order as the queries.
+  # @return [Array<Hashie::Mash>] An array of {file:README.html#API_response API responses}, each a +Hashie::Mash+, in the same order as the queries.
   #
-  # @note Not supported on JRuby because it uses {https://github.com/igrigorik/em-http-request em-http-request}, which suffers from {https://github.com/eventmachine/eventmachine/issues/155 an issue with +pending_connect_timeout+}.
+  # @note You may get errors like +SOCKET: SET COMM INACTIVITY UNIMPLEMENTED 10+ on JRuby because under the hood we're using {https://github.com/igrigorik/em-http-request em-http-request}, which suffers from {https://github.com/eventmachine/eventmachine/issues/155 an issue with +pending_connect_timeout+}.
   #
   # @example Two flights and an automobile trip
   #   queries = [
@@ -80,50 +63,20 @@ module Carbon
   #     ['AutomobileTrip', :make => 'Nissan', :model => 'Altima', :timeframe => Timeframe.new(:year => 2008), :comply => [:tcr]]
   #   ]
   #   Carbon.multi(queries)
-  def self.multi(queries)
-    return [] if queries.empty?
-    require 'em-http-request'
-    unsorted = {}
-    multi = ::EventMachine::MultiRequest.new
-    ::EventMachine.run do
-      queries.each_with_index do |(emitter, params), query_idx|
-        params ||= {}
-        params = params.reverse_merge(:key => key) if key
-        multi.add query_idx, ::EventMachine::HttpRequest.new(DOMAIN).post(:path => "/#{emitter.underscore.pluralize}.json", :body => params)
-      end
-      multi.callback do
-        multi.responses[:callback].each do |query_idx, http|
-          response = ::Hashie::Mash.new
-          response.status = http.response_header.status
-          if (200..299).include?(response.status)
-            response.success = true
-            response.merge! ::MultiJson.decode(http.response)
-          else
-            response.success = false
-            response.errors = [http.response]
-          end
-          unsorted[query_idx] = response
-        end
-        multi.responses[:errback].each do |query_idx, http|
-          response = ::Hashie::Mash.new
-          response.status = http.response_header.status
-          response.success = false
-          response.errors = ['Timeout or other network error.']
-          unsorted[query_idx] = response
-        end
-        ::EventMachine.stop
-      end
+  def Carbon.multi(queries)
+    futures = queries.map do |emitter, params|
+      future = Future.new emitter, params
+      future.multi!
+      future
     end
-    unsorted.sort_by do |query_idx, _|
-      query_idx
-    end.map do |_, response|
-      response
+    Future.multi(futures).map do |future|
+      future.result
     end
   end
 
   # Called when you +include Carbon+ and adds the class method +emit_as+.
   # @private
-  def self.included(klass)
+  def Carbon.included(klass)
     klass.extend ClassMethods
   end
 
@@ -181,11 +134,10 @@ module Carbon
     end
   end
 
-  # What will be sent to Brighter Planet CM1.
-  # @private
-  def impact_params
-    return unless registration = Registry.instance[self.class.name]
-    registration.characteristics.inject({}) do |memo, (method_id, translation_options)|
+  # A query like what you could pass into +Carbon.query+.
+  def as_impact_query(extra_params = {})
+    registration = Registry.instance[self.class.name]
+    params = registration.characteristics.inject({}) do |memo, (method_id, translation_options)|
       k = translation_options.has_key?(:as) ? translation_options[:as] : method_id
       if translation_options.has_key?(:key)
         k = "#{k}[#{translation_options[:key]}]"
@@ -200,6 +152,7 @@ module Carbon
       end
       memo
     end
+    [ registration.emitter, params.merge(extra_params) ]
   end
 
   # Get an impact estimate from Brighter Planet CM1.
@@ -258,7 +211,7 @@ module Carbon
   #   my_impact.characteristics.airline.description
   #   my_impact.equivalents.lightbulbs_for_a_week
   def impact(extra_params = {})
-    return unless registration = Registry.instance[self.class.name]
-    Carbon.query registration.emitter, impact_params.merge(extra_params)
+    future = Future.new(*as_impact_query(extra_params))
+    future.result
   end
 end

data/lib/carbon/future.rb

@@ -0,0 +1,116 @@
+require 'uri'
+require 'net/http'
+require 'cache_method'
+require 'hashie/mash'
+require 'multi_json'
+
+module Carbon
+  # @private
+  class Future
+    class << self
+      def single(future)
+        uri = ::URI.parse("#{Carbon::DOMAIN}/#{future.emitter.underscore.pluralize}.json")
+        raw_result = ::Net::HTTP.post_form(uri, future.params)
+        result = ::Hashie::Mash.new
+        case raw_result
+        when ::Net::HTTPSuccess
+          result.status = raw_result.code.to_i
+          result.success = true
+          result.merge! ::MultiJson.decode(raw_result.body)
+        else
+          result.status = raw_result.code.to_i
+          result.success = false
+          result.errors = [raw_result.body]
+        end
+        result
+      end
+
+      def multi(futures)
+        uniq_pending_futures = futures.uniq.select do |future|
+          future.pending?
+        end
+        return futures if uniq_pending_futures.empty?
+        require 'em-http-request'
+        multi = ::EventMachine::MultiRequest.new
+        ::EventMachine.run do
+          uniq_pending_futures.each do |future|
+            multi.add future, ::EventMachine::HttpRequest.new(Carbon::DOMAIN).post(:path => "/#{future.emitter.underscore.pluralize}.json", :body => future.params)
+          end
+          multi.callback do
+            multi.responses[:callback].each do |future, http|
+              result = ::Hashie::Mash.new
+              result.status = http.response_header.status
+              if (200..299).include?(result.status)
+                result.success = true
+                result.merge! ::MultiJson.decode(http.response)
+              else
+                result.success = false
+                result.errors = [http.response]
+              end
+              future.result = result
+            end
+            multi.responses[:errback].each do |future, http|
+              result = ::Hashie::Mash.new
+              result.status = http.response_header.status
+              result.success = false
+              result.errors = ['Timeout or other network error.']
+              future.result = result
+            end
+            ::EventMachine.stop
+          end
+        end
+        futures
+      end
+    end
+
+    attr_reader :emitter
+    attr_reader :params
+
+    def initialize(emitter, params = {})
+      @result = nil
+      @emitter = emitter
+      params = params || {}
+      params.reverse_merge(:key => Carbon.key) if Carbon.key
+      @params = params
+    end
+
+    def multi!
+      @multi = true
+    end
+
+    def multi?
+      @multi == true
+    end
+
+    def pending?
+      @result.nil? and !cache_method_cached?(:result)
+    end
+
+    def result=(result)
+      @result = result
+      self.result # force this to be cached
+    end
+
+    def result
+      if @result
+        @result
+      elsif not multi?
+        @result = Future.single(self)
+      end
+    end
+    cache_method :result, 3_600 # one hour
+
+    def as_cache_key
+      [ @emitter, @params ]
+    end
+
+    def hash
+      as_cache_key.hash
+    end
+
+    def eql?(other)
+      as_cache_key == other.as_cache_key
+    end
+    alias :== :eql?
+  end
+end

data/lib/carbon/version.rb

@@ -1,3 +1,3 @@
 module Carbon
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/test/carbon_test.rb

@@ -1,23 +1,4 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'benchmark'
-require 'webmock/minitest'
-WebMock.disable!
-def with_web_mock
-  WebMock.enable!
-  WebMock.disable_net_connect!
-  yield
-ensure
-  WebMock.disable!
-end
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'minitest/reporters'
-MiniTest::Unit.runner = MiniTest::SuiteRunner.new
-MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
-require 'timeframe'
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'carbon'
+require File.expand_path("../helper", __FILE__)
 
 Carbon.key = 'carbon_test'
 
@@ -60,89 +41,130 @@ class MyNissanAltima
 end
 
 describe Carbon do
-  # args could be mmm(:post, 'http://impact.brighterplanet.com/monkeys.json').to_return(:status => 500, :body => 'too many monkeys')
+  before do
+    flush_cache!
+  end
+
   describe :query do
     it "calculates flight impact" do
-      response = Carbon.query('Flight', :origin_airport => 'LAX', :destination_airport => 'SFO', :segments_per_trip => 1, :trips => 1)
-      response.decisions.carbon.object.value.must_be_close_to 200, 50
+      result = Carbon.query('Flight', :origin_airport => 'LAX', :destination_airport => 'SFO', :segments_per_trip => 1, :trips => 1)
+      result.decisions.carbon.object.value.must_be_close_to 200, 50
     end
     it "gets back characteristics" do
-      response = Carbon.query('Flight', :origin_airport => 'LAX', :destination_airport => 'SFO', :segments_per_trip => 1, :trips => 1)
-      response.characteristics.origin_airport.description.must_match %r{lax}i
+      result = Carbon.query('Flight', :origin_airport => 'LAX', :destination_airport => 'SFO', :segments_per_trip => 1, :trips => 1)
+      result.characteristics.origin_airport.description.must_match %r{lax}i
     end
     it "tells you if the query is successful" do
-      response = Carbon.query('Flight')
-      response.success.must_equal true
+      result = Carbon.query('Flight')
+      result.success.must_equal true
     end
     it "is gentle about errors" do
-      response = Carbon.query('Monkey')
-      response.success.must_equal false
+      result = Carbon.query('Monkey')
+      result.success.must_equal false
     end
     it "sends timeframe properly" do
-      response = Carbon.query('Flight', :timeframe => Timeframe.new(:year => 2009))
-      response.timeframe.startDate.must_equal '2009-01-01'
-      response.timeframe.endDate.must_equal '2010-01-01'
+      result = Carbon.query('Flight', :timeframe => Timeframe.new(:year => 2009))
+      result.timeframe.startDate.must_equal '2009-01-01'
+      result.timeframe.endDate.must_equal '2010-01-01'
     end
     it "sends key properly" do
       with_web_mock do
         WebMock.stub_request(:post, 'http://impact.brighterplanet.com/flights.json').with(:key => 'carbon_test').to_return(:status => 500, :body => 'Good job')
-        response = Carbon.query('Flight')
-        response.error_body.must_equal 'Good job'
+        result = Carbon.query('Flight')
+        result.errors.first.must_equal 'Good job'
       end
     end
   end
+
   describe :multi do
     before do
       @queries = []
-      3.times do
-        @queries << ['Flight', {:origin_airport => 'LAX', :destination_airport => 'SFO', :segments_per_trip => 1, :trips => 1}]
-        @queries << ['RailTrip', {:distance => 25}]
-        @queries << ['AutomobileTrip', {:make => 'Nissan', :model => 'Altima'}]
-        @queries << ['Residence']
-        @queries << ['Monkey']
-      end
+      @queries << ['Flight', {:origin_airport => 'LAX', :destination_airport => 'SFO', :segments_per_trip => 1, :trips => 1}]
+      @queries << ['Flight', {:origin_airport => 'MSN', :destination_airport => 'ORD', :segments_per_trip => 1, :trips => 1}]
+      @queries << ['Flight', {:origin_airport => 'IAH', :destination_airport => 'DEN', :segments_per_trip => 1, :trips => 1}]
+      @queries << ['RailTrip', {:distance => 25}]
+      @queries << ['RailTrip', {:rail_class => 'commuter'}]
+      @queries << ['RailTrip', {:rail_traction => 'electric'}]
+      @queries << ['AutomobileTrip', {:make => 'Nissan', :model => 'Altima'}]
+      @queries << ['AutomobileTrip', {:make => 'Toyota', :model => 'Prius'}]
+      @queries << ['AutomobileTrip', {:make => 'Ford', :model => 'Taurus'}]
+      @queries << ['Residence', {:urbanity => 'City'}]
+      @queries << ['Residence', {:zip_code => '53703'}]
+      @queries << ['Residence', {:bathrooms => 4}]
+      @queries << ['Monkey', {:bananas => '1'}]
+      @queries << ['Monkey', {:bananas => '2'}]
+      @queries << ['Monkey', {:bananas => '3'}]
       @queries = @queries.sort_by { rand }
     end
     it "doesn't hang up on 0 queries" do
       Timeout.timeout(0.5) { Carbon.multi([]) }.must_equal []
     end
     it "runs multiple queries at once" do
-      responses = Carbon.multi(@queries)
+      reference_results = @queries.map do |query|
+        Carbon.query(*query)
+      end
+      flush_cache! # important!
+      multi_results = Carbon.multi(@queries)
       error_count = 0
-      responses.each do |response|
-        if response.success
-          response.decisions.carbon.object.value.must_be :>, 0
-          response.decisions.carbon.object.value.must_be :<, 10_000
+      multi_results.each do |result|
+        if result.success
+          result.decisions.carbon.object.value.must_be :>, 0
+          result.decisions.carbon.object.value.must_be :<, 10_000
         else
           error_count += 1
         end
       end
       error_count.must_equal 3
-      @queries.each_with_index do |query, i|
-        reference_response = Carbon.query(*query)
-        if reference_response.success
-          responses[i].decisions.must_equal reference_response.decisions
+      reference_results.each_with_index do |reference_result, idx|
+        if reference_result.success
+          multi_results[idx].decisions.must_equal reference_result.decisions
+        else
+          multi_results[idx].must_equal reference_result
         end
       end
     end
-    it "is faster than just calling #query over and over" do
-      # dry run
+    it "is faster than just calling .query over and over" do
+      # warm up the cache on the other end
       @queries.each { |query| Carbon.query(*query) }
-      # --
+      flush_cache! # important!
       single_threaded_time = ::Benchmark.realtime do
         @queries.each { |query| Carbon.query(*query) }
       end
+      flush_cache! # important!
       multi_threaded_time = ::Benchmark.realtime do
         Carbon.multi(@queries)
       end
-      # Carbon::#multi
-      #    PASS test_0001_runs_multiple_queries_at_once (12.10s)
-      #    Multi-threaded was 95% faster
-      #    PASS test_0002_is_faster_than_just_calling_query_over_and_over (23.73s)
-      $stderr.puts "   Multi-threaded was #{((single_threaded_time - multi_threaded_time) / single_threaded_time * 100).round}% faster"
+      cached_single_threaded_time = ::Benchmark.realtime do
+        @queries.each { |query| Carbon.query(*query) }
+      end
+      cached_multi_threaded_time = ::Benchmark.realtime do
+        Carbon.multi(@queries)
+      end
       multi_threaded_time.must_be :<, single_threaded_time
+      cached_single_threaded_time.must_be :<, multi_threaded_time
+      cached_multi_threaded_time.must_be :<, multi_threaded_time
+      $stderr.puts "   Multi-threaded was #{((single_threaded_time - multi_threaded_time) / single_threaded_time * 100).round}% faster than single-threaded"
+      $stderr.puts "   Cached single-threaded was #{((multi_threaded_time - cached_single_threaded_time) / multi_threaded_time * 100).round}% faster than uncached multi-threaded"
+      $stderr.puts "   Cached multi-threaded was #{((multi_threaded_time - cached_multi_threaded_time) / multi_threaded_time * 100).round}% faster than uncached multi-threaded"
+    end
+    it "safely uniq's and caches queries" do
+      reference_results = @queries.map do |query|
+        Carbon.query(*query)
+      end
+      flush_cache! # important!
+      3.times do
+        multi_results = Carbon.multi(@queries)
+        reference_results.each_with_index do |reference_result, idx|
+          if reference_result.success
+            multi_results[idx].decisions.must_equal reference_result.decisions
+          else
+            multi_results[idx].must_equal reference_result
+          end
+        end
+      end
     end
   end
+  
   describe "mixin" do
     describe :emit_as do
       it "overwrites old emit_as blocks" do
@@ -153,11 +175,16 @@ describe Carbon do
         Carbon::Registry.instance['MyFoo'].characteristics.keys.must_equal [:model]
       end
     end
-    describe '#impact_params' do
-      it "only takes non-nil params" do
+    describe '#as_impact_query' do
+      it "sets up an query to be run by Carbon.multi" do
+        a = MyNissanAltima.new(2006)
+        a.as_impact_query.must_equal ["Automobile", {:make=>"Nissan", :model=>"Altima", :year=>2006, "automobile_fuel[code]"=>"R"}]
+      end
+      it "only includes non-nil params" do
         a = MyNissanAltima.new(2006)
-        a.impact_params.keys.wont_include :nil_model
-        a.impact_params.keys.wont_include :nil_make
+        a.as_impact_query[1].keys.must_include :year
+        a.as_impact_query[1].keys.wont_include :nil_model
+        a.as_impact_query[1].keys.wont_include :nil_make
       end
     end
     describe '#impact' do

data/test/helper.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'benchmark'
+require 'webmock/minitest'
+WebMock.disable!
+def with_web_mock
+  WebMock.enable!
+  WebMock.disable_net_connect!
+  yield
+ensure
+  WebMock.disable!
+end
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'minitest/reporters'
+MiniTest::Unit.runner = MiniTest::SuiteRunner.new
+MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
+require 'timeframe'
+require 'carbon'
+
+class MiniTest::Spec
+  def flush_cache!
+    CacheMethod.config.storage.flush
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carbon
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2153871340 !ruby/object:Gem::Requirement
+  requirement: &2165918380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153871340
+  version_requirements: *2165918380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153870880 !ruby/object:Gem::Requirement
+  requirement: &2165917960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153870880
+  version_requirements: *2165917960
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2153870440 !ruby/object:Gem::Requirement
+  requirement: &2165917480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153870440
+  version_requirements: *2165917480
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2153869980 !ruby/object:Gem::Requirement
+  requirement: &2165917040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153869980
+  version_requirements: *2165917040
+- !ruby/object:Gem::Dependency
+  name: cache_method
+  requirement: &2165941860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2165941860
 - !ruby/object:Gem::Dependency
   name: bombshell
-  requirement: &2153869540 !ruby/object:Gem::Requirement
+  requirement: &2165941440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153869540
+  version_requirements: *2165941440
 - !ruby/object:Gem::Dependency
   name: conversions
-  requirement: &2153869080 !ruby/object:Gem::Requirement
+  requirement: &2165941020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153869080
+  version_requirements: *2165941020
 - !ruby/object:Gem::Dependency
   name: brighter_planet_metadata
-  requirement: &2153868640 !ruby/object:Gem::Requirement
+  requirement: &2165940600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153868640
+  version_requirements: *2165940600
 description: Brighter Planet API client for Ruby
 email:
 - seamus@abshere.net
@@ -110,11 +121,13 @@ files:
 - features/shell.feature
 - features/support/env.rb
 - lib/carbon.rb
+- lib/carbon/future.rb
 - lib/carbon/registry.rb
 - lib/carbon/shell.rb
 - lib/carbon/shell/emitter.rb
 - lib/carbon/version.rb
 - test/carbon_test.rb
+- test/helper.rb
 homepage: https://github.com/brighterplanet/carbon
 licenses: []
 post_install_message: 
@@ -143,4 +156,5 @@ test_files:
 - features/shell.feature
 - features/support/env.rb
 - test/carbon_test.rb
+- test/helper.rb
 has_rdoc: