rest-core 1.0.3 → 2.0.0

data/test/test_error_detector.rb

@@ -9,6 +9,5 @@ describe RC::ErrorDetector do
     end.new.lighten
 
     client.attributes.should.key?(:error_detector)
-    client.app.call({}).should.eq({})
   end
 end

data/test/test_error_handler.rb

@@ -0,0 +1,44 @@
+
+require 'rest-core/test'
+
+describe RC::ErrorHandler do
+  client = RC::Builder.client do
+    use RC::ErrorHandler
+    run RC::Dry
+  end
+
+  exp = Class.new(Exception)
+
+  describe 'there is an exception' do
+    should 'raise an error with future' do
+      lambda{
+      client.new.get('/', {}, RC::FAIL => [exp.new('fail')])
+      }.should.raise(exp)
+    end
+
+    should 'give an error with callback' do
+      client.new.get('/', {}, RC::FAIL => [exp.new('fail')]){ |res|
+        res.should.kind_of?(exp)
+      }
+    end
+  end
+
+  describe 'error_handler gives an exception' do
+    should 'raise an error with future' do
+      lambda{
+      client.new(:error_handler => lambda{ |res| exp.new }).
+        get('/', {}, RC::FAIL => [true])
+      }.should.raise(exp)
+    end
+
+    should 'give an error with callback' do
+      client.new(:error_handler => lambda{ |res| exp.new }).
+        get('/', {}, RC::FAIL => [true]){ |res| res.should.kind_of?(exp) }
+    end
+  end
+
+  should 'no exception but errors' do
+    client.new(:error_handler => lambda{ |res| 1 }).
+      request({RC::FAIL => [0]}, RC::FAIL).should.eq [0, 1]
+  end
+end

data/test/test_follow_redirect.rb

@@ -3,7 +3,13 @@ require 'rest-core/test'
 
 describe RC::FollowRedirect do
   before do
-    @dry = RC::Dry.new
+    @dry = Class.new do
+      attr_accessor :status
+      def call env
+        yield(env.merge(RC::RESPONSE_STATUS  => status,
+                        RC::RESPONSE_HEADERS => {'LOCATION' => 'location'}))
+      end
+    end.new
     @app = RC::FollowRedirect.new(dry, 1)
   end
   after do
@@ -14,34 +20,26 @@ describe RC::FollowRedirect do
 
   [301, 302, 303, 307].each do |status|
     should "not follow redirect if reached max_redirects: #{status}" do
-      mock(dry).call(anything){ |env|
-        env.merge(RC::RESPONSE_STATUS => status,
-                  RC::RESPONSE_HEADERS => {'LOCATION' => 'location'})
+      dry.status = status
+      app.call(RC::REQUEST_METHOD => :get, 'max_redirects' => 0){ |res|
+        res[RC::RESPONSE_HEADERS]['LOCATION'].should.eq 'location'
       }
-      app.call(RC::REQUEST_METHOD => :get,
-               'max_redirects' => 0)[RC::RESPONSE_HEADERS]['LOCATION'].
-                                                 should.eq 'location'
     end
 
     should "follow once: #{status}" do
-      mock(dry).call(anything){ |env|
-        env.merge(RC::RESPONSE_STATUS => status,
-                  RC::RESPONSE_HEADERS => {'LOCATION' => 'location'})
-      }.times(2)
-      app.call(RC::REQUEST_METHOD => :get)[RC::RESPONSE_HEADERS]['LOCATION'].
-                                                       should.eq 'location'
+      dry.status = status
+      app.call(RC::REQUEST_METHOD => :get){ |res|
+        res[RC::RESPONSE_HEADERS]['LOCATION'].should.eq 'location'
+      }
     end
   end
 
   [200, 201, 404, 500].each do |status|
     should "not follow redirect if it's not a redirect status: #{status}" do
-      mock(dry).call(anything){ |env|
-        env.merge(RC::RESPONSE_STATUS => status,
-                  RC::RESPONSE_HEADERS => {'LOCATION' => 'location'})
+      dry.status = status
+      app.call(RC::REQUEST_METHOD => :get, 'max_redirects' => 9){ |res|
+        res[RC::RESPONSE_HEADERS]['LOCATION'].should.eq 'location'
       }
-      app.call(RC::REQUEST_METHOD => :get,
-               'max_redirects' => 9)[RC::RESPONSE_HEADERS]['LOCATION'].
-                                                 should.eq 'location'
     end
   end
 end

data/test/test_json_request.rb

@@ -0,0 +1,28 @@
+
+require 'rest-core/test'
+
+describe RC::JsonRequest do
+  app = RC::JsonRequest.new(RC::Dry.new, true)
+  env = {RC::REQUEST_HEADERS => {}}
+  request_params = {
+    'key' => 'value',
+    'array' => [1, 2, 3],
+    'nested' => {'k' => 'v', 'a' => [4, 5, 6]}
+  }
+
+  should 'encode payload as json' do
+    e = env.merge(RC::REQUEST_METHOD  => :post,
+                  RC::REQUEST_PAYLOAD => request_params)
+
+    app.call(e){ |res|
+      res.should.eq(
+        RC::REQUEST_METHOD  => :post,
+        RC::REQUEST_HEADERS => {'Content-Type' => 'application/json'},
+        RC::REQUEST_PAYLOAD => RC::Json.encode(request_params))}
+  end
+
+  should 'do nothing if json_request is false' do
+    app = RC::JsonRequest.new(RC::Dry.new, false)
+    app.call(env){ |res| res.should.eq res }
+  end
+end

data/test/test_json_response.rb

@@ -0,0 +1,51 @@
+
+require 'rest-core/test'
+
+describe RC::JsonResponse do
+  describe 'app' do
+    def app
+      @app ||= RC::JsonResponse.new(RC::Dry.new, true)
+    end
+
+    should 'do nothing' do
+      expected = {RC::RESPONSE_BODY => nil,
+                  RC::REQUEST_HEADERS => {'Accept' => 'application/json'}}
+      app.call({}){ |response| response.should.eq(expected) }
+    end
+
+    should 'decode' do
+      expected = {RC::RESPONSE_BODY => {},
+                  RC::REQUEST_HEADERS => {'Accept' => 'application/json'}}
+      app.call(RC::RESPONSE_BODY => '{}'){ |response|
+        response.should.eq(expected)
+      }
+    end
+  end
+
+  describe 'client' do
+    def client
+      @client ||= RC::Builder.client do
+        use RC::JsonResponse, true
+        run Class.new{
+          def call env
+            yield(env.merge(RC::RESPONSE_BODY => '{}'))
+          end
+        }
+      end
+    end
+
+    should 'do nothing' do
+      expected = '{}'
+      client.new(:json_response => false).get(''){ |response|
+        response.should.eq(expected)
+      }.get('').should.eq(expected)
+    end
+
+    should 'decode' do
+      expected = {}
+      client.new.get(''){ |response|
+        response.should.eq(expected)
+      }.get('').should.eq(expected)
+    end
+  end
+end

data/test/test_oauth1_header.rb

@@ -1,10 +1,10 @@
 
 require 'rest-core/test'
 
-describe RestCore::Oauth1Header do
+describe RC::Oauth1Header do
   before do
-    @env = {RestCore::REQUEST_METHOD => :post,
-            RestCore::REQUEST_PATH   =>
+    @env = {RC::REQUEST_METHOD => :post,
+            RC::REQUEST_PATH   =>
               'https://api.twitter.com/oauth/request_token'}
 
     callback =
@@ -18,7 +18,7 @@ describe RestCore::Oauth1Header do
        'oauth_version'      => '1.0'                                        ,
        'oauth_signature_method' => 'HMAC-SHA1'}
 
-    @auth = RestCore::Oauth1Header.new(RestCore::Dry.new,
+    @auth = RC::Oauth1Header.new(RC::Dry.new,
       nil, nil, nil,
       'GDdmIQH6jhtmLUypg82g',
       'MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98')

data/test/test_payload.rb

@@ -2,28 +2,36 @@
 require 'rest-core/test'
 
 describe RC::DefaultPayload do
-  before do
-    @app = RC::DefaultPayload.new(RC::Dry.new, {})
-  end
-
-  def app
-    @app
-  end
+  app = RC::DefaultPayload.new(RC::Dry.new, {})
 
   should 'do nothing' do
-    app.call({})[RC::REQUEST_PAYLOAD].should.eq({})
+    app.call({}){ |r| r[RC::REQUEST_PAYLOAD].should.eq({}) }
   end
 
   should 'merge payload' do
     app.instance_eval{@payload = {'pay' => 'load'}}
 
-    app.call({}).should.eq({RC::REQUEST_PAYLOAD =>
-      {'pay' => 'load'}})
+    app.call({}){ |r| r.should.eq({RC::REQUEST_PAYLOAD =>
+      {'pay' => 'load'}}) }
 
     format = {'format' => 'json'}
     env    = {RC::REQUEST_PAYLOAD => format}
 
-    app.call(env).should.eq({RC::REQUEST_PAYLOAD =>
-      {'pay' => 'load'}.merge(format)})
+    app.call(env){ |r| r.should.eq({RC::REQUEST_PAYLOAD =>
+      {'pay' => 'load'}.merge(format)})}
+  end
+
+  should 'accept non-hash payload' do
+    u = RC::Universal.new(:log_method => false)
+    env = {RC::REQUEST_PAYLOAD => 'payload'}
+    u.request_full(env, u.dry)[RC::REQUEST_PAYLOAD].should.eq('payload')
+
+    u.payload = 'default'
+    u.request_full(env, u.dry)[RC::REQUEST_PAYLOAD].should.eq('payload')
+    u.request_full({} , u.dry)[RC::REQUEST_PAYLOAD].should.eq('default')
+
+    u = RC::Builder.client{use RC::DefaultPayload, 'maylord'}.new
+    u.request_full({} , u.dry)[RC::REQUEST_PAYLOAD].should.eq('maylord')
+    u.request_full(env, u.dry)[RC::REQUEST_PAYLOAD].should.eq('payload')
   end
 end

data/test/test_simple.rb

@@ -0,0 +1,14 @@
+
+require 'rest-core/test'
+
+describe RC::Simple do
+  before do
+    @path = 'http://example.com'
+    stub_request(:get, @path).to_return(:body => 'OK')
+  end
+
+  should 'work with RC' do
+    RC::Simple.new.get(@path).should.eq 'OK'
+  end
+end
+

data/test/test_timeout.rb

@@ -2,33 +2,25 @@
 require 'rest-core/test'
 
 describe RC::Timeout do
-  before do
-    @app = RC::Timeout.new(RC::Dry.new, 0)
-  end
-
   after do
     WebMock.reset!
+    RR.verify
+  end
+
+  def setup_app
+    RC::Timeout.new(RC::Dry.new, 0)
   end
 
   should 'bypass timeout if timeout is 0' do
-    mock(@app).monitor.times(0)
-    @app.call({}).should.eq({})
+    app = setup_app
+    mock(app).monitor.times(0)
+    app.call({}){ |e| e.should.eq({}) }
   end
 
   should 'run the monitor to setup timeout' do
+    app = setup_app
     env = {'timeout' => 2}
-    mock.proxy(@app).monitor(env).times(1)
-    @app.call(env).should.eq(env)
+    mock.proxy(app).monitor(env).times(1)
+    app.call(env){|e| e[RC::TIMER].should.kind_of?(RC::Timeout::TimerThread)}
   end
-
-  should 'return correct result under fibers' do
-    path = 'http://example.com/'
-    stub_request(:get, path).to_return(:body => 'response')
-
-    c = RC::Builder.client do
-      use RC::Timeout, 10
-      run RC::EmHttpRequestFiber
-    end.new
-    EM.run{Fiber.new{c.get(path).should.eq('response');EM.stop}.resume}
-  end if defined?(Fiber)
 end

data/test/test_universal.rb

@@ -1,19 +1,19 @@
 
 require 'rest-core/test'
 
-describe RestCore::Universal do
+describe RC::Universal do
   should 'send Authorization header' do
-    u = RestCore::Universal.new(:log_method => false)
+    u = RC::Universal.new(:log_method => false)
     u.username = 'Aladdin'
     u.password = 'open sesame'
 
-    u.request_full({}, u.dry)[RestCore::REQUEST_HEADERS].should.eq(
+    u.request_full({}, u.dry)[RC::REQUEST_HEADERS].should.eq(
       {'Authorization' => 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=='})
 
     acc = {'Accept' => 'text/plain'}
-    env = {RestCore::REQUEST_HEADERS => acc}
+    env = {RC::REQUEST_HEADERS => acc}
 
-    u.request_full(env, u.dry)[RestCore::REQUEST_HEADERS].should.eq(
+    u.request_full(env, u.dry)[RC::REQUEST_HEADERS].should.eq(
       {'Authorization' => 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=='}.merge(acc))
   end
 end

data/test/test_wrapper.rb

@@ -1,30 +1,36 @@
 
 require 'rest-core/test'
 
-describe RestCore::Wrapper do
+describe RC::Wrapper do
   should 'wrap around simple middleware' do
-    wrapper = RestCore::Bypass.dup
-    wrapper.send(:include, RestCore::Wrapper)
-    client = RestCore::Builder.client do
+    wrapper = RC::Bypass.dup
+    wrapper.send(:include, RC::Wrapper)
+    client = RC::Builder.client do
       use wrapper do
-        use RestCore::Bypass
+        use RC::Bypass
       end
-      run RestCore::Dry
+      run RC::Dry
     end
 
-    client.new.app.call({1=>2}).should.eq({1=>2})
+    client.new.app.call(1=>2){ |res| res.should.eq(1=>2) }
   end
 
   should 'default app is RestCore::Dry' do
     wrapper = Class.new
-    wrapper.send(:include, RestCore::Wrapper)
-    wrapper.new.wrapped.class.should.eq RestCore::Dry
+    wrapper.send(:include, RC::Wrapper)
+    wrapper.new.wrapped.class.should.eq RC::Dry
   end
 
-  should 'switch default_app to RestCore::RestClient' do
+  should 'switch default_engine to RestCore::RestClient' do
     wrapper = Class.new
-    wrapper.send(:include, RestCore::Wrapper)
-    wrapper.default_app = RestCore::RestClient
-    wrapper.new.wrapped.class.should.eq RestCore::RestClient
+    wrapper.send(:include, RC::Wrapper)
+    wrapper.default_engine = RC::RestClient
+    wrapper.new.wrapped.class.should.eq RC::RestClient
+  end
+
+  should 'accept middlewares without a member' do
+    Class.new.send(:include, RC::Wrapper).new{
+      use Class.new.send(:include, RC::Middleware)
+    }.members.should.eq []
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -35,7 +35,7 @@ description: ! 'Modular Ruby clients interface for REST APIs
 
   To address the need for a way to access these APIs easily and elegantly,
 
-  we have developed [rest-core][], which consists of composable middleware
+  we have developed rest-core, which consists of composable middleware
 
   that allows you to build a REST client for any REST API. Or in the case of
 
@@ -44,8 +44,6 @@ description: ! 'Modular Ruby clients interface for REST APIs
   dedicated clients provided by [rest-more][].
 
 
-  [rest-core]: https://github.com/cardinalblue/rest-core
-
   [rest-more]: https://github.com/cardinalblue/rest-more'
 email:
 - dev (XD) cardinalblue.com
@@ -63,30 +61,22 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- doc/ToC.md
-- doc/dependency.md
-- doc/design.md
-- example/auto.rb
-- example/coolio.rb
-- example/eventmachine.rb
 - example/multi.rb
-- example/rest-client.rb
+- example/simple.rb
+- example/use-cases.rb
 - lib/rest-core.rb
-- lib/rest-core/app/abstract/async_fiber.rb
-- lib/rest-core/app/auto.rb
-- lib/rest-core/app/coolio-async.rb
-- lib/rest-core/app/coolio-fiber.rb
-- lib/rest-core/app/coolio.rb
-- lib/rest-core/app/dry.rb
-- lib/rest-core/app/em-http-request-async.rb
-- lib/rest-core/app/em-http-request-fiber.rb
-- lib/rest-core/app/em-http-request.rb
-- lib/rest-core/app/rest-client.rb
 - lib/rest-core/builder.rb
 - lib/rest-core/client.rb
 - lib/rest-core/client/simple.rb
 - lib/rest-core/client/universal.rb
 - lib/rest-core/client_oauth1.rb
+- lib/rest-core/engine/auto.rb
+- lib/rest-core/engine/dry.rb
+- lib/rest-core/engine/em-http-request.rb
+- lib/rest-core/engine/future/future.rb
+- lib/rest-core/engine/future/future_fiber.rb
+- lib/rest-core/engine/future/future_thread.rb
+- lib/rest-core/engine/rest-client.rb
 - lib/rest-core/error.rb
 - lib/rest-core/event.rb
 - lib/rest-core/middleware.rb
@@ -103,21 +93,22 @@ files:
 - lib/rest-core/middleware/error_detector_http.rb
 - lib/rest-core/middleware/error_handler.rb
 - lib/rest-core/middleware/follow_redirect.rb
-- lib/rest-core/middleware/json_decode.rb
+- lib/rest-core/middleware/json_request.rb
+- lib/rest-core/middleware/json_response.rb
 - lib/rest-core/middleware/oauth1_header.rb
 - lib/rest-core/middleware/oauth2_header.rb
 - lib/rest-core/middleware/oauth2_query.rb
 - lib/rest-core/middleware/timeout.rb
-- lib/rest-core/middleware/timeout/coolio_timer.rb
-- lib/rest-core/middleware/timeout/eventmachine_timer.rb
+- lib/rest-core/middleware/timeout/timer_em.rb
+- lib/rest-core/middleware/timeout/timer_thread.rb
+- lib/rest-core/patch/multi_json.rb
 - lib/rest-core/patch/rest-client.rb
 - lib/rest-core/test.rb
 - lib/rest-core/util/hmac.rb
+- lib/rest-core/util/json.rb
 - lib/rest-core/util/parse_query.rb
 - lib/rest-core/version.rb
 - lib/rest-core/wrapper.rb
-- pending/test_multi.rb
-- pending/test_test_util.rb
 - rest-core.gemspec
 - test/test_auth_basic.rb
 - test/test_builder.rb
@@ -125,12 +116,16 @@ files:
 - test/test_client.rb
 - test/test_client_oauth1.rb
 - test/test_default_query.rb
+- test/test_em_http_request.rb
 - test/test_error_detector.rb
 - test/test_error_detector_http.rb
+- test/test_error_handler.rb
 - test/test_follow_redirect.rb
-- test/test_json_decode.rb
+- test/test_json_request.rb
+- test/test_json_response.rb
 - test/test_oauth1_header.rb
 - test/test_payload.rb
+- test/test_simple.rb
 - test/test_timeout.rb
 - test/test_universal.rb
 - test/test_wrapper.rb
@@ -165,12 +160,16 @@ test_files:
 - test/test_client.rb
 - test/test_client_oauth1.rb
 - test/test_default_query.rb
+- test/test_em_http_request.rb
 - test/test_error_detector.rb
 - test/test_error_detector_http.rb
+- test/test_error_handler.rb
 - test/test_follow_redirect.rb
-- test/test_json_decode.rb
+- test/test_json_request.rb
+- test/test_json_response.rb
 - test/test_oauth1_header.rb
 - test/test_payload.rb
+- test/test_simple.rb
 - test/test_timeout.rb
 - test/test_universal.rb
 - test/test_wrapper.rb