flexirest 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 499dd67a747959e769fab4e11aa7ee9eed6599b8
-  data.tar.gz: 632be3df00eae719a6238d312d29c1dae4bef214
+  metadata.gz: 96d88b8be9d4f041d00c6da07228fb7dccc57092
+  data.tar.gz: 9b7314b8f2685ccc77f0de3093558bd49abc0bec
 SHA512:
-  metadata.gz: 63f8eaaa04a862b48151effef441782ac3917cb71417834cb4cfcfbe84586907c7f45c47b33846a7a22a5bdf1584d68124a6ac6a5c2fc5becfc9a00da37f622b
-  data.tar.gz: 38c540be4278f892a9bc2461c2c7b0e12b9f3074c8b90202be880aed496056c6ad258475b713ae8a86877787814f45e739739d659deed3fcb899adb00d00de9b
+  metadata.gz: 7b863f36580dddf3415740f2f2ca7cb8ded5371404e9384996d8c11a18dea26dfd76674f3972eee2d6c92aa2b1f5d159217d5d3c56c902b3dc219103b7388789
+  data.tar.gz: 30dd6fe0eaa1e9b4c63f9f7802a6b1f1b98c060231bf246e5993710f58f19c000ee05af5b6111e4a5a32b2cca68e84ed0452596cd78af1452ae5349fd5f60b7c

data/README.md

@@ -796,7 +796,7 @@ Person._request('http://api.example.com/v1/people', :post, {id:1234,name:"John"}
 When you need to specify custom headers (for example for authentication) you can do this with a fourth option to the `_request` method. If you are using the default paramaters you'll need to specify them. For example:
 
 ```ruby
-Person._request("http://api.example.com/v1/people", :get, {}, {"X-Something": "foo/bar"})
+Person._request("http://api.example.com/v1/people", :get, {}, {headers:{"X-Something": "foo/bar"}})
 ```
 
 If you want to use a lazy loaded request instead (so it will create an object that will only call the API if you use it), you can use `_lazy_request` instead of `_request`. If you want you can create a construct that creates and object that lazy loads itself from a given method (rather than a URL):

data/lib/flexirest/base.rb

@@ -66,16 +66,16 @@ module Flexirest
       @attributes[:errors] || (_errors != {} ? _errors : nil)
     end
 
-    def self._request(request, method = :get, params = nil, headers = {})
-      prepare_direct_request(request, method, headers: headers).call(params)
+    def self._request(request, method = :get, params = nil, options = {})
+      prepare_direct_request(request, method, options).call(params)
     end
 
-    def self._plain_request(request, method = :get, params = nil, headers = {})
-      prepare_direct_request(request, method, plain:true, headers: headers).call(params)
+    def self._plain_request(request, method = :get, params = nil, options = {})
+      prepare_direct_request(request, method, options.merge(plain:true)).call(params)
     end
 
-    def self._lazy_request(request, method = :get, params = nil, headers = {})
-      Flexirest::LazyLoader.new(prepare_direct_request(request, method, headers: headers), params)
+    def self._lazy_request(request, method = :get, params = nil, options = {})
+      Flexirest::LazyLoader.new(prepare_direct_request(request, method, options), params)
     end
 
     def self.prepare_direct_request(request, method = :get, options={})

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/spec/lib/base_spec.rb

@@ -313,9 +313,9 @@ describe Flexirest::Base do
 
     it "passes headers" do
       stub_request(:get, "http://api.example.com/v1").
-        with(headers: {'Accept'=>'application/hal+json, application/json;q=0.5', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Connection'=>'Keep-Alive', 'X-Something'=>'foo/bar', 'User-Agent'=>'Flexirest/1.5.2'}).
+        with(headers: {'Accept'=>'application/hal+json, application/json;q=0.5', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Connection'=>'Keep-Alive', 'Content-Type'=>'application/x-www-form-urlencoded', 'X-Something'=>'foo/bar', 'User-Agent'=>/Flexirest\//}).
         to_return(status: 200, body: "", headers: {})
-      EmptyExample._request("http://api.example.com/v1", :get, {}, {"X-Something": "foo/bar"})
+      EmptyExample._request("http://api.example.com/v1", :get, {}, {headers: {"X-Something": "foo/bar"}})
     end
 
     it "runs callbacks as usual" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler