qswarm 0.0.5 → 0.0.6

data/lib/qswarm/listener.rb

@@ -56,11 +56,11 @@ module Qswarm
     end
 
     def speak(name, args = nil, &block)
-      if !args.nil?
+      if !args[:type].nil?
         require "qswarm/speakers/#{args[:type].downcase}"
-        @speakers << eval("Qswarm::Speakers::#{args[:type].capitalize}").new(self, name, &block)
+        @speakers << eval("Qswarm::Speakers::#{args[:type].capitalize}").new(self, name, args, &block)
       else
-        @speakers << Qswarm::Speaker.new(self, name, &block)
+        @speakers << Qswarm::Speaker.new(self, name, args, &block)
       end
       logger.info "Registering speaker: #{name} < #{@name}"
     end

data/lib/qswarm/speaker.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'ostruct'
 
 require 'qswarm/dsl'
 
@@ -10,12 +11,12 @@ module Qswarm
     dsl_accessor :broker
     attr_reader :agent, :metadata, :heard, :name
 
-    def initialize(listener, name, &block)
+    def initialize(listener, name, args, &block)
       @listener = listener
       @agent    = @listener.agent
       @name     = name.to_s unless name.nil?
       @block    = block
-
+      @args     = OpenStruct.new args
     end
 
     def parse(metadata, payload)
@@ -50,6 +51,10 @@ module Qswarm
     
     def run
     end
+    
+    def arg(name)
+      @args[name]
+    end
 
     private
 

data/lib/qswarm/speakers/http.rb

@@ -6,7 +6,7 @@ module Qswarm
     class Http < Qswarm::Speaker
       @@connections = {}
 
-      def initialize(listener, name, &block)
+      def initialize(listener, name, args, &block)
         @uri = URI.parse(name)
         @uri.host = 'localhost' if @uri.host.nil?
         super
@@ -17,29 +17,39 @@ module Qswarm
       end
 
       def run
-        connect
       end
 
       private
-
-      def connect
+      
+      def auth?
+        
       end
 
       def publish(format, msg)
         logger.debug "Sending '#{msg}' to #{@name}"
+        head = @args.user.nil? ? {} : { 'authorization' => [@args.user, @args.password] }
         
         case format
         when :get
           if msg.is_a? Hash
-            http = EventMachine::HttpRequest.new(@uri).get :query => msg
+            http = EventMachine::HttpRequest.new(@uri).get :head => head, :query => msg
           else
-            http = EventMachine::HttpRequest.new(URI.join(@uri.to_s, msg)).get
+            http = EventMachine::HttpRequest.new(URI.join(@uri.to_s, msg)).get :head => head
+          end
+          http.errback do |err|
+            logger.error "Error sending #{msg} to #{@name}: #{err}"
+          end
+          http.callback do 
+            logger.debug "#{@name} #{http.response_header.status} #{http.response}"
           end
+        
+        when :post
+          http = EventMachine::HttpRequest.new(@uri).post :head => head, :body => msg
           http.errback do |err|
             logger.error "Error sending #{msg} to #{@name}: #{err}"
           end
           http.callback do 
-            logger.debug "#{http.response_header.status} #{http.response}"
+            logger.debug "#{@name} #{http.response_header.status} #{http.response}"
           end
         end
       end

data/lib/qswarm/version.rb

@@ -1,3 +1,3 @@
 module Qswarm
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qswarm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000Z
+date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70155150039980 !ruby/object:Gem::Requirement
+  requirement: &70161152695980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155150039980
+  version_requirements: *70161152695980
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70155150039560 !ruby/object:Gem::Requirement
+  requirement: &70161152695560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155150039560
+  version_requirements: *70161152695560
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70155150039140 !ruby/object:Gem::Requirement
+  requirement: &70161152695120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155150039140
+  version_requirements: *70161152695120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70155150038720 !ruby/object:Gem::Requirement
+  requirement: &70161152694640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155150038720
+  version_requirements: *70161152694640
 - !ruby/object:Gem::Dependency
   name: andand
-  requirement: &70155153872900 !ruby/object:Gem::Requirement
+  requirement: &70161152694220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155153872900
+  version_requirements: *70161152694220
 description: Framework for writing distributed agents hanging off an AMQP message
   bus
 email: