communicator 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    communicator (0.1.2)
+    communicator (0.1.5)
       activerecord (< 3.0.0)
       httparty (>= 0.6.1)
       json (>= 1.4.0)
@@ -15,12 +15,21 @@ GEM
     activesupport (2.3.10)
     crack (0.1.8)
     factory_girl (1.3.2)
+    gemcutter (0.6.1)
+    git (1.2.5)
     httparty (0.6.1)
       crack (= 0.1.8)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
     json (1.4.6)
+    json_pure (1.4.6)
     rack (1.2.1)
     rack-test (0.5.6)
       rack (>= 1.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
     shoulda (2.10.3)
     sinatra (1.1.0)
       rack (~> 1.1)
@@ -37,6 +46,7 @@ DEPENDENCIES
   communicator!
   factory_girl (>= 1.2.3)
   httparty (>= 0.6.1)
+  jeweler (>= 1.4.0)
   json (>= 1.4.0)
   rack-test (>= 0.5.6)
   shoulda (= 2.10.3)

data/Rakefile

@@ -14,7 +14,6 @@ begin
     gem.add_dependency 'activerecord', "< 3.0.0"
     gem.add_dependency 'httparty', '>= 0.6.1'
     gem.add_dependency 'json', '>= 1.4.0'
-    
     gem.add_development_dependency "shoulda", "2.10.3"
     gem.add_development_dependency 'factory_girl', ">= 1.2.3"
     gem.add_development_dependency 'rack-test', ">= 0.5.6"

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/communicator.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{communicator}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]

data/lib/communicator.rb

@@ -11,7 +11,20 @@ module Communicator
   # Error to be raised when no credentials were given
   class MissingCredentials < StandardError; end;
   
+  # Fake logger to be returned as Communicator.logger when Rails is unavailable
+  class FakeLogger
+    class << self
+      def method_missing(*args, &blk)
+        true
+      end
+    end
+  end
+  
   class << self
+    def logger
+      defined?(Rails) ? Rails.logger : Communicator::FakeLogger
+    end
+    
     # Hash containing all receivers
     def receivers
       @recevers ||= {}.with_indifferent_access
@@ -25,6 +38,7 @@ module Communicator
       target.send(:include, Communicator::ActiveRecordIntegration::InstanceMethods)
       
       target.skip_remote_attributes(*options[:except]) if options[:except]
+      Communicator.logger.info "Registered #{target} as receiver for messages from #{source}"
       
       target
     end
@@ -62,5 +76,6 @@ if defined?(Rails)
     Communicator::Server.username = Communicator::Client.username = config[:username]
     Communicator::Server.password = Communicator::Client.password = config[:password]
     Communicator::Client.base_uri config[:base_uri]
+    Communicator.logger.info "Set up communicator from yaml config"
   end
 end

data/lib/communicator/active_record_integration.rb

@@ -30,12 +30,15 @@ module Communicator::ActiveRecordIntegration
     
     # Publishes this instance as an OutboundMessage with json representation as body
     def publish
-      Communicator::OutboundMessage.create!(:body => {self.class.to_s.underscore => attributes}.to_json)
+      msg = Communicator::OutboundMessage.create!(:body => {self.class.to_s.underscore => attributes}.to_json)
+      Communicator.logger.info "Publishing updates for #{self.class} ##{id}"
+      msg
     end
     
     # Processes the given message body by applying all contained attributes and their values
     # and saving. When the setter instance method is missing on the local record, skip that attribute.
     def process_message(input)
+      Communicator.logger.info "Processing json message content on #{self.class} ##{id}"
       # When the input is still json, parse it. Otherwise we're assuming it's already a demarshalled hash
       input = JSON.parse(input) if input.kind_of?(String)
       input.each do |attr_name, value|

data/lib/communicator/inbound_message.rb

@@ -16,6 +16,7 @@ class Communicator::InboundMessage < ActiveRecord::Base
     inbound_msg = Communicator::InboundMessage.new(:body => json_message["body"])
     inbound_msg.id = json_message["id"]
     inbound_msg.save!
+    Communicator.logger.info "Created inbound message from json, local id is #{inbound_msg.id}"
     inbound_msg
   end
   
@@ -37,15 +38,19 @@ class Communicator::InboundMessage < ActiveRecord::Base
   end
   
   def message_content
-    JSON.parse(body).with_indifferent_access
+    @message_content ||= JSON.parse(body).with_indifferent_access
   end
   
   # Figure out who is the receiver of this message and process the message
   def process!
-    return if processed_at.present? # Do not process if already processed!
+    if processed_at.present? # Do not process if already processed!
+      Communicator.logger.info "InboundMessage #{id} has already been processed, not processing again!"
+      return false
+    end
     source, content = message_content.first
     Communicator.receiver_for(source).find_or_initialize_by_id(content["id"]).process_message(content)
     self.processed_at = Time.now
     self.save!
+    Communicator.logger.info "Processed inbound message #{id} successfully"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: communicator
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Christoph Olszowka