grac 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe42ef3ce727ab81a2c43b7a533d6796a22d13b
-  data.tar.gz: bd2cef82ac90fd4cd19a1e1150a2ec0d15c4fc92
+  metadata.gz: 2b7388a3893226c18a95cf03b7f9c11dada6f6bc
+  data.tar.gz: 617dd5a6f749929bbe26277bfd0ae9b26fe91091
 SHA512:
-  metadata.gz: a2e94ebfada36c24be7af68a0c1c087d541aea63911d809b107dc0940f7b1defcdef5eb9cb14307756b418b0edecac3e217c162e9e48189b051cafff6da61180
-  data.tar.gz: 6cf05bd411ae8e12a3234d6e6e8ea218a2f1f14d6764b1e2eb5141936b629199ab74fc3517e89172dd6e3f4191f1d1ecd2072442c59dbc55c9ff6196da247739
+  metadata.gz: bf132d0ea4f5d427c36b79c5a3fa124bad63990eef29e8974252b09658cc78e6e3c0df9e95ed914cb9416a144569a942bccdf7a57c25f2076e19c055324640f0
+  data.tar.gz: b1dc8341930b7352ff18484f0591c038fc8d4269915195b69b340cbb50bf8a802448f83e9a0c43a18d63e1b30bca32be489d517952d195677ee18c74c81be13c

data/lib/grac/client.rb

@@ -18,13 +18,20 @@ module Grac
         :timeout        => options[:timeout]        || 15,
         :params         => options[:params]         || {},
         :headers        => { "User-Agent" => "Grac v#{Grac::VERSION}" }.merge(options[:headers] || {}),
-        :postprocessing => options[:postprocessing] || {}
+        :postprocessing => options[:postprocessing] || {},
+        :middleware     => options[:middleware]    || []
       }
+      @options.freeze
+      [:params, :headers, :postprocessing, :middleware].each do |k|
+        @options[k].freeze
+      end
+      @uri.freeze
     end
 
     def set(options = {})
       options = options.merge({
-        headers: @options[:headers].merge(options[:headers] || {})
+        headers:    @options[:headers].merge(options[:headers]      || {}),
+        middleware: @options[:middleware] + (options[:middleware] || [])
       })
 
       self.class.new(@uri, @options.merge(options))
@@ -53,16 +60,24 @@ module Grac
 
     private
       def build_request(method, options = {})
-        body = options[:body].nil? || options[:body].empty? ? nil : options[:body].to_json
+        body   = options[:body].nil? || options[:body].empty? ? nil : options[:body].to_json
+        params = @options[:params].merge(options[:params] || {})
+
+        opts        = @options
+        request_uri = uri
+
+        @options[:middleware].each do |mw|
+          opts, request_uri, method, params, body = mw.call(opts, request_uri, method, params, body)
+        end
 
         request_hash = { :method => method }
-        request_hash[:params]         = @options[:params].merge(options[:params] || {})
+        request_hash[:params]         = params
         request_hash[:body]           = body
-        request_hash[:connecttimeout] = @options[:connecttimeout]
-        request_hash[:timeout]        = @options[:timeout]
-        request_hash[:headers]        = @options[:headers]
+        request_hash[:connecttimeout] = opts[:connecttimeout]
+        request_hash[:timeout]        = opts[:timeout]
+        request_hash[:headers]        = opts[:headers]
 
-        return ::Typhoeus::Request.new(uri, request_hash)
+        return ::Typhoeus::Request.new(request_uri, request_hash)
       end
 
       def postprocessing(data, processing = nil)

data/lib/grac/version.rb

@@ -1,3 +1,3 @@
 module Grac
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grac
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Very generic client for REST API with basic error handling