grac 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc8d442348cefff5c227ad66c293e43c4cba8c60
-  data.tar.gz: 29c51894a8b8c99fc68647fbca5cd1b5273949cd
+  metadata.gz: 916f6671cff0b7712c90a00f6775ee05d4bf8636
+  data.tar.gz: 70ffc2800c0c0b936d7d94e80ea6ece0e7e8af9b
 SHA512:
-  metadata.gz: 5f28f165b1e1ed3237e70ca6c8e8e89a4c09205ba774218e8ef694a4975e399834396dd6d17cadbbb645f2fe794ecaaea69b3011f39442c7209a1de95c636dc3
-  data.tar.gz: 828571dfc5a27c87023c86d2cc254194181d25c06c3744ef3f7820870ef03c910a69cc927ffaf717bcf2075c68acc972277880f66d2af8639969efb1300a66c9
+  metadata.gz: 49ad9f2608734ff7d75a9bbf0e658c9bc4300ae6aa6a172c511f3c7ffe6f282e06a69fa5e96898f9a228ca4f552417e190b65b0fcff93b6c2418f4be367d5586
+  data.tar.gz: 0e2aaa5c0299332ba8c1bebf562a5bed723d4f630b67a3afc7c7da8951dfc9fefa8755a0d9d328e6e181cdd4b48975a665549fdd979fed2610def29135cffd44

data/lib/grac/client.rb

@@ -22,29 +22,13 @@ module Grac
           "User-Agent"   => "Grac v#{Grac::VERSION}",
           "Content-Type" => "application/json;charset=utf-8"
         }.merge(options[:headers] || {}),
-        :postprocessing => {},
+        :postprocessing => options[: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
 
@@ -190,11 +174,12 @@ module Grac
       if data.kind_of?(Hash)
         data.each do |key, value|
           processing = nil
-          regexp = @options[:postprocessing].keys.detect { |pattern| pattern =~ key }
-
-          if !regexp.nil?
-            processing = @options[:postprocessing][regexp]
+          @options[:postprocessing].each do |regex, action|
+            if /#{regex}/ =~ key
+              processing = action
+            end
           end
+
           data[key] = postprocessing(value, processing)
         end
       elsif data.kind_of?(Array)
@@ -212,7 +197,7 @@ module Grac
       # We don't want spaces to be encoded as plus sign - a plus sign can be ambiguous in a URL and
       # either represent a plus sign or a space.
       # CGI::escape replaces all plus signs with their percent-encoding representation, so all
-      # remaining plus signs are spaces. Replacing these with a space's percent encoding makes the
+      # remaining plus signs are spaces. Replacing these with a space's percent encoding makes the
       # encoding unambiguous.
       CGI::escape(value).gsub('+', '%20')
     end

data/lib/grac/response.rb

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

data/lib/grac/version.rb

@@ -1,3 +1,3 @@
 module Grac
-  VERSION = "2.5.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grac
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ 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-test
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '1'
 description: Generic REST API Client
 email:
 - tobias.schoknecht@barzahlen.de
@@ -140,7 +112,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