diplomat 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3327f89ee1a1649aac458741a7dece72edd9617e
-  data.tar.gz: d6f82af7f86a6ddf2ac9f10e3b7726317f6e6c92
+  metadata.gz: dbf402f2ee123f9bd5695a8faa1d1419cf504c7e
+  data.tar.gz: 183ea346004b5658c96dfdd9c7a023bd4a39a685
 SHA512:
-  metadata.gz: 05b006160976a65d944efbf737a49a7177632047dac032d91ee77013dcdd983fe871635bc83daeb956cf6a3d1322c52b37e1862e553269da4b538b038695e658
-  data.tar.gz: 7858da8128b071bd2001310a6ad5331edd229ed37050782f91b8c6903e29f3bce16dc0e0461383bcdc0b74144b745bc8a0377656c601e2dd3b40949b90e6950a
+  metadata.gz: 7dfd0b88b712187fe1ad8f025b410e687c6b655c60ded8e448f43d0a586ce0ea030387355f3c45f9b569b15956bc595843ca63a90c2a9fb67d0352aad245b6cf
+  data.tar.gz: e92caa5c03cf316657b98b3c431077e456326d574715f183ba91c084cfcc542dc81cc260b2532193e5c419b522b87facb3dc4cf1c3cd55dac92efe77a871a917

data/lib/diplomat/event.rb

@@ -52,15 +52,14 @@ module Diplomat
     def get_all name=nil, not_found=:reject, found=:return
       url = ["/v1/event/list"]
       url += use_named_parameter("name", name)
+      url = concat_url url
 
       # Event list never returns 404 or blocks, but may return an empty list
-      @raw = @conn.get concat_url url
+      @raw = @conn.get url
       if JSON.parse(@raw.body).count == 0
         case not_found
           when :reject
             raise Diplomat::EventNotFound, name
-          when :wait
-            index = @raw.headers["x-consul-index"]
         end
       else
         case found
@@ -69,17 +68,10 @@ module Diplomat
           when :return
             parse_body
             return return_payload
-          when :wait
-            index = @raw.headers["x-consul-index"]
         end
       end
 
-      # Wait for first/next event
-      url += use_named_parameter("index", index)
-      @raw = @conn.get do |req|
-        req.url concat_url url
-        req.options.timeout = 86400
-      end
+      @raw = wait_for_next_event(url)
       parse_body
       return_payload
     end
@@ -107,7 +99,8 @@ module Diplomat
     def get name=nil, token=:last, not_found=:wait, found=:return
       url = ["/v1/event/list"]
       url += use_named_parameter("name", name)
-      @raw = @conn.get concat_url url
+      url = concat_url url
+      @raw = @conn.get url
       body = JSON.parse(@raw.body)
       # TODO: deal with unknown symbols, invalid indices (find_index will return nil)
       idx = case token
@@ -121,15 +114,11 @@ module Diplomat
           when :reject
             raise Diplomat::EventNotFound, name
           when :wait
-            # Wait for next event
-            index = @raw.headers["x-consul-index"]
-            url += use_named_parameter("index", index)
-            @raw = @conn.get do |req|
-              req.url concat_url url
-              req.options.timeout = 86400
-            end
-            body = JSON.parse(@raw.body)
-            event = body.last # If it's possible for two events to arrive at once, this needs to #find again
+            @raw = wait_for_next_event(url)
+            parse_body
+            # If it's possible for two events to arrive at once,
+            # this needs to #find again:
+            event = @raw.last
         end
       else
         case found
@@ -140,8 +129,14 @@ module Diplomat
         end
       end
 
-      { :value => { :name => event["Name"], :payload => Base64.decode64(event["Payload"]) },
-        :token => event["ID"] }
+      {
+        :value => {
+          :name => event["Name"],
+          :payload => Base64.decode64(event["Payload"])
+        },
+        :token => event["ID"]
+      }
+
     end
 
 
@@ -159,5 +154,17 @@ module Diplomat
     def self.get *args
       Diplomat::Event.new.get *args
     end
+
+    private
+
+    def wait_for_next_event url
+      index = @raw.headers["x-consul-index"]
+      url = [url, use_named_parameter("index", index)].join("&")
+      return @conn.get do |req|
+        req.url concat_url url
+        req.options.timeout = 86400
+      end
+    end
+
   end
 end

data/lib/diplomat/rest_client.rb

@@ -25,19 +25,15 @@ module Diplomat
     # Build the API Client
     # @param api_connection [Faraday::Connection,nil] supply mock API Connection
     def start_connection api_connection=nil
-      @conn = api_connection || Faraday.new(:url => Diplomat.configuration.url) do |faraday|
-        faraday.adapter  Faraday.default_adapter
-        faraday.request  :url_encoded
-        faraday.response :raise_error
-
-        Diplomat.configuration.middleware.each do |middleware|
-          faraday.use middleware
-        end
-      end
+      @conn = build_connection(api_connection)
+      @conn_no_err = build_connection(api_connection, true)
+    end
 
-      @conn_no_err = api_connection || Faraday.new(:url => Diplomat.configuration.url) do |faraday|
+    def build_connection(api_connection, raise_error=false)
+      return api_connection || Faraday.new(:url => Diplomat.configuration.url) do |faraday|
         faraday.adapter  Faraday.default_adapter
         faraday.request  :url_encoded
+        faraday.response :raise_error if raise_error
 
         Diplomat.configuration.middleware.each do |middleware|
           faraday.use middleware

data/lib/diplomat/service.rb

@@ -3,8 +3,6 @@ require 'faraday'
 
 module Diplomat
   class Service < Diplomat::RestClient
-    REGISTER_URL   = '/v1/agent/service/register'
-    DEREGISTER_URL = '/v1/agent/service/deregister'
 
     # Get a service by it's key
     # @param key [String] the key
@@ -14,23 +12,12 @@ module Diplomat
     # @return [OpenStruct] all data associated with the service
     def get key, scope=:first, options=nil, meta=nil
 
-      qs = ""
-      sep = "?"
-      if options and options[:wait]
-        qs = "#{qs}#{sep}wait=#{options[:wait]}"
-        sep = "&"
-      end
-      if options and options[:index]
-        qs = "#{qs}#{sep}index=#{options[:index]}"
-        sep = "&"
-      end
-      if options and options[:dc]
-        qs = "#{qs}#{sep}dc=#{options[:dc]}"
-        sep = "&"
-      end
+      url = ["/v1/catalog/service/#{key}"]
+      url << use_named_parameter('wait', options[:wait]) if options and options[:wait]
+      url << use_named_parameter('index', options[:index]) if options and options[:index]
+      url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
 
-
-      ret = @conn.get "/v1/catalog/service/#{key}#{qs}"
+      ret = @conn.get concat_url url
 
       if meta and ret.headers
         meta[:index] = ret.headers["x-consul-index"]
@@ -41,6 +28,7 @@ module Diplomat
       if scope == :all
         return JSON.parse(ret.body).map { |service| OpenStruct.new service }
       end
+
       return OpenStruct.new JSON.parse(ret.body).first
     end
 
@@ -49,7 +37,7 @@ module Diplomat
     # @return [Boolean]
     def register(definition)
       json_definition = JSON.dump(definition)
-      register = @conn.put Service::REGISTER_URL, json_definition
+      register = @conn.put '/v1/agent/service/register', json_definition
       return register.status == 200
     end
 
@@ -57,7 +45,7 @@ module Diplomat
     # @param service_name [String] Service name to de-register
     # @return [Boolean]
     def deregister(service_name)
-      deregister = @conn.get "#{Service::DEREGISTER_URL}/#{service_name}"
+      deregister = @conn.get "/v1/agent/service/deregister/#{service_name}"
       return deregister.status == 200
     end
 

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - John Hamelink