neighborparrot 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/neighborparrot.rb

@@ -22,11 +22,17 @@ module Neighborparrot
   DEFAULT_SERVER = 'https://neighborparrot.net'
   @@config = { :server => DEFAULT_SERVER }
 
-  def self.check_params(p)
+  # 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
-    raise "ERROR# Neighborparrot: api_key can't be nil" if p[:api_key].nil? || p[:api_key].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/post'
+require 'neighborparrot/send'
 require 'neighborparrot/esparrot'

data/lib/neighborparrot/esparrot.rb

@@ -1,7 +1,6 @@
-require 'pp'
 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.
@@ -15,25 +14,26 @@ class ESParrot
   # * :api_id => Your api ID in neighborparrot.com
   # * :api_key => Your api key
   # * :server => Server to connect (Only for development)
-  def open(channel, params={})
+  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(channel, params) do | channel, params|
-        open_connection channel, params
+      @current_thread = Thread.new(params) do | params|
+        open_connection params
       end
       return true
     else
-      open_connection channel, params
+      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?
@@ -41,39 +41,39 @@ class ESParrot
     @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(channel, params={})
+  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=#{channel}")
+        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|
@@ -84,9 +84,9 @@ class ESParrot
           end
         end
       end
-    rescue      
-      @on_error_blk.call($!) if @on_error_blk      
-    end      
+    rescue
+      @on_error_blk.call($!) if @on_error_blk
+    end
     @on_close_blk.call if @on_close_blk
   end
 end

data/lib/neighborparrot/{post.rb → send.rb}

@@ -3,23 +3,22 @@ module Neighborparrot
   # Post a message to a channel
   # Raise exception if channel is not setted
   # If empty data, refuse to send nothing
-  # @param [String] channel: The channel name
-  # @param [String] string to send
   # @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 self.post(channel, data, params={})
-    raise "Channel can't be nil" if channel.nil? || channel.length == 0
-    return false if data.nil? || data.length == 0
+  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('/post')
-      request.set_form_data(params.merge({ :channel => channel, :data => data }))
+      request = Net::HTTP::Post.new('/send')
+      request.set_form_data(params)
       response = http.request(request)
       return true if response.body == "Ok"
     end

data/neighborparrot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "neighborparrot"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Gomez"]
-  s.date = "2012-01-06"
+  s.date = "2012-01-07"
   s.description = "Send messages to the neighborparrot event source service"
   s.email = "eloy@indeos.es"
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/neighborparrot.rb",
     "lib/neighborparrot/esparrot.rb",
-    "lib/neighborparrot/post.rb",
+    "lib/neighborparrot/send.rb",
     "neighborparrot.gemspec",
     "spec/esparrot_spec.rb",
     "spec/neighborparrot_spec.rb",

data/spec/esparrot_spec.rb

@@ -5,6 +5,7 @@ describe "Neighborparrot::ESParrot" do
     api_id = 'test-id'
     api_key = 'api_key'
     Neighborparrot.configure({ :api_id => api_id, :api_key => :api_key })
+    @channel = 'test'
   end
 
   before :each do
@@ -21,7 +22,7 @@ describe "Neighborparrot::ESParrot" do
       @parrot.on_connect do
         connected = true
       end
-      @parrot.open('test')
+      @parrot.open(:channel => @channel)
       sleep(2)
       connected.should be_true
     end
@@ -31,24 +32,24 @@ describe "Neighborparrot::ESParrot" do
       @parrot.on_message do |msg|
         received = msg
       end
-      @parrot.open('test')
+      @parrot.open(:channel => @channel)
       sleep(2)
       text = Faker::Lorem.paragraph(30)
-      @parrot.post('test', text)
+      Neighborparrot.send(:channel => 'test', :data => text)
       sleep(1)
       received.should eq text
     end
 
     it "should return false if already a connection active" do
-      @parrot.open('test')
+      @parrot.open(:channel => @channel)
       sleep(2)
-      @parrot.open('other test').should be_false
+      @parrot.open(:channel => 'other test').should be_false
     end
   end
 
   describe "Neighborparrot::ESParrot#close" do
     it "should close a connection" do
-      @parrot.open('test')
+      @parrot.open(:channel => @channel)
       sleep(2)
       @parrot.close()
       @parrot.connected?.should be_false
@@ -62,7 +63,7 @@ describe "Neighborparrot::ESParrot" do
     end
 
     it "should be true when connected" do
-      @parrot.open('test')
+      @parrot.open(:channel => @channel)
       sleep(2)
       @parrot.connected?.should be_true
       @parrot.close

data/spec/neighborparrot_spec.rb

@@ -9,33 +9,33 @@ describe "Neighborparrot" do
 
   describe "Neigborparrot#post" do
     it 'should return true if no errors' do
-      test_post.should be_true
+      send_test.should be_true
     end
 
     it "should rails exception without id" do
       Neighborparrot.configure({ :api_key => nil })
-      expect { test_post }.to raise_error
+      expect { send_test }.to raise_error
     end
 
     it "should rails exception  without key" do
     Neighborparrot.configure({:api_id => nil})
-      expect { test_post }.to raise_error
+      expect { send_test }.to raise_error
     end
 
     it "should raise exception with nill channel" do
-      expect { Neighborparrot.post(nil, 'test string') }.to raise_error
+      expect { Neighborparrot.send(:channel => nil, :data => 'test string') }.to raise_error
     end
 
     it "should raise exception with empty channel" do
-      expect { Neighborparrot.post('', 'test string') }.to raise_error
+      expect { Neighborparrot.send(:channel => '', :data => 'test string') }.to raise_error
     end
 
     it "should not send message with nil data" do
-      Neighborparrot.post('test-channel', nil).should be_false
+      Neighborparrot.send(:channel => 'test-channel', :data => nil).should be_false
     end
 
     it "should not send message with empty data" do
-      Neighborparrot.post('test-channel', '').should be_false
+      Neighborparrot.send(:channel => 'test-channel', :data => '').should be_false
     end
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/neighborparrot')
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+# Setup server on localhost
+Neighborparrot.configure :server => 'http://127.0.0.1:9000'
+
 RSpec.configure do |config|
 
 end

data/spec/support/helpers.rb

@@ -1,4 +1,4 @@
-# Post 'test' string to 'test_channel'
-def test_post
-  Neighborparrot.post('test_channel', 'test')
+# Send 'test' string to 'test_channel'
+def send_test
+  Neighborparrot.send(:channel => 'test_channel', :data => 'test')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neighborparrot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000Z
+date: 2012-01-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26510820 !ruby/object:Gem::Requirement
+  requirement: &13007020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *26510820
+  version_requirements: *13007020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26510280 !ruby/object:Gem::Requirement
+  requirement: &13006480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *26510280
+  version_requirements: *13006480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &26509780 !ruby/object:Gem::Requirement
+  requirement: &13005740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *26509780
+  version_requirements: *13005740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &26509200 !ruby/object:Gem::Requirement
+  requirement: &13004940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26509200
+  version_requirements: *13004940
 description: Send messages to the neighborparrot event source service
 email: eloy@indeos.es
 executables: []
@@ -73,7 +73,7 @@ files:
 - VERSION
 - lib/neighborparrot.rb
 - lib/neighborparrot/esparrot.rb
-- lib/neighborparrot/post.rb
+- lib/neighborparrot/send.rb
 - neighborparrot.gemspec
 - spec/esparrot_spec.rb
 - spec/neighborparrot_spec.rb
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3144654155739837993
+      hash: -1488788034171426421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: