grac 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fdd0470abd5596e55d738192c7abdfb57b64e88
-  data.tar.gz: 79f10e51fb3d8b197b44a95cab96d8b91f43afc3
+  metadata.gz: dce6c4eb73575542179fb0ad403d3d730abc9efa
+  data.tar.gz: 5572592f8aa53d04fc2c56569497f04792756550
 SHA512:
-  metadata.gz: c01b818108bf6fc8b107a2dc25998caa5542cd9a710b871fd93ae33009e0441e559a43cbaefa314c9f74928b6cbdba606a31004ac0a73c0ba32b93cf413d85e4
-  data.tar.gz: 29cf2986998e375cc4a00f971beae2d40f5c43d50ba361c4a0fe481fefc2c846590ce0d478b66dd381ac156f0bf9a88cefcc56f9ec20bc5edb865e473e327ed5
+  metadata.gz: c84337bb9c57a1c9d77dcdff6d626692f4cdc2dae2a9091d014a13956f3b71e22e9012b7a999dc4bca4c086505a46a51056a066c8114fd14a35a2135556f9faa
+  data.tar.gz: 3d9e91062b5eb57aa9cac9ab26cebe4de3b04261443892ded6013e019683c006b9e92f43194f3b6d0d1f8ae6da773e842c4225e2377ce63fb9bf3a964eb18d27

data/lib/grac/client.rb

@@ -120,11 +120,31 @@ module Grac
     private
 
     def build_and_run(method, options = {})
-      body   = options[:body].nil? || options[:body].empty? ? nil : options[:body].to_json
+      body   = prepare_body_by_content_type(options[:body])
       params = @options[:params].merge(options[:params] || {})
       return middleware_chain.call(@options, uri, method, params, body)
     end
 
+    def headers
+      @options[:headers] || {}
+    end
+
+    def prepare_body_by_content_type(body)
+      return nil if body.nil? || body.empty?
+
+      case headers['Content-Type']
+      when /\Aapplication\/json/
+        return body.to_json
+      when /\Aapplication\/x-www-form-urlencoded/
+        # Typhoeus will take care of the encoding when receiving a hash
+        return body
+      else
+        # Do not encode other unknown Content-Types either.
+        # The default is JSON through the Content-Type header which is set by default.
+        return body
+      end
+    end
+
     def middleware_chain
       callee = self
 

data/lib/grac/version.rb

@@ -1,3 +1,3 @@
 module Grac
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grac
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Very generic client for REST API with basic error handling