rest-graph 1.9.1 → 2.0.0

data/example/rails2/app/controllers/application_controller.rb

@@ -49,14 +49,23 @@ class ApplicationController < ActionController::Base
   end
 
   def reinitialize
-    cache_nil = rest_graph.cache
     rest_graph_setup(:cache => {'a' => 'b'})
-    cache     = rest_graph.cache
-    render :text => YAML.dump([cache_nil, cache])
+    render :text => YAML.dump(rest_graph.cache)
   end
 
   def helper; end
 
+  def defaults
+    rest_graph_setup
+    render :text => (rest_graph.cache               == Rails.cache &&
+                     rest_graph.log_method.receiver == Rails.logger)
+  end
+
+  def parse_cookies
+    rest_graph_setup
+    render :text => 'dummy'
+  end
+
   private
   def filter_common
     rest_graph_setup(:auto_authorize => true, :canvas => '')

data/example/rails2/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/example/rails2/test/functional/application_controller_test.rb

@@ -1,11 +1,13 @@
 
 require 'test_helper'
 require 'webmock'
+require 'rr'
 
 WebMock.disable_net_connect!
 
 class ApplicationControllerTest < ActionController::TestCase
   include WebMock::API
+  include RR::Adapters::TestUnit
 
   def setup
     body = rand(2) == 0 ? '{"error":{"type":"OAuthException"}}' :
@@ -16,6 +18,7 @@ class ApplicationControllerTest < ActionController::TestCase
   end
 
   def teardown
+    RR.verify
     WebMock.reset!
   end
 
@@ -172,7 +175,7 @@ class ApplicationControllerTest < ActionController::TestCase
   def test_reinitailize
     get(:reinitialize)
     assert_response :success
-    assert_equal [nil, {'a' => 'b'}], YAML.load(@response.body)
+    assert_equal({'a' => 'b'}, YAML.load(@response.body))
   end
 
   def test_helper
@@ -180,4 +183,28 @@ class ApplicationControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal RestGraph.default_app_id, @response.body.strip
   end
+
+  def test_defaults
+    get(:defaults)
+    assert_response :success
+    assert_equal 'true', @response.body.strip
+  end
+
+  def setup_cookies key
+    cookies = {"#{key}_#{RestGraph.default_app_id}" => 'dummy'}
+    stub(@controller).cookies{cookies}
+    f = RestGraph.new
+    stub(@controller).rest_graph{f}
+    mock(f).parse_cookies!(cookies)
+  end
+
+  def test_parse_cookies_fbs
+    setup_cookies('fbs')
+    get(:parse_cookies)
+  end
+
+  def test_parse_cookies_fbsr
+    setup_cookies('fbsr')
+    get(:parse_cookies)
+  end
 end

data/example/rails3/Gemfile

@@ -1,11 +1,11 @@
 
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.7'
+gem 'rails', '3.0.9'
 
 gem 'rest-client' # for rest-graph
 gem 'yajl-ruby'   # for rest-graph
-gem 'rest-graph'
+gem 'rest-graph', :path => '../../'
 
 group 'test' do
   gem 'rr'

data/example/rails3/app/controllers/application_controller.rb

@@ -49,14 +49,23 @@ class ApplicationController < ActionController::Base
   end
 
   def reinitialize
-    cache_nil = rest_graph.cache
     rest_graph_setup(:cache => {'a' => 'b'})
-    cache     = rest_graph.cache
-    render :text => YAML.dump([cache_nil, cache])
+    render :text => YAML.dump(rest_graph.cache)
   end
 
   def helper; end
 
+  def defaults
+    rest_graph_setup
+    render :text => (rest_graph.cache               == Rails.cache &&
+                     rest_graph.log_method.receiver == Rails.logger)
+  end
+
+  def parse_cookies
+    rest_graph_setup
+    render :text => 'dummy'
+  end
+
   private
   def filter_common
     rest_graph_setup(:auto_authorize => true, :canvas => '')

data/example/rails3/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/example/rails3/config/environments/development.rb

@@ -14,9 +14,6 @@ Rails3::Application.configure do
   config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
-
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 

data/example/rails3/test/functional/application_controller_test.rb

@@ -1,11 +1,13 @@
 
 require 'test_helper'
 require 'webmock'
+require 'rr'
 
 WebMock.disable_net_connect!
 
 class ApplicationControllerTest < ActionController::TestCase
   include WebMock::API
+  include RR::Adapters::TestUnit
 
   def setup
     body = rand(2) == 0 ? '{"error":{"type":"OAuthException"}}' :
@@ -16,6 +18,7 @@ class ApplicationControllerTest < ActionController::TestCase
   end
 
   def teardown
+    RR.verify
     WebMock.reset!
   end
 
@@ -172,7 +175,7 @@ class ApplicationControllerTest < ActionController::TestCase
   def test_reinitailize
     get(:reinitialize)
     assert_response :success
-    assert_equal [nil, {'a' => 'b'}], YAML.load(@response.body)
+    assert_equal({'a' => 'b'}, YAML.load(@response.body))
   end
 
   def test_helper
@@ -180,4 +183,28 @@ class ApplicationControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal RestGraph.default_app_id, @response.body.strip
   end
+
+  def test_defaults
+    get(:defaults)
+    assert_response :success
+    assert_equal 'true', @response.body.strip
+  end
+
+  def setup_cookies key
+    cookies = {"#{key}_#{RestGraph.default_app_id}" => 'dummy'}
+    stub(@controller).cookies{cookies}
+    f = RestGraph.new
+    stub(@controller).rest_graph{f}
+    mock(f).parse_cookies!(cookies)
+  end
+
+  def test_parse_cookies_fbs
+    setup_cookies('fbs')
+    get(:parse_cookies)
+  end
+
+  def test_parse_cookies_fbsr
+    setup_cookies('fbsr')
+    get(:parse_cookies)
+  end
 end

data/lib/rest-graph/config_util.rb

@@ -34,7 +34,7 @@ module RestGraph::ConfigUtil
           #{v.kind_of?(String) ? "'#{v}'" : v}
         end
       RUBY
-    }.join)
+    }.join, __FILE__, __LINE__)
 
     RestGraph.send(:extend, mod)
   end

data/lib/rest-graph/core.rb

@@ -1,7 +1,8 @@
 
 # optional http client
 begin; require 'restclient'     ; rescue LoadError; end
-begin; require 'em-http-request'; rescue LoadError; end
+begin; gem 'em-http-request', '<1'
+       require 'em-http-request'; rescue LoadError; end
 
 # optional gem
 begin; require 'rack'           ; rescue LoadError; end
@@ -14,11 +15,13 @@ require 'cgi'
 require 'timeout'
 
 # the data structure used in RestGraph
-RestGraphStruct = Struct.new(:auto_decode, :timeout,
+RestGraphStruct = Struct.new(:access_token,
+                             :auto_decode, :timeout,
                              :graph_server, :old_server,
                              :accept, :lang,
                              :app_id, :secret,
                              :data, :cache,
+                             :expires_in,
                              :log_method,
                              :log_handler,
                              :error_handler) unless defined?(RestGraphStruct)
@@ -91,6 +94,7 @@ class RestGraph < RestGraphStruct
   # setup defaults
   module DefaultAttributes
     extend self
+    def default_access_token; nil                          ; end
     def default_auto_decode ; true                         ; end
     def default_strict      ; false                        ; end
     def default_timeout     ; 10                           ; end
@@ -102,6 +106,7 @@ class RestGraph < RestGraphStruct
     def default_secret      ; nil                          ; end
     def default_data        ; {}                           ; end
     def default_cache       ; nil                          ; end
+    def default_expires_in  ; 600                          ; end
     def default_log_method  ; nil                          ; end
     def default_log_handler ; nil                          ; end
     def default_error_handler
@@ -191,9 +196,7 @@ class RestGraph < RestGraphStruct
   # common methods
 
   def initialize o={}
-    (Attributes + [:access_token]).each{ |name|
-      send("#{name}=", o[name]) if o.key?(name)
-    }
+    o.each{ |key, value| send("#{key}=", value) if respond_to?("#{key}=") }
   end
 
   def access_token
@@ -344,7 +347,11 @@ class RestGraph < RestGraphStruct
   end
 
   def parse_cookies! cookies
-    self.data = parse_fbs!(cookies["fbs_#{app_id}"])
+    self.data = if   fbsr = cookies["fbsr_#{app_id}"]
+                  parse_fbsr!(fbsr)
+                else fbs  = cookies["fbs_#{app_id}"]
+                  parse_fbs!(fbs)
+                end
   end
 
   def parse_fbs! fbs
@@ -353,6 +360,15 @@ class RestGraph < RestGraphStruct
       Rack::Utils.parse_query(fbs.to_s.sub(/^"/, '').sub(/"$/, '')))
   end
 
+  def parse_fbsr! fbsr
+    old_data = parse_signed_request!(fbsr)
+    # beware! maybe facebook would take out the code someday
+    return self.data = old_data unless old_data && old_data['code']
+    # passing empty redirect_uri is needed!
+    authorize!(:code => old_data['code'], :redirect_uri => '')
+    self.data = old_data.merge(data)
+  end
+
   def parse_json! json
     self.data = json &&
       check_sig_and_return_data(self.class.json_decode(json))
@@ -368,6 +384,7 @@ class RestGraph < RestGraphStruct
 
   def parse_signed_request! request
     sig_encoded, json_encoded = request.split('.')
+    return self.data = nil unless sig_encoded && json_encoded
     sig,  json = [sig_encoded, json_encoded].map{ |str|
       "#{str.tr('-_', '+/')}==".unpack('m').first
     }
@@ -591,9 +608,10 @@ class RestGraph < RestGraphStruct
     # fake post (opts[:post] => true) is considered get and need cache
     return if meth != :get unless opts[:post]
 
-    if opts[:expires_in].kind_of?(Fixnum) && cache.method(:store).arity == -3
+    expires = opts[:expires_in] || expires_in
+    if expires.kind_of?(Fixnum) && cache.method(:store).arity == -3
       cache.store(cache_key(opts, uri), value,
-                  :expires_in => opts[:expires_in])
+                  :expires_in => expires)
     else
       cache_assign(opts, uri, value)
     end

data/lib/rest-graph/rails_util.rb

@@ -22,6 +22,8 @@ end
 
 class RestGraph
   module DefaultAttributes
+    def default_log_method            ; Rails.logger.method(:debug); end
+    def default_cache                 ; Rails.cache                ; end
     def default_canvas                ; ''   ; end
     def default_iframe                ; false; end
     def default_auto_authorize        ; false; end
@@ -183,7 +185,7 @@ module RestGraph::RailsUtil
   end
 
   def rest_graph_options_new
-    @rest_graph_options_new ||= {:log_method => logger.method(:debug)}
+    @rest_graph_options_new ||= {}
   end
   # ==================== end options utility =======================
 
@@ -226,8 +228,9 @@ module RestGraph::RailsUtil
   # if we're not in canvas nor code passed,
   # we could check out cookies as well.
   def rest_graph_check_cookie
-    return if rest_graph.authorized? ||
-              !cookies["fbs_#{rest_graph.app_id}"]
+    return if rest_graph.authorized?                 ||
+              (!cookies["fbsr_#{rest_graph.app_id}"] &&
+               !cookies["fbs_#{rest_graph.app_id}"])
 
     rest_graph.parse_cookies!(cookies)
     logger.debug("DEBUG: RestGraph: detected cookies, parsed:" \

data/lib/rest-graph/version.rb

@@ -1,4 +1,4 @@
 
 require 'rest-graph/core'
 
-RestGraph::VERSION = '1.9.1'
+RestGraph::VERSION = '2.0.0'

data/rest-graph.gemspec

@@ -1,170 +1,134 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rest-graph}
-  s.version = "1.9.1"
+  s.name = "rest-graph"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [
-  %q{Cardinal Blue},
-  %q{Lin Jen-Shin (godfat)}]
-  s.date = %q{2011-06-07}
-  s.description = %q{A lightweight Facebook Graph API client}
-  s.email = [%q{dev (XD) cardinalblue.com}]
-  s.extra_rdoc_files = [
-  %q{CHANGES},
-  %q{CONTRIBUTORS},
-  %q{LICENSE},
-  %q{TODO}]
+  "Cardinal Blue",
+  "Lin Jen-Shin (godfat)"]
+  s.date = "2011-10-08"
+  s.description = "A lightweight Facebook Graph API client\n\nWe have moved the development from rest-graph to [rest-core][].\nBy now on, we would only fix bugs in rest-graph rather than adding\nfeatures, and we would only backport important changes from rest-core\nonce in a period. If you want the latest goodies, please see [rest-core][]\nOtherwise, you can stay with rest-graph with bugs fixes.\n\n[rest-core]: https://github.com/cardinalblue/rest-core"
+  s.email = ["dev (XD) cardinalblue.com"]
   s.files = [
-  %q{.gitignore},
-  %q{.gitmodules},
-  %q{CHANGES},
-  %q{CONTRIBUTORS},
-  %q{Gemfile},
-  %q{LICENSE},
-  %q{README},
-  %q{README.md},
-  %q{Rakefile},
-  %q{TODO},
-  %q{doc/ToC.md},
-  %q{doc/dependency.md},
-  %q{doc/design.md},
-  %q{doc/heroku-facebook.md},
-  %q{doc/rails.md},
-  %q{doc/test.md},
-  %q{doc/tutorial.md},
-  %q{example/multi/config.ru},
-  %q{example/multi/rainbows.rb},
-  %q{example/rails2/Gemfile},
-  %q{example/rails2/README},
-  %q{example/rails2/Rakefile},
-  %q{example/rails2/app/controllers/application_controller.rb},
-  %q{example/rails2/app/views/application/helper.html.erb},
-  %q{example/rails2/config/boot.rb},
-  %q{example/rails2/config/environment.rb},
-  %q{example/rails2/config/environments/development.rb},
-  %q{example/rails2/config/environments/production.rb},
-  %q{example/rails2/config/environments/test.rb},
-  %q{example/rails2/config/initializers/cookie_verification_secret.rb},
-  %q{example/rails2/config/initializers/new_rails_defaults.rb},
-  %q{example/rails2/config/initializers/session_store.rb},
-  %q{example/rails2/config/preinitializer.rb},
-  %q{example/rails2/config/rest-graph.yaml},
-  %q{example/rails2/config/routes.rb},
-  %q{example/rails2/log},
-  %q{example/rails2/test/functional/application_controller_test.rb},
-  %q{example/rails2/test/test_helper.rb},
-  %q{example/rails2/test/unit/rails_util_test.rb},
-  %q{example/rails3/Gemfile},
-  %q{example/rails3/Rakefile},
-  %q{example/rails3/app/controllers/application_controller.rb},
-  %q{example/rails3/app/views/application/helper.html.erb},
-  %q{example/rails3/config.ru},
-  %q{example/rails3/config/application.rb},
-  %q{example/rails3/config/environment.rb},
-  %q{example/rails3/config/environments/development.rb},
-  %q{example/rails3/config/environments/production.rb},
-  %q{example/rails3/config/environments/test.rb},
-  %q{example/rails3/config/initializers/secret_token.rb},
-  %q{example/rails3/config/initializers/session_store.rb},
-  %q{example/rails3/config/rest-graph.yaml},
-  %q{example/rails3/config/routes.rb},
-  %q{example/rails3/test/functional/application_controller_test.rb},
-  %q{example/rails3/test/test_helper.rb},
-  %q{example/rails3/test/unit/rails_util_test.rb},
-  %q{example/sinatra/config.ru},
-  %q{init.rb},
-  %q{lib/rest-graph.rb},
-  %q{lib/rest-graph/config_util.rb},
-  %q{lib/rest-graph/core.rb},
-  %q{lib/rest-graph/facebook_util.rb},
-  %q{lib/rest-graph/rails_util.rb},
-  %q{lib/rest-graph/test_util.rb},
-  %q{lib/rest-graph/version.rb},
-  %q{rest-graph.gemspec},
-  %q{task/gemgem.rb},
-  %q{test/common.rb},
-  %q{test/config/rest-graph.yaml},
-  %q{test/test_api.rb},
-  %q{test/test_cache.rb},
-  %q{test/test_default.rb},
-  %q{test/test_error.rb},
-  %q{test/test_facebook.rb},
-  %q{test/test_handler.rb},
-  %q{test/test_load_config.rb},
-  %q{test/test_misc.rb},
-  %q{test/test_multi.rb},
-  %q{test/test_oauth.rb},
-  %q{test/test_old.rb},
-  %q{test/test_page.rb},
-  %q{test/test_parse.rb},
-  %q{test/test_rest-graph.rb},
-  %q{test/test_serialize.rb},
-  %q{test/test_test_util.rb},
-  %q{test/test_timeout.rb}]
-  s.homepage = %q{https://github.com/godfat/}
-  s.rdoc_options = [
-  %q{--main},
-  %q{README}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{A lightweight Facebook Graph API client}
+  ".gitignore",
+  ".gitmodules",
+  ".travis.yml",
+  "CHANGES.md",
+  "CONTRIBUTORS",
+  "Gemfile",
+  "LICENSE",
+  "README.md",
+  "Rakefile",
+  "TODO.md",
+  "doc/ToC.md",
+  "doc/dependency.md",
+  "doc/design.md",
+  "doc/heroku-facebook.md",
+  "doc/rails.md",
+  "doc/test.md",
+  "doc/tutorial.md",
+  "example/multi/config.ru",
+  "example/multi/rainbows.rb",
+  "example/rails2/Gemfile",
+  "example/rails2/README",
+  "example/rails2/Rakefile",
+  "example/rails2/app/controllers/application_controller.rb",
+  "example/rails2/app/views/application/helper.html.erb",
+  "example/rails2/config/boot.rb",
+  "example/rails2/config/environment.rb",
+  "example/rails2/config/environments/development.rb",
+  "example/rails2/config/environments/production.rb",
+  "example/rails2/config/environments/test.rb",
+  "example/rails2/config/initializers/cookie_verification_secret.rb",
+  "example/rails2/config/initializers/new_rails_defaults.rb",
+  "example/rails2/config/initializers/session_store.rb",
+  "example/rails2/config/preinitializer.rb",
+  "example/rails2/config/rest-graph.yaml",
+  "example/rails2/config/routes.rb",
+  "example/rails2/log",
+  "example/rails2/test/functional/application_controller_test.rb",
+  "example/rails2/test/test_helper.rb",
+  "example/rails2/test/unit/rails_util_test.rb",
+  "example/rails3/Gemfile",
+  "example/rails3/Rakefile",
+  "example/rails3/app/controllers/application_controller.rb",
+  "example/rails3/app/views/application/helper.html.erb",
+  "example/rails3/config.ru",
+  "example/rails3/config/application.rb",
+  "example/rails3/config/boot.rb",
+  "example/rails3/config/environment.rb",
+  "example/rails3/config/environments/development.rb",
+  "example/rails3/config/environments/production.rb",
+  "example/rails3/config/environments/test.rb",
+  "example/rails3/config/initializers/secret_token.rb",
+  "example/rails3/config/initializers/session_store.rb",
+  "example/rails3/config/rest-graph.yaml",
+  "example/rails3/config/routes.rb",
+  "example/rails3/test/functional/application_controller_test.rb",
+  "example/rails3/test/test_helper.rb",
+  "example/rails3/test/unit/rails_util_test.rb",
+  "example/sinatra/config.ru",
+  "init.rb",
+  "lib/rest-graph.rb",
+  "lib/rest-graph/config_util.rb",
+  "lib/rest-graph/core.rb",
+  "lib/rest-graph/facebook_util.rb",
+  "lib/rest-graph/rails_util.rb",
+  "lib/rest-graph/test_util.rb",
+  "lib/rest-graph/version.rb",
+  "rest-graph.gemspec",
+  "task/.gitignore",
+  "task/gemgem.rb",
+  "test/common.rb",
+  "test/config/rest-graph.yaml",
+  "test/test_api.rb",
+  "test/test_cache.rb",
+  "test/test_default.rb",
+  "test/test_error.rb",
+  "test/test_facebook.rb",
+  "test/test_handler.rb",
+  "test/test_load_config.rb",
+  "test/test_misc.rb",
+  "test/test_multi.rb",
+  "test/test_oauth.rb",
+  "test/test_old.rb",
+  "test/test_page.rb",
+  "test/test_parse.rb",
+  "test/test_rest-graph.rb",
+  "test/test_serialize.rb",
+  "test/test_test_util.rb",
+  "test/test_timeout.rb"]
+  s.homepage = "https://github.com/cardinalblue/rest-graph"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "A lightweight Facebook Graph API client"
   s.test_files = [
-  %q{test/test_api.rb},
-  %q{test/test_cache.rb},
-  %q{test/test_default.rb},
-  %q{test/test_error.rb},
-  %q{test/test_facebook.rb},
-  %q{test/test_handler.rb},
-  %q{test/test_load_config.rb},
-  %q{test/test_misc.rb},
-  %q{test/test_multi.rb},
-  %q{test/test_oauth.rb},
-  %q{test/test_old.rb},
-  %q{test/test_page.rb},
-  %q{test/test_parse.rb},
-  %q{test/test_rest-graph.rb},
-  %q{test/test_serialize.rb},
-  %q{test/test_test_util.rb},
-  %q{test/test_timeout.rb}]
+  "test/test_api.rb",
+  "test/test_cache.rb",
+  "test/test_default.rb",
+  "test/test_error.rb",
+  "test/test_facebook.rb",
+  "test/test_handler.rb",
+  "test/test_load_config.rb",
+  "test/test_misc.rb",
+  "test/test_multi.rb",
+  "test/test_oauth.rb",
+  "test/test_old.rb",
+  "test/test_page.rb",
+  "test/test_parse.rb",
+  "test/test_rest-graph.rb",
+  "test/test_serialize.rb",
+  "test/test_test_util.rb",
+  "test/test_timeout.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rest-client>, [">= 0"])
-      s.add_development_dependency(%q<em-http-request>, [">= 0"])
-      s.add_development_dependency(%q<rack>, [">= 0"])
-      s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<json_pure>, [">= 0"])
-      s.add_development_dependency(%q<ruby-hmac>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
-      s.add_development_dependency(%q<bacon>, [">= 0"])
-      s.add_development_dependency(%q<rr>, [">= 0"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<em-http-request>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<ruby-hmac>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
-      s.add_dependency(%q<bacon>, [">= 0"])
-      s.add_dependency(%q<rr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<em-http-request>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<ruby-hmac>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
-    s.add_dependency(%q<bacon>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
   end
 end