rest-more 1.0.2 → 2.0.0

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

@@ -124,7 +124,7 @@ class ApplicationControllerTest < ActionController::TestCase
 
     get(:cache)
     assert_response :success
-    assert_equal '{"message":"ok"}', @response.body
+    assert_equal %Q|200\n\n\n{"message":"ok"}|, @response.body
   end
 
   def test_handler

data/example/rainbows.rb

@@ -4,7 +4,9 @@ preload_app      true
 
 Rainbows! do
   use :EventMachine, :em_client_class => lambda{
-    RainbowsEventMachineFiberClient
+    RainbowsEventMachineThreadPoolClient
+    # or
+    # RainbowsEventMachineFiberSpawnClient
   }
   worker_connections        100
 
@@ -12,14 +14,53 @@ Rainbows! do
   client_header_buffer_size  8*1024      #  8 kilobytes
 end
 
-require 'rest-more'
-::RC::Builder.default_app = ::RC::Auto
+after_fork{ |_, _|
+  EM.threadpool_size = 32
+  class RainbowsEventMachineThreadPoolClient < Rainbows::EventMachine::Client
+    def app_call input
+      set_comm_inactivity_timeout 0
+      @env[RACK_INPUT] = input
+      @env[REMOTE_ADDR] = @_io.kgio_addr
+      @env[ASYNC_CALLBACK] = method(:write_async_response)
+      @env[ASYNC_CLOSE] = EM::DefaultDeferrable.new
+      @deferred = true
+      EM.defer{
+        status, headers, body = catch(:async) {
+          APP.call(@env.merge!(RACK_DEFAULTS))
+        }
+        if nil == status || -1 == status
+          @deferred = true
+        else
+          @deferred = nil
+          ev_write_response(status, headers, body, @hp.next?)
+        end
+      }
+    end
+  end
 
-class RainbowsEventMachineFiberClient < Rainbows::EventMachine::Client
-  def app_call input
-    Fiber.new{ super }.resume
+  class RainbowsEventMachineFiberSpawnClient < Rainbows::EventMachine::Client
+    def app_call input
+      set_comm_inactivity_timeout 0
+      @env[RACK_INPUT] = input
+      @env[REMOTE_ADDR] = @_io.kgio_addr
+      @env[ASYNC_CALLBACK] = method(:write_async_response)
+      @env[ASYNC_CLOSE] = EM::DefaultDeferrable.new
+      f = Fiber.new{
+        status, headers, body = catch(:async) {
+          APP.call(@env.merge!(RACK_DEFAULTS))
+        }
+        if nil == status || -1 == status
+          @deferred = true
+        else
+          @deferred = nil
+          ev_write_response(status, headers, body, @hp.next?)
+        end
+      }
+      f.resume
+      @deferred = true if f.alive?
+    end
   end
-end
+}
 
 EM.error_handler{ |e|
   puts "Error: EM.error_handler: #{e.inspect} #{e.backtrace.inspect}"

data/example/simple.rb

@@ -1,8 +1,8 @@
 
 require 'rest-more'
 
-p RestCore::Twitter.new.statuses('_cardinalblue').first # get user tweets
+p RC::Twitter.new.statuses('_cardinalblue').first # get user tweets
 puts
-p RestCore::Github.new.get('users/cardinalblue')        # get user info
+p RC::Github.new.get('users/cardinalblue')        # get user info
 puts
-p RestCore::Facebook.new.get('4') # get user info
+p RC::Facebook.new.get('4') # get user info

data/example/sinatra/config.ru

@@ -8,7 +8,7 @@ config = {:app_id => app_id,
           :secret => secret}
 
 post '/' do
-  fb = RestCore::Facebook.new(config)
+  fb = RC::Facebook.new(config)
   fb.parse_signed_request!(params['signed_request'])
   "#{fb.get('me').inspect.gsub('<', '&lt;')}\n"
 end

data/lib/rest-core/client/dropbox.rb

@@ -2,32 +2,24 @@
 require 'rest-core'
 
 # https://www.dropbox.com/developers/reference/api
-RestCore::Dropbox = RestCore::Builder.client(:root) do
-  s = RestCore
-  use s::Timeout       , 10
-
-  use s::DefaultSite   , 'https://api.dropbox.com/'
-  use s::DefaultHeaders, {'Accept'       => 'application/json',
-                          'Content-Type' => 'application/octet-stream'}
-
-  use s::Oauth1Header  ,
-    '1/oauth/request_token', '1/oauth/access_token',
-    'https://www.dropbox.com/1/oauth/authorize'
-
-  use s::CommonLogger  , nil
-  use s::Cache         , nil, 600 do
-    use s::ErrorHandler, lambda{ |env|
-      if env[s::ASYNC]
-        if env[s::RESPONSE_BODY].kind_of?(::Exception)
-          env
-        else
-          env.merge(s::RESPONSE_BODY => ::RestCore::Dropbox::Error.call(env))
-        end
-      else
-        raise ::RestCore::Dropbox::Error.call(env)
-      end}
-    use s::ErrorDetectorHttp
-    use s::JsonDecode  , true
+module RestCore
+  Dropbox = Builder.client(:root) do
+    use Timeout       , 10
+
+    use DefaultSite   , 'https://api.dropbox.com/'
+    use DefaultHeaders, {'Accept'       => 'application/json',
+                         'Content-Type' => 'application/octet-stream'}
+
+    use Oauth1Header  ,
+      '1/oauth/request_token', '1/oauth/access_token',
+      'https://www.dropbox.com/1/oauth/authorize'
+
+    use CommonLogger  , nil
+    use Cache         , nil, 600 do
+      use ErrorHandler, lambda{ |env| Dropbox::Error.call(env) }
+      use ErrorDetectorHttp
+      use JsonResponse, true
+    end
   end
 end
 
@@ -86,7 +78,7 @@ module RestCore::Dropbox::Client
 
   def download path, query={}, opts={}
     get("https://api-content.dropbox.com/1/files/#{root}/#{path}",
-        query, {:json_decode => false}.merge(opts))
+        query, {:json_response => false}.merge(opts))
   end
 
   def upload path, file, query={}, opts={}

data/lib/rest-core/client/facebook.rb

@@ -4,39 +4,27 @@ require 'rest-core/util/hmac'
 
 # https://developers.facebook.com/docs/reference/api
 # https://developers.facebook.com/tools/explorer
-RestCore::Facebook = RestCore::Builder.client(
-  :data, :app_id, :secret, :old_site) do
-
-  s = RestCore
-  use s::Timeout       , 10
-
-  use s::DefaultSite   , 'https://graph.facebook.com/'
-  use s::DefaultHeaders, {'Accept'          => 'application/json',
-                          'Accept-Language' => 'en-us'}
-  use s::Oauth2Query   , nil
-
-  use s::CommonLogger  , nil
-  use s::Cache         , nil, 600 do
-    use s::ErrorHandler,  lambda{ |env|
-      if env[s::ASYNC]
-        if env[s::RESPONSE_BODY].kind_of?(::Exception)
-          env
-        else
-          env.merge(s::RESPONSE_BODY => ::RestCore::Facebook::Error.call(env))
-        end
-      else
-        raise ::RestCore::Facebook::Error.call(env)
-      end}
-    use s::ErrorDetector, lambda{ |env|
-      if env[s::RESPONSE_BODY].kind_of?(Hash)
-        env[s::RESPONSE_BODY]['error'] ||
-        env[s::RESPONSE_BODY]['error_code']
-      end}
-
-    use s::JsonDecode  , true
-  end
+module RestCore
+  Facebook = Builder.client(:data, :app_id, :secret, :old_site) do
+    use Timeout       , 10
+
+    use DefaultSite   , 'https://graph.facebook.com/'
+    use DefaultHeaders, {'Accept'          => 'application/json',
+                            'Accept-Language' => 'en-us'}
+    use Oauth2Query   , nil
+
+    use CommonLogger  , nil
+    use Cache         , nil, 600 do
+      use ErrorHandler,  lambda{ |env| Facebook::Error.call(env) }
+      use ErrorDetector, lambda{ |env|
+        env[RESPONSE_BODY].kind_of?(Hash) &&
+        (env[RESPONSE_BODY]['error'] || env[RESPONSE_BODY]['error_code'])}
+
+      use JsonResponse, true
+    end
 
-  use s::Defaults      , :old_site => 'https://api.facebook.com/'
+    use Defaults      , :old_site => 'https://api.facebook.com/'
+  end
 end
 
 class RestCore::Facebook::Error < RestCore::Error
@@ -195,8 +183,8 @@ module RestCore::Facebook::Client
 
   def parse_json! json
     self.data = json &&
-      check_sig_and_return_data(JsonDecode.json_decode(json))
-  rescue JsonDecode::ParseError
+      check_sig_and_return_data(Json.decode(json))
+  rescue Json::ParseError
     self.data = nil
   end
 
@@ -213,10 +201,10 @@ module RestCore::Facebook::Client
       "#{str.tr('-_', '+/')}==".unpack('m').first
     }
     self.data = check_sig_and_return_data(
-                  JsonDecode.json_decode(json).merge('sig' => sig)){
+                  Json.decode(json).merge('sig' => sig)){
                     Hmac.sha256(secret, json_encoded)
                   }
-  rescue JsonDecode::ParseError
+  rescue Json::ParseError
     self.data = nil
   end
 
@@ -231,24 +219,14 @@ module RestCore::Facebook::Client
     payload = {:client_id => app_id, :client_secret => secret}.merge(opts)
     self.data = ParseQuery.parse_query(
                   post('oauth/access_token', payload, {},
-                      {:json_decode => false}.merge(opts)))
+                      {:json_response => false}.merge(opts)))
   end
 
   # old rest facebook api, i will definitely love to remove them someday
 
   def old_rest path, query={}, opts={}, &cb
-    uri = url("method/#{path}", {:format => 'json'}.merge(query),
-              {:site => old_site}.merge(opts))
-    if opts[:post]
-      post(url("method/#{path}", {:format => 'json'},
-               {:site => old_site}.merge(opts)),
-           query,
-           {}   ,
-           opts.merge('cache.key' => uri, 'cache.post' => true),
-           &cb)
-    else
-      get(uri, {}, opts, &cb)
-    end
+    get("method/#{path}", {:format => 'json'}.merge(query),
+      {:site => old_site}.merge(opts), &cb)
   end
 
   def secret_old_rest path, query={}, opts={}, &cb
@@ -261,7 +239,7 @@ module RestCore::Facebook::Client
 
   def fql_multi codes, query={}, opts={}, &cb
     old_rest('fql.multiquery',
-      {:queries => JsonDecode.json_encode(codes)}.merge(query), opts, &cb)
+      {:queries => Json.encode(codes)}.merge(query), opts, &cb)
   end
 
   def exchange_sessions query={}, opts={}, &cb
@@ -280,7 +258,6 @@ module RestCore::Facebook::Client
     super(env.inject({}){ |r, (k, v)|
       case k.to_s
         when 'secret'     ; r['access_token'] = secret_access_token
-        when 'cache'      ; r['cache.update'] = !!!v
         else              ; r[k.to_s]         = v
       end
       r

data/lib/rest-core/client/facebook/rails_util.rb

@@ -268,17 +268,19 @@ module RestCore::Facebook::RailsUtil
   end
 
   def rc_facebook_normalized_request_uri
-    uri = if rc_facebook_in_canvas?
-            # rails 3 uses newer rack which has fullpath
-            "http://apps.facebook.com/#{
-              rc_options_get(RestCore::Facebook, :canvas)}" +
-            (request.respond_to?(:fullpath) ?
-              request.fullpath : request.request_uri)
-          else
-            request.url
-          end
-
-    rc_facebook_filter_uri(uri)
+    @rc_facebook_normalized_request_uri ||= begin
+      uri = if rc_facebook_in_canvas?
+              # rails 3 uses newer rack which has fullpath
+              "http://apps.facebook.com/#{
+                rc_options_get(RestCore::Facebook, :canvas)}" +
+              (request.respond_to?(:fullpath) ?
+                request.fullpath : request.request_uri)
+            else
+              request.url
+            end
+
+      rc_facebook_filter_uri(uri)
+    end
   end
 
   def rc_facebook_filter_uri uri

data/lib/rest-core/client/github.rb

@@ -2,29 +2,21 @@
 require 'rest-core'
 
 # http://developer.github.com/v3/
-RestCore::Github = RestCore::Builder.client do
-  s = RestCore
-  use s::Timeout       , 10
+module RestCore
+  Github = Builder.client do
+    use Timeout       , 10
 
-  use s::DefaultSite   , 'https://api.github.com/'
-  use s::DefaultHeaders, {'Accept' => 'application/json'}
-  use s::Oauth2Query   , nil
+    use DefaultSite   , 'https://api.github.com/'
+    use DefaultHeaders, {'Accept' => 'application/json'}
+    use Oauth2Query   , nil
 
-  use s::CommonLogger  , nil
-  use s::Cache         , nil, 600 do
-    use s::ErrorHandler, lambda{ |env|
-      if env[s::ASYNC]
-        if env[s::RESPONSE_BODY].kind_of?(::Exception)
-          env
-        else
-          env.merge(s::RESPONSE_BODY =>
-                      RuntimeError.new(env[s::RESPONSE_BODY]['message']))
-        end
-      else
-        raise env[s::RESPONSE_BODY]['message']
-      end}
-    use s::ErrorDetectorHttp
-    use s::JsonDecode  , true
+    use CommonLogger  , nil
+    use Cache         , nil, 600 do
+      use ErrorHandler, lambda{ |env|
+        RuntimeError.new(env[RESPONSE_BODY]['message'])}
+      use ErrorDetectorHttp
+      use JsonResponse, true
+    end
   end
 end
 

data/lib/rest-core/client/linkedin.rb

@@ -2,33 +2,25 @@
 require 'rest-core'
 
 # http://developer.linkedin.com/documents/linkedin-api-resource-map
-RestCore::Linkedin = RestCore::Builder.client do
-  s = RestCore
-  use s::Timeout       , 10
-
-  use s::DefaultSite   , 'https://api.linkedin.com/'
-  use s::DefaultHeaders, {'Accept' => 'application/json'}
-  use s::DefaultQuery  , {'format' => 'json'}
-
-  use s::Oauth1Header  ,
-    'uas/oauth/requestToken', 'uas/oauth/accessToken',
-    'https://www.linkedin.com/uas/oauth/authorize'
-
-  use s::CommonLogger  , nil
-  use s::Cache         , nil, 600 do
-    use s::ErrorHandler, lambda{ |env|
-      if env[s::ASYNC]
-        if env[s::RESPONSE_BODY].kind_of?(::Exception)
-          env
-        else
-          env.merge(s::RESPONSE_BODY =>
-                      RuntimeError.new(env[s::RESPONSE_BODY]['message']))
-        end
-      else
-        raise env[s::RESPONSE_BODY]['message']
-      end}
-    use s::ErrorDetectorHttp
-    use s::JsonDecode  , true
+module RestCore
+  Linkedin = Builder.client do
+    use Timeout       , 10
+
+    use DefaultSite   , 'https://api.linkedin.com/'
+    use DefaultHeaders, {'Accept' => 'application/json'}
+    use DefaultQuery  , {'format' => 'json'}
+
+    use Oauth1Header  ,
+      'uas/oauth/requestToken', 'uas/oauth/accessToken',
+      'https://www.linkedin.com/uas/oauth/authorize'
+
+    use CommonLogger  , nil
+    use Cache         , nil, 600 do
+      use ErrorHandler, lambda{ |env|
+        RuntimeError.new(env[RESPONSE_BODY]['message'])}
+      use ErrorDetectorHttp
+      use JsonResponse, true
+    end
   end
 end
 

data/lib/rest-core/client/twitter.rb

@@ -2,30 +2,22 @@
 require 'rest-core'
 
 # https://dev.twitter.com/docs
-RestCore::Twitter = RestCore::Builder.client do
-  s = RestCore
-  use s::Timeout       , 10
+module RestCore
+  Twitter = Builder.client do
+    use Timeout       , 10
 
-  use s::DefaultSite   , 'https://api.twitter.com/'
-  use s::DefaultHeaders, {'Accept' => 'application/json'}
+    use DefaultSite   , 'https://api.twitter.com/'
+    use DefaultHeaders, {'Accept' => 'application/json'}
 
-  use s::Oauth1Header  ,
-    'oauth/request_token', 'oauth/access_token', 'oauth/authorize'
+    use Oauth1Header  ,
+      'oauth/request_token', 'oauth/access_token', 'oauth/authorize'
 
-  use s::CommonLogger  , nil
-  use s::Cache         , nil, 600 do
-    use s::ErrorHandler, lambda{ |env|
-      if env[s::ASYNC]
-        if env[s::RESPONSE_BODY].kind_of?(::Exception)
-          env
-        else
-          env.merge(s::RESPONSE_BODY => ::RestCore::Twitter::Error.call(env))
-        end
-      else
-        raise ::RestCore::Twitter::Error.call(env)
-      end}
-    use s::ErrorDetectorHttp
-    use s::JsonDecode  , true
+    use CommonLogger  , nil
+    use Cache         , nil, 600 do
+      use ErrorHandler, lambda{ |env| Twitter::Error.call(env) }
+      use ErrorDetectorHttp
+      use JsonResponse, true
+    end
   end
 end