lib/rufus/verbs.rb in rufus-verbs-0.10 vs lib/rufus/verbs.rb in rufus-verbs-1.0.0

- old
+ new

@@ -1,8 +1,7 @@ -# #-- -# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com +# Copyright (c) 2008-2010, John Mettraux, jmettraux@gmail.com # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell @@ -18,115 +17,107 @@ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -# (MIT license) +# Made in Japan. #++ -# -# -# John Mettraux -# -# Made in Japan -# -# 2008/01/11 -# require 'rufus/verbs/endpoint' require 'rufus/verbs/conditional' module Rufus::Verbs - # - # GET - # - def get (*args) + # + # GET + # + def get (*args) - EndPoint.request :get, args - end + EndPoint.request :get, args + end - # - # POST - # - def post (*args, &block) + # + # POST + # + def post (*args, &block) - EndPoint.request :post, args, &block - end + EndPoint.request :post, args, &block + end - # - # PUT - # - def put (*args, &block) + # + # PUT + # + def put (*args, &block) - EndPoint.request :put, args, &block - end + EndPoint.request :put, args, &block + end - # - # DELETE - # - def delete (*args) + # + # DELETE + # + def delete (*args) - EndPoint.request :delete, args - end + EndPoint.request :delete, args + end - # - # HEAD - # - def head (*args) + # + # HEAD + # + def head (*args) - EndPoint.request :head, args - end + EndPoint.request :head, args + end - # - # OPTIONS - # - def options (*args) + # + # OPTIONS + # + def options (*args) - EndPoint.request :options, args - end + 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) + # + # 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) - # should I really care about blocks here ? ... + # should I really care about blocks here ? ... - u = URI.parse uri.to_s + u = URI.parse uri.to_s - return File.open(uri.to_s, &block) \ - if u.scheme == nil + return File.open(uri.to_s, &block) \ + if u.scheme == nil - return File.open(uri.to_s[5..-1], &block) \ - if u.scheme == 'file' + return File.open(uri.to_s[5..-1], &block) \ + if u.scheme == 'file' - if u.scheme == 'http' or u.scheme == 'https' + if u.scheme == 'http' or u.scheme == 'https' - r = EndPoint.request(:get, [ uri ] + args) \ + r = EndPoint.request(:get, [ uri ] + args) \ - if block - block.call r - return - end + if block + block.call r + return + end - class << r - def read - self.body - end - end unless r.respond_to?(:read) - - return r + class << r + def read + self.body end + end unless r.respond_to?(:read) - raise "can't handle scheme '#{u.scheme}' for #{u.to_s}" + return r end - extend self + raise "can't handle scheme '#{u.scheme}' for #{u.to_s}" + end + + extend self end