hornet-connector-ruby 0.3.0 → 0.3.1

data/Gemfile

@@ -2,4 +2,4 @@ source 'http://rubygems.org'
 
 gem 'alphadecimal', '1.1.1'
 gem 'redis'
-gem 'json'
+gem 'json'

data/README.md

@@ -2,22 +2,13 @@
 
 ## Description
 
-[Hornet](https://github.com/nectify/hornet) is a realtime engine that let you enhance your web application by connecting users together. [Hornet](https://github.com/nectify/hornet) is a publish/suscribe system extremely easy to use, secure and scalable. Well, [Hornet](https://github.com/nectify/hornet) will integrates very well your own existing application, no matter what language or framework you're using.
+This is the Ruby connector for [Hornet](https://github.com/nectify/hornet) realtime engine.
 
-[Hornet](https://github.com/nectify/hornet) is powered by NodeJs, Socket.io and is backed by Redis.
-
-The current library is a connector, a piece of software that will make your application able to talk with [Hornet](https://github.com/nectify/hornet). See Hornet README for the connector specification
-
-
-### Hornet philosophy: core engine and connectors
+[Hornet](https://github.com/nectify/hornet) is a realtime engine that let you enhance your web application by connecting users together. [Hornet](https://github.com/nectify/hornet) is a easy, secure and scalable publish/suscribe system. [Hornet](https://github.com/nectify/hornet) will integrates your own existing application, no matter what language or framework you're using.
 
-Hornet is intented to act as a hub for your existing web application, offering the possibility to keep a pool of connected users and broadcasting messages to them in realtime. That's where NodeJS is goot at.
-
-The connector is a small library that your existing application will use to connect your clients to Hornet and to broadcast message to them. When a client access a page with realtime features on it, your web application will generates a connection token to let the client subscribe to a hornet channel. 
-
-When you want to broadcast a message to a specific channel, you'll also use the hornet connector to publish it. Using Redis publish/subscribe mechanism, Hornet core engines will be notified by this new message and transfer it to subscribed clients.
+[Hornet](https://github.com/nectify/hornet) is powered by NodeJs, Socket.io and is backed by Redis.
 
-Hornet messages should always be JSON valid objects, containing at least the "type" attribute.
+See [Hornet](https://github.com/nectify/hornet) README for more information about Hornet and the connector specification
 
 ## Connector Installation
 
@@ -27,5 +18,4 @@ Add the following dependency in your Gemfile:
 
 ## License
 
-This project is distributed under Apache 2 License. See LICENSE.txt for more information.
-
+This project is distributed under Apache 2 License. See LICENSE.txt for more information.

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.1

data/hornet-connector-ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "hornet-connector-ruby"
-  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 = ["Robin Komiwes", "Benjamin Tierny", "Tristan Bourgois", "Maxime Brazeilles"]

data/lib/hornet.rb

@@ -14,7 +14,7 @@ module Hornet
     @token_TTL || 120
   end
 
-  def redis_options(redis_option={})
+  def redis_options( redis_option = {} )
     @redis_options ||= redis_option
   end
   
@@ -27,20 +27,36 @@ module Hornet
   #
   # - a random number on 5 digits, again, left padded with 0.
   #   This last part is just to increase the complexity of the token.
-  def create_access_token(channel)
+  def create_access_token( *args )
     token_id = redis.incr "hornet:tokens_id"
 
     token = (token_id.to_s + generate_token_suffix).to_i.alphadecimal
     
     key = "hornet:token:" + token
+    if args[0].is_a? Hash
+      opts = args[0]
 
-    redis.set key, channel
+      if opts[:channels]
+
+        opts[:channels].each do |channel|
+          redis.sadd key, channel
+        end
+
+      elsif opts[:channel]
+        redis.sadd key, opts[:channel] 
+      end
+
+    else
+      puts '*** DEPRECATED : Please use :channel => "#{args[0]}" instead of "#{args[0]}" ***'
+      redis.sadd key, args[0]
+    end
 
     redis.expire key, token_TTL
 
-    return token;
+    return token
   end
 
+
   def disconnect_tokens(tokens)
     disconnectMsg = "token:" + tokens.to_json
 
@@ -48,8 +64,26 @@ module Hornet
   end
   
 
-  def publish(channel, type, message, options = {})
-    redis.publish("hornet:channel:" + channel.to_s, message.merge(:type => type).merge(options).to_json)
+  def publish( *args )
+    if args[0].is_a? Hash
+      opts = args[0]
+      opts[:options] ||= {}
+
+      if opts[:channels]
+
+        opts[:channels].each do |channel|
+          redis.publish("hornet:channel:" + channel.to_s, opts[:message].merge( :type => opts[:type], :channel => channel.to_s  ).merge(opts[:options]).to_json )
+        end
+
+      elsif opts[:channel]
+        redis.publish("hornet:channel:" + opts[:channel].to_s, opts[:message].merge( :type => opts[:type], :channel => opts[:channel].to_s ).merge(opts[:options]).to_json )
+      end
+
+    else
+      puts '*** DEPRECATED : Please use :type , :channel(s) :message :options instead of direct args ***'
+      args[3] ||= {}
+      redis.publish("hornet:channel:" + args[0].to_s, args[2].merge( :type => args[1].to_s, :channel => args[0].to_s ).merge( args[3] ).to_json)
+    end
   end
   
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hornet-connector-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphadecimal
-  requirement: &70312994167200 !ruby/object:Gem::Requirement
+  requirement: &70358017108060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -24,10 +24,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70312994167200
+  version_requirements: *70358017108060
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70312994165460 !ruby/object:Gem::Requirement
+  requirement: &70358017107400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70312994165460
+  version_requirements: *70358017107400
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70312994164740 !ruby/object:Gem::Requirement
+  requirement: &70358017106700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70312994164740
+  version_requirements: *70358017106700
 - !ruby/object:Gem::Dependency
   name: alphadecimal
-  requirement: &70312994386180 !ruby/object:Gem::Requirement
+  requirement: &70358017106180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70312994386180
+  version_requirements: *70358017106180
 description: Hornet Ruby Connector is a connector for Hornet, a realtime engine backed
   by Redis and Socket.io
 email: robin.komiwes@gmail.com