stomp_actors 0.1.2 → 0.2.0

data/.rspec

@@ -0,0 +1 @@
+--colour

data/lib/stomp_actors/client.rb

@@ -16,34 +16,12 @@ module StompActors
     end
 
     def connect
-      @client = OnStomp.open(uri)
-
-      me = current_actor
-
-      @client.on_connection_closed do |_, _, msg|
-        me.async.connection_closed(msg)
-      end
-
-      @client.on_error do |e, *_|
-        me.async.broker_error(e)
-      end
-    end
-
-    def connection_closed(msg)
-      unless @disconnecting
-        error "Connection closed: #{msg}" if respond_to?(:error)
-        raise DisconnectionError.new(msg)
-      end
-    end
-
-    def broker_error(e)
-      error("Broker error: #{e.inspect}") if respond_to?(:error)
-      raise BrokerError.new(e[:message])
+      @client = Stomp::Client.new(connect_opts)
     end
 
     def disconnect
       @disconnecting = true
-      @client.disconnect if @client && @client.connected?
+      @client.close if @client && @client.open?
     end
 
   end

data/lib/stomp_actors/consumer.rb

@@ -21,7 +21,7 @@ module StompActors
     def subscribe
       me = current_actor
 
-      @subscription_id = client.subscribe(queue, subscribe_opts) do |msg|
+      client.subscribe(queue, subscribe_opts) do |msg|
         me.receive(msg)
       end
     end
@@ -31,7 +31,7 @@ module StompActors
     end
 
     def ack(msg)
-      client.ack(msg)
+      client.acknowledge(msg)
     end
 
     def cleanup
@@ -40,7 +40,7 @@ module StompActors
     end
 
     def unsubscribe
-      client.unsubscribe(@subscription_id) if @subscription_id
+      client.unsubscribe(queue)
     end
   end
 end

data/lib/stomp_actors/producer.rb

@@ -12,7 +12,7 @@ module StompActors
     end
 
     def emit(msg, opts = {})
-      client.send(queue, msg, opts)
+      client.publish(queue, msg, opts)
     end
 
   end

data/lib/stomp_actors/version.rb

@@ -1,3 +1,3 @@
 module StompActors
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/stomp_actors.rb

@@ -1,3 +1,5 @@
+require 'stomp'
+
 require "stomp_actors/version"
 require "stomp_actors/client"
 require "stomp_actors/producer"

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'bundler'
 
 require 'celluloid'
 require 'stomp_droid'
-require 'onstomp'
+require 'stomp'
 require 'pry'
 
 require 'stomp_actors'

data/spec/stomp_actors/client_spec.rb

@@ -5,15 +5,21 @@ describe StompActors::Client do
   let(:port) { 61623 }
 
   before do
+
     class MyActor
       include Celluloid
       include StompActors::Client
 
-      def uri
-        "stomp://127.0.0.1:61623"
+      def connect_opts
+        {
+          hosts: [{ host: '127.0.0.1', port: 61623 }]
+        }
       end
     end
 
+    Celluloid.shutdown
+    Celluloid.boot
+
     @server_thread = StompDroid::Server.start(host, port)
     sleep 0.1 # let start
   end
@@ -26,11 +32,10 @@ describe StompActors::Client do
     actor = MyActor.new
 
     actor.connect
-    actor.client.connected?.should be_true
+    actor.client.open?.should be_true
 
     actor.disconnect
-    actor.client.connected?.should be_false
+    actor.client.open?.should be_false
   end
 
-  pending "should handle errors"
 end

data/spec/stomp_actors/consumer_spec.rb

@@ -17,8 +17,10 @@ describe StompActors::Consumer do
         super()
       end
 
-      def uri
-        "stomp://#{@host}:#{@port}"
+      def connect_opts
+        {
+          hosts: [{ host: @host, port: @port}]
+        }
       end
 
       def receive(msg)
@@ -29,6 +31,9 @@ describe StompActors::Consumer do
       def do_something; end
     end
 
+    Celluloid.shutdown
+    Celluloid.boot
+    
     @server_thread = StompDroid::Server.start(host, port, queue_name: queue, message: msg)
     sleep 0.1 # let start
   end
@@ -49,6 +54,6 @@ describe StompActors::Consumer do
     sleep 0.1
     consumer.terminate
     sleep 0.1
-    expect(client.connected?).to be_false
+    expect(client.open?).to be_false
   end
 end

data/spec/stomp_actors/producer_spec.rb

@@ -8,14 +8,17 @@ describe StompActors::Producer do
 
   before do
     class MyProducer < StompActors::Producer
-      def uri
-        "stomp://127.0.0.1:61623"
+      def connect_opts
+        { hosts: [{ host: "127.0.0.1", port: 61623 }] }
       end
       def queue
         '/queue/foo'
       end
     end
 
+    Celluloid.shutdown
+    Celluloid.boot
+    
     @server_thread = StompDroid::Server.start(host, port, queue_name: queue, sent_message_dir: message_dir)
     sleep 0.1 # let start
   end

data/stomp_actors.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Emilien Taque"]
   spec.email         = ["e.taque@alphalink.fr"]
   spec.description   = %q{Celluloid actors for Stomp}
-  spec.summary       = %q{Build Stomp consumers and publishers with Celluloid actors framework and OnStomp lib.}
+  spec.summary       = %q{Build Stomp consumers and publishers with Celluloid actors framework and stomp lib.}
   spec.homepage      = ""
   spec.license       = "MIT"
 
@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   
   spec.add_runtime_dependency 'celluloid', '~> 0.14'
-  spec.add_runtime_dependency 'onstomp', '~> 1.0'
+  spec.add_runtime_dependency 'stomp', '~> 1.2.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stomp_actors
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: onstomp
+  name: stomp
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.9
 description: Celluloid actors for Stomp
 email:
 - e.taque@alphalink.fr
@@ -131,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -170,7 +171,7 @@ rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Build Stomp consumers and publishers with Celluloid actors framework and
-  OnStomp lib.
+  stomp lib.
 test_files:
 - spec/spec_helper.rb
 - spec/stomp_actors/client_spec.rb