microservice_dsl 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2bf369380148747520edd76b31a7c2b0432636
-  data.tar.gz: aa81d1d988315d09114519949fae3e1ef87be783
+  metadata.gz: 68f80331aa78c068cd49a0857cfdab759b92e526
+  data.tar.gz: b8151235152bd251750c315ef3956e370bb438a1
 SHA512:
-  metadata.gz: 6c57fa06ad3810d1d3c69909477e38015062dd3147a88bb16a586be82666aae314a77114d7dbbf5ad8a8044b4b4ce0e06fa948cbf1b219345a151b662f07e653
-  data.tar.gz: adf413de93464447b9fa80d287536819e4710f48552fdbd8906b1cd6e3cbf17e179ca5af3d62c0310c0f9b5827657535d9c184cb4c86470ddf9c1ce8c59547a8
+  metadata.gz: 2d3b0ce97cd1f75f76d90a783dd5c4636c81f929d5a6e4d5428078dff37c6e93e2e18e013df40365192a1b95cade93337eef1552e35422d93dec56ac63b38838
+  data.tar.gz: 0093d08eab116fa76adc104c3faeb9df18843e2e94d8072a541a25b431a6bb94e6f2e08df9cadd01b8dfcd9f7b52b516971c0b8d90d2c2b9a7201bea46b63110

data/lib/microservice_dsl.rb

@@ -1,8 +1,8 @@
-require "microservice_dsl/version"
-require "typhoeus"
-require "json"
-require "digest"
-require "redis"
+require 'microservice_dsl/version'
+require 'typhoeus'
+require 'json'
+require 'digest'
+require 'redis'
 
 module Kernel
   private
@@ -13,18 +13,20 @@ module Kernel
     url = ENV["#{microservice.upcase}_URL"] || "http://#{microservice}.#{ENV['MS_DOMAIN'] || Rails.env}:#{ENV["MS_#{microservice.upcase}_PORT"] || '3000'}"
     url << "/#{args[:path]}" if args[:path]
     body = (args[:body].is_a? String) ? args[:body] : args[:body].to_json if args[:body]
-    headers = MicroserviceDSL.default_headers.merge(args[:headers] || {}).merge({MicroserviceDSL.hop_header => MicroserviceDSL.hop_string})
+    headers = MicroserviceDSL.default_headers.merge(args[:headers] || {}).merge(MicroserviceDSL.hop_header => MicroserviceDSL.hop_string)
     method = args[:method] || :get
-    req = Typhoeus::Request.new(url, method: method, headers: headers, body: body, params: args[:params], timeout: ENV['MS_DEFAULT_TIMEOUT'] || 10)
-    
-    if method.to_s.downcase == "get"
+    timeout = ENV['MS_DEFAULT_TIMEOUT'].try(:to_f) || 0
+    timeout = 10 if timeout == 0
+    req = Typhoeus::Request.new(url, method: method, headers: headers, body: body, params: args[:params], timeout: timeout)
+
+    if method.to_s.casecmp('get').zero?
       req.on_complete do |res|
-        if res.code == 200 && etag = res.headers["etag"]
+        if res.code == 200 && etag = res.headers['etag']
           MicroserviceDSL.set_cache(url, etag, res)
         end
       end
       if cached = MicroserviceDSL.get_cache(url, req)
-        req.options[:headers]["If-None-Match"] = cached[:etag]
+        req.options[:headers]['If-None-Match'] = cached[:etag]
         req.on_complete do |res|
           if res.code == 304
             res.options[:response_body] = cached[:response][:body]
@@ -33,12 +35,12 @@ module Kernel
           end
         end
       end
-      
+
     end
     req
   end
 
-  def call_microservice(microservice, args={})
+  def call_microservice(microservice, args = {})
     request = prepare_microservice_request microservice, args
     response = request.run
     [response.body, response.headers['content-type'], response.code]
@@ -47,19 +49,19 @@ end
 
 module MicroserviceDSL
   def self.redis_reset!
-    @@redis=nil
+    @@redis = nil
   end
-  
+
   def self.redis
     return nil unless caching?
-    splitted = ENV["MS_CACHE_URL"].split(":")
+    splitted = ENV['MS_CACHE_URL'].split(':')
     host = splitted[0]
-    port = splitted[1] || "6379"
+    port = splitted[1] || '6379'
     @@redis ||= Redis.new(host: host, port: port)
   end
-  
+
   def self.caching?
-    if ENV["MS_CACHE_URL"]
+    if ENV['MS_CACHE_URL']
       return true
     else
       return false
@@ -72,65 +74,61 @@ module MicroserviceDSL
     data = {
       etag: etag,
       response: {
-            body: res.body,
-            code: res.code,
-            headers: res.headers
-          }
+        body: res.body,
+        code: res.code,
+        headers: res.headers
+      }
     }
     puts data
     redis.set([redis_hash_name, cache_key(url, res.request)].join(':'), JSON.dump(data))
   end
-  
+
   def self.cache_key(url, req)
     @@taggers ||= nil
-    url = url.gsub(":", "|")
-    unless @@taggers
-      url
+    url = url.tr(':', '|')
+    if @@taggers
+      @@taggers.map { |t| Digest::MD5.hexdigest(req.options[:headers][t]) }.join('/') + '-' + url
     else
-      @@taggers.map {|t| Digest::MD5.hexdigest(req.options[:headers][t])}.join("/") + "-" + url
+      url
     end
   end
-  
+
   def self.get_etag(url, req)
     return nil unless caching?
     if val = get_cache(url, req)
       val[:etag]
-    else
-      nil
     end
   end
-  
+
   def self.has_cache?(url, etag, req)
     return nil unless caching?
     (stored_etag = get_etag(url, req)) && (stored_etag == etag) && stored_etag
   end
-  
+
   def self.get_cache(url, req)
     return nil unless caching?
     if val = redis.get([redis_hash_name, cache_key(url, req)].join(':'))
       JSON.parse(val, symbolize_names: true)
-    else
-      nil
     end
   end
-  
+
   def self.redis_hash_name
-    ENV["MS_CACHE_HASH"] || "msdsl"
+    ENV['MS_CACHE_HASH'] || 'msdsl'
   end
-  
+
   def self.cache_taggers=(taggers)
     raise unless taggers.is_a?(Array)
     @@taggers = taggers
   end
-  
+
   def self.hop_header
-    "X-Hop-Count"
+    'X-Hop-Count'
   end
-  
+
   def self.rack_hop_header
-    "HTTP_#{self.hop_header.upcase.gsub("-", "_")}"
+    "HTTP_#{hop_header.upcase.tr('-', '_')}"
   end
-  
+
   def self.default_headers
     Thread.current[:microservice_dsl_default_headers] || {}
   end
@@ -138,39 +136,39 @@ module MicroserviceDSL
   def self.default_headers=(headers = {})
     Thread.current[:microservice_dsl_default_headers] = headers
   end
-  
+
   def self.current_hop=(hop)
     Thread.current[:microservice_dsl_current_hop] = hop
   end
-  
+
   def self.current_hop
-    Thread.current[:microservice_dsl_current_hop] = "1" unless Thread.current[:microservice_dsl_current_hop]
+    Thread.current[:microservice_dsl_current_hop] = '1' unless Thread.current[:microservice_dsl_current_hop]
     Thread.current[:microservice_dsl_current_hop]
   end
-  
+
   def self.next_hop=(hop)
     Thread.current[:microservice_dsl_next_hop] = hop
   end
-  
+
   def self.next_hop
     Thread.current[:microservice_dsl_next_hop] = 0 unless Thread.current[:microservice_dsl_next_hop]
     Thread.current[:microservice_dsl_next_hop] += 1
   end
-  
+
   def self.hop_string
-    [self.current_hop, self.next_hop].join(".")
+    [current_hop, next_hop].join('.')
   end
-  
+
   def self.hashable_string_for(obj)
     case obj
     when Hash
-      hashable_string_for(obj.sort_by {|sub_obj| sub_obj.first.to_s})
+      hashable_string_for(obj.sort_by { |sub_obj| sub_obj.first.to_s })
     when Array
-      obj.map {|sub_obj| hashable_string_for(sub_obj)}.to_s
+      obj.map { |sub_obj| hashable_string_for(sub_obj) }.to_s
     else
       obj.to_s
     end
   end
 end
 
-require "microservice_dsl/railtie" if defined?(Rails)
+require 'microservice_dsl/railtie' if defined?(Rails)

data/lib/microservice_dsl/version.rb

@@ -1,3 +1,3 @@
 module MicroserviceDSL
-  VERSION = "0.3.0"
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: microservice_dsl
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Vincenzo Ferrara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Little DSL for interact in a microservice environment