flexirest 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f28de2c590cd7b7b1e6f697ee8a7754b2229dd1
-  data.tar.gz: 4a5e1f2611b17b356af7660225d9bb5851131a7d
+  metadata.gz: 279ae7a2af0287f062269f28c6a7b0de3a68fc92
+  data.tar.gz: b3c284e4398f6c2ba6ce00febf171b9fa2646a82
 SHA512:
-  metadata.gz: c4f74bc929c9286f645fa652dfb8cace3ad70b463ca29272eb55a48b61ad1273239221c5ace8d10428c45423439fe64cf0675c19df3b66e6d2327900b92b9bb5
-  data.tar.gz: b1df82262931a447f99670d097dc662cac1b6c21733709640bea16d0133c4dbd143f3e792cfd4c88921ad3f95ba56d49ae874ea01a153a2424f41ea355d17984
+  metadata.gz: 0b5d1fd29eee4108938611724a78058b9eb363a97ce9a36b60d20fa99c28328eaacd5e6e558a5b403938856932ad64ddee0ebf3dc7f1d0db3f3a28cb21774e56
+  data.tar.gz: 1b8c7df46edc7894d71f2e398dd9923a114fe136d38ee0667a5c5182cb90954dd42f0124858ee529504fedd719b2055a41b5da59a9d9cc28ce57d347d9356533

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.5.1
+
+Bugfix:
+
+- PUT/POST/PATCH methods called on an instantiated object should merge the objects attributes with specified params.
+
 ## 1.5.0
 
 Bugfix:

data/lib/flexirest/request.rb

@@ -226,7 +226,11 @@ module Flexirest
     end
 
     def prepare_params
-      params = @params || @object._attributes rescue {}
+      if http_method == :post || http_method == :put || http_method == :patch
+        params = (@object._attributes rescue {}).merge(@params || {}) rescue {}
+      else
+        params = @params || @object._attributes rescue {}
+      end
       if params.is_a?(String) || params.is_a?(Integer)
         params = {id:params}
       end

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/lib/request_spec.rb

@@ -768,6 +768,12 @@ describe Flexirest::Request do
     expect{request.call}.to raise_error(Flexirest::InvalidRequestException)
   end
 
+  it "should send all object's attributes and params through class mapped methods" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:post).with("/create", "arg=2&prop=1", anything).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"first_name\":\"Johnny\", \"expenses\":[{\"amount\":1}, {\"amount\":2}]}", status:200, response_headers:{})))
+    client = ExampleClient.new(prop: "1")
+    client.create(arg: "2")
+  end
+
   it "should send all class mapped methods through _callback_request" do
     expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"first_name\":\"Johnny\", \"expenses\":[{\"amount\":1}, {\"amount\":2}]}", status:200, response_headers:{})))
     expect(ExampleClient).to receive(:_callback_request).with(any_args).exactly(2).times

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler