nestful 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/nestful.rb

@@ -1,18 +1,18 @@
-require "net/http"
-require "uri"
-require "tempfile"
+require 'net/http'
+require 'uri'
+require 'tempfile'
 
-require "active_support/core_ext"
-require "active_support/inflector"
+require 'active_support/core_ext'
+require 'active_support/inflector'
 
 $:.unshift(File.dirname(__FILE__))
 
-require "nestful/exceptions"
-require "nestful/formats"
-require "nestful/connection"
-require "nestful/request/callbacks"
-require "nestful/request"
-require "nestful/resource"
+require 'nestful/exceptions'
+require 'nestful/formats'
+require 'nestful/connection'
+require 'nestful/request/callbacks'
+require 'nestful/request'
+require 'nestful/resource'
 
 module Nestful
   extend self

data/lib/nestful/connection.rb

@@ -7,11 +7,11 @@ module Nestful
   class Connection
 
     HTTP_FORMAT_HEADER_NAMES = {  
-      :get => 'Accept',
-      :put => 'Content-Type',
-      :post => 'Content-Type',
+      :get    => 'Accept',
+      :put    => 'Content-Type',
+      :post   => 'Content-Type',
       :delete => 'Accept',
-      :head => 'Accept'
+      :head   => 'Accept'
     }
 
     attr_reader :site, :user, :password, :auth_type, :timeout, :proxy, :ssl_options

data/lib/nestful/formats.rb

@@ -14,12 +14,12 @@ module Nestful
       end
     end
     
-    autoload :BlankFormat, 'nestful/formats/blank_format'
-    autoload :TextFormat, 'nestful/formats/text_format'
+    autoload :BlankFormat,      'nestful/formats/blank_format'
+    autoload :TextFormat,       'nestful/formats/text_format'
     autoload :MultipartFormat,  'nestful/formats/multipart_format'
-    autoload :FormFormat,  'nestful/formats/form_format'
-    autoload :XmlFormat,   'nestful/formats/xml_format'
-    autoload :JsonFormat,  'nestful/formats/json_format'
+    autoload :FormFormat,       'nestful/formats/form_format'
+    autoload :XmlFormat,        'nestful/formats/xml_format'
+    autoload :JsonFormat,       'nestful/formats/json_format'
     
     # Lookup the format class from a mime type reference symbol. Example:
     #

data/lib/nestful/formats/blank_format.rb

@@ -2,7 +2,7 @@ module Nestful
   module Formats
     class BlankFormat < Format
       def encode(params, options = nil)
-        raise "Choose an encoding format, such as :form"	
+        raise 'Choose an encoding format, such as :form'	
       end
 
       def decode(body)

data/lib/nestful/formats/form_format.rb

@@ -2,7 +2,7 @@ module Nestful
   module Formats
     class FormFormat < Format
       def mime_type
-        "application/x-www-form-urlencoded"
+        'application/x-www-form-urlencoded'
       end
   
       def encode(params, options = nil)

data/lib/nestful/formats/json_format.rb

@@ -5,11 +5,11 @@ module Nestful
   module Formats
     class JsonFormat < Format
       def extension
-        "json"
+        'json'
       end
 
       def mime_type
-        "application/json"
+        'application/json'
       end
 
       def encode(hash, options = nil)

data/lib/nestful/formats/multipart_format.rb

@@ -1,4 +1,4 @@
-require "active_support/secure_random"
+require 'securerandom'
 
 module Nestful
   module Formats
@@ -9,7 +9,7 @@ module Nestful
       
       def initialize(*args)
         super
-        @boundary = ActiveSupport::SecureRandom.hex(10)
+        @boundary = SecureRandom.hex(10)
         @stream   = Tempfile.new("nf.#{rand(1000)}")
         @stream.binmode
       end
@@ -72,8 +72,8 @@ module Nestful
         def filename(body)
           return body.original_filename   if body.respond_to?(:original_filename)
           return File.basename(body.path) if body.respond_to?(:path)
-          "Unknown"
+          'Unknown'
         end
     end
   end
-end
+end

data/lib/nestful/formats/text_format.rb

@@ -2,7 +2,7 @@ module Nestful
   module Formats
     class TextFormat < Format
       def mime_type
-        "text/plain"
+        'text/plain'
       end
 
       def encode(body)

data/lib/nestful/formats/xml_format.rb

@@ -4,11 +4,11 @@ module Nestful
   module Formats
     class XmlFormat < Format
       def extension
-        "xml"
+        'xml'
       end
 
       def mime_type
-        "application/xml"
+        'application/xml'
       end
 
       def encode(hash, options={})

data/lib/nestful/oauth.rb

@@ -1,4 +1,4 @@
-require "roauth"
+require 'roauth'
 
 module Nestful
   class Request
@@ -16,7 +16,7 @@ module Nestful
       )
     
       self.headers ||= {}
-      self.headers["Authorization"] = signature
+      self.headers['Authorization'] = signature
     end
 
     before_request(&:oauth_sign)

data/lib/nestful/request.rb

@@ -6,7 +6,7 @@ module Nestful
       @callbacks[type] ||= []
     end
     
-    attr_reader :url, :options, :format
+    attr_reader :options, :format, :url
     attr_accessor :params, :body, :buffer, :method, :headers, :callbacks, :raw, :extension
     
     # Connection options
@@ -14,20 +14,18 @@ module Nestful
   
     def initialize(url, options = {})
       @url     = url.to_s
+      
       @options = options
-      @options.each {|key, val| 
+      @options.each do |key, val| 
         method = "#{key}="
         send(method, val) if respond_to?(method)
-      }
+      end
+
       self.method  ||= :get
-      self.format  ||= :blank
-      self.headers ||= {}
       self.params  ||= {}
+      self.headers ||= {}
       self.body    ||= ''
-      
-      if self.uri.query
-        populate_query_params
-      end
+      self.format  ||= :blank
     end
     
     def format=(mime_or_format)
@@ -46,17 +44,33 @@ module Nestful
       conn
     end
     
+    def url=(value)
+      @url = value
+      @uri = nil
+      @url
+    end
+        
     def uri
-      http_url = url.match(/^http/) ? url : "http://#{url}"
-      uri      = URI.parse(http_url)
-      uri.path = "/" if uri.path.empty?
+      return @uri if @uri
+      
+      url = @url.match(/^http/) ? @url : "http://#{@url}"
+      
+      @uri = URI.parse(url)
+      @uri.path = "/" if @uri.path.empty?
+      
       if extension
         extension = format.extension if extension.is_a?(Boolean)
-        uri.path += ".#{extension}"
-      end      
-      uri
+        @uri.path += ".#{extension}"
+      end
+      
+      @uri.query.split("&").each do |res|
+        key, value = res.split("=")
+        @params[key] = value
+      end if @uri.query
+      
+      @uri
     end
-
+    
     def path
       uri.path
     end
@@ -74,23 +88,26 @@ module Nestful
       callback(:before_request, self)
       result = nil
       if [:post, :put].include?(method)
-        connection.send(method, path, encoded, headers) {|res| 
-            result = decoded(res)
-            result.class_eval { attr_accessor :response }
-            result.response = res
-        }
+        connection.send(method, path, encoded, headers) do |res| 
+          result = decoded(res)
+          result.class_eval { attr_accessor :response }
+          result.response = res
+        end
       else
-        connection.send(method, query_path, headers) {|res|
-            result = decoded(res) 
-            result.class_eval { attr_accessor :response }
-            result.response = res
-        }
+        connection.send(method, query_path, headers) do |res|
+          result = decoded(res) 
+          result.class_eval { attr_accessor :response }
+          result.response = res
+        end
       end
       callback(:after_request, self, result)
       result
+    rescue Redirection => error
+      self.url = error.response['Location']
+      execute
     end
             
-    protected    
+    protected
       def encoded
         params.any? ? format.encode(params) : body
       end
@@ -101,10 +118,10 @@ module Nestful
           size  = 0
           total = result.content_length
           
-          result.read_body {|chunk|
+          result.read_body do |chunk|
             callback(:progress, self, total, size += chunk.size)
             data.write(chunk)
-          }
+          end
           
           data.rewind
           data
@@ -115,15 +132,6 @@ module Nestful
         end
       end
       
-      def populate_query_params
-        uri_query = self.uri.query.split("&").inject({}) {|hash, res|
-          key, value = res.split("=")
-          hash[key]  = value
-          hash
-        }
-        self.params.merge!(uri_query)
-      end
-      
       def callbacks(type = nil)
         @callbacks ||= {}
         return @callbacks unless type

data/lib/nestful/resource.rb

@@ -30,5 +30,9 @@ module Nestful
     def json_post(params = nil)
       post(:format => :json, :params => params)
     end
+    
+    def request(options = {})
+      Request.new(url, options.merge(@options)).execute
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nestful
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2012-01-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70154433041120 !ruby/object:Gem::Requirement
+  requirement: &70352776847120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *70154433041120
+  version_requirements: *70352776847120
 description: Simple Ruby HTTP/REST client with a sane API
 email: info@eribium.org
 executables: []