weary 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    weary (1.0.1)
+    weary (1.1.1)
       addressable (~> 2.3.2)
       multi_json (~> 1.3.0)
       promise (~> 0.3.0)

data/lib/weary/client.rb

@@ -207,10 +207,17 @@ module Weary
           parameters = parameters.first || {}
           @defaults ||= {}
           request = resource.request(@defaults.merge(parameters), &block)
+          self.pass_values_onto_requestable(request)
           request
         end
       end
     end
 
+    include Weary::Requestable
+
+    def initialize
+      yield self if block_given?
+    end
+
   end
 end

data/lib/weary/middleware/oauth.rb

@@ -20,11 +20,27 @@ module Weary
 
       def sign(env)
         req = Rack::Request.new(env)
+        post_body = req.body.read
+        req.body.rewind
         SimpleOAuth::Header.new req.request_method,
                                 req.url,
-                                req.params,
+                                request_body_to_hash(post_body),
                                 @oauth
       end
+
+      # Stolen from Rack::Utils
+      def request_body_to_hash(qs, d = nil)
+        params = Rack::Utils::KeySpaceConstrainedParams.new
+        default_sep = /[&;] */n
+
+        (qs || '').split(d ? /[#{d}] */n : default_sep).each do |p|
+          k, v = p.split('=', 2).map { |s| Rack::Utils.unescape(s, defined?(::Encoding) ? Encoding::BINARY : nil) }
+
+          Rack::Utils.normalize_params(params, k, v)
+        end
+
+        return params.to_params_hash
+      end
     end
   end
 end

data/lib/weary/request.rb

@@ -70,7 +70,7 @@ module Weary
       if !parameters.nil?
         if ["POST", "PUT"].include? method
           @body = query_params_from_hash(parameters)
-          body stringio_encode(@body)
+          body StringIO.new(@body)
           use Weary::Middleware::ContentType
         else
           uri.query_values = parameters
@@ -123,10 +123,21 @@ module Weary
 
     private
 
-    def query_params_from_hash(hash)
-      tmp_uri = Addressable::URI.new
-      tmp_uri.query_values = hash
-      tmp_uri.query
+    # Stolen from Faraday
+    def query_params_from_hash(value, prefix = nil)
+      case value
+      when Array
+        value.map { |v| query_params_from_hash(v, "#{prefix}%5B%5D") }.join("&")
+      when Hash
+        value.map { |k, v|
+          query_params_from_hash(v, prefix ? "#{prefix}%5B#{Rack::Utils.escape_path(k)}%5D" : Rack::Utils.escape_path(k))
+        }.join("&")
+      when NilClass
+        prefix
+      else
+        raise ArgumentError, "value must be a Hash" if prefix.nil?
+        "#{prefix}=#{Rack::Utils.escape_path(value)}"
+      end
     end
 
     def rack_env_defaults

data/lib/weary/requestable.rb

@@ -57,8 +57,8 @@ module Weary
     #
     # Returns the Requestable object.
     def pass_values_onto_requestable(requestable)
-      requestable.headers self.headers
-      requestable.adapter self.adapter
+      requestable.headers self.headers unless @headers.nil?
+      requestable.adapter self.adapter unless @connection.nil?
       if has_middleware?
         @middlewares.each {|middleware| requestable.use *middleware }
       end

data/lib/weary/version.rb

@@ -1,3 +1,3 @@
 module Weary
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/weary/client_spec.rb

@@ -257,6 +257,27 @@ describe Weary::Client do
       client.instance_variable_set :@defaults, :user => "mwunsch", :repo => "weary"
       expect { client.send(action) }.to_not raise_error
     end
+
+    it "forwards requestables on to the requests" do
+      action = :show
+      url = "http://github.com/api/v2/json/repos/show/{user}/{repo}"
+      @klass.get action, url
+      adapter = Class.new { include Weary::Adapter }
+      client = @klass.new
+      client.adapter adapter
+      client.send(action, :user => "mwunsch", :repo => "weary").adapter.should eql adapter
+    end
+
+    it "accepts a block to further add requestables" do
+      action = :show
+      url = "http://github.com/api/v2/json/repos/show/{user}/{repo}"
+      @klass.get action, url
+      adapter = Class.new { include Weary::Adapter }
+      client = @klass.new do |c|
+        c.adapter adapter
+      end
+      client.send(action, :user => "mwunsch", :repo => "weary").adapter.should eql adapter
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weary
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -160,12 +160,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2981531106124675018
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2981531106124675018
 requirements: []
 rubyforge_project: weary
 rubygems_version: 1.8.23