multiple_man 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2a4b260906b99133630620edf54de759b89cebe
-  data.tar.gz: 3c34667e49a1e021b6da5c5121ffdbefb72da4db
+  metadata.gz: 9e1c4aa897f1db298c404d9f6d9a511d497f8ca1
+  data.tar.gz: 68d3af66452856d5683f3dd9893aa77216347bad
 SHA512:
-  metadata.gz: c2415f3bf346b9ffdd1922023b9eb7ce68c07bb6ceaf70ca4b4791b7af197303b719ce212f1fbfa1178e21a17343a1fac74ba04f994d7851c69e86f4dc46f6e8
-  data.tar.gz: 92dc26d2dae07a016b4e00f002639dc83864fbd1b7e72b01df793cba52ab37e9c6f5cd55dfff573e2f7d933934b92311e203c7d86d16615a3c7b6200a19c0545
+  metadata.gz: fa34e065547d1e52973f77dd36d907054177a36a858311a91b576fed1405a4dc0d3173cf0384a0c600a190ada4a73b11bdd085bc5e487345b8a3ad799c19c621
+  data.tar.gz: 776d1610bdce6abdcc08af4dd730802ba5b34722ce07d9866acab98a50dcaa357987175d96f7c1b76c6a27a24df13aa2064c61e9a90e4277abda0fd7d541ceb9

data/lib/multiple_man.rb

@@ -24,4 +24,4 @@ module MultipleMan
   def self.enable!
     MultipleMan.configuration.enabled = true
   end
-end
+end

data/lib/multiple_man/attribute_extractor.rb

@@ -3,17 +3,32 @@ require 'json'
 module MultipleMan
   class AttributeExtractor
 
-    def initialize(record, fields)
+    def initialize(record, fields, identifier)
       raise "Fields must be specified" unless fields
       
       self.record = record
       self.fields = fields 
+      self.identifier = identifier
     end
 
     def data
-      Hash[fields.map do |field|
-        [field, record.send(field)]
-      end]
+      {
+        id: identifier_for_record,
+        data: Hash[fields.map do |field|
+          [field, record.send(field)]
+        end]
+      }
+    end
+
+    def identifier_for_record
+      puts identifier.class
+      if identifier.class == Symbol
+        record.send(identifier)
+      elsif identifier.class == Proc
+        identifier.call(record)
+      else
+        record.id
+      end
     end
 
     def to_json
@@ -22,7 +37,7 @@ module MultipleMan
 
   private
 
-    attr_accessor :record, :fields
+    attr_accessor :record, :fields, :identifier
 
   end
 end

data/lib/multiple_man/configuration.rb

@@ -11,7 +11,8 @@ module MultipleMan
       @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
     end
 
-    attr_accessor :topic_name, :app_name, :connection, :logger, :enabled
+    attr_accessor :topic_name, :app_name, :connection, :enabled
+    attr_writer :logger
   end
 
   def self.configuration

data/lib/multiple_man/model_publisher.rb

@@ -27,13 +27,16 @@ module MultipleMan
     end
 
     def record_data(record)
-      AttributeExtractor.new(record, fields).to_json
+      AttributeExtractor.new(record, fields, identifier).to_json
     end
 
     def fields
       options[:fields]
     end
 
+    def identifier
+      options[:identifier]
+    end
     
   end
 end

data/lib/multiple_man/model_subscriber.rb

@@ -16,17 +16,16 @@ module MultipleMan
 
     attr_reader :klass    
 
-    def create(data)
-      model = find_model(data)
-      model.remote_id = data.delete(:id)
-      model.attributes = data
+    def create(payload)
+      model = find_model(payload[:id])
+      model.attributes = payload[:data]
       model.save!
     end
 
     alias_method :update, :create
 
-    def destroy(data)
-      model = find_model(data)
+    def destroy(payload)
+      model = find_model(payload[:id])
       model.destroy!
     end
 
@@ -40,8 +39,8 @@ module MultipleMan
 
   private
 
-    def find_model(data)
-      klass.find_by_remote_id(data[:id]) || klass.new
+    def find_model(id)
+      klass.find_or_initialize_by(multiple_man_identifier: id)
     end
 
     attr_writer :klass

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/spec/attribute_extractor_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 
 describe MultipleMan::AttributeExtractor do 
 
-  MockClass = Struct.new(:a, :b, :c)
-  let(:object) { MockClass.new(1,2,3) }
-  subject { described_class.new(object, fields) }
+  MockClass = Struct.new(:a, :b, :c, :id)
+  let(:object) { MockClass.new(1,2,3,10) }
+  subject { described_class.new(object, fields, identifier) }
+  let(:fields) { nil }
+  let(:identifier) { nil }
 
   context "without fields" do
     it "should not be allowed" do
@@ -14,8 +16,22 @@ describe MultipleMan::AttributeExtractor do
 
   context "with fields" do
     let(:fields) { [:a, :c] }
-    its(:data) { should == {a: 1, c: 3}}
-    its(:to_json) { should == '{"a":1,"c":3}'}
+    its(:data) { should == {id:10, data:{a: 1, c: 3}}}
+    its(:to_json) { should == '{"id":10,"data":{"a":1,"c":3}}'}
+  end
+
+  context "with an identifier" do
+    let(:fields) { [:a] }
+    context "symbol" do
+      let(:identifier) { :a }
+      its(:data) { should == {id:1, data:{a: 1}}}
+      its(:to_json) { should == '{"id":1,"data":{"a":1}}'}
+    end
+    context "proc" do
+      let(:identifier) { lambda{|record| record.b } }
+      its(:data) { should == {id:2, data:{a: 1}}}
+      its(:to_json) { should == '{"id":2,"data":{"a":1}}'}
+    end
   end
   
 end

data/spec/model_publisher_spec.rb

@@ -17,6 +17,10 @@ describe MultipleMan::ModelPublisher do
       "bar"
     end
 
+    def id
+      10
+    end
+
     def model_name
       OpenStruct.new(singular: "mock_object")
     end
@@ -30,8 +34,8 @@ describe MultipleMan::ModelPublisher do
       described_class.new(:create, fields: [:foo]).after_commit(MockObject.new)
     end
     it "should send the jsonified version of the model to the correct routing key" do
-      MultipleMan::AttributeExtractor.any_instance.should_receive(:to_json).and_return('{"foo": "bar"}')
-      topic_stub.should_receive(:publish).with('{"foo": "bar"}', routing_key: "MockObject.create")
+      MultipleMan::AttributeExtractor.any_instance.should_receive(:to_json).and_return('{"id":10,"data":{"foo": "bar"}}')
+      topic_stub.should_receive(:publish).with('{"id":10,"data":{"foo": "bar"}}', routing_key: "MockObject.create")
       described_class.new(:create, fields: [:foo]).after_commit(MockObject.new)
     end
   end

data/spec/model_subscriber_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe MultipleMan::ModelSubscriber do
   class MockClass
-    def remote_id=(value)
-    end
+
   end
 
   describe "register" do 
@@ -16,31 +15,18 @@ describe MultipleMan::ModelSubscriber do
   describe "create" do
     it "should create a new model" do
       mock_object = MockClass.new
-      MockClass.stub(:find_by_remote_id).and_return(nil)
-      mock_object.should_receive(:attributes=)
-      mock_object.should_receive(:remote_id=)
-      MockClass.should_receive(:new).and_return(mock_object)
-      mock_object.should_receive(:save!)
-
-      MultipleMan::ModelSubscriber.new(MockClass).create({a: 1, b: 2})
-    end
-  end
-
-  describe "update" do
-    it "should find an existing model and update it" do
-      mock_object = MockClass.new
-      MockClass.should_receive(:find_by_remote_id).and_return(mock_object)
+      MockClass.stub(:find_or_initialize_by).with(multiple_man_identifier: 5).and_return(mock_object)
       mock_object.should_receive(:attributes=)
       mock_object.should_receive(:save!)
 
-      MultipleMan::ModelSubscriber.new(MockClass).update({id: 5, a: 1, b: 2})
+      MultipleMan::ModelSubscriber.new(MockClass).create({id: 5, data:{a: 1, b: 2}})
     end
   end
 
   describe "destroy" do
     it "should destroy the model" do
       mock_object = MockClass.new
-      MockClass.should_receive(:find_by_remote_id).and_return(mock_object)
+      MockClass.should_receive(:find_or_initialize_by).and_return(mock_object)
       mock_object.should_receive(:destroy!)
 
       MultipleMan::ModelSubscriber.new(MockClass).destroy({id: 1})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Brunner