promiscuous 0.100.2 → 0.100.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f03baccd94bfc3544565c1d22949b5c9a27837ff
-  data.tar.gz: 37b69e7efed0d7b8e0d89e6dfd7f78610ec2bef7
+  metadata.gz: 661ee6c4ebf5e97d57ba23bc894dec27875b51da
+  data.tar.gz: 0c803f496368153a921f2e1a377f8164c65574b6
 SHA512:
-  metadata.gz: 4c41185a3ba9ec6ef9e9df5bfbe688b050085ee3aa723a89a5c6f549797d2ff2d7cf2142f23ac631ef483f4d7e80a4013bf8e6534b22d04e44f14360eb6decb5
-  data.tar.gz: 7d1aba8027e95a1e6760e2cf9020b349d2d5fb99c42e54064f82abc689803d79d446b46421cfc95c44eb43a1b239ad2c6a54f3458473043518feee0e0ff5ebcf
+  metadata.gz: 62dce82bf3dae1f68f6fdeb895059162c3e66e82587096a6b2d6ee6ebd6a1bbbae4cdcb95cb19e417ac4b712a33785e39521206f1206f33f3559a30c55e60b79
+  data.tar.gz: 90926a0597ef13645fdb17aeca623f28fe57bf6101208d73f529c82812162ce133a8893411a93c3392c24832b343d6423a5db82640379f942757b7aea6efca57

data/lib/promiscuous/subscriber/message.rb

@@ -20,7 +20,7 @@ class Promiscuous::Subscriber::Message
   end
 
   def generation
-    parsed_payload['generation']
+    parsed_payload['generation'] || 0
   end
 
   def dependencies

data/lib/promiscuous/subscriber/model/base.rb

@@ -3,9 +3,9 @@ module Promiscuous::Subscriber::Model::Base
 
   def __promiscuous_eventual_consistency_update(operation)
     return true unless self.respond_to?(:attributes)
-    return true unless operation.version
+    return true unless operation.dependency.try(&:version)
 
-    version = operation.version
+    version = operation.dependency.version
     generation = operation.message.generation
     version = (generation << 50) | version
 

data/lib/promiscuous/subscriber/operation.rb

@@ -1,5 +1,5 @@
 class Promiscuous::Subscriber::Operation
-  attr_accessor :model, :id, :operation, :attributes, :version
+  attr_accessor :model, :id, :operation, :attributes, :dependency
   delegate :message, :to => :unit_of_work
 
   def initialize(payload)
@@ -7,7 +7,7 @@ class Promiscuous::Subscriber::Operation
       self.id         = payload['id']
       self.operation  = payload['operation'].try(:to_sym)
       self.attributes = payload['attributes']
-      self.version    = payload['version']
+      self.dependency = payload['dependency']
       self.model      = self.get_subscribed_model(payload) if payload['types']
     end
   end
@@ -29,6 +29,7 @@ class Promiscuous::Subscriber::Operation
 
   def create(options={})
     model.__promiscuous_fetch_new(id).tap do |instance|
+      instance.__promiscuous_eventual_consistency_update(self)
       instance.__promiscuous_update(self)
       instance.save!
     end

data/lib/promiscuous/subscriber/unit_of_work.rb

@@ -13,7 +13,7 @@ class Promiscuous::Subscriber::UnitOfWork
   def operations
     message.parsed_payload['operations'].
       each_with_index.
-      map { |op, i| Promiscuous::Subscriber::Operation.new(op.merge('version' => message.dependencies[i].try(&:version))) }
+      map { |op, i| Promiscuous::Subscriber::Operation.new(op.merge('dependency' => message.dependencies[i])) }
   end
 
   def self.process(*args)
@@ -51,23 +51,15 @@ class Promiscuous::Subscriber::UnitOfWork
     end
   end
 
-  def instance_dep
-    @instance_dep ||= dependencies.first
-  end
-
-  def master_node
-    @master_node ||= instance_dep.redis_node
-  end
-
   LOCK_OPTIONS = { :timeout => 1.5.minute, # after 1.5 minute, we give up
                    :sleep   => 0.1,        # polling every 100ms.
                    :expire  => 1.minute }  # after one minute, we are considered dead
 
-  def with_instance_locked(&block)
-    return yield unless message.has_dependencies?
+  def with_instance_locked_for(operation, &block)
+    return yield unless operation.dependency
 
-    lock_options = LOCK_OPTIONS.merge(:node => master_node)
-    mutex = Promiscuous::Redis::Mutex.new(instance_dep.key(:sub).to_s, lock_options)
+    lock_options = LOCK_OPTIONS.merge(:node => operation.dependency.redis_node)
+    mutex = Promiscuous::Redis::Mutex.new(operation.dependency.key(:sub).to_s, lock_options)
 
     unless mutex.lock
       raise Promiscuous::Error::LockUnavailable.new(mutex.key)
@@ -86,14 +78,15 @@ class Promiscuous::Subscriber::UnitOfWork
 
   # XXX Used for hooking into e.g. by promiscuous-newrelic
   def execute_operation(operation)
-    operation.execute
+    with_instance_locked_for(operation) do
+      operation.execute
+    end
   end
 
   def on_message
-    with_instance_locked do
-      with_transaction do
-        self.operations.each { |op| execute_operation(op) if op.model }
-      end
+    # XXX This needs to be done for each operation
+    with_transaction do
+      self.operations.each { |op| execute_operation(op) if op.model }
     end
     message.ack
   end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.100.2'
+  VERSION = '0.100.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.100.2
+  version: 0.100.3
 platform: ruby
 authors:
 - Nicolas Viennot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport