carbon 2.2.2 → 2.2.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+2.2.3 / 2012-04-12
+
+* Enhancements
+
+  * Raise an ArgumentError if you make the common mistake of calling Carbon.query(array) {} instead of Carbon.query(array).each {}
+
+* Bug fixes
+
+  * Fix how shell gets characteristics for an emitter
+
 2.2.2 / 2012-04-05
 
 * Enhancements

data/lib/carbon.rb

@@ -95,6 +95,8 @@ module Carbon
   #
   # @raise [ArgumentError] If your arguments don't match any of the method signatures.
   #
+  # @raise [ArgumentError] If you try to pass a block - you probably want +Carbon.query(array).each {}+ or something.
+  #
   # @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])
   #
@@ -132,6 +134,7 @@ module Carbon
   #     puts "Carbon emitter by #{car_or_flight} was #{impact.decisions.carbon.object.value.round(1)}"
   #   end
   def Carbon.query(*args)
+    raise ::ArgumentError, "Don't pass a block directly - instead use Carbon.query(array).each (for example)." if block_given?
     case Carbon.method_signature(*args)
     when :plain_query
       plain_query = args

data/lib/carbon/shell/emitter.rb

@@ -1,11 +1,22 @@
 require 'uri'
 require 'net/http'
 require 'conversions'
+require 'cache_method'
 
 module Carbon
   class Shell
     # @private
     class Emitter < Bombshell::Environment
+      class << self
+        # @private
+        def characteristics(emitter)
+          ::MultiJson.decode ::Net::HTTP.get(::URI.parse("http://impact.brighterplanet.com/#{emitter.underscore.pluralize}/options.json"))
+        rescue
+          # oops
+        end
+        cache_method :characteristics, 300
+      end
+
       include Bombshell::Shell
       include Carbon
       
@@ -13,10 +24,8 @@ module Carbon
       def initialize(name, input = {})
         @emitter = name.to_s.singularize.camelcase
         @input = input
-        response = ::Net::HTTP.get_response(::URI.parse("http://impact.brighterplanet.com/#{@emitter.underscore.pluralize}/options.json"))
-        if (200..299).include?(response.code.to_i)
-          @characteristics = ::MultiJson.decode response.body
-          @characteristics.keys.each do |characteristic|
+        if characteristics = Emitter.characteristics(@emitter)
+          characteristics.each do |characteristic|
             instance_eval <<-meth
               def #{characteristic}(arg = nil)
                 if arg
@@ -28,12 +37,12 @@ module Carbon
               end
             meth
           end
-          provisions = @characteristics.keys.map { |k| "provide :#{k}"}.join('; ')
+          provisions = characteristics.map { |k| "provide :#{k}"}.join('; ')
           emit_as_block = "emit_as(:#{name}) { #{provisions} }"
           self.class.class_eval emit_as_block
           emission
         else
-          puts "  => Sorry, characteristics couldn't be retrieved for #{@emitter.underscore.pluralize} (via #{url})"
+          puts "  => Sorry, characteristics couldn't be retrieved for #{@emitter.underscore.pluralize}. Please try again later."
           done
         end
       end
@@ -123,7 +132,7 @@ module Carbon
       
       # @private
       def help
-        puts "  => #{@characteristics.keys.join ', '}"
+        puts "  => #{Emitter.characteristics(@emitter).join ', '}"
       end
       
       prompt_with do |emitter|

data/lib/carbon/version.rb

@@ -1,3 +1,3 @@
 module Carbon
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/test/carbon_test.rb

@@ -126,6 +126,11 @@ describe Carbon do
       it "doesn't hang up on 0 queries" do
         Timeout.timeout(0.5) { Carbon.query([]) }.must_equal(Hash.new)
       end
+      it "raises if you pass it a block directly" do
+        lambda {
+          Carbon.query([]) { }
+        }.must_raise(ArgumentError)
+      end
       it "can be used on objects that respond to #as_impact_query" do
         a = MyNissanAltima.new(2001)
         b = MyNissanAltima.new(2006)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carbon
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport