lolitra 0.0.2 → 0.0.3

data/lib/lolitra/handler_base.rb

@@ -1,4 +1,7 @@
 require 'singleton'
+require 'amqp'
+require 'amqp/utilities/event_loop_helper'
+require 'json'
 
 module Lolitra
   module MessageHandler
@@ -175,7 +178,9 @@ module Lolitra
     end
 
     def marshall
-      JSON.generate(self)
+      hash = {}
+      self.instance_variables.each {|var| hash[var.to_s.delete("@")] = self.instance_variable_get(var) }
+      JSON.generate(hash)
     end
   end
 
@@ -207,25 +212,34 @@ module Lolitra
 
   class AmqpBus
     attr_accessor :queue_prefix
+    attr_accessor :connection
     attr_accessor :exchange
 
     def initialize(hash = {})
-      self.queue_prefix = hash[:queue_prefix]
-      self.exchange = hash[:exchange]
+      params = hash.reject { |key, value| !value }
+      raise "no :exchange specified" unless hash[:exchange]
+
+      self.queue_prefix = hash[:queue_prefix]||""
+
+      AMQP::Utilities::EventLoopHelper.run do
+        self.connection = AMQP.connect(params)
+        self.exchange = AMQP::Channel.new(self.connection).topic(params[:exchange], :durable => true)
+      end
     end
 
     def subscribe(message_class, handler_class)
       EM.next_tick do
-        AmqpNotifier.new(exchange, queue_prefix + MessageHandler::Helper.underscore(handler_class.name).subscribe(message_class.message_key)) do |info, payload|
-          #all message with the same handler goes here to try to maintain the order in the same queue (not ensured)
+        channel = AMQP::Channel.new(self.connection)
+        channel.prefetch(1).queue(queue_prefix + MessageHandler::Helpers.underscore(handler_class.name), :dureable => true).bind(self.exchange, :routing_key => message_class.message_key).subscribe do |info, payload|
           message_class_tmp = handler_class.message_class_by_key[info.routing_key]
           handler_class.handle(message_class_tmp.unmarshall(payload))
-        end 
+        end
       end
     end
 
     def publish(message)
-      AmqpNotifier.new(exchange).publish(message.class.message_key, message.marshall)
+      self.exchange.publish(message.marshall, :routing_key => message.class.message_key, :timestamp => Time.now.to_i)
     end
+
   end
 end  

data/lib/lolitra/version.rb

@@ -1,3 +1,3 @@
 module Lolitra
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lolitra.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Lolitra::VERSION
 
   gem.add_development_dependency("rspec")
+  gem.add_dependency("amqp")
+  gem.add_dependency("json")
 end

data/spec/lolitra_spec.rb

@@ -66,8 +66,13 @@ class TestAmqpMessageHandler
   message_handler TestMessage1
 
   stateful false
+
+  def test_message(message)
+    EM.stop { exit } 
+  end
 end
 
+
 describe Lolitra::MessageHandler,'#create_handler' do
   it "returns old instance of the handler for the same message id" do
     handler = TestMessageHandler.new
@@ -171,6 +176,26 @@ describe Lolitra::AmqpMessageHandler, '#message_class_by_key' do
   end
 end
 
+describe Lolitra::AmqpBus do
+  it "should recive message when publish a message" do
+    Lolitra::MessageHandlerManager.bus = Lolitra::AmqpBus.new(:host => "127.0.0.1", :exchange => "test_exchange")
+    Lolitra::MessageHandlerManager.register(TestAmqpMessageHandler)
+
+    TestAmqpMessageHandler.should_receive(:handle) do |message|
+      message.should be_an_instance_of TestMessage
+      EM.stop { exit }
+    end
+
+    Lolitra::MessageHandlerManager.publish(TestMessage.new)
 
-#TODO
-#add test to Lolitra::AmqpMessageHandler and AmqpBus with evented-spec
+    EM.next_tick{ EM.add_timer(60) { EM.stop { exit } }}
+    AMQP::Utilities::EventLoopHelper.eventmachine_thread.join
+  end
+end
+
+describe Lolitra::AmqpBus do
+  it "should return a unable to connect when specify a wrong amqp host" do
+    expect { Lolitra::AmqpBus.new(:host => "192.168.123.123") }.to raise_error(UnableToConnect) #TODO
+    pending 
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Hugo Freire
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-19 00:00:00 +02:00
+date: 2012-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +30,32 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: amqp
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Lolitra, build Sagas, a kind of Long Live Transaction (LLT), in less lines
 email: 
 - hfreire@abajar.com
@@ -47,9 +73,12 @@ files:
 - README.md
 - Rakefile
 - lib/lolitra.rb
+- lib/lolitra/.handler_base.rb.swp
+- lib/lolitra/.version.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
@@ -85,5 +114,6 @@ 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