neighborparrot 0.3.3 → 0.3.4

data/Gemfile

@@ -3,12 +3,15 @@ source "http://rubygems.org"
 gem 'eventmachine'
 gem 'em-http-request'
 gem 'em-eventsource'
+gem 'bson_ext'
+gem 'ruby-hmac'
+gem 'signature'
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "rspec"
+  gem "bundler"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "simplecov"
 end
 
 

data/Gemfile.lock

@@ -2,15 +2,20 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
+    bson (1.5.2)
+    bson_ext (1.5.2)
+      bson (= 1.5.2)
+    cookiejar (0.3.0)
     diff-lcs (1.1.3)
     em-eventsource (0.1.5)
       em-http-request (~> 1.0.0)
       eventmachine (~> 1.0.0.beta3)
-    em-http-request (1.0.0)
+    em-http-request (1.0.1)
       addressable (>= 2.2.3)
+      cookiejar
       em-socksify
-      eventmachine (>= 1.0.0.beta.3)
-      http_parser.rb (>= 0.5.2)
+      eventmachine (>= 1.0.0.beta.4)
+      http_parser.rb (>= 0.5.3)
     em-socksify (0.1.0)
       eventmachine
     eventmachine (1.0.0.beta.4)
@@ -23,26 +28,36 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    multi_json (1.0.4)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.8.0)
+    ruby-hmac (0.4.0)
+    signature (0.1.2)
+      ruby-hmac
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bson_ext
+  bundler
   em-eventsource
   em-http-request
   eventmachine
   faker
   jeweler (~> 1.6.4)
-  rcov
-  rspec (~> 2.3.0)
+  rspec
+  ruby-hmac
+  signature
+  simplecov

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/neighborparrot.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'neighborparrot/config'
 require 'neighborparrot/callbacks'
 require 'neighborparrot/reactor'
+require 'neighborparrot/auth'
 require 'neighborparrot/send'
 require 'neighborparrot/open'
 require 'neighborparrot/helpers/url_helpers'

data/lib/neighborparrot/auth.rb

@@ -0,0 +1,21 @@
+require 'hmac-sha2'
+require 'signature'
+
+module Neighborparrot
+  def self.sign_connect_request(query, params={})
+    endpoint = query[:service] == 'es' ? '/open' : '/ws'
+    sign_request('GET', endpoint, query, params)
+  end
+
+  def self.sign_send_request(body, params={})
+    sign_request('POST', '/send',body, params)
+  end
+
+  def self.sign_request(method, path, request, params={})
+    params = Neighborparrot.configuration.merge params
+    token = Signature::Token.new(params[:api_id], params[:api_key])
+    sign_request = Signature::Request.new(method, path, request)
+    auth_hash = sign_request.sign(token)
+    request.merge(auth_hash)
+  end
+end

data/lib/neighborparrot/config.rb

@@ -38,14 +38,15 @@ module Neighborparrot
   end
 
 
-  # Chen mandatory parameters
+  # Check mandatory parameters
   # @param [Hash] parameters
   # @param [Symbol] action [:send/:open]
   def check_params(p, action=:send)
-    trigger_on_error "Channel can't be nil" if p[:channel].nil? || p[:channel].length == 0
-    trigger_on_error "ERROR# Neighborparrot: api_id can't be nil" if p[:api_id].nil? || p[:api_id].length == 0
-    if action == :send
-      trigger_on_error "ERROR# Neighborparrot: api_key can't be nil" if p[:api_key].nil? || p[:api_key].length == 0
+    trigger_error "Channel can't be nil" if p[:channel].nil? || p[:channel].length == 0
+    trigger_error "ERROR# Neighborparrot: api_id can't be nil" if p[:api_id].nil? || p[:api_id].length == 0
+    trigger_error "ERROR# Neighborparrot: api_key can't be nil" if p[:api_key].nil? || p[:api_key].length == 0
+    if action == :open
+      trigger_error "ERROR# Neighborparrot: socket_id can't be nil" if p[:socket_id].nil? || p[:socket_id].length == 0
     end
     true
   end

data/lib/neighborparrot/open.rb

@@ -19,15 +19,16 @@ module Neighborparrot
     return unless check_params params, :post
     return if dummy_connections?
     uri = URI.parse(params[:server])
-    channel = params[:channel]
     url = "#{params[:server]}/open"
-
-    @source = EM::EventSource.new(url, :channel => channel )
+    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
     @source.message do |message|
      EM.next_tick { trigger_message message }
     end
     @source.error do |error|
+      puts "Error #{error}"
       EM.next_tick { trigger_error error }
     end
 

data/lib/neighborparrot/reactor.rb

@@ -68,15 +68,13 @@ module Neighborparrot
 
   # Send a message to a channel
   # If empty data, refuse to send nothing
-  # @param [Hash] params
-  # * :api_id => Your api ID in neighborparrot.com
-  # * :api_key => Your api key
-  # * :server => Server to connect (Only for development)
+  # @request [Hash] params
   # * :channel => The channel name
   # * :data => Your payload
+  # @params optional parameters
   # @return [Boolean] true if sended
-  def send(params)
-    EM.schedule { @out_queue.push params }
+  def send(request, params={})
+    EM.schedule { @out_queue.push({ :request => request, :params => params }) }
   end
 
 
@@ -92,7 +90,12 @@ module Neighborparrot
       return init_queue unless @out_queue
     end
     @em_thread = Thread.new {
-      EM.run { init_queue }
+      EM.run  do
+        EM.error_handler{ |e|
+          puts "Error raised during event loop: #{e.message} , #{e}"
+        }
+        init_queue
+      end
     }
   end
 

data/lib/neighborparrot/send.rb

@@ -7,9 +7,9 @@ module Neighborparrot
   # If you start a module reactor in some point in your program
   # the request is scheduled in this reactor and return
   # the control to your program. Module callbacks are used in this case.
-  def self.send(params={})
+  def self.send(request, params={})
     if self.reactor_running?
-      return @@class_reactor.send params
+      return @@class_reactor.send request, params
     end
     response = nil
     error = false
@@ -23,21 +23,27 @@ module Neighborparrot
         response = resp
         parrot.stop
       end
-      parrot.send params
+      # Skip reactor queues
+      parrot.send_to_broker request, params
     end
     fail error if error
     return response
   end
 
-  private
   # Send the message to the broker
-  def send_to_broker(params={})
-    params = Neighborparrot.configuration.merge params
-    return unless check_params params
-    return if params[:data].nil? || params[:data].length == 0
+  # This is the final step of a send request in the reactor process
+  def send_to_broker(options)
+    params = Neighborparrot.configuration.merge options[:params]
+    request = options[:request]
+    # TODO: Refactor
+    # return unless check_params request
+    return if request[:data].nil? || request[:data].length == 0
     return if params[:dummy_connections]
+
+    signed_request = Neighborparrot.sign_send_request request, params
+
     url = "#{params[:server]}/send"
-    http = EventMachine::HttpRequest.new(url).post :body => params
+    http = EventMachine::HttpRequest.new(url).post :body => signed_request
     http.errback{ |msg| trigger_error msg }
     http.callback do
       if http.response_header.status == 200

data/neighborparrot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "neighborparrot"
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Gomez"]
-  s.date = "2012-01-11"
+  s.date = "2012-02-01"
   s.description = "Send messages to the neighborparrot event source service"
   s.email = "eloy@indeos.es"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/neighborparrot.rb",
+    "lib/neighborparrot/auth.rb",
     "lib/neighborparrot/callbacks.rb",
     "lib/neighborparrot/config.rb",
     "lib/neighborparrot/helpers/url_helpers.rb",
@@ -42,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://neighborparrot.com"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Ruby client for the Neighborparrot"
 
   if s.respond_to? :specification_version then
@@ -52,27 +53,36 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
       s.add_runtime_dependency(%q<em-eventsource>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
+      s.add_runtime_dependency(%q<signature>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<em-http-request>, [">= 0"])
       s.add_dependency(%q<em-eventsource>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<ruby-hmac>, [">= 0"])
+      s.add_dependency(%q<signature>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<em-http-request>, [">= 0"])
     s.add_dependency(%q<em-eventsource>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<ruby-hmac>, [">= 0"])
+    s.add_dependency(%q<signature>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/spec/integration/neighborparrot_spec.rb

@@ -2,10 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Neighborparrot::ESParrot" do
   before :all do
-    api_id = 'test-id'
-    api_key = 'api_key'
-    Neighborparrot.configure({ :api_id => api_id, :api_key => :api_key })
-    @channel = 'test'
+    api_id = '7b6632eb-1345-4431-81d6-27744845a7c2'
+    api_key = '39aa7d81-8f6a-4885-a254-335dcf7dc8f7'
+    @socket_id = '1234'
+    Neighborparrot.configure(:api_id => api_id, :api_key => api_key)
+    @channel = 'spec-test'
   end
 
   before :each do
@@ -23,7 +24,7 @@ describe "Neighborparrot::ESParrot" do
       @parrot.on_connect do
         connected = true
       end
-      @parrot.open(:channel => @channel)
+      @parrot.open(:channel => @channel, :socket_id => @socket_id)
       sleep 1
       connected.should be_true
     end
@@ -33,23 +34,23 @@ describe "Neighborparrot::ESParrot" do
       @parrot.on_message do |msg|
         received = msg
       end
-      @parrot.open(:channel => @channel)
+      @parrot.open(:channel => @channel, :socket_id => @socket_id)
 
       text = Faker::Lorem.paragraph(30)
-      @parrot.send(:channel => 'test', :data => text)
+      @parrot.send(:channel => @channel, :data => text)
       sleep 1
       received.should eq text
     end
 
     it "should return false if already a connection active" do
-      @parrot.open(:channel => @channel)
+      @parrot.open(:channel => @channel, :socket_id => @socket_id)
       @parrot.open(:channel => 'other test').should be_false
     end
   end
 
   describe "Neighborparrot::ESParrot#close" do
     it "should close a connection" do
-      @parrot.open(:channel => @channel)
+      @parrot.open(:channel => @channel, :socket_id => @socket_id)
       @parrot.stop
       @parrot.connected?.should be_false
     end
@@ -62,7 +63,7 @@ describe "Neighborparrot::ESParrot" do
     end
 
     it "should be true when connected" do
-      @parrot.open(:channel => @channel)
+      @parrot.open(:channel => @channel, :socket_id => @socket_id)
       sleep 2
       @parrot.connected?.should be_true
       @parrot.close

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'faker'
+require 'hmac-sha2'
+require 'signature'
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/neighborparrot')
 
@@ -10,7 +12,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/neighborparrot')
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 # Setup server on localhost
-# Neighborparrot.configure :server => 'http://127.0.0.1:9000'
+Neighborparrot.configure :server => 'http://127.0.0.1:9000'
 
 RSpec.configure do |config|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neighborparrot
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &28945400 !ruby/object:Gem::Requirement
+  requirement: &80693500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28945400
+  version_requirements: *80693500
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &28944760 !ruby/object:Gem::Requirement
+  requirement: &80689840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28944760
+  version_requirements: *80689840
 - !ruby/object:Gem::Dependency
   name: em-eventsource
-  requirement: &28943860 !ruby/object:Gem::Requirement
+  requirement: &80712050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,32 +43,65 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28943860
+  version_requirements: *80712050
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &80708470 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *80708470
+- !ruby/object:Gem::Dependency
+  name: ruby-hmac
+  requirement: &80810390 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *80810390
+- !ruby/object:Gem::Dependency
+  name: signature
+  requirement: &80807390 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *80807390
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28942880 !ruby/object:Gem::Requirement
+  requirement: &80941980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28942880
+  version_requirements: *80941980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &28942180 !ruby/object:Gem::Requirement
+  requirement: &80940920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28942180
+  version_requirements: *80940920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &28940820 !ruby/object:Gem::Requirement
+  requirement: &80940000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +109,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *28940820
+  version_requirements: *80940000
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &28940060 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &80938470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28940060
+  version_requirements: *80938470
 description: Send messages to the neighborparrot event source service
 email: eloy@indeos.es
 executables: []
@@ -105,6 +138,7 @@ files:
 - Rakefile
 - VERSION
 - lib/neighborparrot.rb
+- lib/neighborparrot/auth.rb
 - lib/neighborparrot/callbacks.rb
 - lib/neighborparrot/config.rb
 - lib/neighborparrot/helpers/url_helpers.rb
@@ -132,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 96556740036397666
+      hash: -150390895
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby client for the Neighborparrot