zk 1.1.1 → 1.2.0

data/.gitignore

@@ -9,3 +9,4 @@ html
 Gemfile.*
 wiki
 zookeeper
+coverage/

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "releaseops"]
+	path = releaseops
+	url = git://github.com/slyphon/releaseops.git

data/.travis.yml

@@ -6,6 +6,10 @@ notifications:
 env:
   - SPAWN_ZOOKEEPER='true'
 
+# pull in releaseops submodule
+before_install:
+  - git submodule update --init --recursive
+
 rvm:
   - 1.9.3
   - 1.9.2
@@ -16,5 +20,5 @@ rvm:
 #   - jruby-18mode
 #   - jruby-19mode
 
-bundler_args: --without development docs
+bundler_args: --without development docs coverage
 

data/.yardopts

@@ -1,4 +1,3 @@
---protected
 --no-private
 --tag hidden_example:Hidden
 --hide-tag hidden_example

data/Gemfile

@@ -2,6 +2,17 @@ source :rubygems
 
 # gem 'slyphon-zookeeper', :path => '~/zookeeper'
 
+# gem 'zookeeper', :path => "~/zookeeper"
+
+# this is the last known commit that we tested against and is passing.
+# keep closer track of this stuff to make bisecting easier and travis more
+# accurate
+#
+# git 'git://github.com/slyphon/zookeeper.git', :ref => 'e8b181a37ee' do
+#   gem 'zookeeper', '>= 1.0.0.beta.1'
+# end
+
+
 gem 'rake', :group => [:development, :test]
 gem 'pry',  :group => [:development]
 
@@ -13,6 +24,10 @@ group :docs do
   end
 end
 
+platform :mri_19 do
+  gem 'simplecov', :group => :coverage, :require => false
+end
+
 group :test do
   gem 'rspec', '~> 2.8.0'
   gem 'flexmock', '~> 0.8.10'

data/README.markdown

@@ -1,8 +1,8 @@
-# ZK
+# ZK #
 
 [![Build Status (master)](https://secure.travis-ci.org/slyphon/zk.png?branch=master)](http://travis-ci.org/slyphon/zk)
 
-ZK is a high-level interface to the Apache [ZooKeeper][] server. It is based on the [zookeeper gem][] which is a multi-Ruby low-level driver. Currently MRI 1.8.7, 1.9.2, 1.9.3, and JRuby are supported, rubinius 2.0.testing is supported-ish (it's expected to work, but upstream is unstable, so YMMV). 
+ZK is an application programmer's interface to the Apache [ZooKeeper][] server. It is based on the [zookeeper gem][] which is a multi-Ruby low-level driver. Currently MRI 1.8.7, 1.9.2, 1.9.3, REE, and JRuby are supported. Rubinius 2.0.testing is supported-ish (it's expected to work, but upstream is unstable, so YMMV). 
 
 ZK is licensed under the [MIT][] license. 
 
@@ -18,91 +18,26 @@ Development is sponsored by [Snapfish][] and has been generously released to the
 [MIT]: http://www.gnu.org/licenses/license-list.html#Expat "MIT (Expat) License"
 [Snapfish]: http://www.snapfish.com/ "Snapfish"
 
-## Contacting the author
-
-* I'm usually hanging out in IRC on freenode.net in the BRAND NEW #zk-gem channel.
-* if you really want to, you can also reach me via twitter [@slyphon][]
-
-[@slyphon]: https://twitter.com/#!/slyphon
-
-## New in 1.1 !! ##
-
-* NEW! Thread-per-Callback event delivery model! [Read all about it!](https://github.com/slyphon/zk/wiki/EventDeliveryModel). Provides a simple, sane way to increase the concurrency in your ZK-based app while maintaining the ordering guarantees ZooKeeper makes. Each callback can perform whatever work it needs to without blocking other callbacks from receiving events. Inspired by [Celluloid's](https://github.com/celluloid/celluloid) actor model.
-
-* Use the [zk-server](https://github.com/slyphon/zk-server) gem to run a standalone ZooKeeper server for tests (`rake SPAWN_ZOOKEEPER=1`). Makes live-fire testing of any project that uses ZK easy to run anywhere!
-
-## New in 1.0 ##
-
-* Threaded client (the default one) will now automatically reconnect (i.e. `reopen()`) if a `SESSION_EXPIRED` or `AUTH_FAILED` event is received. Thanks to @eric for pointing out the _nose-on-your-face obviousness_ and importance of this. If users want to handle these events themselves, and not automatically reopen, you can pass `:reconnect => false` to the constructor.
-
-* allow for both :sequence and :sequential arguments to create, because I always forget which one is the "right one"
-
-* add zk.register(:all) to recevie node updates for all nodes (i.e. not filtered on path)
-
-* add 'interest' feature to zk.register, now you can indicate what kind of events should be delivered to the given block (previously you had to do that filtering inside the block). The default behavior is still the same, if no 'interest' is given, then all event types for the given path will be delivered to that block.
-  
-```ruby
-zk.register('/path', :created) do |event|
-  # event.node_created? will always be true
-end
-
-# or multiple kinds of events
-
-zk.register('/path', [:created, :changed]) do |event|
-  # (event.node_created? or event.node_changed?) will always be true
-end
-
-# this will, however, be changed in 1.1 to (backwards compatible, with a deprecation warning)
-
-zk.register('/path', :only => :created) do |event|
-end
-
-```
-
-* create now allows you to pass a path and options, instead of requiring the blank string
-
-```ruby
-zk.create('/path', '', :sequential => true)
-
-# now also
-
-zk.create('/path', :sequential => true)
-```
-
-* fix for shutdown: close! called from threadpool will do the right thing
-
-* Chroot users rejoice! By default, ZK.new will create a chrooted path for you. 
-    
-```ruby
-ZK.new('localhost:2181/path', :chroot => :create) # the default, create the path before returning connection
-
-ZK.new('localhost:2181/path', :chroot => :check)  # make sure the chroot exists, raise if not
-
-ZK.new('localhost:2181/path', :chroot => :do_nothing) # old default behavior
-
-# and, just for kicks
-
-ZK.new('localhost:2181', :chroot => '/path') # equivalent to 'localhost:2181/path', :chroot => :create
-```
-
-* Most of the event functionality used is now in a ZK::Event module. This is still mixed into the underlying slyphon-zookeeper class, but now all of the important and relevant methods are documented, and Event appears as a first-class citizen.
-
-* Support for 1.8.7 WILL BE *DROPPED* in v1.1. You've been warned.
-
-## What is ZooKeeper good for?
+## What is ZooKeeper? ##
 
 ZooKeeper is a multi-purpose tool that is designed to allow you to write code that coordinates many nodes in a cluster. It can be used as a directory service, a configuration database, and can provide cross-cluster [locking][], [leader election][], and [group membership][] (to name a few). It presents to the user what looks like a distributed file system, with a few important differences: every node can have children _and_ data, and there is a 1MB limit on data size for any given node. ZooKeeper provides atomic semantics and a simple API for manipulating data in the heirarchy.
 
-One of the most useful aspects of ZooKeeper is the ability to set "[watches][]" on nodes. This allows one to be notified when a node has been deleted, created, has had a child modified, or had its data modified. The asynchronous nature of these watches enables you to write code that can _react_ to changes in your environment.
+One of the most useful aspects of ZooKeeper is the ability to set "[watches][]" on nodes. This allows one to be notified when a node has been deleted, created, changd, or has had its list of child znodes modified. The asynchronous nature of these watches enables you to write code that can _react_ to changes in your environment without polling and busy-waiting.
 
-ZooKeeper is also (relatively) easy to deploy in a [Highly Available][ha-config] configuration, and the clients natively understand the clustering and how to resume a session transparently when one of the cluster nodes goes away. 
+Znodes can be _ephemeral_, which means that when the connection that created them goes away, they're automatically cleaned up, and all the clients that were watching them are notified of the deletion. This is an incredibly useful mechanism for providing _presence_ in a cluster ("which of my thingamabobers are up?). If you've ever run across a stale pid file or lock, you can imagine how useful this feature can be. 
 
+Znodes can also be created as _sequence_ nodes, which means that beneath a given path, a node can be created with a given prefix and assigned a unique integer. This, along with the _ephemeral_ property, provide the basis for most of the coordination classes such as [groups][] and [locks][].
+
+ZooKeeper is easy to deploy in a [Highly Available][ha-config] configuration, and the clients natively understand the clustering and how to resume a session transparently when one of the cluster nodes goes away. 
 
 [watches]: http://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#ch_zkWatches
 [locking]: http://zookeeper.apache.org/doc/current/recipes.html#sc_recipes_Locks
 [leader election]: http://zookeeper.apache.org/doc/current/recipes.html#sc_leaderElection
 [group membership]: http://zookeeper.apache.org/doc/current/recipes.html#sc_outOfTheBox
 [ha-config]: http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_CrossMachineRequirements "HA config"
+[groups]: https://github.com/slyphon/zk-group
+[locks]: http://rubydoc.info/gems/zk/ZK/Locker
+
 
 ## What does ZK do that the zookeeper gem doesn't?
 
@@ -126,6 +61,34 @@ In addition to all of that, I would like to think that the public API the ZK::Cl
 [EventMachine]: https://github.com/eventmachine/eventmachine
 [zk-eventmachine]: https://github.com/slyphon/zk-eventmachine
 
+## NEWS ##
+
+### v1.2.0 ###
+
+You are __STRONGLY ENCOURAGED__ to go and look at the [CHANGELOG](http://git.io/tPbNBw) from the zookeeper 1.0.0 release
+
+* NOTICE: This release uses the 1.0 release of the zookeeper gem, which has had a MAJOR REFACTORING of its namespaces. Included in that zookeeper release is a compatibility layer that should ease the transition, but any references to Zookeeper\* heirarchy should be changed. 
+
+* Refactoring related to the zokeeper gem, use all the new names internally now.
+
+* Create a new Subscription class that will be used as the basis for all subscription-type things.
+
+* Add new Locker features!
+  * `LockerBase#assert!` - will raise an exception if the lock is not held. This check is not only for local in-memory "are we locked?" state, but will check the connection state and re-run the algorithmic tests that determine if a given Locker implementation actually has the lock.
+  * `LockerBase#acquirable?` - an advisory method that checks if any condition would prevent the receiver from acquiring the lock. 
+
+* Deprecation of the `lock!` and `unlock!` methods. These may change to be exception-raising in a future relase, so document and refactor that `lock` and `unlock` are the way to go.
+
+* Fixed a race condition in `event_catcher_spec.rb` that would cause 100% cpu usage and hang.
+
+
+### v1.1.0 ###
+
+* NEW! Thread-per-Callback event delivery model! [Read all about it!](https://github.com/slyphon/zk/wiki/EventDeliveryModel). Provides a simple, sane way to increase the concurrency in your ZK-based app while maintaining the ordering guarantees ZooKeeper makes. Each callback can perform whatever work it needs to without blocking other callbacks from receiving events. Inspired by [Celluloid's](https://github.com/celluloid/celluloid) actor model.
+
+* Use the [zk-server](https://github.com/slyphon/zk-server) gem to run a standalone ZooKeeper server for tests (`rake SPAWN_ZOOKEEPER=1`). Makes live-fire testing of any project that uses ZK easy to run anywhere!
+
+
 ## Caveats
 
 ZK strives to be a complete, correct, and convenient way of interacting with ZooKeeper. There are a few things to be aware of:
@@ -168,4 +131,11 @@ ZK strives to be a complete, correct, and convenient way of interacting with Zoo
 [szk-jar-gem]: https://rubygems.org/gems/slyphon-zookeeper_jar
 [szk-jar-repo]: https://github.com/slyphon/zookeeper_jar
 
+## Contacting the author
+
+* I'm usually hanging out in IRC on freenode.net in the BRAND NEW #zk-gem channel.
+* if you really want to, you can also reach me via twitter [@slyphon][]
+
+[@slyphon]: https://twitter.com/#!/slyphon
+
 

data/RELEASES.markdown

@@ -1,4 +1,22 @@
 This file notes feature differences and bugfixes contained between releases. 
+### v1.2.0 ###
+
+You are __STRONGLY ENCOURAGED__ to go and look at the [CHANGELOG](http://git.io/tPbNBw) from the zookeeper 1.0.0 release
+
+* NOTICE: This release uses the 1.0 release of the zookeeper gem, which has had a MAJOR REFACTORING of its namespaces. Included in that zookeeper release is a compatibility layer that should ease the transition, but any references to Zookeeper\* heirarchy should be changed. 
+
+* Refactoring related to the zokeeper gem, use all the new names internally now.
+
+* Create a new Subscription class that will be used as the basis for all subscription-type things.
+
+* Add new Locker features!
+  * `LockerBase#assert!` - will raise an exception if the lock is not held. This check is not only for local in-memory "are we locked?" state, but will check the connection state and re-run the algorithmic tests that determine if a given Locker implementation actually has the lock.
+  * `LockerBase#acquirable?` - an advisory method that checks if any condition would prevent the receiver from acquiring the lock. 
+
+* Deprecation of the `lock!` and `unlock!` methods. These may change to be exception-raising in a future relase, so document and refactor that `lock` and `unlock` are the way to go.
+
+* Fixed a race condition in `event_catcher_spec.rb` that would cause 100% cpu usage and hang.
+
 ### v1.1.1 ###
 
 * Documentation for Locker and ilk

data/Rakefile

@@ -1,87 +1,68 @@
-gemset_name = 'zk'
+release_ops_path = File.expand_path('../releaseops/lib', __FILE__)
 
-# this nonsense with the Gemfile symlinks is a bundler optimization
+# if the special submodule is availabe, use it
+# we use a submodule because it doesn't depend on anything else (*cough* bundler)
+# and can be shared across projects
+#
+if File.exists?(release_ops_path)
+  require File.join(release_ops_path, 'releaseops')
 
-GEMSPEC_NAME = 'zk.gemspec'
+  # sets up the multi-ruby zk:test_all rake tasks
+  ReleaseOps::TestTasks.define_for(*%w[1.8.7 1.9.2 jruby rbx ree 1.9.3])
 
-%w[1.8.7 1.9.2 jruby rbx ree 1.9.3].each do |ns_name|
-  rvm_ruby = (ns_name == 'rbx') ? "rbx-2.0.testing" : ns_name
+  # sets up the task :default => 'spec:run' and defines a simple
+  # "run the specs with the current rvm profile" task
+  ReleaseOps::TestTasks.define_simple_default_for_travis
 
-  ruby_with_gemset        = "#{rvm_ruby}@#{gemset_name}"
-  create_gemset_task_name = "mb:#{ns_name}:create_gemset"
-  bundle_task_name        = "mb:#{ns_name}:bundle_install"
-  rspec_task_name         = "mb:#{ns_name}:run_rspec"
+  # Define a task to run code coverage tests
+  ReleaseOps::TestTasks.define_simplecov_tasks
 
-  phony_gemfile_link_name = "Gemfile.#{ns_name}"
-  phony_gemfile_lock_name = "#{phony_gemfile_link_name}.lock"
+  # set up yard:server, yard:gems, and yard:clean tasks 
+  # for doing documentation stuff
+  ReleaseOps::YardTasks.define
 
-  file phony_gemfile_link_name do
-    # apparently, rake doesn't deal with symlinks intelligently :P
-    ln_s('Gemfile', phony_gemfile_link_name) unless File.symlink?(phony_gemfile_link_name)
-  end
+  namespace :zk do
+    namespace :gems do
+      task :build do
+        require 'tmpdir'
 
-  task :clean do
-    rm_rf [phony_gemfile_lock_name, phony_gemfile_lock_name]
-  end
+        raise "You must specify a TAG" unless ENV['TAG']
 
-  task create_gemset_task_name do
-    sh "rvm #{rvm_ruby} do rvm gemset create #{gemset_name}"
-  end
+        ReleaseOps.with_tmpdir(:prefix => 'zk') do |tmpdir|
+          tag = ENV['TAG']
 
-  task bundle_task_name => [phony_gemfile_link_name, create_gemset_task_name] do
-    sh "rvm #{ruby_with_gemset} do bundle install --gemfile #{phony_gemfile_link_name}"
-  end
+          sh "git clone . #{tmpdir}"
 
-  task rspec_task_name => bundle_task_name do
-    sh "rvm #{ruby_with_gemset} do env JRUBY_OPTS='--1.9' BUNDLE_GEMFILE=#{phony_gemfile_link_name} bundle exec rspec spec --fail-fast"
-  end
+          orig_dir = Dir.getwd
 
-  task "mb:#{ns_name}" => rspec_task_name
+          cd tmpdir do
+            sh "git co #{tag} && git reset --hard && git clean -fdx"
 
-  task "mb:test_all_rubies" => rspec_task_name
-end
+            sh "rvm 1.8.7 do gem build zk.gemspec"
 
-task 'mb:test_all' do
-  require 'benchmark'
-  tm = Benchmark.realtime do
-    Rake::Task['mb:test_all_rubies'].invoke
-  end
+            mv FileList['*.gem'], orig_dir
+          end
+        end
+      end
 
-  $stderr.puts "Test run took: #{tm}"
-end
+      task :push do
+        gems = FileList['*.gem']
+        raise "No gemfiles to push!" if gems.empty?
 
+        gems.each do |gem|
+          sh "gem push #{gem}"
+        end
+      end
 
-namespace :yard do
-  task :clean do
-    rm_rf '.yardoc'
-  end
+      task :clean do
+        rm_rf FileList['*.gem']
+      end
 
-  task :server => :clean do
-    sh "yard server --reload"
-  end
-
-  task :gems do
-    sh 'yard server --gems --port=8809'
-  end
-end
-
-task :clean => 'yard:clean'
-
-namespace :spec do
-  task :define do
-    require 'rubygems'
-    require 'bundler/setup'
-    require 'rspec/core/rake_task'
-
-    RSpec::Core::RakeTask.new('spec:runner') do |t|
-      t.rspec_opts = '-f d' if ENV['TRAVIS']
+      task :all => [:build, :push, :clean]
     end
   end
 
-  task :run => :define do
-    Rake::Task['spec:runner'].invoke
-  end
-end
 
-task :default => 'spec:run'
+  task :clean => 'yard:clean'
+end
 

data/lib/zk.rb

@@ -2,6 +2,10 @@ require 'rubygems'
 
 require 'logger'
 require 'zookeeper'
+
+# XXX: after 1.0 we'll need this
+# require 'zookeeper/compatibility'
+
 require 'forwardable'
 require 'thread'
 require 'monitor'
@@ -15,6 +19,7 @@ require 'zk/exceptions'
 require 'zk/extensions'
 require 'zk/event'
 require 'zk/stat'
+require 'zk/subscription'
 require 'zk/threadpool'
 require 'zk/threaded_callback'
 require 'zk/event_handler_subscription'

data/lib/zk/client/base.rb

@@ -28,6 +28,19 @@ module ZK
     #
     #   # connection is automatically closed
     #
+    # @example How to handle a fork()
+    #
+    #   zk = ZK.new
+    #
+    #   fork do
+    #     zk.reopen() # <-- reopen is the important thing
+    #
+    #     zk.create('/child/pid', $$.to_s, :ephemeral => true)  # for example.
+    #
+    #     # etc.
+    #   end
+    #
+    #
     class Base
       # The Eventhandler is used by client code to register callbacks to handle
       # events triggerd for given paths. 
@@ -142,9 +155,9 @@ module ZK
       # @overload create(path, data, opts={})
       #   creates a znode at the absolute `path` with given data and options
       # 
-      # @option opts [Integer] :acl defaults to <tt>ZookeeperACLs::ZOO_OPEN_ACL_UNSAFE</tt>, 
+      # @option opts [Integer] :acl defaults to <tt>Zookeeper::Constants::ZOO_OPEN_ACL_UNSAFE</tt>, 
       #   otherwise the ACL for the node. Should be a `ZOO_*` constant defined under the 
-      #   ZookeeperACLs module in the zookeeper gem.
+      #   Zookeeper::ACLs module in the zookeeper gem.
       #
       # @option opts [bool] :ephemeral (false) if true, the created node will be ephemeral
       #
@@ -153,7 +166,7 @@ module ZK
       # @option opts [bool] :sequential (false) alias for :sequence option. if both are given
       #   an ArgumentError is raised
       #
-      # @option opts [ZookeeperCallbacks::StringCallback] :callback (nil) provide a callback object
+      # @option opts [Zookeeper::Callbacks::StringCallback] :callback (nil) provide a callback object
       #   that will be called when the znode has been created
       # 
       # @option opts [Object] :context (nil) an object passed to the `:callback`
@@ -309,24 +322,24 @@ module ZK
       # @option opts [bool] :watch (false) set to true if you want your registered
       #   callbacks for this node to be called on change
       #
-      # @option opts [ZookeeperCallbacks::DataCallback] :callback to make this call asynchronously
+      # @option opts [Zookeeper::Callbacks::DataCallback] :callback to make this call asynchronously
       #
       # @option opts [Object] :context an object passed to the `:callback`
       #   given as the `context` param
       #
-      # @return [Array] a two-element array of ['node data', #<ZookeeperStat::Stat>]
+      # @return [Array] a two-element array of ['node data', #<Zookeeper::Stat>]
       #
       # @raise [ZK::Exceptions::NoNode] if no node with the given path exists.
       #
       # @example get data for path
       #
       #   zk.get("/path")
-      #   # => ['this is the data', #<ZookeeperStat::Stat>]
+      #   # => ['this is the data', #<Zookeeper::Stat>]
       #   
       # @example get data and set watch on node
       #
       #   zk.get("/path", :watch => true)
-      #   # => ['this is the data', #<ZookeeperStat::Stat>]
+      #   # => ['this is the data', #<Zookeeper::Stat>]
       #
       # @hidden_example get data asynchronously
       #
@@ -359,7 +372,7 @@ module ZK
       # -1, it matches any node's versions). Passing the version allows you to
       # perform optimistic locking, in that if someone changes the node's
       # data "behind your back", your update will fail. Since #create does not
-      # return a ZookeeperStat::Stat object, you should be aware that nodes are
+      # return a Zookeeper::Stat object, you should be aware that nodes are
       # created with version == 0.
       # 
       # This operation, if successful, will trigger all the watches on the node
@@ -383,8 +396,8 @@ module ZK
       #   default is used, otherwise acts as an assertion that the znode has the 
       #   supplied version.
       #   
-      # @option opts [ZookeeperCallbacks::StatCallback] :callback will recieve the
-      #   ZookeeperStat::Stat object asynchronously
+      # @option opts [Zookeeper::Callbacks::StatCallback] :callback will recieve the
+      #   Zookeeper::Stat object asynchronously
       #
       # @option opts [Object] :context an object passed to the `:callback`
       #   given as the `context` param
@@ -434,13 +447,13 @@ module ZK
       # @option opts [bool] :watch (false) set to true if you want to enable
       #   registered watches on this node
       # 
-      # @option opts [ZookeeperCallbacks::StatCallback] :callback will recieve the
-      #   ZookeeperStat::Stat object asynchronously
+      # @option opts [Zookeeper::Callbacks::StatCallback] :callback will recieve the
+      #   Zookeeper::Stat object asynchronously
       #
       # @option opts [Object] :context an object passed to the `:callback`
       #   given as the `context` param
       #
-      # @return [ZookeeperStat::Stat] a stat object of the specified node
+      # @return [Zookeeper::Stat] a stat object of the specified node
       #
       # @example get stat for for path
       #   >> zk.stat("/path")
@@ -453,7 +466,7 @@ module ZK
       # @example exists for non existent path
       #
       #   >> stat = zk.stat("/non_existent_path")
-      #   # => #<ZookeeperStat::Stat:0x000001eb54 @exists=false>
+      #   # => #<Zookeeper::Stat:0x000001eb54 @exists=false>
       #   >> stat.exists?
       #   # => false
       #
@@ -518,7 +531,7 @@ module ZK
       # @option opts [bool] :watch (false) set to true if you want your registered
       #   callbacks for this node to be called on change
       #
-      # @option opts [ZookeeperCallbacks::StringsCallback] :callback to make this
+      # @option opts [Zookeeper::Callbacks::StringsCallback] :callback to make this
       #   call asynchronously
       #
       # @option opts [Object] :context an object passed to the `:callback`
@@ -586,7 +599,7 @@ module ZK
       #   default is used, otherwise acts as an assertion that the znode has the 
       #   supplied version.
       #
-      # @option opts [ZookeeperCallbacks::VoidCallback] :callback will be called
+      # @option opts [Zookeeper::Callbacks::VoidCallback] :callback will be called
       #   asynchronously when the operation is complete
       #
       # @option opts [Object] :context an object passed to the `:callback`
@@ -626,7 +639,7 @@ module ZK
       # 
       # @param [String] path absolute path of the znode
       #
-      # @option opts [ZookeeperStat::Stat] (nil) provide a Stat object that will
+      # @option opts [Zookeeper::Stat] (nil) provide a Stat object that will
       #   be set with the Stat information of the node path
       #
       # @option opts [ZookeeperCallback::AclCallback] (nil) :callback for an
@@ -675,13 +688,13 @@ module ZK
       # 
       # @param [String] path absolute path of the znode
       #
-      # @param [ZookeeperACLs] acls the acls to set on the znode
+      # @param [Zookeeper::ACLs] acls the acls to set on the znode
       # 
       # @option opts [Integer] :version (-1) matches all versions of a node if the
       #   default is used, otherwise acts as an assertion that the znode has the 
       #   supplied version.
       #
-      # @option opts [ZookeeperCallbacks::VoidCallback] :callback will be called
+      # @option opts [Zookeeper::Callbacks::VoidCallback] :callback will be called
       #   asynchronously when the operation is complete
       #
       # @option opts [Object] :context an object passed to the `:callback`
@@ -873,7 +886,7 @@ module ZK
           if cnx and cnx.session_id
             '0x%x' % cnx.session_id
           end
-        rescue ZookeeperExceptions::ZookeeperException, ZK::Exceptions::KeeperException
+        rescue Zookeeper::Exceptions::ZookeeperException, ZK::Exceptions::KeeperException
           nil
         end
     end # Base