zeevex_cluster 0.2.3 → 0.3.0

data/lib/zeevex_cluster/coordinator/base_key_val_store.rb

@@ -5,7 +5,7 @@ class ZeevexCluster::Coordinator::BaseKeyValStore
 
   def self.setup
     unless @setup
-      require 'zeevex_cluster/serializer/json_hash'
+      require 'zeevex_cluster/serializer/edn'
       @setup = true
     end
   end
@@ -26,7 +26,7 @@ class ZeevexCluster::Coordinator::BaseKeyValStore
 
     @logger     = options[:logger]
 
-    @serializer    = options[:serializer] || ZeevexCluster::Serializer::JsonHash.new
+    @serializer    = options[:serializer] || ZeevexCluster::Serializer::EDN.new
 
     @retries    = options.fetch(:retries,    20)
     @retry_wait = options.fetch(:retry_wait,  2)

data/lib/zeevex_cluster/serializer/edn.rb

@@ -0,0 +1,18 @@
+require 'edn'
+require 'date'
+
+require 'zeevex_cluster/serializer'
+
+class ZeevexCluster::Serializer::EDN
+  def new(options = {})
+    @options = options
+  end
+
+  def deserialize(str)
+    parsed = ::EDN.read(str)
+  end
+
+  def serialize(obj)
+    obj.to_edn
+  end
+end

data/lib/zeevex_cluster/serializer.rb

@@ -7,21 +7,21 @@ module ZeevexCluster
     end
 
     module InstanceMethods
-      def to_json
+      def to_serialized
         serializer.serialize(self)
       end
 
       def serializer
-        @_serializer ||= ZeevexCluster::Serializer::JsonHash.new
+        @_serializer ||= ZeevexCluster::Serializer::EDN.new
       end
     end
 
     module ClassMethods
-      def from_json(string)
+      def from_serialized(string)
         serializer.deserialize(self)
       end
     end
   end
 end
 
-require 'zeevex_cluster/serializer/json_hash'
+require 'zeevex_cluster/serializer/edn'

data/lib/zeevex_cluster/strategy/cas.rb

@@ -116,7 +116,7 @@ class ZeevexCluster::Strategy::Cas < ZeevexCluster::Strategy::Base
     list = server.get(key('members')) || make_member_list
     members = []
     list[:members].values.each do |v|
-      members << v[:nodename] unless v[:timestamp].utc < stale_point
+      members << v[:nodename] unless time_of(v[:timestamp]) < stale_point
     end
     members
   end
@@ -185,7 +185,7 @@ class ZeevexCluster::Strategy::Cas < ZeevexCluster::Strategy::Base
 
   def got_lock(token)
     unless @locked_at
-      @locked_at     = token[:timestamp]
+      @locked_at     = time_of(token[:timestamp])
       token          = my_token
       run_hook :election_won
     end
@@ -238,8 +238,8 @@ class ZeevexCluster::Strategy::Cas < ZeevexCluster::Strategy::Base
   def qualifies_for_master?(token)
     now = time_now()
     ! token_invalid?(token) and
-        token[:timestamp] > (now - @stale_time) and
-        token[:locked_at] <= (now - INAUGURATION_UPDATE_DELAY * @update_period)
+        time_of(token[:timestamp]) > (now - @stale_time) and
+        time_of(token[:locked_at]) <= (now - INAUGURATION_UPDATE_DELAY * @update_period)
   end
 
   def time_now
@@ -250,7 +250,7 @@ class ZeevexCluster::Strategy::Cas < ZeevexCluster::Strategy::Base
     now = time_now
     !token || !token.is_a?(Hash) || !token[:timestamp] ||
         ! token[:locked_at] || ! token[:nodename] ||
-        token[:timestamp].utc < (now - @stale_time)
+        time_of(token[:timestamp]) < (now - @stale_time)
   end
 
   def resigned?
@@ -343,7 +343,7 @@ class ZeevexCluster::Strategy::Cas < ZeevexCluster::Strategy::Base
       res = server.cas(memberlist_key) do |hash|
         hash[:members] ||= {}
         hash[:members].keys.each do |key|
-          hash[:members].delete(key) if hash[:members][key][:timestamp] < stale_point
+          hash[:members].delete(key) if time_of(hash[:members][key][:timestamp]) < stale_point
         end
         hash[:members][@nodename] = me
         hash
@@ -390,7 +390,7 @@ class ZeevexCluster::Strategy::Cas < ZeevexCluster::Strategy::Base
   # has the master gone without updating suspiciously long?
   #
   def master_suspect?(token)
-    time_now - token[:timestamp] > SUSPECT_MISSED_UPDATE_COUNT * @update_period
+    time_now - time_of(token[:timestamp]) > SUSPECT_MISSED_UPDATE_COUNT * @update_period
   end
 
   def reset_state_vars
@@ -401,4 +401,18 @@ class ZeevexCluster::Strategy::Cas < ZeevexCluster::Strategy::Base
     @current_master = nil
     @thread = nil
   end
+
+  def time_of(timelike)
+    res = case timelike
+            when DateTime then timelike.to_time
+            when Time     then timelike
+            when String   then time_of(DateTime.parse(timelike))
+            when Integer  then Time.at(timelike)
+            when nil      then nil
+            else
+              raise ArgumentError, "Cannot parse #{timelike.inspect} of class #{timelike.class} to a time"
+          end
+    res.respond_to?(:utc) ? res.utc : res
+  end
+
 end

data/lib/zeevex_cluster/version.rb

@@ -1,3 +1,3 @@
 module ZeevexCluster
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/zeevex_cluster.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'hookem', '~> 0.0.1'
 
+  s.add_dependency 'edn'
+
   ## other headius utils
   # s.add_dependency 'thread_safe'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeevex_cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: edn
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +245,7 @@ files:
 - lib/zeevex_cluster/message.rb
 - lib/zeevex_cluster/nil_logger.rb
 - lib/zeevex_cluster/serializer.rb
+- lib/zeevex_cluster/serializer/edn.rb
 - lib/zeevex_cluster/serializer/json_hash.rb
 - lib/zeevex_cluster/static.rb
 - lib/zeevex_cluster/strategy.rb