boutons 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8404a07f91159d2d6e43aaa0c4373ade25bec0b7
-  data.tar.gz: 15be8b55b0f1b027d1417658cb606d4aeede9bc8
+  metadata.gz: f8c5c658913f95268eb4b5a1d61afbb136e5f9ae
+  data.tar.gz: b4c7c25727e06438529ed2a94f76e30236b4f3c4
 SHA512:
-  metadata.gz: f25c2b2d639728003cd7a28550c17bf221846dfbe30456e3863f7edd8689c752b9618223e38b8f010e79a923ce9c81c58e02a92d6e59f3f7fb9303a043f0fc5e
-  data.tar.gz: 26939ca4317d773232c148d35a398f7148fe0ad0b67d19a20004bc22c1cf5d07d38d5417ec9838b66f811aa9e9a585c9aa72c019881339a32bf34c0045c4fc57
+  metadata.gz: 3092f22743c1caef1a3eabe97976db939df673dbc3dafe1a8dcd2ba5859d9bfded3990ed24e862709d1976a51af367fc9812e96e064686105e91e675d7172246
+  data.tar.gz: b94c370fb516aaa08b169f85fc855b4ca9f111236d9c2bf6473968ef65cc8391d8a967a9725d562865a32fee111b573683d109a15acdeddd0eb8aa3a400a60c3

data/lib/boutons.rb

@@ -125,8 +125,9 @@ module Boutons
         uri = Boutons::URI.new service_uri
         params = {}
         params[:application] = uri.host
+        params[:mode]        = uri.mode
+        params[:uri]         = uri.check_uri
         params[:method]      = uri.registry.method
-        params[:type]        = uri.registry.type
         params[:path]        = uri.registry.zk_path
         params[:hosts]       = uri.registry.zk_hosts
         params[:name]        = service

data/lib/boutons/uri.rb

@@ -13,9 +13,6 @@ module Boutons
       def method
         @uri.scheme.split("+")[0]
       end
-      def type
-        @uri.scheme.split("+")[1] || "tcp"
-      end
       def zk_hosts
         @hosts = []
         if @uri.host
@@ -69,7 +66,7 @@ module Boutons
         end
       end
       def zk_path
-        @uri.path
+        ::URI.unescape(@uri.path).split("#",2)[0]
       end
     end
     def initialize uri
@@ -79,9 +76,17 @@ module Boutons
     def registry
       @registry ||= Registry.new @uri
     end
+    def mode
+    end
     def type
       @uri.scheme
     end
+    def mode
+      @uri.scheme.split("+")[1] || "tcp"
+    end
+    def check_uri
+      ::URI.unescape(@uri.path).split("#",2)[1] || "/"
+    end
     private
     def method_missing method, *args, &block
       @uri.send method, *args, &block

data/lib/boutons/version.rb

@@ -1,3 +1,3 @@
 module Boutons
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boutons
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Mathias Kaufmann