slanger 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3af74396ad01a665097cd94f9520c3f9e93e35
-  data.tar.gz: beac501fa1ec42ba40096fe2854654200c7436ce
+  metadata.gz: cd65a213b5685b79b1fd958a1ee446cd9dac9986
+  data.tar.gz: 428f76b4006c574491bcb308a2547b2bcb983d7f
 SHA512:
-  metadata.gz: dcf153eb18832d068ada988ca15d9c11cd21c06d712c0a38b1cdef1502becc64a19d106f6834819582b82b083e7e872578d6b8bd7290314c4827da17995036f8
-  data.tar.gz: 9c72e7738e139b245d474d4d007ca1897f9bfa585c642d369274cc6d877b2f74f75190a6cbaadba3ede607c0d1b708a7281f1e2bdf953c4e6d82337616f0ade7
+  metadata.gz: b90d2d727f37da70e2e88a05f0cba997c43ddbd4a62472b6aba89d73914e8d0ef5b6aeb22bf12c152329a8e28d4cc15b3438521cde04434a3854a7a71fa78297
+  data.tar.gz: dbcd5c1d8070327d26adda0881766151024e0148d4a7f69afb9a16aa27c2a64933bc11dcf3a56101c65e55a43603409226e64866d5441244e79165e0459f9ce7

data/README.md

@@ -161,12 +161,14 @@ Of course you could proxy all requests to `ws.example.com` to port 8080 of your
 
 # Configuration Options
 
-Slanger supports several configuration options, which can be supplied as command line arguments at invocation.
+Slanger supports several configuration options, which can be supplied as command line arguments at invocation. You can also supply a yaml file containing config options. If you use the config file in combination with other configuration options, the values passed on the command line will win. Allows running multiple instances with only a few differences easy.
 
 ```
--k or --app_key This is the Pusher app key you want to use. This is a required argument
+-k or --app_key This is the Pusher app key you want to use. This is a required argument on command line or in optional config file
 
--s or --secret This is your Pusher secret. This is a required argument
+-s or --secret This is your Pusher secret. This is a required argument on command line or in optional config file
+
+-C or --config_file Path to Yaml file that can contain all or some of the configuration options, including required arguments
 
 -r or --redis_address An address where there is a Redis server running. This is an optional argument and defaults to redis://127.0.0.1:6379/0
 

data/bin/slanger

@@ -4,11 +4,10 @@
 require 'optparse'
 require 'bundler/setup'
 require 'eventmachine'
+require 'yaml'
+require 'active_support/core_ext/hash'
 
-options = {
-  api_host: '0.0.0.0', api_port: '4567', websocket_host: '0.0.0.0',
-  websocket_port: '8080', debug: false, redis_address: 'redis://0.0.0.0:6379/0'
-  }
+options = {}
 
 
 OptionParser.new do |opts|
@@ -17,14 +16,18 @@ OptionParser.new do |opts|
     exit
   end
 
-  opts.on '-k', '--app_key APP_KEY', "Pusher application key. This parameter is required." do |k|
+  opts.on '-k', '--app_key APP_KEY', "Pusher application key. This parameter is required on command line or in optional config file." do |k|
     options[:app_key] = k
   end
 
-  opts.on '-s', '--secret SECRET', "Pusher application secret. This parameter is required." do |k|
+  opts.on '-s', '--secret SECRET', "Pusher application secret. This parameter is required on command line or in optional config file." do |k|
     options[:secret] = k
   end
 
+  opts.on '-C', '--config_file FILE', "Path to Yaml file that can contain all configuration options, including required ones." do |k|
+    options[:config_file] = k
+  end
+
   opts.on '-r', '--redis_address URL', "Address to bind to (Default: redis://127.0.0.1:6379/0)" do |h|
     options[:redis_address] = h
   end
@@ -70,6 +73,11 @@ OptionParser.new do |opts|
 
   opts.parse!
 
+  if options[:config_file] and File.exists? options[:config_file]
+    config_file_contents = YAML::load(File.open(options[:config_file]))
+    options.reverse_merge! config_file_contents.deep_symbolize_keys!
+  end
+
   %w<app_key secret>.each do |parameter|
     unless options[parameter.to_sym]
       puts "--#{parameter} STRING is a required argument. Use your Pusher #{parameter}.\n"
@@ -123,6 +131,6 @@ EM.run do
   puts "Running Slanger v.#{Slanger::VERSION}"
   puts "\n"
 
-  puts "Slanger API server listening on port #{options[:api_port]}"
-  puts "Slanger WebSocket server listening on port #{options[:websocket_port]}"
+  puts "Slanger API server listening on port #{Slanger::Config.api_port}"
+  puts "Slanger WebSocket server listening on port #{Slanger::Config.websocket_port}"
 end

data/lib/slanger/api/event.rb

@@ -1,13 +1,15 @@
+require 'oj'
+
 module Slanger
   module Api
     class Event < Struct.new :name, :data, :socket_id
       def payload(channel_id)
-        {
+        Oj.dump({
           event:     name,
           data:      data,
           channel:   channel_id,
           socket_id: socket_id
-        }.select { |_,v| v }.to_json
+        }.select { |_,v| v }, mode: :compat)
       end
     end
   end

data/lib/slanger/api/request_validation.rb

@@ -1,3 +1,5 @@
+require 'oj'
+
 module Slanger
   module Api
     class RequestValidation < Struct.new :raw_body, :raw_params, :path_info
@@ -10,7 +12,7 @@ module Slanger
       end
 
       def data
-        @data ||= JSON.parse(body["data"] || params["data"])
+        @data ||= Oj.load(body["data"] || params["data"])
       end
 
       def body
@@ -85,8 +87,8 @@ module Slanger
       end
 
       def assert_valid_json!(string)
-        JSON.parse(string)
-      rescue JSON::ParserError
+        Oj.load(string)
+      rescue Oj::ParserError
         raise Slanger::InvalidRequest.new("Invalid request body: #{raw_body}")
       end
 

data/lib/slanger/api/server.rb

@@ -8,6 +8,7 @@ require 'em-hiredis'
 require 'rack'
 require 'fiber'
 require 'rack/fiber_pool'
+require 'oj'
 
 module Slanger
   module Api
@@ -31,7 +32,7 @@ module Slanger
         EventPublisher.publish(valid_request.channels, event)
 
         status 202
-        return {}.to_json
+        return Oj.dump({}, mode: :compat)
       end
 
       post '/apps/:app_id/channels/:channel_id/events' do
@@ -41,7 +42,7 @@ module Slanger
         EventPublisher.publish(valid_request.channels, event)
 
         status 202
-        return {}.to_json
+        return Oj.dump({}, mode: :compat)
       end
 
       def valid_request

data/lib/slanger/channel.rb

@@ -7,6 +7,7 @@
 
 require 'eventmachine'
 require 'forwardable'
+require 'oj'
 
 module Slanger
   class Channel
@@ -75,13 +76,13 @@ module Slanger
     # Only events to channels requiring authentication (private or presence)
     # are accepted. Public channels only get events from the API.
     def send_client_message(message)
-      Slanger::Redis.publish(message['channel'], message.to_json) if authenticated?
+      Slanger::Redis.publish(message['channel'], Oj.dump(message, mode: :compat)) if authenticated?
     end
 
     # Send an event received from Redis to the EventMachine channel
     # which will send it to subscribed clients.
     def dispatch(message, channel)
-      push(message.to_json) unless channel =~ /\Aslanger:/
+      push(Oj.dump(message, mode: :compat)) unless channel =~ /\Aslanger:/
     end
 
     def authenticated?

data/lib/slanger/connection.rb

@@ -1,3 +1,5 @@
+require 'oj'
+
 module Slanger
   class Connection
     attr_accessor :socket, :socket_id
@@ -7,9 +9,9 @@ module Slanger
     end
 
     def send_message m
-      msg = JSON.parse m
+      msg = Oj.load m
       s = msg.delete 'socket_id'
-      socket.send msg.to_json unless s == socket_id
+      socket.send Oj.dump(msg, mode: :compat) unless s == socket_id
     end
 
     def send_payload *args
@@ -36,9 +38,9 @@ module Slanger
     private
 
     def format(channel_id, event_name, payload = {})
-      body = { event: event_name, data: payload.to_json }
+      body = { event: event_name, data: Oj.dump(payload, mode: :compat) }
       body[:channel] = channel_id if channel_id
-      body.to_json
+      Oj.dump(body, mode: :compat)
     end
   end
 end

data/lib/slanger/handler.rb

@@ -6,6 +6,7 @@ require 'securerandom'
 require 'signature'
 require 'fiber'
 require 'rack'
+require 'oj'
 
 module Slanger
   class Handler
@@ -24,9 +25,9 @@ module Slanger
     # Dispatches message handling to method with same name as
     # the event name
     def onmessage(msg)
-      msg = JSON.parse(msg)
+      msg = Oj.load(msg)
 
-      msg['data'] = JSON.parse(msg['data']) if msg['data'].is_a? String
+      msg['data'] = Oj.load(msg['data']) if msg['data'].is_a? String
 
       event = msg['event'].gsub(/\Apusher:/, 'pusher_')
 
@@ -44,10 +45,14 @@ module Slanger
     end
 
     def onclose
-      @subscriptions.select { |k,v| k && v }.
-        each do |channel_id, subscription_id|
-          Channel.unsubscribe channel_id, subscription_id
-        end
+
+      subscriptions = @subscriptions.select { |k,v| k && v }
+      
+      subscriptions.each_key do |channel_id|
+        subscription_id = subscriptions[channel_id]
+        Channel.unsubscribe channel_id, subscription_id
+      end
+
     end
 
     def authenticate

data/lib/slanger/presence_channel.rb

@@ -8,6 +8,7 @@
 require 'eventmachine'
 require 'forwardable'
 require 'fiber'
+require 'oj'
 
 module Slanger
   class PresenceChannel < Channel
@@ -20,7 +21,7 @@ module Slanger
         # subscriptions. Update our subscribers accordingly.
         update_subscribers message
       else
-        push message.to_json
+        push Oj.dump(message, mode: :compat)
       end
     end
 
@@ -31,7 +32,7 @@ module Slanger
     end
 
     def subscribe(msg, callback, &blk)
-      channel_data = JSON.parse msg['data']['channel_data']
+      channel_data = Oj.load msg['data']['channel_data']
       public_subscription_id = SecureRandom.uuid
 
       # Send event about the new subscription to the Redis slanger:connection_notification Channel.
@@ -97,7 +98,7 @@ module Slanger
     def publish_connection_notification(payload, retry_count=0)
       # Send a subscription notification to the global slanger:connection_notification
       # channel.
-      Slanger::Redis.publish('slanger:connection_notification', payload.to_json).
+      Slanger::Redis.publish('slanger:connection_notification', Oj.dump(payload, mode: :compat)).
         tap { |r| r.errback { publish_connection_notification payload, retry_count.succ unless retry_count == 5 } }
     end
 
@@ -133,7 +134,7 @@ module Slanger
     end
 
     def payload(event_name, payload = {})
-      { channel: channel_id, event: event_name, data: payload }.to_json
+      Oj.dump({ channel: channel_id, event: event_name, data: payload }, mode: :compat)
     end
   end
 end

data/lib/slanger/redis.rb

@@ -2,6 +2,7 @@
 # Interface with Redis.
 
 require 'forwardable'
+require 'oj'
 
 module Slanger
   module Redis
@@ -24,7 +25,7 @@ module Slanger
     def subscriber
       @subscriber ||= new_connection.pubsub.tap do |c|
         c.on(:message) do |channel, message|
-          message = JSON.parse message
+          message = Oj.load(message)
           c = Channel.from message['channel']
           c.dispatch message, channel
         end

data/lib/slanger/version.rb

@@ -1,3 +1,3 @@
 module Slanger
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/lib/slanger/webhook.rb

@@ -1,14 +1,17 @@
 require 'fiber'
 require 'em-http-request'
+require 'oj'
 
 module Slanger
   module Webhook
     def post payload
       return unless Slanger::Config.webhook_url
 
-      payload = {
+      payload ={
         time_ms: Time.now.strftime('%s%L'), events: [payload]
-      }.to_json
+      }
+
+      payload = Oj.dump(payload, mode: :compat)
 
       digest        = OpenSSL::Digest::SHA256.new
       hmac          = OpenSSL::HMAC.hexdigest(digest, Slanger::Config.secret, payload)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slanger
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Stevie Graham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -151,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.9
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement