grac 3.1.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dab0f1b6af881d0b6968b1477a3a5c59106d6bae
-  data.tar.gz: 5a4b3e25345397044751c355a68ce05dc5a937bf
+SHA256:
+  metadata.gz: e07dfd433cf6ddc13c769efafc1f17601b543d261293f36fadc0729fa4179d8a
+  data.tar.gz: 7d809236ea5e09c13da7beb1fa86c8d1469b27066c4485b3a6253259d11338fe
 SHA512:
-  metadata.gz: 4bea07d3bdad420bc3ef902edaa94f46025e11b60c20fecb1f236a843ba52face2e7c7e89bd65f37bb2f20aaccde34a23d7cdbcb6e1aff32d635ef8c839136c6
-  data.tar.gz: b5815598119b2d4d79ca84b89dd9752125da520dc9b3e7a0df841902e1666bc00783a24a614b3dfa241cee3e86c503c1f9bddc8e53edef578369aebf7fa16b1d
+  metadata.gz: faa8e139d25822e970ca9ed824608cc1199fea454c19d28094d9f92da1a36963fa51d6719b3020a5ce08b57255b91967cc310e5635ae84ad47db2a89ba7e6dfa
+  data.tar.gz: 74437d90aee461c093d1fcf19cc24116292b9d2b9192b59b5767cfca62ba8894ec7bd46189e570f89a40ffbf90f0b9b8e29c25f851f32e0dae927bc02d0e8466

data/lib/grac/client.rb

@@ -22,13 +22,29 @@ module Grac
           "User-Agent"   => "Grac v#{Grac::VERSION}",
           "Content-Type" => "application/json;charset=utf-8"
         }.merge(options[:headers] || {}),
-        :postprocessing => options[:postprocessing] || {},
+        :postprocessing => {},
         :middleware     => options[:middleware]     || []
       }
+
+      if options[:postprocessing]
+        options[:postprocessing]
+          .each_with_object(postprocessing = {}) do |(pattern, transformation), obj|
+          if pattern.kind_of?(Regexp)
+            obj[pattern] = transformation
+          else
+            obj[Regexp.new(pattern)] = transformation
+          end
+        end
+
+        @options[:postprocessing] = postprocessing
+      end
+
       @options.freeze
+
       [:params, :headers, :postprocessing, :middleware].each do |k|
         @options[k].freeze
       end
+
       @uri.freeze
     end
 
@@ -104,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
 
@@ -174,14 +210,11 @@ module Grac
       if data.kind_of?(Hash)
         data.each do |key, value|
           processing = nil
-          @options[:postprocessing].each do |regex, action|
-            pattern = Regexp.new(regex).freeze
+          regexp = @options[:postprocessing].keys.detect { |pattern| pattern.match?(key) }
 
-            if pattern =~ key
-              processing = action
-            end
+          if !regexp.nil?
+            processing = @options[:postprocessing][regexp]
           end
-
           data[key] = postprocessing(value, processing)
         end
       elsif data.kind_of?(Array)

data/lib/grac/response.rb

@@ -1,6 +1,5 @@
-require 'json'
+require 'oj'
 require 'forwardable'
-
 require_relative './exception'
 
 module Grac
@@ -26,8 +25,8 @@ module Grac
     end
 
     def parsed_json
-      JSON.parse(body)
-    rescue JSON::ParserError
+      Oj.load(body)
+    rescue Oj::ParseError, EncodingError
       raise Exception::InvalidContent.new(body, 'json')
     end
 

data/lib/grac/version.rb

@@ -1,3 +1,3 @@
 module Grac
-  VERSION = "3.1.0"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grac
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.3
 - !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
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.13
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -102,17 +144,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Very generic client for REST API with basic error handling