eventbus 0.0.22 → 0.24

data/lib/eventbus/message.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'bunny'
 require 'yaml'
 require 'uuid'
 require 'eventbus/queue'
@@ -15,21 +14,21 @@ class Message
     raise "No application ID specified!" if application_id.nil?
     
     @data = {
-      :HEADER => {
-        :message_id => UUID.new.generate.to_s,
-        :message_type => self.default_section_name,
-        :status => "BEGIN",
-        :application_id => application_id
+      'HEADER' => {
+        'message_id' => UUID.new.generate.to_s,
+        'message_type' => self.default_section_name,
+        'status' => "BEGIN",
+        'application_id' => application_id
       },
-      :ERROR_INFO => {
-        :is_error => false,
-        :backtrace => nil,
-        :message => nil
+      'ERROR_INFO' => {
+        'is_error' => false,
+        'backtrace' => nil,
+        'message' => nil
       },
-      :PAYLOAD => {}
+      'PAYLOAD' => {}
     }
     
-    @connection_driver = ENV["EVENTBUS_CONNECTOR"] || "Bunny"
+    @connection_driver = ENV["EVENTBUS_CONNECTOR"] || "Stomp"
     
     driver_module = "#{@connection_driver}ConnectionDriver"
     
@@ -47,18 +46,33 @@ class Message
   
   def set(key, val, opts = {})
     
+    # This is for convenience and to make messages more 
+    # human-readable by eliminating the !Binary encoding 
+    # in YAML messages. I'm not willing to make this method
+    # more expensive by walking deep structures to do the
+    # same legwork, because this isn't a functionality issue. 
+    # The message deserializes just fine without this.
+    # If your YAML is popping up with random !binary segments
+    # in the YAML *and this bothers you*, just do 
+    # a force_encoding("UTF-8") on the members of the structure
+    # as needed.
+    if val.is_a?(String)
+      val = val.dup if val.frozen? # Copy to non-frozen string. 
+      val.force_encoding("UTF-8")
+    end
+
     raise "You must specify a key name!" if key.nil?
     section = opts.delete(:section) || self.default_section_name
     
-    @data[:PAYLOAD][section] = {} if @data[:PAYLOAD][section].nil?
-    @data[:PAYLOAD][section][key] = val
+    @data['PAYLOAD'][section.to_s] = {} if @data['PAYLOAD'][section.to_s].nil?
+    @data['PAYLOAD'][section.to_s][key.to_s] = val
   end
   
   def get(key, opts = {})
     raise "You must specify a key name!" if key.nil?
     section = opts.delete(:section) || self.default_section_name
     
-    return @data[:PAYLOAD][section].nil? ? nil : @data[:PAYLOAD][section][key]
+    return @data['PAYLOAD'][section.to_s].nil? ? nil : @data['PAYLOAD'][section.to_s][key.to_s]
   end
   
   # opts: 
@@ -89,8 +103,12 @@ class Message
   end
 
   def set_error(exception)
-    @data[:ERROR_INFO][:backtrace] = exception.backtrace
-    @data[:ERROR_INFO][:message]   = exception.to_s
+    
+    exception.backtrace.map { |frame| frame.force_encoding("UTF-8") }
+    exception.message.force_encoding("UTF-8")
+    
+    @data['ERROR_INFO']['backtrace'] = exception.backtrace
+    @data['ERROR_INFO']['message']   = exception.message
     self.is_error = true
     self.status = exception.class.name
   end
@@ -163,14 +181,16 @@ class Message
   
   private
   
-  
-
   def set_special(block, key, val)
-    @data[block][key] = val
+    if val.is_a?(String)
+      val = val.dup if val.frozen? # Copy to non-frozen string. 
+      val.force_encoding("UTF-8")
+    end
+    @data[block.to_s][key.to_s] = val
   end
 
   def get_special(block, key)
-    return @data[block][key]
+    return @data[block.to_s][key.to_s]
   end
 
 end

data/lib/eventbus/service.rb

@@ -1,4 +1,3 @@
-require 'bunny'
 require 'logger'
 require 'eventbus/queue'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventbus
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: '0.24'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &13397500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13397500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &13396960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13396960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stomp
-  requirement: &13396440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13396440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &13396000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,19 +69,24 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13396000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Distributed application framework for developing event-driven automations.
 email: dev.incognito@spadea.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/eventbus/message.rb
-- lib/eventbus/service.rb
 - lib/eventbus/queue.rb
-- lib/eventbus/connectors/stomp.rb
 - lib/eventbus/connectors/bunny.rb
+- lib/eventbus/connectors/stomp.rb
 - lib/eventbus/connectors/amqp.rb
+- lib/eventbus/message.rb
+- lib/eventbus/service.rb
 homepage: http://spadea.net/?page_id=8
 licenses: []
 post_install_message: 
@@ -87,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Libraries for creating EventBus services