httprb 0.1.3 → 0.1.4

data/lib/httprb/dsl.rb

@@ -6,18 +6,19 @@
 # note that each of the following methods accepts a
 # block- this is the beauty of the whole thing.
 
-# if you're wondering about the code duplication, read:
-#
-# http://blog.sidu.in/2007/11/ruby-blocks-gotchas.html
-#
-# implicit invocation of blocks is just faster. so we
-# duplicate code. :(
-
 require 'httprb/request'
 require 'httprb/http_cache'
 
 module HTTPrb
   public
+  def HTTPrb.req(type, url, options = {}, &block)
+    options[:type] = type.upcase
+    req = Request.new(url, options)
+    #yield(req) if block_given?
+    req.evaluate(&block) if block_given?
+    HTTPrb::HTTPCache.instance.make_request(req)
+  end
+
   # get request
   # 
   # * options are not generally used; HTTPrb::Request
@@ -25,11 +26,8 @@ module HTTPrb
   #   handling.
   # * accepts a block, handing off the HTTPrb::Request
   #   object to it, if provided.
-  def HTTPrb.get(url, options = {})
-    options[:type] = 'GET'
-    req = Request.new(url, options)
-    yield(req) if block_given?
-    HTTPrb::HTTPCache.instance.make_request(req)
+  def HTTPrb.get(url, options = {}, &block)
+    HTTPrb.req('GET', url, options, &block)
   end
 
   # head request
@@ -39,11 +37,8 @@ module HTTPrb
   #   handling.
   # * accepts a block, handing off the HTTPrb::Request
   #   object to it, if provided.
-  def HTTPrb.head(url, options = {})
-    options[:type] = 'HEAD'
-    req = Request.new(url, options)
-    yield(req) if block_given?
-    HTTPrb::HTTPCache.instance.make_request(req)
+  def HTTPrb.head(url, options = {}, &block)
+    HTTPrb.req('HEAD', url, options, &block)
   end
   
   # post request
@@ -53,11 +48,8 @@ module HTTPrb
   #   handling.
   # * accepts a block, handing off the HTTPrb::Request
   #   object to it, if provided.
-  def HTTPrb.post(url, options = {})
-    options[:type] = 'POST'
-    req = Request.new(url, options)
-    yield(req) if block_given?
-    HTTPrb::HTTPCache.instance.make_request(req)
+  def HTTPrb.post(url, options = {}, &block)
+    HTTPrb.req('POST', url, options, &block)
   end
   
   # put request
@@ -67,11 +59,8 @@ module HTTPrb
   #   handling.
   # * accepts a block, handing off the HTTPrb::Request
   #   object to it, if provided.
-  def HTTPrb.put(url, options = {})
-    options[:type] = 'PUT'
-    req = Request.new(url, options)
-    yield(req) if block_given?
-    HTTPrb::HTTPCache.instance.make_request(req)
+  def HTTPrb.put(url, options = {}, &block)
+    HTTPrb.req('PUT', url, options, &block)
   end
   
   # delete request
@@ -81,11 +70,8 @@ module HTTPrb
   #   handling.
   # * accepts a block, handing off the HTTPrb::Request
   #   object to it, if provided.
-  def HTTPrb.delete(url, options = {})
-    options[:type] = 'DELETE'
-    req = Request.new(url, options)
-    yield(req) if block_given?
-    HTTPrb::HTTPCache.instance.make_request(req)
+  def HTTPrb.delete(url, options = {}, &block)
+    HTTPrb.req('DELETE', url, options, &block)
   end
 
 end

data/lib/httprb/request.rb

@@ -145,15 +145,26 @@ class Request
     return http_req
   end
   
+  def evaluate(&block)
+    @self_before_eval = eval "self", block.binding
+    r = instance_eval &block
+    @self_before_eval = nil # clear our state
+    r
+  end
+  
   # yep, you got it. we're messing with your mind
   # here. nothing to see here, move along...
-  def method_missing(method)
+  def method_missing(method, *args, &block)
     if method == :"ssl?"
       return @ssl
     elsif @options.keys.include?(method)
       return @options[method]
     end
-    super
+    if @self_before_eval
+      @self_before_eval.send method, *args, &block
+    else
+      super
+    end
   end
 end
 

data/lib/httprb/version.rb

@@ -1,6 +1,6 @@
 module HTTPrb
   # HTTPrb version
-  VERSION         = '0.1.3'
+  VERSION         = '0.1.4'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_dsl.rb

@@ -21,10 +21,9 @@ class TestDSL < Test::Unit::TestCase
   end
   
   def test_get_block
-    res = get 'http://google.com' do |req|
-      assert_not_nil req
-      assert req.options[:type] == 'GET'
-      assert req.uri.host = 'mozy.com'
+    res = get 'http://google.com' do
+      assert type == 'GET'
+      assert uri.host = 'mozy.com'
     end
     assert_not_nil res
     assert res.code =~ /2[0-9].|3[0-9]./
@@ -36,10 +35,9 @@ class TestDSL < Test::Unit::TestCase
   end
   
   def test_get_ssl_block
-    res = get 'https://mozy.com/' do |req|
-      assert_not_nil req
-      assert req.options[:type] == 'GET'
-      assert req.uri.host = 'mozy.com'
+    res = get 'https://mozy.com/' do
+      assert type == 'GET'
+      assert uri.host = 'mozy.com'
     end
     assert res.code =~ /2[0-9].|3[0-9]./
   end
@@ -50,10 +48,9 @@ class TestDSL < Test::Unit::TestCase
   end
   
   def test_head_block
-    res = head 'http://google.com' do |req|
-      assert_not_nil req
-      assert req.options[:type] == 'HEAD'
-      assert req.uri.host = 'mozy.com'
+    res = head 'http://google.com' do
+      assert type == 'HEAD'
+      assert uri.host = 'mozy.com'
     end
     assert_not_nil res
     assert res.code =~ /2[0-9].|3[0-9]./
@@ -65,10 +62,9 @@ class TestDSL < Test::Unit::TestCase
   end
   
   def test_put_block
-    res = put 'http://google.com' do |req|
-      assert_not_nil req
-      assert req.options[:type] == 'PUT'
-      assert req.uri.host = 'mozy.com'
+    res = put 'http://google.com' do
+      assert type == 'PUT'
+      assert uri.host = 'mozy.com'
     end
     assert_not_nil res
     assert res.code =~ /2[0-9].|3[0-9]./
@@ -80,10 +76,9 @@ class TestDSL < Test::Unit::TestCase
   end
 
   def test_post_block
-    res = post 'http://google.com' do |req|
-      assert_not_nil req
-      assert req.options[:type] == 'POST'
-      assert req.uri.host = 'mozy.com'
+    res = post 'http://google.com' do
+      assert type == 'POST'
+      assert uri.host = 'mozy.com'
     end
     assert_not_nil res
     assert res.code =~ /2[0-9].|3[0-9]./
@@ -96,29 +91,28 @@ class TestDSL < Test::Unit::TestCase
 
   def test_delete_block
     res = delete 'http://google.com' do |req|
-      assert_not_nil req
-      assert req.options[:type] == 'DELETE'
-      assert req.uri.host = 'mozy.com'
+      assert type == 'DELETE'
+      assert uri.host = 'mozy.com'
     end
     assert_not_nil res
     assert res.code =~ /2[0-9].|3[0-9]./
   end
   
   def test_params
-    res = get 'http://mozy.com' do |req|
-      assert req.parameter "key", "value"
-      assert req.parameter "key2", "value"
-      assert req.parameters.include?("key")
-      assert req.parameters.include?("key2")
-      assert req.http_request.path.include?("key=value")
+    res = get 'http://mozy.com' do
+      assert parameter "key", "value"
+      assert parameter "key2", "value"
+      assert parameters.include?("key")
+      assert parameters.include?("key2")
+      assert http_request.path.include?("key=value")
     end
   end
   
   def test_headers
-    res = get 'http://mozy.com' do |req|
-      assert req.header "x-key", "value"
-      assert req.headers["x-key"] == "value"
-      assert req.http_request["x-key"] == "value"
+    res = get 'http://mozy.com' do
+      assert header "x-key", "value"
+      assert headers["x-key"] == "value"
+      assert http_request["x-key"] == "value"
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - thomas metge