fix up membership_subscription and update deps on zk

Gemfile

@@ -1,6 +1,12 @@
 source :rubygems
 
-gem 'zk', :path => '~/zk'
+# git 'git://github.com/slyphon/zookeeper.git', :ref => '8dfdd6be' do
+#     gem 'zookeeper', '>= 1.0.0.beta.1'
+# end
+
+git 'git://github.com/slyphon/zk', :ref => '41bfd35' do
+  gem 'zk'
+end
 
 gem 'pry', :group => [:development, :test]
 

lib/zk-group/membership_subscription.rb

@@ -1,17 +1,15 @@
 module ZK
   module Group
-    class MembershipSubscription
+    class MembershipSubscription < ZK::Subscription::Base
       include ZK::Logging
 
-      attr_reader :group, :opts
-      :callable
+      attr_reader :opts
+
+      alias group parent
 
       def initialize(group, opts, block)
-        raise ArgumentError, "block must repsond_to?(:call)" unless block.respond_to?(:call)
-        @group = group
+        super(group, block)
         @opts = opts
-        @callable = block
-        @threaded_callback = ThreadedCallback.new(block)
       end
 
       def notify(last_members, current_members)
@@ -24,18 +22,14 @@ def notify(last_members, current_members)
           current_members = current_members.map { |m| File.join(group_path, m) }
         end
 
-        @threaded_callback.call(last_members, current_members)
+        call(last_members, current_members)
       end
 
       def absolute_paths?
         opts[:absolute]
       end
 
-      def unregister
-        @threaded_callback.shutdown
-        group.unregister(self)
-      end
-      alias unsubscribe unregister
+      protected :call
     end
   end
 end

zk-group.gemspec

@@ -13,7 +13,7 @@ Part of the ZK project.
 }
   s.homepage      = "https://github.com/slyphon/zk-group"
 
-  s.add_runtime_dependency 'zk', '~> 1.1.0'
+  s.add_runtime_dependency 'zk', '~> 1.6.0'
 
   s.files         = `git ls-files`.split($\)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }