garufa 1.1.5 → 1.2.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d786b484f5fab7fd3d89b658e6112b4075f99bef
-  data.tar.gz: 824a6094723424159fc9d309ca664b45f95e1209
+  metadata.gz: f0834fb0cd97fc6212f90c8f1fe3e72efdffc68c
+  data.tar.gz: 8ac82e1d5952efd3a90c9bcfa4b972d600d4dfbd
 SHA512:
-  metadata.gz: e79c4b1d0b103bebecdc8458b469afcd1f52d6c923b8337a1ac6019eae3a1009c4420f04269cad749d16018ab3aff4a46ceb26e67122ffc8ec23e541d5bc5471
-  data.tar.gz: 582a840feee8ae3c9995647b51f3fe49292e3fd5ca62de3d2c9e74a642a041e19d82b69acf6e97b166ca5685ccf8bdb3b1f558b519929f91e15ee38068145ee9
+  metadata.gz: f6acfd627b5975767fd1f6557798cbabd8a2521944d7a8f443179b8bf862f67b401c42541f2b21b7e370748d69f490c6eb4066565542aaea7c2bd33a89d19086
+  data.tar.gz: 31e8d4a3a0b7be4d2b549ea0dc64e44a2a291b155ffb80b097d4c9b68cab2bebaa542e3b04c9597d90296705ae04b4d53dd3384adf28e6bc3d10c494eee98254

data/README.md

@@ -22,8 +22,9 @@ Documentation
 * [SSL Support](/doc/ssl.md)
 * [Deploy to Heroku](/doc/heroku.md)
 * [Using Nginx as reverse proxy](/doc/nginx.md)
-* [Cheking number of current connections](/doc/connections.md)
+* [Checking number of current connections](/doc/connections.md)
 * [Testing and contributing](/doc/testing.md)
+* [Health endpoint](/doc/health.md)
 
 Pusher
 ------
@@ -31,6 +32,6 @@ Pusher
 [Pusher][pusher] is a great service, very well documented and with excellent
 support. Consider using it on production.
 
-[pusher]: http://pusher.com
+[pusher]: https://pusher.com
 [goliath]: https://github.com/postrank-labs/goliath/
 [slanger]: https://github.com/stevegraham/slanger

data/garufa.gemspec

@@ -1,39 +1,43 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 require 'garufa/version'
 
-Gem::Specification.new do |s|
-  s.name        = "garufa"
-  s.version     = Garufa::VERSION
-  s.summary     = "Websocket server compatible with Pusher."
-  s.description = "Garufa is a websocket server compatible with the Pusher protocol."
-  s.authors     = ["Juan Manuel Cuello"]
-  s.email       = ["juanmacuello@gmail.com"]
-  s.homepage    = "http://github.com/Juanmcuello/garufa"
-  s.bindir      = "bin"
-  s.executables << "garufa"
-  s.required_ruby_version = ">=1.9"
+spec = Gem::Specification.new
+
+spec.name        = 'garufa'
+spec.version     = Garufa::VERSION
+spec.summary     = 'Websocket server compatible with Pusher.'
+spec.description = 'A websocket server compatible with the Pusher protocol.'
+spec.authors     = ['Juan Manuel Cuello']
+spec.email       = ['juanmacuello@gmail.com']
+spec.homepage    = 'https://github.com/Juanmcuello/garufa'
+spec.bindir      = 'bin'
+spec.license     = 'MIT'
+spec.executables << 'garufa'
+spec.required_ruby_version = '>=2.2.2'
 
-  s.files = Dir[
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "lib/**/*.rb",
-    "lib/**/*.yajl",
-    "bin/*",
-    "*.gemspec",
-    "test/*.*"
-  ]
+spec.files = Dir[
+  'LICENSE',
+  'README.md',
+  'Rakefile',
+  'lib/**/*.rb',
+  'lib/**/*.yajl',
+  'bin/*',
+  '*.gemspec',
+  'test/*.*'
+]
 
-  s.add_dependency "goliath", "1.0.4"
-  s.add_dependency "faye-websocket", "0.7.4"
-  s.add_dependency "websocket-driver", "0.3.5"
-  s.add_dependency "roda", "2.4.0"
-  s.add_dependency "signature", "0.1.7"
-  s.add_dependency "tilt", "2.0.1"
-  s.add_dependency "yajl-ruby", "1.3.0"
-  s.add_development_dependency "rack-test", "0.6.3"
-  s.add_development_dependency "rake", "10.3.2"
-  s.add_development_dependency "minitest", "5.4.0"
-end
+spec.add_dependency 'goliath', '1.0.6'
+spec.add_dependency 'faye-websocket', '0.10.7'
+spec.add_dependency 'websocket-driver', '0.7.0'
+spec.add_dependency 'roda', '3.2.0'
+spec.add_dependency 'signature', '0.1.8'
+spec.add_dependency 'tilt', '2.0.8'
+spec.add_dependency 'yajl-ruby', '1.3.1'
+spec.add_development_dependency 'rack-test', '0.8.2'
+spec.add_development_dependency 'rake', '12.3.0'
+spec.add_development_dependency 'minitest', '5.10.3'
+spec

data/lib/garufa/api/routes/channels.rb

@@ -23,13 +23,14 @@ module Garufa
             end
 
             # GET channels/non-presence-channel
-            r.is ":channel" do |channel|
+            r.is String do |channel|
               render 'non_presence', locals: { stats: stats.single_channel(channel) }
             end
 
             # GET channels/non-presence-channel/users
-            r.is ":channel/users" do |channel|
+            r.is String, "users" do |channel|
               response.status = 400
+              nil
             end
           end
         end

data/lib/garufa/api/routes/events.rb

@@ -10,7 +10,7 @@ module Garufa
           end
 
           # Legacy events
-          r.is 'channels/:channel/events' do |channel|
+          r.is 'channels', String, 'events' do |channel|
             handler = EventHandler.new
             handler.handle_legacy(read_body, channel, request.GET)
             response.status = 202

data/lib/garufa/api/server.rb

@@ -25,8 +25,7 @@ module Garufa
           response.status = 204
         end
 
-        r.on 'apps/:app_id' do |app_id|
-
+        r.on 'apps', String do |app_id|
           authenticate(app_id)
 
           r.get do

data/lib/garufa/message.rb

@@ -14,7 +14,7 @@ module Garufa
 
       @attributes.each do |name, value|
         instance_variable_set("@#{name}", value)
-        self.class.send(:attr_reader, name)
+        define_singleton_method(name.to_sym) { value }
       end
     end
 

data/lib/garufa/subscription.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 require 'garufa/config'
 require 'garufa/subscriptions'
 
 module Garufa
   class Subscription
-
     attr_reader :error
 
     def initialize(data, connection)
-      @data, @connection = data, connection
+      @data = data
+      @connection = connection
+      @error = nil
     end
 
     def subscribe
@@ -81,7 +84,12 @@ module Garufa
     end
 
     def valid_signature?
-      string_to_sign = [@connection.socket_id, channel, channel_data].compact.join(':')
+      string_to_sign = [
+        @connection.socket_id,
+        channel,
+        channel_data
+      ].compact.join(':')
+
       token(string_to_sign) == signature
     end
 
@@ -103,6 +111,12 @@ module Garufa
     end
   end
 
-  class SubscriptionError < Struct.new(:code, :message)
+  class SubscriptionError
+    attr_reader :code, :message
+
+    def initialize(code, message)
+      @code = code
+      @message = message
+    end
   end
 end

data/lib/garufa/version.rb

@@ -1,3 +1,3 @@
 module Garufa
-  VERSION = '1.1.5'
+  VERSION = '1.2.0.rc.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garufa
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0.rc.1
 platform: ruby
 authors:
 - Juan Manuel Cuello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -16,141 +16,141 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.10.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.10.7
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: signature
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 12.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 12.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0
-description: Garufa is a websocket server compatible with the Pusher protocol.
+        version: 5.10.3
+description: A websocket server compatible with the Pusher protocol.
 email:
 - juanmacuello@gmail.com
 executables:
@@ -190,8 +190,9 @@ files:
 - test/helper.rb
 - test/message.rb
 - test/subscriptions.rb
-homepage: http://github.com/Juanmcuello/garufa
-licenses: []
+homepage: https://github.com/Juanmcuello/garufa
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -201,15 +202,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Websocket server compatible with Pusher.