rest-core 3.5.6 → 3.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b1bd4e98e62b8b87bbe2021020e0fc3897d429
-  data.tar.gz: 15f1a45e675881ad5a2de3c10fd56ffd2d0837e3
+  metadata.gz: 92e289bb3e825b93385443dade7adf26959b90b8
+  data.tar.gz: 5861deec728b6d154f582702c5b2643ad7797b07
 SHA512:
-  metadata.gz: ecf7a1ec80da7bc369bd49985f5c43eac6c298050f7b2777790c170e2f80cf0062725320a41efe268605faaab212f34c84b662bd563195c561dfd900d25f92d4
-  data.tar.gz: d4203a3a72e2c511d4e0b0312942e9155dc5ef440c8e4de76ef45a8ee1e16660a69aad3c0b8e4d38cb5688d9926db466b193932b27999365b1d74138d3f30d2f
+  metadata.gz: 6a33744abd434667196c62f2066c0fecfa0315d0d397239964d16d13d7726cd94d0aa98dc3581924e84912decbb6f32040106d42cdeaafd5b962d3ba75382c94
+  data.tar.gz: d6f3fe16efe1d82931cbb88cd9053509e2ca064e7d693365d963c5aefe154ef04e8e08d154aa3b79c4f4f3035e3795c6e14022d526a03a9624cdeff84e5e06c1

data/CHANGES.md

@@ -1,5 +1,20 @@
 # CHANGES
 
+## rest-core 3.5.7 -- 2015-09-10
+
+### Incompatible changes
+
+* JSON_REQUEST_METHOD was removed.
+
+### Bugs fixed
+
+* GET/DELETE/HEAD/OPTIONS would no longer try to attach any payload.
+
+### Enhancements
+
+* Introduced Middleware.has_payload? which would detect if the request
+  should attach a payload or not.
+
 ## rest-core 3.5.6 -- 2015-07-23
 
 ### Bugs fixed

data/lib/rest-core/engine.rb

@@ -15,7 +15,12 @@ class RestCore::Engine
 
   private
   def payload_and_headers env
-    Payload.generate_with_headers(env[REQUEST_PAYLOAD], env[REQUEST_HEADERS])
+    if has_payload?(env)
+      Payload.generate_with_headers(env[REQUEST_PAYLOAD],
+                                    env[REQUEST_HEADERS])
+    else
+      [{}, env[REQUEST_HEADERS]]
+    end
   end
 
   def normalize_headers headers

data/lib/rest-core/middleware.rb

@@ -4,6 +4,7 @@ require 'rest-core'
 
 module RestCore::Middleware
   include RestCore
+  METHODS_WITH_PAYLOAD = [:post, :put, :patch]
 
   def self.included mod
     mod.send(:include, RestCore)
@@ -96,6 +97,11 @@ module RestCore::Middleware
   end
   public :escape
 
+  def has_payload? env
+    METHODS_WITH_PAYLOAD.include?(env[REQUEST_METHOD])
+  end
+  public :has_payload?
+
   def contain_binary? payload
     return false unless payload
     return true  if     payload.respond_to?(:read)

data/lib/rest-core/middleware/json_request.rb

@@ -7,12 +7,10 @@ class RestCore::JsonRequest
   include RestCore::Middleware
 
   JSON_REQUEST_HEADER = {'Content-Type' => 'application/json'}.freeze
-  JSON_REQUEST_METHOD = [:post, :put, :patch]
 
   def call env, &k
     return app.call(env, &k) unless json_request(env)
-    return app.call(env, &k) unless
-      JSON_REQUEST_METHOD.include?(env[REQUEST_METHOD])
+    return app.call(env, &k) unless has_payload?(env)
 
     app.call(env.merge(
       REQUEST_HEADERS => JSON_REQUEST_HEADER.merge(env[REQUEST_HEADERS]||{}),

data/lib/rest-core/version.rb

@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '3.5.6'
+  VERSION = '3.5.7'
 end

data/rest-core.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-core 3.5.6 ruby lib
+# stub: rest-core 3.5.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "3.5.6"
+  s.version = "3.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2015-07-23"
+  s.date = "2015-09-10"
   s.description = "Modular Ruby clients interface for REST APIs.\n\nThere has been an explosion in the number of REST APIs available today.\nTo address the need for a way to access these APIs easily and elegantly,\nwe have developed rest-core, which consists of composable middleware\nthat allows you to build a REST client for any REST API. Or in the case of\ncommon APIs such as Facebook, Github, and Twitter, you can simply use the\ndedicated clients provided by [rest-more][].\n\n[rest-more]: https://github.com/godfat/rest-more"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [

data/task/gemgem.rb

@@ -79,6 +79,11 @@ module Gemgem
   end
 
   def gem_check
+    unless git('status', '--porcelain').empty?
+      puts("\e[35mWorking copy is not clean.\e[0m")
+      exit(3)
+    end
+
     ver = spec.version.to_s
 
     if ENV['VERSION'].nil?

data/test/test_universal.rb

@@ -8,6 +8,22 @@ describe RC::Universal do
     WebMock.reset!
   end
 
+  would 'only send payload for post, put, patch' do
+    c = RC::Universal.new(:log_method => false, :payload => '$payload')
+    [:get, :delete, :head, :options].each do |method|
+      stub_request(method, url)
+      c.send(method, url).tap{}
+      assert_requested(method, url, :body => nil)
+    end
+
+    [:put, :post, :patch].each do |method|
+      stub_request(method, url).with(:body => '$payload')
+      c.send(method, url).tap{}
+      assert_requested(method, url, :body => '$payload')
+    end
+    ok
+  end
+
   would 'send Authorization header' do
     u = RC::Universal.new(:log_method => false)
     u.username = 'Aladdin'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 3.5.6
+  version: 3.5.7
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient