boutons 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395a488c36000d58f046a462efd3c3f99e948c38
-  data.tar.gz: eed04265d3dce468adacfaa3689e8890d93305e4
+  metadata.gz: 51727c2ed0f15675876579d355fdf01aa2edbae0
+  data.tar.gz: ddd212a3a02675be8aad3e7853924c1fb691dd89
 SHA512:
-  metadata.gz: 5ad7ce5ff7eeee4004a73fbd9f2283d13f05383cd94980af99ed70a27e929ac31b4b255205130727f84253e9d408fdfbeb9bb039219eb104db4d3eac181b9131
-  data.tar.gz: 6f7d5c886d71329a31e353742d3288273f2dae1bac14b8aca8e385c05b62045e8d86dbeed12e774b598e8c9716caa9bed6be7d8122d9cfd4e8a9a777be5c279c
+  metadata.gz: 0271103992aa33d3f24b40a3ba5e4f8d8d8ce1a6ef227a6ad3fc0ba188e5192f74d86ad43f19bdbdec600b9e6d09b8fa8ec2f0fd9af614f0a30c4be54f20285d
+  data.tar.gz: 2402112f0f91ad4aa9f176dcb6fda1570e8b8a314a72d74cd858841cc3e117510fd57112a4a89a3079b2da56997aa8f2cc4ba82faeff1036686d50ad70495f2e

data/lib/boutons/uri.rb

@@ -10,8 +10,26 @@ module Boutons
       def service
         @uri.scheme
       end
+
       def zk_hosts
-        Config.registry.send(service).hosts
+        @hosts = []
+        if @uri.host
+          if ::URI.unescape(@uri.host)=~/\{(.*)\}/
+            uris = ::URI.unescape(@uri.host).split(",").select do |x|
+              x=~/\{(.*)\}/
+            end.collect do |x|
+              URI "#{@uri.scheme}://#{x[1..-2].reverse.sub(';',':').reverse}/"
+            end
+            uris.each do |uri|
+              @hosts << "#{uri.host}:#{uri.port || 2181 }"
+            end
+          else
+            @hosts << "#{@uri.host}:#{@uri.port || 2181 }"
+          end
+        else
+          @hosts = Config.registry.send(service).hosts
+        end
+        @hosts
       end
       def zk
         begin
@@ -46,20 +64,12 @@ module Boutons
         end
       end
       def zk_path
-        return @zk_path if @zk_path
-        paths = []
-        paths << "nerve"
-        paths += @uri.path.split("/")[1..-1].join("/#{@uri.host}/").split("/")
-        paths << "services"
-        paths.inject([Pathname.new("/")]) do |path,dir|
-          path << path.last.join(dir)
-        end.map{|p|p.to_s}.reverse.each do |path|
-          return @zk_path = path unless zk.children(path).empty?
-        end
+        @uri.path
       end
     end
     def initialize uri
-      @uri ||= URI uri
+      uri = ::URI.escape uri
+      @uri ||= URI(uri)
     end
     def registry
       @registry ||= Registry.new @uri

data/lib/boutons/version.rb

@@ -1,3 +1,3 @@
 module Boutons
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/lib/boutons.rb

@@ -128,12 +128,12 @@ module Boutons
         params[:method]      = uri.registry.service
         params[:path]        = uri.registry.zk_path
         params[:hosts]       = uri.registry.zk_hosts
-        params[:name]        = uri.registry.zk_path[1..-1].gsub(/\//,"_")
+        params[:name]        = service
         add Synapse::Easy::Service.new params
       end
     end
     def connectable? service
-      Boutons::Config.services.keys.include?(service) rescue false
+      available.include?(service) rescue false
     end
     def connection service
       services[mapping[service]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boutons
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Mathias Kaufmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: synapse