microservice_dsl 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a8ae1f8d70c4ea1091b3905c57fd921d9f0bbb
-  data.tar.gz: 9a2c7de4b3e85ba3e35ed5ec4a96f9538817744b
+  metadata.gz: 8a2bf369380148747520edd76b31a7c2b0432636
+  data.tar.gz: aa81d1d988315d09114519949fae3e1ef87be783
 SHA512:
-  metadata.gz: 4274ec10d2ce6c0bd8abebfc5b185654bcb83e9e03a1342ade08d1085d3a2b366e59afc9be8276d28db0265c237e8f2e74319ace87355b760c2d9f547bd1bb29
-  data.tar.gz: b77bf817b794a1035ca6a106d88f6e8857c83aa51ffba5ac31b2d79c4f3756808683cdb1993a28434c47114018b037b08310d4117b8ecd5e776ec732a36fae33
+  metadata.gz: 6c57fa06ad3810d1d3c69909477e38015062dd3147a88bb16a586be82666aae314a77114d7dbbf5ad8a8044b4b4ce0e06fa948cbf1b219345a151b662f07e653
+  data.tar.gz: adf413de93464447b9fa80d287536819e4710f48552fdbd8906b1cd6e3cbf17e179ca5af3d62c0310c0f9b5827657535d9c184cb4c86470ddf9c1ce8c59547a8

data/lib/microservice_dsl/version.rb

@@ -1,3 +1,3 @@
 module MicroserviceDSL
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/microservice_dsl.rb

@@ -1,5 +1,8 @@
 require "microservice_dsl/version"
 require "typhoeus"
+require "json"
+require "digest"
+require "redis"
 
 module Kernel
   private
@@ -10,7 +13,29 @@ 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]
-    Typhoeus::Request.new(url, method: args[:method] || :get, headers: MicroserviceDSL.default_headers.merge(args[:headers] || {}).merge({MicroserviceDSL.hop_header => MicroserviceDSL.hop_string}), body: body, params: args[:params], timeout: ENV['MS_DEFAULT_TIMEOUT'] || 10)
+    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"
+      req.on_complete do |res|
+        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.on_complete do |res|
+          if res.code == 304
+            res.options[:response_body] = cached[:response][:body]
+            res.options[:response_code] = cached[:response][:code]
+            res.options[:headers] = Typhoeus::Response::Header.new(cached[:response][:headers])
+          end
+        end
+      end
+      
+    end
+    req
   end
 
   def call_microservice(microservice, args={})
@@ -21,6 +46,83 @@ module Kernel
 end
 
 module MicroserviceDSL
+  def self.redis_reset!
+    @@redis=nil
+  end
+  
+  def self.redis
+    return nil unless caching?
+    splitted = ENV["MS_CACHE_URL"].split(":")
+    host = splitted[0]
+    port = splitted[1] || "6379"
+    @@redis ||= Redis.new(host: host, port: port)
+  end
+  
+  def self.caching?
+    if ENV["MS_CACHE_URL"]
+      return true
+    else
+      return false
+    end
+  end
+
+  def self.set_cache(url, etag, res)
+    return nil unless caching?
+    puts "Etag: #{etag}"
+    data = {
+      etag: etag,
+      response: {
+            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
+    else
+      @@taggers.map {|t| Digest::MD5.hexdigest(req.options[:headers][t])}.join("/") + "-" + 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"
+  end
+  
+  def self.cache_taggers=(taggers)
+    raise unless taggers.is_a?(Array)
+    @@taggers = taggers
+  end
+  
   def self.hop_header
     "X-Hop-Count"
   end
@@ -58,6 +160,17 @@ module MicroserviceDSL
   def self.hop_string
     [self.current_hop, self.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})
+    when Array
+      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)

data/microservice_dsl.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "typhoeus", "~> 1.1"
+  spec.add_dependency "redis"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: microservice_dsl
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Vincenzo Ferrara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement