grac 2.4.0 → 2.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODI2MDQyOWFjYzdmMjU0MGY2MDkzMzM1MTU1ZjJhNzg0MjE4NjY3Ng==
-  data.tar.gz: !binary |-
-    NjFmNWIwZmNlMWJhMjQxNzAzZTkzZWU0OGJjNjE0YzE2YjA4YzU5NQ==
+SHA1:
+  metadata.gz: c4fdd9cfbf5dc5c8680575c1588978d4237aa766
+  data.tar.gz: 5978ccb99392af8670bd8f9a182e25b14769dcc0
 SHA512:
-  metadata.gz: !binary |-
-    MGNlODU3ZTcwZjg4MDIyOWE1YzAwODk4YTM4ZTYxODU1NThjYWFiZmVkMjk5
-    OTQzZjFiOWVmNWQxZDBlOTc0NjhkNDY0NGRmMjkzOTgxYWJjMzI1NWE3NzM4
-    YmQ1Njg4OGU4NDgzYTcxZTJkZTNjOGEzZDNhZjUyZTBmZGFkMWQ=
-  data.tar.gz: !binary |-
-    MmIwYTg2NTlkYzM0MWJlNjM2OWRkMjdiOWI2MGEzNjM5ZTE2M2EwMDE2NWM0
-    OWJhM2VjNGE2MThiMGIwMTQ3ZmJhY2E1NTM4NjMxMzNkNTIwMmM5NzM0Mjk0
-    MWZmN2U4YjFlNGNiNzBjMWMzZTY4NjQwYTJkZWMzNjgwMWFjYzM=
+  metadata.gz: badef6606c488d9a4d3dae9e09e66c69a29afae3b85fac924782f8df98861560e7aaa9c391dcab4e0e45d30e9afcaae2f4f798f9e6fecc06b1214f0ec5240330
+  data.tar.gz: cc0100af0a171ae16bc22b61af14b87cabbdc4a6df117c6d184eb20bf3c54374154c874a5b18340069bc8a67c80fd9ff95c0462544cbd539bf3644a016d80946

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
 
@@ -174,12 +190,11 @@ module Grac
       if data.kind_of?(Hash)
         data.each do |key, value|
           processing = nil
-          @options[:postprocessing].each do |regex, action|
-            if /#{regex}/ =~ key
-              processing = action
-            end
-          end
+          regexp = @options[:postprocessing].keys.detect { |pattern| pattern =~ key }
 
+          if !regexp.nil?
+            processing = @options[:postprocessing][regexp]
+          end
           data[key] = postprocessing(value, processing)
         end
       elsif data.kind_of?(Array)
@@ -197,7 +212,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/version.rb

@@ -1,3 +1,3 @@
 module Grac
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

metadata

@@ -1,111 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: grac
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.9
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
 description: Generic REST API Client
@@ -130,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Very generic client for REST API with basic error handling