neighborparrot 0.3.1 → 0.3.2

data/Gemfile

@@ -1,10 +1,9 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem 'eventmachine'
+gem 'em-http-request'
+gem 'em-eventsource'
+
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -1,10 +1,23 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
     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)
+      addressable (>= 2.2.3)
+      em-socksify
+      eventmachine (>= 1.0.0.beta.3)
+      http_parser.rb (>= 0.5.2)
+    em-socksify (0.1.0)
+      eventmachine
+    eventmachine (1.0.0.beta.4)
     faker (1.0.1)
       i18n (~> 0.4)
     git (1.2.5)
+    http_parser.rb (0.5.3)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -26,6 +39,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  em-eventsource
+  em-http-request
+  eventmachine
   faker
   jeweler (~> 1.6.4)
   rcov

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/neighborparrot/callbacks.rb

@@ -0,0 +1,20 @@
+# Callbacks used by the client
+module Neighborparrot
+  @@module_event_block = {}
+
+  EVENTS = %w(message error close connect success timeout)
+
+  # Callbacks helpers are auto generated
+  #===============================================
+
+  # Generate class helpers
+  EVENTS.each do |event|
+    clazz = class << self; self; end
+    clazz.send :define_method, "on_#{event}" do |&block|
+      @@module_event_block[event] = block
+    end
+    clazz.send :define_method, "trigger_#{event}" do |*args|
+      @@module_event_block[event].call *args
+    end
+  end
+end

data/lib/neighborparrot/config.rb

@@ -0,0 +1,57 @@
+# Configuration settings and methods
+module Neighborparrot
+
+  # Setup the configuration options
+  # * :api_id => Your api ID in neighborparrot.com
+  # * :api_key => Your api key
+  # * :server => Server to connect (Only for development)
+  # * :dummy_tests => See neighboparrot/helpers/url_helpers
+  def self.configure(params={})
+    @@config.merge! params
+  end
+
+  # Return settings
+  def self.configuration
+    @@config
+  end
+
+  private
+
+  DEFAULT_SERVER = 'https://neighborparrot.net'
+  ASSETS_SERVER = 'https://neighborparrot.com'
+  DEFAULT_SEND_TIMEOUT = 5
+
+  def self.default_values
+    {
+      :server => DEFAULT_SERVER ,
+      :assets_server => ASSETS_SERVER,
+      :send_timeout => DEFAULT_SEND_TIMEOUT
+    }
+  end
+
+
+  @@config = self.default_values
+
+  # Return true if neighborparrot is in dummy connection mode
+  def dummy_connections?
+    @@config[:dummy_tests] && in_rails? && Rails.env.test?
+  end
+
+
+  # Chen 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
+    end
+    true
+  end
+
+  # In rails?
+  def in_rails?
+    defined?(Rails) == 'constant'
+  end
+end

data/lib/neighborparrot/helpers/url_helpers.rb

@@ -0,0 +1,20 @@
+module ActionView
+  module Helpers
+    module AssetTagHelper
+
+      NEIGHBORPARROT_JS_API = '/js/parrot.js'
+      NEIGHBORPARROT_JS_DUMMY_API = '/js/dummy-parrot.js'
+
+      # URL helper for the parrot js client
+      # If :dummy_tests is true, use a dummy parrot
+      # avoiding connections with the server but
+      # triggering onconnect
+      def neighborparrot_include_tag
+        config = Neighborparrot.configuration
+        parrot_js = config[:dummy_connections] ? NEIGHBORPARROT_JS_DUMMY_API : NEIGHBORPARROT_JS_API
+        src = "#{config[:assets_server]}#{parrot_js}"
+        content_tag(:script, nil, { :type => 'text/javascript', :src => src })
+      end
+    end
+  end
+end

data/lib/neighborparrot/open.rb

@@ -0,0 +1,66 @@
+require 'em-eventsource'
+module Neighborparrot
+
+  # Open a persistent connection to the Neighbor in a new
+  # thread and return true if all works  unless :foreground
+  # options is true.
+  # Current options to the connectio are:
+  #
+  # @param [String] channel to connect
+  # @param [Hash] Params for the connection. this params can be:
+  # * :foreground [Boolean] run the connection in the foreground
+  #     stoping the clode flow until the connection is closed by server or
+  #     another thread call close
+  # * :api_id => Your api ID in neighborparrot.com
+  # * :api_key => Your api key
+  # * :server => Server to connect (Only for development)
+  def open_connection(params)
+    params = Neighborparrot.configuration.merge params
+    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 )
+    @source.inactivity_timeout = 120
+    @source.message do |message|
+     EM.next_tick { trigger_message message }
+    end
+    @source.error do |error|
+      EM.next_tick { trigger_error error }
+    end
+
+    @source.open do
+      EM.next_tick { trigger_connect }
+    end
+
+    @source.start
+  end
+
+  def connected?
+    @source && @source.ready_state == EM::EventSource::OPEN
+  end
+
+  def close
+    return unless connected?
+    @source.close
+  end
+
+  # Static helper. Create a EM Reactor and open the connexion on it
+  def self.open(params={})
+    EM.run do
+      parrot = Neighborparrot::Reactor.new
+      parrot.on_error do |error|
+        puts "Error: #{error}"
+        EM.stop
+      end
+      parrot.on_message do |message|
+        puts "Received: #{message}"
+      end
+      parrot.on_connect { puts "Connected" }
+
+      parrot.open params
+    end
+  end
+end

data/lib/neighborparrot/reactor.rb

@@ -0,0 +1,109 @@
+require 'eventmachine'
+require 'em-http'
+
+module Neighborparrot
+  @@class_reactor = nil
+  # Static a module reactor and keeping running and waiting
+  def self.reactor_start
+    if @@class_reactor.nil?
+      return @@class_reactor = Reactor.new
+    end
+    @@class_reactor.start
+  end
+
+  # Stop the module reactor
+  def self.reactor_stop
+    return unless @@class_reactor
+    @@class_reactor.stop
+  end
+
+  # @return true if module reactor running
+  def self.reactor_running?
+    @@class_reactor && @@class_reactor.running?
+  end
+
+
+  # Reactor class
+  #=====================================
+  class Reactor
+    include Neighborparrot
+
+  # Start the reactor in a new thead and prepare
+    def initialize
+      reactor_start
+      define_event_helpers
+    end
+
+    # generate events helpers for instances
+    # This define tho methods:
+    # on_event(&block):  Setup a block for the event
+    # trigger_event(*args): Trigger the event
+    def define_event_helpers
+      @event_block = {}
+      EVENTS.each do |event|
+        clazz = class << self; self; end
+        clazz.send :define_method, "on_#{event}" do |&block|
+          @event_block[event] = block
+        end
+        clazz.send :define_method, "trigger_#{event}" do |*args|
+          @event_block[event].call *args if @event_block[event]
+        end
+      end
+    end
+  end
+
+  # Start the reactor if not running
+  def start
+    reactor_start unless running?
+  end
+
+  # Stop the reactor
+  def stop
+    EM.schedule { EM.stop }
+  end
+  # @return true if reactor running
+  def running?
+    EM.reactor_running?
+  end
+
+  # 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)
+  # * :channel => The channel name
+  # * :data => Your payload
+  # @return [Boolean] true if sended
+  def send(params)
+    EM.schedule { @out_queue.push params }
+  end
+
+
+  # Open a Event Source connection with the broker
+  def open(params)
+    EM.schedule { open_connection params }
+  end
+
+  private
+  # Create a thread for the reactor and startit
+  def reactor_start
+    if EM.reactor_running?
+      return init_queue unless @out_queue
+    end
+    @em_thread = Thread.new {
+      EM.run { init_queue }
+    }
+  end
+
+  # Prepare the sent queue for send the message to the broker
+  # as soon as possible
+  def init_queue
+    @out_queue = EM::Queue.new
+    processor = proc { |msg|
+      send_to_broker msg
+      @out_queue.pop(&processor)
+    }
+    @out_queue.pop(&processor)
+  end
+end

data/lib/neighborparrot/send.rb

@@ -1,30 +1,47 @@
+require 'pp'
 module Neighborparrot
 
-  # Post a message to a channel
-  # Raise exception if channel is not setted
-  # 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)
-  # * :channel => The channel name
-  # * :data => Your payload
-  # @return [Boolean] true if sended
+  # Send the message to the broker.
+  # Create a new reactor and run the request inside
+  # Any output is printed in the standard output.
+  # 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={})
-    params = self.configuration.merge params
-    self.check_params params
-    return false if params[:data].nil? || params[:data].length == 0
-
-    uri = URI(params[:server])
-    Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-      request = Net::HTTP::Post.new('/send')
-      request.set_form_data(params)
-      response = http.request(request)
-      return true if response.body == "Ok"
+    if self.reactor_running?
+      return @@class_reactor.send params
+    end
+    EM.run do
+      parrot = Neighborparrot::Reactor.new
+      parrot.on_error do |error|
+        puts "Error: #{error}"
+        parrot.stop
+      end
+        parrot.on_success do |resp|
+        puts "=> #{resp}"
+        parrot.stop
+      end
+      parrot.send params
     end
   end
 
-  def post(channel, data, params={})
-    Neighborparrot.post(channel, data, params)
+  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
+    return if params[:dummy_connections]
+    url = "#{params[:server]}/send"
+    http = EventMachine::HttpRequest.new(url).post :body => params
+    http.errback{ |msg| trigger_error msg }
+    http.callback do
+      if http.response_header.status == 200
+        trigger_success http.response, params
+      else
+        trigger_error http.response
+      end
+    end
   end
+
 end

data/lib/neighborparrot.rb

@@ -1,38 +1,8 @@
-require 'net/http'
-require 'net/https'
 require 'uri'
 
-module Neighborparrot
-
-  # Setup the configuration options
-  # * :api_id => Your api ID in neighborparrot.com
-  # * :api_key => Your api key
-  # * :server => Server to connect (Only for development)
-  def self.configure(params={})
-    @@config.merge! params
-  end
-
-  # Return settings
-  def self.configuration
-    @@config
-  end
-
-  private
-
-  DEFAULT_SERVER = 'https://neighborparrot.net'
-  @@config = { :server => DEFAULT_SERVER }
-
-  # Chen mandatory parameters
-  # @param [Hash] parameters
-  # @param [Symbol] action [:send/:open]
-  def self.check_params(p, action=:send)
-    raise "Channel can't be nil" if p[:channel].nil? || p[:channel].length == 0
-    raise "ERROR# Neighborparrot: api_id can't be nil" if p[:api_id].nil? || p[:api_id].length == 0
-    if action == :send
-      raise "ERROR# Neighborparrot: api_key can't be nil" if p[:api_key].nil? || p[:api_key].length == 0
-    end
-  end
-end
-
+require 'neighborparrot/config'
+require 'neighborparrot/callbacks'
+require 'neighborparrot/reactor'
 require 'neighborparrot/send'
-require 'neighborparrot/esparrot'
+require 'neighborparrot/open'
+require 'neighborparrot/helpers/url_helpers'

data/neighborparrot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "neighborparrot"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Gomez"]
-  s.date = "2012-01-07"
+  s.date = "2012-01-11"
   s.description = "Send messages to the neighborparrot event source service"
   s.email = "eloy@indeos.es"
   s.extra_rdoc_files = [
@@ -26,13 +26,18 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/neighborparrot.rb",
-    "lib/neighborparrot/esparrot.rb",
+    "lib/neighborparrot/callbacks.rb",
+    "lib/neighborparrot/config.rb",
+    "lib/neighborparrot/helpers/url_helpers.rb",
+    "lib/neighborparrot/open.rb",
+    "lib/neighborparrot/reactor.rb",
     "lib/neighborparrot/send.rb",
     "neighborparrot.gemspec",
-    "spec/esparrot_spec.rb",
-    "spec/neighborparrot_spec.rb",
+    "spec/integration/neighborparrot_spec.rb",
+    "spec/reactor_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/helpers.rb"
+    "spec/support/helpers.rb",
+    "spec/unit/callbacks_spec.rb"
   ]
   s.homepage = "http://neighborparrot.com"
   s.licenses = ["MIT"]
@@ -44,17 +49,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      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_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 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<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 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<jeweler>, ["~> 1.6.4"])

data/spec/{esparrot_spec.rb → integration/neighborparrot_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Neighborparrot::ESParrot" do
   before :all do
@@ -9,12 +9,13 @@ describe "Neighborparrot::ESParrot" do
   end
 
   before :each do
-    @parrot = ESParrot.new
+    @parrot = Neighborparrot::Reactor.new
+    @parrot.on_error { |e| raise e }
   end
 
   describe "Neighborparrot::ESParrot#open" do
     after :each do
-      @parrot.close
+      @parrot.stop
     end
 
     it "should open a connection with correct values" do
@@ -23,7 +24,7 @@ describe "Neighborparrot::ESParrot" do
         connected = true
       end
       @parrot.open(:channel => @channel)
-      sleep(2)
+      sleep 1
       connected.should be_true
     end
 
@@ -33,16 +34,15 @@ describe "Neighborparrot::ESParrot" do
         received = msg
       end
       @parrot.open(:channel => @channel)
-      sleep(2)
+
       text = Faker::Lorem.paragraph(30)
-      Neighborparrot.send(:channel => 'test', :data => text)
-      sleep(1)
+      @parrot.send(:channel => 'test', :data => text)
+      sleep 1
       received.should eq text
     end
 
     it "should return false if already a connection active" do
       @parrot.open(:channel => @channel)
-      sleep(2)
       @parrot.open(:channel => 'other test').should be_false
     end
   end
@@ -50,8 +50,7 @@ describe "Neighborparrot::ESParrot" do
   describe "Neighborparrot::ESParrot#close" do
     it "should close a connection" do
       @parrot.open(:channel => @channel)
-      sleep(2)
-      @parrot.close()
+      @parrot.stop
       @parrot.connected?.should be_false
     end
   end
@@ -64,7 +63,7 @@ describe "Neighborparrot::ESParrot" do
 
     it "should be true when connected" do
       @parrot.open(:channel => @channel)
-      sleep(2)
+      sleep 2
       @parrot.connected?.should be_true
       @parrot.close
     end

data/spec/reactor_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Neighborparrot::Reactor do
+
+  describe 'class reactor' do
+    after :each do
+      Neighborparrot.reactor_stop
+    end
+    describe 'Neighborparrot#reactor_start' do
+      it 'should not have a static reactor by default' do
+        Neighborparrot.reactor_running?.should be_false
+      end
+      it 'should create a static reator' do
+        Neighborparrot.reactor_start
+        sleep 1
+        Neighborparrot.reactor_running?.should be_true
+      end
+    end
+    describe 'Neighborparrot#reactor_stop' do
+      it 'should stop the static reator' do
+        Neighborparrot.reactor_start
+        Neighborparrot.reactor_stop
+        sleep 1
+        Neighborparrot.reactor_running?.should be_false
+      end
+    end
+  end
+  describe 'Reactor#define_event_helpers' do
+    before :each do
+      @parrot = Neighborparrot::Reactor.new
+    end
+    Neighborparrot::EVENTS.each do |event|
+      it "Shold respond to on_#{event}" do
+        @parrot.respond_to?("on_#{event}").should be_true
+      end
+
+      it "Shold respond to trigger_#{event}" do
+        @parrot.respond_to?("trigger_#{event}").should be_true
+      end
+
+      it 'should trigger defined blocks to events' do
+        received = nil
+        message = 'test string'
+        @parrot.on_message { |m| received = m }
+        @parrot.trigger_message message
+        received.should eq message
+      end
+    end
+  end
+
+  describe 'Reactor#initialize' do
+    it 'should create a new reactor unless skeep start'
+    it 'should not start the reactor if  skeep start'
+  end
+
+  describe 'Reactor#start' do
+    it 'should start the reactor'
+  end
+
+  describe 'Reactor#stop' do
+    it 'should stop the reactor'
+  end
+
+  describe 'Reactor#send' do
+    it 'should send a message to the broker'
+  end
+
+end

data/spec/spec_helper.rb

@@ -10,7 +10,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|
 

data/spec/unit/callbacks_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe 'Callbacks' do
+
+  describe 'class helpers' do
+    Neighborparrot::EVENTS.each do |event|
+      it "Shold respond to on_#{event}" do
+        Neighborparrot.respond_to?("on_#{event}").should be_true
+      end
+
+      it "Shold respond to trigger_#{event}" do
+        Neighborparrot.respond_to?("trigger_#{event}").should be_true
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neighborparrot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &27578960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *27578960
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &27577740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *27577740
+- !ruby/object:Gem::Dependency
+  name: em-eventsource
+  requirement: &27576580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *27576580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13007020 !ruby/object:Gem::Requirement
+  requirement: &27575720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *13007020
+  version_requirements: *27575720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13006480 !ruby/object:Gem::Requirement
+  requirement: &27574720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13006480
+  version_requirements: *27574720
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13005740 !ruby/object:Gem::Requirement
+  requirement: &27573720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *13005740
+  version_requirements: *27573720
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &13004940 !ruby/object:Gem::Requirement
+  requirement: &27572860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13004940
+  version_requirements: *27572860
 description: Send messages to the neighborparrot event source service
 email: eloy@indeos.es
 executables: []
@@ -72,13 +105,18 @@ files:
 - Rakefile
 - VERSION
 - lib/neighborparrot.rb
-- lib/neighborparrot/esparrot.rb
+- lib/neighborparrot/callbacks.rb
+- lib/neighborparrot/config.rb
+- lib/neighborparrot/helpers/url_helpers.rb
+- lib/neighborparrot/open.rb
+- lib/neighborparrot/reactor.rb
 - lib/neighborparrot/send.rb
 - neighborparrot.gemspec
-- spec/esparrot_spec.rb
-- spec/neighborparrot_spec.rb
+- spec/integration/neighborparrot_spec.rb
+- spec/reactor_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
+- spec/unit/callbacks_spec.rb
 homepage: http://neighborparrot.com
 licenses:
 - MIT
@@ -94,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1488788034171426421
+      hash: 4307022084171942048
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/neighborparrot/esparrot.rb

@@ -1,92 +0,0 @@
-class ESParrot
-  include Neighborparrot
-
-  # Open a persistent connection to the Neighbor in a new
-  # thread and return true if all works  unless :foreground
-  # options is true.
-  # Current options to the connectio are:
-  #
-  # @param [String] channel to connect
-  # @param [Hash] Params for the connection. this params can be:
-  # * :foreground [Boolean] run the connection in the foreground
-  #     stoping the clode flow until the connection is closed by server or
-  #     another thread call close
-  # * :api_id => Your api ID in neighborparrot.com
-  # * :api_key => Your api key
-  # * :server => Server to connect (Only for development)
-  def open(params={})
-    params = Neighborparrot.configuration.merge(params)
-    Neighborparrot.check_params params, :open
-    return false if connected?
-    if ! params[:foreground] == true
-      close if @current_thread # If previus thread but closed connection, kill it
-      @current_thread = Thread.new(params) do | params|
-        open_connection params
-      end
-      return true
-    else
-      open_connection params
-    end
-  end
-
-  # @return true if a connection exists and is started
-  def connected?
-    @connection && @connection.started?
-  end
-
-  # close the active connection
-  def close
-    return unless connected?
-    @connection.finish()
-    @current_thread.kill
-    @current_thread = nil
-  end
-
-  # Define a block called on message received
-  # The received message is passed to the block as a var
-  def on_message(&block)
-    @on_message_blk = block
-  end
-
-  # Define a block called on error
-  # An optional param with the error should be pass if present
-  def on_error(&block)
-    @on_error_blk = block
-  end
-
-  # Define a block called on connection closed
-  def on_close(&block)
-    @on_close_blk = block
-  end
-
-  # Define a block called on connect
-  def on_connect(&block)
-    @on_connect_blk = block
-  end
-
-  private
-
-  # Open a persistent connection to the neighbor
-  # TODO: Refactor, EM??
-  def open_connection(params)
-    begin
-      uri = URI(params[:server])
-      Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-        http.read_timeout = 9999999999999999 # TODO Fix this
-        request = Net::HTTP::Get.new URI.escape("/open?channel=#{params[:channel]}")
-        @connection = http
-        @on_connect_blk.call if @on_connect_blk
-        http.request request do |response|
-          response.read_body do |chunk|
-            if chunk.start_with? "data:"
-              @on_message_blk.call(chunk[5..-3]) if @on_message_blk # Remove data: and \n\n
-            end
-          end
-        end
-      end
-    rescue
-      @on_error_blk.call($!) if @on_error_blk
-    end
-    @on_close_blk.call if @on_close_blk
-  end
-end

data/spec/neighborparrot_spec.rb

@@ -1,41 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Neighborparrot" do
-  before :each do
-    api_id = 'test-id'
-    api_key = 'api_key'
-    Neighborparrot.configure({ :api_id => api_id, :api_key => :api_key })
-  end
-
-  describe "Neigborparrot#post" do
-    it 'should return true if no errors' do
-      send_test.should be_true
-    end
-
-    it "should rails exception without id" do
-      Neighborparrot.configure({ :api_key => nil })
-      expect { send_test }.to raise_error
-    end
-
-    it "should rails exception  without key" do
-    Neighborparrot.configure({:api_id => nil})
-      expect { send_test }.to raise_error
-    end
-
-    it "should raise exception with nill channel" do
-      expect { Neighborparrot.send(:channel => nil, :data => 'test string') }.to raise_error
-    end
-
-    it "should raise exception with empty channel" do
-      expect { Neighborparrot.send(:channel => '', :data => 'test string') }.to raise_error
-    end
-
-    it "should not send message with nil data" do
-      Neighborparrot.send(:channel => 'test-channel', :data => nil).should be_false
-    end
-
-    it "should not send message with empty data" do
-      Neighborparrot.send(:channel => 'test-channel', :data => '').should be_false
-    end
-  end
-end