consul-ruby-client 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGM1NWRiMjY3OWUyNGM1MDZjMGUwOGFjYTFiY2Y0NjhmYzYwOTk1OQ==
+    YjVlYmRjNDgxNTI3ZTkwM2U0NTI3ODA5YjljNjJjYTAyYmY2ZjY3Mg==
   data.tar.gz: !binary |-
-    YzM0YWVjMDRjN2M4YTk5MDAzYzJlNGVkMTYwZWQ5OThhMjM3ZGIzNw==
+    NDcxODgzMDkzNWQwM2EzZDRjZWIwOGVkMDc4NGIzMWFlMjgxOWQ1NA==
 SHA512:
   metadata.gz: !binary |-
-    MDk2YTEzMmI3MmNlMjFjMzUwOGRmYmRkYTYwYjdlNGI3ODJiODQyMTg4NWEy
-    Y2VjYTkzYjhjOTdlMjU4OGM2MmMxMTgyMDc5NjE2MGQ0MGQyYmZiMDIxNzM3
-    ZTg5MWJmMTc5NDg5ODJkMWJkZjM3YTI1ZjM3ZDY5YmM2M2Q4MTI=
+    OTczMjJjMGNkMWU5YTQyMzlhYTE1OWQyMDM5ZmI4MDExYzBiOGQwNTg3NmYx
+    ZjRiYjMyYzgwOTg5ZDkxOGI2NTEwZmUzM2M2ODFmNjY1YjYxM2Y0ZjVhY2Nm
+    NjgxMmQzY2JmNDE1NGE0OGFiYmFhNDZmMjU0ZDI2ZDU3YmVhM2Q=
   data.tar.gz: !binary |-
-    YmM1YjYwMDI4ZTU2OTcwNzcwOWUzMjMzZTU4YjViMDA5ZDRiMDQ4YThlYTY1
-    NGQ1MTU3MjYxZmUyNGZiZWU0Nzc0YzFlMmMzNjE1MmJiZDU4MzlkNjZmMDg5
-    OWFiMzY2N2UxM2RhYjgyZjhmYmJjYTM4OGI5ZTFhNDU3ZDM2MmI=
+    NjkzMjQxM2FkNDY4NjFjNjRhMmRiMDYzN2UzZTlkZWVhNTlhMDQ0ODEwMWJj
+    NzJhMGFhZDg1YWMyNGM2ZmUxYTRiZjZlOWQxNzUwYTgzZGExNDJmOGVlZTQw
+    NzlhODNhZmRlZTlkMmNhMGQ0ZWNiM2U5ZWIyNmVlYTYyNWJiOTM=

data/lib/consul/client/session.rb

@@ -10,30 +10,30 @@ module Consul
       # Public: Creates an instance of Consul::Model::Session with as many preset
       # defaults as possible.
       #
-      # name        - The name of the session.
-      # lock_delay  - Allowance window for leaders to Valid values between '0s' and '60s'
-      # node        - The name of the node, defaults to the node the agent is running on
-      # checks      - Health Checks to associate to this session
-      # behaviour   - 'release' or 'destroy' Behaviour when session is invalidated.
-      # ttl         - When provided  Must be between '10s' and '3600s'
+      # Params -
+      # name              - (Required) The name of the session.
+      # opts              - (Optional) Options hash
+      # opts[:lock_delay]  - Allowance window for leaders to Valid values between '0s' and '60s'
+      # opts[:node]        - The name of the node, defaults to the node the agent is running on
+      # opts[:checks]      - Health Checks to associate to this session
+      # opts[:behavior]   - 'release' or 'destroy' Behaviour when session is invalidated.
+      # opts[:ttl]         - When provided  Must be between '10s' and '3600s'
       #
       # Returns: Consul::Model::Session instance.
-      def self.for_name(name,
-          lock_delay = '15s',
-          node = nil,
-          checks = ['serfHealth'],
-          behaviour = 'release',
-          ttl = nil)
+      def self.for_name(name, opts = {})
+          # lock_delay = '15s',
+          # node = nil,
+          # checks = ['serfHealth'],
+          # behaviour = 'release',
+          # ttl = nil)
         raise ArgumentError.new "Illegal Name: #{name}" if name.nil?
+        opts = {} if opts.nil?
         session = Consul::Model::Session.new(name: name)
-        session.lock_delay = lock_delay unless lock_delay.nil?
-        session.node = node unless node.nil?
-        checks = [] if checks.nil?
-        checks += 'serfHealth' unless checks.include? 'serfHealth'
-        session.checks = checks
-        behaviour = 'release' if behaviour.nil? or behaviour != 'release' or behaviour != 'destroy'
-        session.behaviour = behaviour
-        session.ttl = ttl unless ttl.nil?
+        session.lock_delay = opts[:lock_delay] unless opts.has_key?(:lock_delay)
+        session.node = opts[:node]  unless opts.has_key?(:node)
+        session.checks = opts[:checks] if opts.has_key?(:checks)
+        session.behavior = opts[:behavior] if opts.has_key?(:behavior)
+        session.ttl = opts[:ttl] unless opts.has_key?(:ttl)
         session
       end
 

data/lib/consul/client/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Client
-    VERSION = '0.0.9'
+    VERSION = '0.0.10'
   end
 end

data/lib/consul/model/session.rb

@@ -16,7 +16,7 @@ module Consul
         property :name, as: :Name
         property :node, as: :Node
         collection :checks, as: :Checks
-        property :behaviour, as: :Behavior
+        property :behavior, as: :Behavior
         property :ttl, as: :TTL
 
         # Properties that exclusively read access.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Michael Hotan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler