rufus-verbs 0.7 → 0.8

data/README.txt

@@ -26,13 +26,13 @@ currently :
 * cookie-aware (if :cookies option is explicitely set to true)
 * http digest authentication (rfc 2617) (auth ok, auth-int not tested)
 * query parameters are automatically escaped (disable with :no_escape => true)
+* fopen(uri) method (feels like open-uri's open method, but provides all the previously mentioned features)
 
 maybe later :
 
 * retry on failure
 * cache awareness
 * greediness (automatic parsing for content like JSON or YAML)
-* head, options
 * persistent cookie jar
 
 
@@ -149,6 +149,21 @@ Digest authentication and basic authentication are available at request or endpo
         "http://server/doc1", 
         :digest_authentication => [ "toto", "secretpass" ])
 
+The Rufus::Verbs module provides as well a <tt>fopen</tt> method, which mostly feels like the <tt>open</tt> method of open-uri.
+
+    res = fopen "CHANGELOG.txt"
+
+    Rufus::Verbs.fopen "mydir/mypath.txt" do |f|
+        puts f.readlines
+    end
+
+    res = Rufus::Verbs.fopen "http://whatever.nada.ks"
+
+    res = Rufus::Verbs.fopen "http://whatever.nada.ks", :noredir => true
+
+But it follows redirections (has all the rufus-verbs features). It's provided for when targets are local files or URIs.
+
+
 The tests may provide good intel as on 'rufus-verbs' usage as well : http://rufus.rubyforge.org/svn/trunk/verbs/test/
 
 

data/lib/rufus/verbs.rb

@@ -87,6 +87,38 @@ module Rufus::Verbs
         EndPoint.request :options, args
     end
 
+    #
+    # Opens a file or a URI (GETs it and return the reply). Will tolerate
+    # a HTTP[S] URI or a file path.
+    #
+    # It is not named open() in order not to collide with File.open and
+    # open-uri's open.
+    #
+    def fopen (uri, *args, &block)
+
+        u = URI.parse uri.to_s
+
+        return File.open(uri.to_s, &block) \
+            if u.scheme == nil
+
+        return File.open(uri.to_s[5..-1], &block) \
+            if u.scheme == 'file'
+
+        if u.scheme == 'http' or u.scheme == 'https'
+
+            r = EndPoint.request(:get, [ uri ] + args) \
+
+            if block
+                block.call r
+                return
+            else
+                return r
+            end
+        end
+
+        raise "can't handle scheme '#{u.scheme}' for #{u.to_s}"
+    end
+
     extend self
 end
 

data/lib/rufus/verbs/endpoint.rb

@@ -212,8 +212,11 @@ module Verbs
 
                 args = [ args ] unless args.is_a?(Array)
 
-                opts = args.last if args.last.is_a?(Hash)
-                opts[:uri] = args.first if args.first.is_a?(String)
+                opts = args.last \
+                    if args.last.is_a?(Hash)
+
+                opts[:uri] = args.first \
+                    if args.first.is_a?(String) or args.first.is_a?(URI)
 
                 opts
             end
@@ -297,9 +300,9 @@ module Verbs
                     method = :post
                 end
 
-                p = compute_path opts
+                path = compute_path opts
 
-                r = eval("Net::HTTP::#{method.to_s.capitalize}").new p
+                r = eval("Net::HTTP::#{method.to_s.capitalize}").new path
 
                 r['User-Agent'] = o(opts, :user_agent)
                     # potentially overriden by opts[:headers]
@@ -420,9 +423,7 @@ module Verbs
                 r = o(opts, [ :res, :resource ])
                 i = o(opts, :id)
 
-                p = o(opts, :path)
-
-                path = p
+                path = o(opts, :path)
 
                 if b or r or i
                     path = ""

data/lib/rufus/verbs/version.rb

@@ -39,7 +39,7 @@ module Verbs
     #
     # The version of this rufus-verbs [gem]
     #
-    VERSION = '0.7'
+    VERSION = '0.8'
 end
 end
 

data/test/bm.rb

@@ -0,0 +1,72 @@
+
+# 
+# The original version of this benchmark can be found at :
+# 
+#     http://m.onkey.org/2008/2/2/tidbits-from-my-crap
+#
+# By running it, you'll simply learn that rufus-verbs perform like
+# net/http which it wraps.
+# Seems a bit better than open-uri though.
+#
+# Mon Feb 18 09:17:02 JST 2008
+# 
+
+#['rubygems', 'benchmark', 'eventmachine', 'net/http', 'open-uri', 'rfuzz/session'].each {|lib| require lib }
+['rubygems', 'benchmark', 'net/http', 'open-uri', 'rufus/verbs' ].each {|lib| require lib }
+
+server      = 'tiramisu'
+port        = 80
+request_uri = "http://#{server}:#{port}/"
+
+def run(name, x)
+  x.report(name) do
+    100.times do
+      yield
+    end
+  end
+end
+
+uri = URI.parse(request_uri)
+puts Net::HTTP.get(uri)
+
+#rfuzz = RFuzz::HttpClient.new(server, port)
+#puts rfuzz.get('/').http_body
+
+puts open(request_uri).read
+
+#puts Rufus::Verbs.get(uri)
+puts Rufus::Verbs.get(request_uri)
+
+#EM.epoll
+#http = nil
+#EM.run do
+#  http = EM::Protocols::HttpClient2.connect(server, port).get("/")
+#  http.callback { EM.stop  }
+#end
+#puts http.content
+#EM.run { EM::Protocols::HttpClient2.connect(server, port).get("/").callback { EM.stop  } }
+
+Benchmark.bm do |x|
+  
+  run("Ruby Net::HTTP ", x) do
+    Net::HTTP.get(uri)
+  end
+  
+  run("Open URI       ", x) do
+    open(request_uri).read
+  end
+
+  run("Rufus-verbs    ", x) do
+    #Rufus::Verbs.get(uri)
+    Rufus::Verbs.get(request_uri)
+  end
+  
+  #run("RFuzz          ", x) do
+  #  rfuzz.get('/').http_body
+  #end
+  
+  #run("Event Machine  ", x) do
+  #  EM.run { EM::Protocols::HttpClient2.connect(server, port).get("/").callback {  EM.stop } }
+  #end
+  
+end

data/test/fopen_test.rb

@@ -0,0 +1,53 @@
+
+#
+# Testing rufus-verbs
+#
+# jmettraux@gmail.com
+#
+# Mon Feb 18 13:00:36 JST 2008
+#
+
+require 'test/unit'
+require 'testbase'
+
+require 'rufus/verbs'
+
+
+class UriTest < Test::Unit::TestCase
+    include TestBaseMixin
+
+    include Rufus::Verbs
+
+    def test_0
+
+        uri = "http://localhost:7777/items"
+
+        res = fopen uri
+        assert_equal 200, res.code.to_i
+        assert_equal "{}", res.body.strip
+
+        res = fopen "file:CHANGELOG.txt"
+        assert_kind_of String, res.read
+
+        res = fopen "CHANGELOG.txt"
+        assert_kind_of String, res.read
+
+        res = fopen "http://localhost:7777/things"
+        assert_equal 200, res.code.to_i
+        assert_equal "{}", res.body.strip
+            #
+            # it follows redirections :)
+
+        res = fopen "http://localhost:7777/things", :noredir => true
+        assert_equal 303, res.code.to_i
+
+        fopen "CHANGELOG.txt" do |f|
+            assert_kind_of String, f.read
+        end
+
+        fopen "http://localhost:7777/things" do |res|
+            assert_equal 200, res.code.to_i
+            assert_equal "{}", res.body.strip
+        end
+    end
+end

data/test/test.rb

@@ -18,3 +18,6 @@ require 'cookie1_test'
 
 require 'escape_test'
 
+require 'uri_test'
+require 'fopen_test'
+

data/test/uri_test.rb

@@ -0,0 +1,33 @@
+
+#
+# Testing rufus-verbs
+#
+# jmettraux@gmail.com
+#
+# Mon Feb 18 11:05:07 JST 2008
+#
+
+require 'test/unit'
+require 'testbase'
+
+require 'rufus/verbs'
+
+
+class UriTest < Test::Unit::TestCase
+    include TestBaseMixin
+
+    include Rufus::Verbs
+
+    def test_0
+
+        uri = URI.parse "http://localhost:7777/items"
+
+        res = get :uri => uri
+        assert_equal 200, res.code.to_i
+        assert_equal "{}", res.body.strip
+
+        res = get uri
+        assert_equal 200, res.code.to_i
+        assert_equal "{}", res.body.strip
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-verbs
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: "0.8"
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-17 00:00:00 +09:00
+date: 2008-02-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,11 +41,13 @@ files:
 - test/auth0_test.rb
 - test/auth1_test.rb
 - test/block_test.rb
+- test/bm.rb
 - test/conditional_test.rb
 - test/cookie0_test.rb
 - test/cookie1_test.rb
 - test/dryrun_test.rb
 - test/escape_test.rb
+- test/fopen_test.rb
 - test/https_test.rb
 - test/iconditional_test.rb
 - test/items.rb
@@ -55,6 +57,7 @@ files:
 - test/test.htdigest
 - test/test.rb
 - test/testbase.rb
+- test/uri_test.rb
 - README.txt
 has_rdoc: true
 homepage: http://rufus.rubyforge.org/rufus-verbs