zoo-service-discovery 1.1.1 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDJmYzA2YWEzMmM5NDQxYmUwZTM4Nzc2ODE0OWZhMmIxNzJhYmIzNw==
+    YzIwMThkMjJlOTZiODViMzAwNzNjYzM1ZjI5YTk3Y2UxYzhjODczNg==
   data.tar.gz: !binary |-
-    MDRkMDc2ODlkMGRlNDg0MjNjYjU4NzYzNzk3OTE4ZTBjOTJhZjQ0Zg==
-!binary "U0hBNTEy":
+    OTVhNjZkOGMxNmVmMDcxZjhmY2ZlOGRhMTE4YTlkOTEwMmJlNTZiOQ==
+SHA512:
   metadata.gz: !binary |-
-    MmQxMDY5Y2QzN2I3NWQ3NTBkNGNjM2RjZTIxOGYzNDc2ZDllYWQ4OGIyZGNh
-    YzE3YmRkN2I1NmVmMzU5ZmJkY2ZmOGU2YTc5Y2Q0MzNlYzk5NjNhNTIyNjk2
-    MWIxMTVkYWYxYWFkZDQ3OTZhMWEzMTE3ZmVjMjE5YmU1NTFkNzg=
+    Yjc3Y2MyN2IyMTY2ZWZhYzE2NmIzYzQ5ODg1NDQzYmIyYzM2YjY1YWYzYzlj
+    YTRhMmY4MjViYjkyOGIyZGM0MTY0YzZiOTk3MDcwNWU2ZjI1MmQyNmY4MjUx
+    OWMyNzEzMmU3NzFhYjZjYjRkOTViNWM2YmY3NTE3YTQzOTMzYmU=
   data.tar.gz: !binary |-
-    ZTFlMmZmMTQzZTBkNGQ2NDllMGYxNzc2ZjcwMWUxN2ZlNTdmZmQxNDU2MjI0
-    ZmNmN2M3MmMwMTYwODg5MDYxYjk0MjE5YTI4N2Y2ZDNmNWRjNTdmM2JlOThi
-    OTNkYTFlM2ZiMWYzMzIzYTU0NzVhOTdmMjBmMTMzYTFmYWFkMmQ=
+    Zjg2OWMzMjExYzk3ZDc2NjA2ZTAwMGM1ZDg3MDYwZDE0NGJhNTE2ZDNiM2Vi
+    OWMwMWJkN2E1NTk3OGMzZjMxYTk0YjdkZGMxODc0YTBjNTM5NGQ1NzI2ZjI4
+    ODVlNjYyMWE5MzIzZGExOGU5OTFiMWQ0ZjYxNTUyYzZiMWQ5NDk=

data/lib/zoo_service/publication.rb

@@ -23,10 +23,19 @@ module ZooService
     # Returns +true+, if everything went OK, +false+ otherwise.
     def register_service(name, url)
       registration_block = create_registration_block(name, url)
-      service_registration_blocks << registration_block
+      service_registration_blocks[name.to_sym] = registration_block
       registration_block.(zk)
     end
 
+    # :call-seq:
+    #   unregister_service(name) => Boolean
+    #
+    # Unregisters all the instances of a well-known service with _name_.
+    def unregister_service(name)
+      service_registration_blocks.delete(name.to_sym)
+      zk.rm_rf("/services/#{name}")
+    end
+
     def reconnect
       @zk = nil
       zk
@@ -46,7 +55,7 @@ module ZooService
     # Stores the registration blocks that are rerun after reconnection to
     # the ZooKeeper.
     def service_registration_blocks
-      @service_registration_blocks ||= [ ]
+      @service_registration_blocks ||= { }
     end
 
     # Returns a working instance of a ZooKeeper client.
@@ -54,7 +63,7 @@ module ZooService
       @zk ||= ZK.new(ENV['SERVICE_DISCOVERY_WELLKNOWN_ADDRESS'] || 'localhost:2181') do |zk|
         zk.on_connected do
           # Rerun all the registrations upon reconnection
-          service_registration_blocks.each do |registration_block|
+          service_registration_blocks.values.each do |registration_block|
             registration_block.(zk)
           end
         end
@@ -64,4 +73,4 @@ module ZooService
   end
 
   Publication = defined?(PhusionPassenger) ? PublicationImpl.new(PhusionPassenger) : PublicationImpl.new
-end
+end

data/spec/features/discovery_spec.rb

@@ -12,8 +12,12 @@ describe "Discovered service URL" do
 
   context "when service is registered" do
 
+    let(:publication) {
+      ZooService::PublicationImpl.new
+    }
+
     let!(:service) {
-      ZooService::PublicationImpl.new.register_service("service", real_service_url)
+      publication.register_service("service", real_service_url)
       "service"
     }
 
@@ -25,6 +29,12 @@ describe "Discovered service URL" do
       should == nil          # check that it cannot be discovered
     end
 
+    it "should be nil if we then unregister the service" do
+      sleep 0.5
+      publication.unregister_service(service)
+      should == nil
+    end
+
   end
 
   context "when service is not registered" do
@@ -37,4 +47,4 @@ describe "Discovered service URL" do
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zoo-service-discovery
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Druzhinin <andrey.druginin@gmail.com>
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
@@ -32,6 +32,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - lib/zoo-service-discovery.rb
 - lib/zoo_service/discovery.rb
 - lib/zoo_service/publication.rb
@@ -40,7 +41,6 @@ files:
 - spec/features/passenger_spec.rb
 - spec/spec_helper.rb
 - spec/support/zookeeper_runner.rb
-- README.md
 homepage: http://uniqsystems.ru/
 licenses: []
 metadata: {}
@@ -60,9 +60,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: ZooKeeper service discovery gem
 test_files: []
-has_rdoc: