neighborparrot 0.3.4 → 0.3.5

data/README.rdoc

@@ -1,6 +1,6 @@
-= neighborparrot
-
-Description goes here.
+= Neighborparrot ruby client
+Ruby client for the NeighborParrot hosted broker service. You must create a free account in http://nbparrot.com before in order to get an api_id and api_key. This client allow you to send messages to WebSocket and EventSource channels and open EventSource connections.
+Can be used in sync and async way.
 
 == Contributing to neighborparrot
  

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/examples/simple_es_listen.rb

@@ -0,0 +1,24 @@
+require 'neighborparrot'
+
+api_id = 'your_api_id'
+api_key = 'your_api_key'
+
+Neighborparrot.configure(:api_id => api_id, :api_key => api_key)
+
+# Callback for message received
+Neighborparrot.on_message do |msg|
+  puts "Message received: #{msg}"
+end
+
+# Error callback
+Neighborparrot.on_error do |error|
+  puts "Error!: #{error}"
+end
+
+# Callback for connection open
+Neighborparrot.on_connect do
+  puts "Connection open"
+end
+
+# Open the Neighborparrot Connection
+Neighborparrot.open(:channel => 'test', :service => 'es')

data/examples/simple_send.rb

@@ -0,0 +1,16 @@
+require 'neighborparrot'
+
+api_id = 'your_api_id'
+api_key = 'your_api_key'
+
+# Setup api_id and api_key
+Neighborparrot.configure(:api_id => api_id, :api_key => api_key)
+
+# We can configure an error callback
+Neighborparrot.on_error do |error|
+  puts "Error: #{error}"
+end
+
+# Send the message
+message_id = Neighborparrot.send(:channel => 'test', :data => 'hello world')
+puts "Sent with message_id: #{message_id}"

data/lib/neighborparrot/callbacks.rb

@@ -14,7 +14,8 @@ module Neighborparrot
       @@module_event_block[event] = block
     end
     clazz.send :define_method, "trigger_#{event}" do |*args|
-      @@module_event_block[event].call *args
+      block = @@module_event_block[event]
+      block.call *args if block
     end
   end
 end

data/lib/neighborparrot/open.rb

@@ -14,13 +14,12 @@ module Neighborparrot
   # * :api_id => Your api ID in neighborparrot.com
   # * :api_key => Your api key
   # * :server => Server to connect (Only for development)
-  def open_connection(params)
+  def open_connection(request, params={})
     params = Neighborparrot.configuration.merge params
-    return unless check_params params, :post
+    return unless check_params request.merge(params), :post
     return if dummy_connections?
     uri = URI.parse(params[:server])
     url = "#{params[:server]}/open"
-    request = {:channel => params[:channel], :socket_id => params[:socket_id]}
     signed_request = Neighborparrot.sign_connect_request(request, params)
     @source = EM::EventSource.new(url, signed_request)
     @source.inactivity_timeout = 120
@@ -49,19 +48,23 @@ module Neighborparrot
   end
 
   # Static helper. Create a EM Reactor and open the connexion on it
-  def self.open(params={})
+  def self.open(request, params={}, &block)
+    EM.error_handler { |error| Neighborparrot.trigger_error error }
+
     EM.run do
+
       parrot = Neighborparrot::Reactor.new
+
       parrot.on_error do |error|
-        puts "Error: #{error}"
+        Neighborparrot.trigger_error error
         EM.stop
       end
       parrot.on_message do |message|
-        puts "Received: #{message}"
+        Neighborparrot.trigger_message message
       end
-      parrot.on_connect { puts "Connected" }
+      parrot.on_connect { Neighborparrot.trigger_connect }
 
-      parrot.open params
+      parrot.open request, params
     end
   end
 end

data/lib/neighborparrot/reactor.rb

@@ -79,8 +79,8 @@ module Neighborparrot
 
 
   # Open a Event Source connection with the broker
-  def open(params)
-    EM.schedule { open_connection params }
+  def open(request, params={})
+    EM.schedule { open_connection request, params }
   end
 
   private
@@ -91,9 +91,7 @@ module Neighborparrot
     end
     @em_thread = Thread.new {
       EM.run  do
-        EM.error_handler{ |e|
-          puts "Error raised during event loop: #{e.message} , #{e}"
-        }
+        EM.error_handler{ |e| trigger_error e }
         init_queue
       end
     }

data/lib/neighborparrot/send.rb

@@ -20,11 +20,12 @@ module Neighborparrot
         parrot.stop
       end
         parrot.on_success do |resp|
+        Neighborparrot.trigger_success resp
         response = resp
         parrot.stop
       end
       # Skip reactor queues
-      parrot.send_to_broker request, params
+      parrot.send_to_broker(:request => request, :params => params)
     end
     fail error if error
     return response

data/neighborparrot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "neighborparrot"
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Gomez"]
-  s.date = "2012-02-01"
+  s.date = "2012-02-04"
   s.description = "Send messages to the neighborparrot event source service"
   s.email = "eloy@indeos.es"
   s.extra_rdoc_files = [
@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "examples/simple_es_listen.rb",
+    "examples/simple_send.rb",
     "lib/neighborparrot.rb",
     "lib/neighborparrot/auth.rb",
     "lib/neighborparrot/callbacks.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neighborparrot
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &80693500 !ruby/object:Gem::Requirement
+  requirement: &21715480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80693500
+  version_requirements: *21715480
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &80689840 !ruby/object:Gem::Requirement
+  requirement: &21714560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80689840
+  version_requirements: *21714560
 - !ruby/object:Gem::Dependency
   name: em-eventsource
-  requirement: &80712050 !ruby/object:Gem::Requirement
+  requirement: &20876540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80712050
+  version_requirements: *20876540
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &80708470 !ruby/object:Gem::Requirement
+  requirement: &20872080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80708470
+  version_requirements: *20872080
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &80810390 !ruby/object:Gem::Requirement
+  requirement: &20870080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80810390
+  version_requirements: *20870080
 - !ruby/object:Gem::Dependency
   name: signature
-  requirement: &80807390 !ruby/object:Gem::Requirement
+  requirement: &21422800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80807390
+  version_requirements: *21422800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80941980 !ruby/object:Gem::Requirement
+  requirement: &21421720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80941980
+  version_requirements: *21421720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &80940920 !ruby/object:Gem::Requirement
+  requirement: &21420440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80940920
+  version_requirements: *21420440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &80940000 !ruby/object:Gem::Requirement
+  requirement: &21417820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *80940000
+  version_requirements: *21417820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &80938470 !ruby/object:Gem::Requirement
+  requirement: &20821840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80938470
+  version_requirements: *20821840
 description: Send messages to the neighborparrot event source service
 email: eloy@indeos.es
 executables: []
@@ -137,6 +137,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- examples/simple_es_listen.rb
+- examples/simple_send.rb
 - lib/neighborparrot.rb
 - lib/neighborparrot/auth.rb
 - lib/neighborparrot/callbacks.rb
@@ -166,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -150390895
+      hash: -3903328379806659970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: