kazoo-ruby 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70929027601215b692188a34a3996cd02cad834e
-  data.tar.gz: 86ac0c773242273960484dadb3ad21cf986fc02c
+  metadata.gz: 30dc75656a63c816b7af84a6f013a8fc0455d053
+  data.tar.gz: 9d14d2fda925b544d932a08ef693376d93198d2c
 SHA512:
-  metadata.gz: bbb219d17b2b0be9d829702d34be76eecdf51c85f9b27bf2a3c19e0acb9ba352324e85a335b0d33b727c6c5ffb8f95f8254c289e270cec92659cc6a1aaa43f5f
-  data.tar.gz: 199b6acea7b81fab0d6179d81b5a0d745c45adf1dcd3198d813bc5c26bb4a58d7f0c87b51fe8ddf5627f794b23a00323023fc4defc70ff837a098cf83d3751df
+  metadata.gz: 6966ad7d849f74a8d37c50b856e8a9fbf9d512fe59d42cf00063b25be211c6d08505f2fbdbdeb10e94892677369cfa0abfe39ae9f664576405a5b46a7083ab17
+  data.tar.gz: be22baa2a58a49278d8bd7f6222916281a60a7783d8e8f18ed89258d33d5bd4cec9f43f7a016b1e13d62dde3f971513367be129978a33fc20b43d8084a9074b6

data/Rakefile

@@ -3,7 +3,7 @@ require "rake/testtask"
 
 Rake::TestTask.new do |t|
   t.libs = ["lib", "test"]
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
 task :default => :test

data/lib/kazoo.rb

@@ -8,7 +8,9 @@ module Kazoo
   Error = Class.new(StandardError)
 
   ValidationError = Class.new(Kazoo::Error)
+  VersionNotSupported = Class.new(Kazoo::Error)
   NoClusterRegistered = Class.new(Kazoo::Error)
+  TopicNotFound = Class.new(Kazoo::Error)
   ConsumerInstanceRegistrationFailed = Class.new(Kazoo::Error)
   PartitionAlreadyClaimed = Class.new(Kazoo::Error)
   ReleasePartitionFailure = Class.new(Kazoo::Error)

data/lib/kazoo/partition.rb

@@ -87,6 +87,8 @@ module Kazoo
     end
 
     def set_state(json)
+      raise Kazoo::VersionNotSupported unless json.fetch('version') == 1
+
       @leader = cluster.brokers.fetch(json.fetch('leader'))
       @isr = json.fetch('isr').map { |r| cluster.brokers.fetch(r) }
     end

data/lib/kazoo/topic.rb

@@ -11,6 +11,8 @@ module Kazoo
     end
 
     def self.from_json(cluster, name, json)
+      raise Kazoo::VersionNotSupported unless json.fetch('version') == 1
+
       topic = new(cluster, name)
       topic.partitions = json.fetch('partitions').map do |(id, replicas)|
         topic.partition(id.to_i, replicas: replicas.map { |b| cluster.brokers[b] })
@@ -82,9 +84,18 @@ module Kazoo
       raise Kazoo::Error, "The topic #{name} already exists!" if exists?
       validate
 
+      result = cluster.zk.create(
+        path: "/config/topics/#{name}",
+        data: JSON.generate(version: 1, config: {})
+      )
+
+      if result.fetch(:rc) != Zookeeper::Constants::ZOK
+        raise Kazoo::Error, "Failed to create topic config node for #{name}. Error code: #{result.fetch(:rc)}"
+      end
+
       result = cluster.zk.create(
         path: "/brokers/topics/#{name}",
-        data: JSON.dump(version: 1, partitions: partitions_as_json)
+        data: JSON.generate(version: 1, partitions: partitions_as_json)
       )
 
       if result.fetch(:rc) != Zookeeper::Constants::ZOK
@@ -107,10 +118,10 @@ module Kazoo
 
       result = cluster.zk.stat(path: "/brokers/topics/#{name}", watcher: cb)
       case result.fetch(:rc)
-       when Zookeeper::Constants::ZOK
+      when Zookeeper::Constants::ZOK
         # continue
       when Zookeeper::Constants::ZNONODE
-        raise Kazoo::Error, "Topic #{name} does not exist!"
+        raise Kazoo::TopicNotFound, "Topic #{name} does not exist!"
       else
         raise Kazoo::Error, "Failed to monitor topic"
       end
@@ -127,6 +138,61 @@ module Kazoo
       end
     end
 
+    def config
+      result = cluster.zk.get(path: "/config/topics/#{name}")
+      case result.fetch(:rc)
+      when Zookeeper::Constants::ZOK
+        # continue
+      when Zookeeper::Constants::ZNONODE
+        raise Kazoo::TopicNotFound, "Topic #{name} does not exist!"
+      else
+        raise Kazoo::Error, "Failed to set topic config"
+      end
+
+      config = JSON.parse(result.fetch(:data))
+      raise Kazoo::VersionNotSupported if config.fetch('version') != 1
+
+      config.fetch('config')
+    end
+
+    def set_config(key, value)
+      new_config = config
+      new_config[key.to_s] = value.to_s
+      write_config(new_config)
+    end
+
+    def delete_config(key)
+      new_config = config
+      new_config.delete(key.to_s)
+      write_config(new_config)
+    end
+
+    def reset_default_config
+      write_config({})
+    end
+
+    def write_config(config_hash)
+      raise Kazoo::TopicNotFound, "Topic #{name.inspect} does not exist" unless exists?
+
+      config = config_hash.inject({}) { |h, (k,v)| h[k.to_s] = v.to_s; h }
+      config_json = JSON.generate(version: 1, config: config)
+
+      # Set topic config
+      result = cluster.zk.set(path: "/config/topics/#{name}", data: config_json)
+      case result.fetch(:rc)
+      when Zookeeper::Constants::ZOK
+        # continue
+      when Zookeeper::Constants::ZNONODE
+        raise Kazoo::TopicNotFound, "Topic #{name} does not exist!"
+      else
+        raise Kazoo::Error, "Failed to set topic config"
+      end
+
+      # Set config change notification
+      result = cluster.zk.create(path: "/config/changes/config_change_", data: name.inspect, sequence: true)
+      raise Kazoo::Error, "Failed to set topic config change notification" unless result.fetch(:rc) == Zookeeper::Constants::ZOK
+    end
+
     def self.create(cluster, name, partitions: nil, replication_factor: nil)
       topic = new(cluster, name)
       topic.send(:sequentially_assign_partitions, partitions, replication_factor)

data/lib/kazoo/version.rb

@@ -1,3 +1,3 @@
 module Kazoo
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/functional/functional_topic_management_test.rb

@@ -19,4 +19,21 @@ class FunctionalTopicManagementTest < Minitest::Test
     refute topic.exists?
     refute @cluster.topics.key?(topic.name)
   end
+
+  def test_topic_config_management
+    topic = @cluster.create_topic('test.kazoo.config', partitions: 1, replication_factor: 1)
+
+    topic.write_config("flush.messages" => 1, "max.message.bytes" => 64000)
+    assert_equal "1", topic.config["flush.messages"]
+    assert_equal "64000", topic.config["max.message.bytes"]
+
+    topic.set_config("max.message.bytes", 128000)
+    topic.delete_config("flush.messages")
+    assert_equal topic.config, { "max.message.bytes" => "128000" }
+
+    topic.reset_default_config
+    assert_equal Hash.new, topic.config
+
+    topic.destroy
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kazoo-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor