garufa 1.0.1 → 1.1.0.rc.1

data/README.md

@@ -30,7 +30,7 @@ Usage
 Start garufa server:
 
 ``` console
-$ garufa -sv --app_key app-key --secret app-secret
+$ garufa -sv --app_id app-id --app_key app-key --secret app-secret
 ```
 
 This will start Garufa, logging to stdout in verbose mode. If you want Garufa
@@ -71,7 +71,7 @@ require 'pusher'
 Pusher.host = 'localhost'
 Pusher.port = 8080
 
-Pusher.app_id = 'my-app'
+Pusher.app_id = 'app-id'
 Pusher.key = 'app-key'
 Pusher.secret = 'app-secret'
 
@@ -181,6 +181,17 @@ Set `Pusher.port` and `Pusher.ws_port` in the example above to port 80, and
 `Pusher.host` to the name of your app provided by Heroku (something like
 `random-name-2323.herokuapp.com`).
 
+Checking number of current connections
+--------------------------------------
+
+A simple way to check the number of current connections is using `lsof`. Be sure to
+set the right path to garufa.pid file.
+
+
+``` console
+while :; do echo "$(date '+%H:%M:%S') $(sudo lsof -p `cat /path/to/garufa.pid` | grep ESTABLISHED | wc -l)"; sleep 1; done;
+```
+
 Testing and Contributing
 ------------------------
 

data/bin/garufa.pid

@@ -1 +1 @@
-16026
+4987

data/lib/garufa/api.rb

@@ -12,7 +12,7 @@ module Garufa
     Server.define do
       on "apps/:app_id" do |app_id|
 
-        authenticate
+        authenticate(app_id)
 
         on post do
           run Events

data/lib/garufa/api/authentication.rb

@@ -4,10 +4,13 @@ require 'garufa/config'
 module Garufa
   module API
     module Authentication
-      def authenticate
+      def authenticate(app_id)
         request = Signature::Request.new(req.request_method, req.path, req.params)
         request.authenticate { |key| Signature::Token.new(key, Garufa::Config[:secret]) }
 
+        if app_id != Garufa::Config[:app_id]
+          halt([400, {}, ["Token validated, but invalid for app #{app_id}"]])
+        end
       rescue Signature::AuthenticationError
         halt([401, {}, ['401 Unauthorized']])
       end

data/lib/garufa/garufa_app.rb

@@ -4,6 +4,7 @@ require 'faye/websocket'
 require 'garufa/config'
 require 'garufa/websocket'
 require 'garufa/api'
+require 'garufa/version'
 
 module Garufa
 
@@ -23,12 +24,16 @@ module Garufa
       opts.separator "Pusher options:"
 
       new_options = {
+        app_id:  ['--app_id APP_ID',   'Pusher application ID (required)'],
         app_key: ['--app_key APP_KEY', 'Pusher application key (required)'],
         secret:  ['--secret SECRET',   'Pusher application secret (required)']
       }
       new_options.each do |k, v|
         opts.on(v.first, v.last) { |value| Garufa::Config[k] = value }
       end
+
+      opts.separator ""
+      opts.on('-V', '--version', 'Display version and exit') { puts "Garufa version #{Garufa::VERSION}"; exit }
     end
 
     def response(env)

data/lib/garufa/version.rb

@@ -1,3 +1,3 @@
 module Garufa
-  VERSION = '1.0.1'
+  VERSION = '1.1.0.rc.1'
 end

data/test/helper.rb

@@ -1,3 +1,4 @@
+require 'minitest'
 require 'minitest/autorun'
 require 'minitest/mock'
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: garufa
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0.rc.1
+  prerelease: 6
 platform: ruby
 authors:
 - Juan Manuel Cuello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: signature
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -105,48 +118,49 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/garufa
-- bin/garufa.pid
-- garufa.gemspec
-- lib/garufa.rb
+- lib/garufa/version.rb
 - lib/garufa/api.rb
-- lib/garufa/api/authentication.rb
 - lib/garufa/api/channels.rb
 - lib/garufa/api/event_handler.rb
+- lib/garufa/api/authentication.rb
 - lib/garufa/api/events.rb
-- lib/garufa/config.rb
-- lib/garufa/connection.rb
-- lib/garufa/garufa_app.rb
-- lib/garufa/message.rb
 - lib/garufa/subscription.rb
+- lib/garufa/message.rb
+- lib/garufa/config.rb
 - lib/garufa/subscriptions.rb
-- lib/garufa/version.rb
 - lib/garufa/websocket.rb
-- test/connection.rb
+- lib/garufa/garufa_app.rb
+- lib/garufa/connection.rb
+- lib/garufa.rb
+- bin/garufa.pid
+- bin/garufa
+- garufa.gemspec
 - test/helper.rb
 - test/message.rb
 - test/subscriptions.rb
+- test/connection.rb
 homepage: http://github.com/Juanmcuello/garufa
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Websocket server compatible with Pusher.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: eafc3046e8da58d35b4e830aec82022ae952133c
-  data.tar.gz: cb28d6901cf7deacacaebee1c9e29386406def28
-SHA512:
-  metadata.gz: ee3baecdd8a39060e2aa452f62c1bc9ff057e6efb2a2dca8a6cc91bf6666f9d0c856aa07bd856068d9d0447c5de3d356ac791e0e0119b8be72ea9602b3862b87
-  data.tar.gz: 377e59dd31c73182b247ce01603ad071a537d08ab747c1d8aff468f00e07b0b528adb792ad757389fd95d3f4ebb1a21e15a02b098ddfa1a6314403d9a5003588