lolitra 0.0.5 → 0.1.0b

data/lib/lolitra/handler_base.rb

@@ -1,12 +1,28 @@
 require 'singleton'
+require 'log4r'
 require 'amqp'
 require 'amqp/utilities/event_loop_helper'
 require 'json'
+require 'fiber'
 
 module Lolitra
+  include Log4r
+
+  @@logger = Logger.new 'lolitra'
+  @@logger.outputters = Outputter.stdout
+
+  def self.logger
+    @@logger
+  end
+
+  def self.logger=(new_logger)
+    @@logger = new_logger
+  end
+
   module MessageHandler
     module Helpers
-      def self.underscore(word)
+      def self.underscore(arg)
+        word = arg.dup
         word.gsub!(/::/, '/')
         word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
         word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
@@ -104,6 +120,10 @@ module Lolitra
       base.send :extend, MessageHandlerClass
     end
 
+    def publish(message)
+      self.class.publish(message)
+    end
+
     def handle(message)
       handler_method = self.class.handlers[message.class.message_key][1]
       raise "Can't handle message #{message.class}" unless handler_method
@@ -165,7 +185,7 @@ module Lolitra
         if (key)
           self.class_message_key = key      
         else
-          self.class_message_key || "#{MessageHandler::Helper.underscore(self.class.name)}"
+          self.class_message_key || "#{MessageHandler::Helpers.underscore(self.class.name)}"
         end
       end
 
@@ -181,14 +201,38 @@ module Lolitra
     end
 
     def initialize(hash={})   
-      hash.each { |key, value| self.send("#{MessageHandler::Helper.underscore(key)}=", value) }
+      hash.each { |key, value| self.send("#{MessageHandler::Helpers.underscore(key)}=", value) }
     end
 
-    def marshall
+    def to_hash
       hash = {}
-      self.instance_variables.each {|var| hash[var.to_s.delete("@")] = self.instance_variable_get(var) }
-      JSON.generate(hash)
+      self.instance_variables.each {|var| hash[var.to_s.delete("@").to_sym] = self.instance_variable_get(var) }
+      hash
     end
+
+    def marshall
+      JSON.generate(to_hash)
+    end
+  end
+
+  class FayeBus
+    def initialize(options = {})
+      EM::next_tick do
+        @socketClient = Faye::Client.new(options[:url] || 'http://localhost:9292/faye')
+      end
+    end
+    
+    def subscribe(message_class, handler_class)
+      EM::next_tick do
+        @socketClient.subscribe(message_class.message_key) do |payload|
+          handler_class.handle(message_class.unmarshall(payload))
+        end
+      end
+    end
+
+    def publish(message)
+      @socketClient.publish(message.class.message_key, message.marshall)
+    end 
   end
 
   class AmqpBus
@@ -217,6 +261,8 @@ module Lolitra
     end
 
     def publish(message)
+      Lolitra::logger.debug("Message sent: #{message.class.message_key}")
+      Lolitra::logger.debug("#{message.marshall}")
       self.exchange.publish(message.marshall, :routing_key => message.class.message_key, :timestamp => Time.now.to_i)
     end
 
@@ -224,9 +270,32 @@ module Lolitra
     def create_queue(message_class, handler_class, options, queue_name)
       EM.next_tick do
         channel = AMQP::Channel.new(self.connection)
-        channel.prefetch(1).queue(queue_name, options).bind(self.exchange, :routing_key => message_class.message_key).subscribe do |info, payload|
-          message_class_tmp = handler_class.handlers[info.routing_key][0]
-          handler_class.handle(message_class_tmp.unmarshall(payload))
+        channel.prefetch(1).queue(queue_name, options).bind(self.exchange, :routing_key => message_class.message_key).subscribe(:ack => true) do |info, payload|
+          Fiber.new do
+            current_fiber = Fiber.current
+            for i in (0..5)
+              begin
+                Lolitra::logger.debug("Message recived: #{info.routing_key}")
+                Lolitra::logger.debug("#{payload}")
+                message_class_tmp = handler_class.handlers[info.routing_key][0]
+                handler_class.handle(message_class_tmp.unmarshall(payload))
+                info.ack
+                Lolitra::logger.debug("Message processed")
+                break
+              rescue => e
+                Lolitra::logger.error("Try #{i}: #{e.message}")
+                if (i!=5)
+                  EventMachine.add_timer(5) do
+                    current_fiber.resume
+                  end
+                  Fiber.yield 
+                else
+                  Lolitra::logger.error(e.backtrace.join("\n\t"))
+                  info.reject(:requeue => false)
+                end
+              end
+            end
+          end.resume
         end
       end
     end

data/lib/lolitra/version.rb

@@ -1,3 +1,3 @@
 module Lolitra
-  VERSION = "0.0.5"
+  VERSION = "0.1.0b"
 end

data/lolitra.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("rspec")
   gem.add_dependency("amqp")
   gem.add_dependency("json")
+  gem.add_dependency("log4r")
+  gem.add_dependency("faye")
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: lolitra
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 0
-  - 5
-  version: 0.0.5
+  - 1
+  - 0b
+  version: 0.1.0b
 platform: ruby
 authors: 
 - Hugo Freire
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 +02:00
+date: 2013-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,32 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: faye
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: Lolitra, build Sagas, a kind of Long Live Transaction (LLT), in less lines
 email: 
 - hfreire@abajar.com
@@ -73,12 +99,9 @@ files:
 - README.md
 - Rakefile
 - lib/lolitra.rb
-- lib/lolitra/.future.rb.swp
-- lib/lolitra/.handler_base.rb.swp
 - lib/lolitra/handler_base.rb
 - lib/lolitra/version.rb
 - lolitra.gemspec
-- spec/.lolitra_spec.rb.swp
 - spec/lolitra_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -101,11 +124,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -114,6 +139,5 @@ signing_key:
 specification_version: 3
 summary: Lolitra, build Sagas, a kind of Long Live Transaction (LLT), in less lines
 test_files: 
-- spec/.lolitra_spec.rb.swp
 - spec/lolitra_spec.rb
 - spec/spec_helper.rb