carbon 2.2.3 → 3.0.0

data/spec/helper.rb

@@ -0,0 +1,25 @@
+require 'bundler/setup'
+
+if ::Bundler.definition.specs['debugger'].first
+  require 'debugger'
+end
+
+require 'carbon'
+
+$:.unshift File.expand_path('../support', __FILE__)
+
+module Utilities
+  def flush_cache!
+    CacheMethod.config.storage.flush
+  end
+end
+
+require 'vcr'
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/cassettes'
+  c.hook_into :fakeweb
+end
+
+RSpec.configure do |c|
+  c.include Utilities
+end

data/spec/support/my_nissan_altima.rb

@@ -0,0 +1,36 @@
+class MyNissan
+  def name
+    'Nissan'
+  end
+  def to_s
+    raise "Not fair!"
+  end
+  alias :inspect :to_s
+end
+
+class MyNissanAltima
+  class << self
+    def all(options)
+      raise unless options == { :order => :year }
+      [ new(2000), new(2001), new(2002), new(2003), new(2004) ]
+    end
+  end
+  def initialize(model_year)
+    @model_year = model_year
+  end
+  def       make; MyNissan.new end
+  def      model; 'Altima'     end
+  def model_year; @model_year  end # what BP knows as "year"
+  def  fuel_type; 'R'          end # what BP knows as "automobile_fuel" and keys on "code"
+  def   nil_make; nil          end
+  def  nil_model; nil          end
+  include Carbon
+  emit_as 'Automobile' do
+    provide(:make) { |my_nissan_altima| my_nissan_altima.make.try(:name) }
+    provide :model
+    provide :model_year, :as => :year
+    provide :fuel_type, :as => :automobile_fuel, :key => :code
+    provide(:nil_make) { |my_nissan_altima| my_nissan_altima.nil_make.try(:blam!) }
+    provide :nil_model
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carbon
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: bombshell
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: brighter_planet_metadata
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bombshell
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: conversions
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: conversions
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: brighter_planet_metadata
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -123,6 +139,150 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: avro
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timeframe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Brighter Planet API client for Ruby
 email:
 - seamus@abshere.net
@@ -147,13 +307,27 @@ files:
 - features/shell.feature
 - features/support/env.rb
 - lib/carbon.rb
-- lib/carbon/future.rb
+- lib/carbon/query.rb
+- lib/carbon/query_pool.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
+- spec/carbon/query_spec.rb
+- spec/carbon_spec.rb
+- spec/cassettes/2006_Altima.yml
+- spec/cassettes/2006_Altima_in_2010.yml
+- spec/cassettes/2006_Altima_in_2011.yml
+- spec/cassettes/Flight.yml
+- spec/cassettes/Flight_and_Automobile.yml
+- spec/cassettes/LAX-_SFO_flight.yml
+- spec/cassettes/Monkey.yml
+- spec/cassettes/carbon_bp_com_flight.yml
+- spec/cassettes/flight_with_key_1.yml
+- spec/cassettes/flight_with_key_2.yml
+- spec/cassettes/timeframed_flight.yml
+- spec/helper.rb
+- spec/support/my_nissan_altima.rb
 homepage: https://github.com/brighterplanet/carbon
 licenses: []
 post_install_message: 
@@ -174,13 +348,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Brighter Planet API client for Ruby
 test_files:
 - features/shell.feature
 - features/support/env.rb
-- test/carbon_test.rb
-- test/helper.rb
+- spec/carbon/query_spec.rb
+- spec/carbon_spec.rb
+- spec/cassettes/2006_Altima.yml
+- spec/cassettes/2006_Altima_in_2010.yml
+- spec/cassettes/2006_Altima_in_2011.yml
+- spec/cassettes/Flight.yml
+- spec/cassettes/Flight_and_Automobile.yml
+- spec/cassettes/LAX-_SFO_flight.yml
+- spec/cassettes/Monkey.yml
+- spec/cassettes/carbon_bp_com_flight.yml
+- spec/cassettes/flight_with_key_1.yml
+- spec/cassettes/flight_with_key_2.yml
+- spec/cassettes/timeframed_flight.yml
+- spec/helper.rb
+- spec/support/my_nissan_altima.rb
 has_rdoc: 

data/lib/carbon/future.rb

@@ -1,109 +0,0 @@
-require 'uri'
-require 'net/http'
-require 'cache_method'
-require 'hashie/mash'
-require 'multi_json'
-
-module Carbon
-  # @private
-  class Future
-    class << self
-      def wrap(plain_query_or_o)
-        future = if plain_query_or_o.is_a?(::Array)
-          new(*plain_query_or_o)
-        else
-          new(*plain_query_or_o.as_impact_query)
-        end
-        future.object = plain_query_or_o
-        future
-      end
-
-      def single(future)
-        uri = ::URI.parse("#{future.domain}/#{future.emitter.underscore.pluralize}.json")
-        raw_result = ::Net::HTTP.post_form(uri, future.params)
-        future.finalize raw_result.code.to_i, raw_result.body
-        future
-      end
-
-      def multi(futures)
-        uniq_pending_futures = futures.uniq.select { |future| future.pending? }
-        while (set = uniq_pending_futures.pop(Carbon::CONCURRENCY)).any?
-          ts = set.map do |future|
-            ::Thread.new { single future }
-          end
-          ts.each do |t|
-            t.join
-          end
-        end
-        futures
-      end
-    end
-
-    attr_reader :emitter
-    attr_reader :params
-    attr_reader :domain
-
-    attr_accessor :object
-
-    def initialize(emitter, params = {})
-      @result = nil
-      @emitter = emitter
-      params = params.dup || {}
-      @domain = params.delete(:domain) || Carbon.domain
-      if Carbon.key and not params.has_key?(:key)
-        params[:key] = Carbon.key
-      end
-      @params = params
-    end
-
-    def multi!
-      @multi = true
-    end
-
-    def multi?
-      @multi == true
-    end
-
-    def pending?
-      @result.nil? and !cache_method_cached?(:result)
-    end
-
-    def finalize(code, body = nil)
-      memo = ::Hashie::Mash.new
-      memo.code = code
-      case code
-      when (200..299)
-        memo.success = true
-        memo.merge! ::MultiJson.decode(body)
-      else
-        memo.success = false
-        memo.errors = [body]
-      end
-      @result = memo
-      self.result # make sure it gets cached
-    end
-
-    def result
-      if @result
-        @result
-      elsif not multi?
-        Future.single self
-        @result
-      end
-    end
-    cache_method :result, 3_600 # one hour
-
-    def as_cache_key
-      [ @domain, @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