microservice_dsl 0.1.3 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06eb0ce76ab4018aca593cd7027e31fa00ffb27d
-  data.tar.gz: 6396891b86a038cf66a47a1eac2b3f76d29cce52
+  metadata.gz: f8a8ae1f8d70c4ea1091b3905c57fd921d9f0bbb
+  data.tar.gz: 9a2c7de4b3e85ba3e35ed5ec4a96f9538817744b
 SHA512:
-  metadata.gz: 70d9caeae5fdaf7d94784d90ecee993957a798a7dce4866fa31077d7208c47c1eff738541b27e2981340029eed65f393cdbafe7078ee06e0c62f6333b3d73e8a
-  data.tar.gz: bc51804eb60d2f67fec0f108d22f59d38e993c4924d0e6da4d4c81a590ed099210d922970c82bcd8fca5f2d0717dbfb38072b2c23b0483abe6d0e1b5ba3b0dde
+  metadata.gz: 4274ec10d2ce6c0bd8abebfc5b185654bcb83e9e03a1342ade08d1085d3a2b366e59afc9be8276d28db0265c237e8f2e74319ace87355b760c2d9f547bd1bb29
+  data.tar.gz: b77bf817b794a1035ca6a106d88f6e8857c83aa51ffba5ac31b2d79c4f3756808683cdb1993a28434c47114018b037b08310d4117b8ecd5e776ec732a36fae33

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/
+*.gem

data/lib/microservice_dsl/middleware.rb

@@ -0,0 +1,18 @@
+module MicroserviceDSL
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if env[MicroserviceDSL.rack_hop_header] && !env[MicroserviceDSL.rack_hop_header].blank?
+        MicroserviceDSL.current_hop = env[MicroserviceDSL.rack_hop_header]
+      else
+        MicroserviceDSL.current_hop = "1"
+      end
+      MicroserviceDSL.next_hop = 0
+      
+      @app.call(env)
+    end
+  end
+end

data/lib/microservice_dsl/railtie.rb

@@ -0,0 +1,10 @@
+require 'microservice_dsl/middleware'
+
+module MicroserviceDSL
+  class Railtie < Rails::Railtie
+    initializer 'microservice_dsl.hop_counter' do |app|
+       app.middleware.insert_before ActionDispatch::RequestId, MicroserviceDSL::Middleware
+    end
+  end
+end
+

data/lib/microservice_dsl/version.rb

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

data/lib/microservice_dsl.rb

@@ -10,7 +10,7 @@ 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] || {}), body: body, params: args[:params], timeout: ENV['MS_DEFAULT_TIMEOUT'] || 10)
+    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)
   end
 
   def call_microservice(microservice, args={})
@@ -21,12 +21,43 @@ module Kernel
 end
 
 module MicroserviceDSL
+  def self.hop_header
+    "X-Hop-Count"
+  end
+  
+  def self.rack_hop_header
+    "HTTP_#{self.hop_header.upcase.gsub("-", "_")}"
+  end
+  
   def self.default_headers
-    Thread.current[:default_headers] || {}
+    Thread.current[:microservice_dsl_default_headers] || {}
   end
 
   def self.default_headers=(headers = {})
-    Thread.current[: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]
+  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(".")
   end
 end
 
+require "microservice_dsl/railtie" if defined?(Rails)

data/microservice_dsl.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "rails", "5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: microservice_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.3
 platform: ruby
 authors:
 - Vincenzo Ferrara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '5'
 description: 
 email:
 - vinceferro92@gmail.com
@@ -84,6 +112,8 @@ files:
 - bin/console
 - bin/setup
 - lib/microservice_dsl.rb
+- lib/microservice_dsl/middleware.rb
+- lib/microservice_dsl/railtie.rb
 - lib/microservice_dsl/version.rb
 - microservice_dsl.gemspec
 homepage: https://github.com/vinceferro/microservice_dsl
@@ -106,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Little DSL for interact in a microservice environment