Skip to content
Browse files

merged origin/master

  • Loading branch information...
2 parents 372b768 + 503773b commit 80ac779bd53f0b8e1b7d246a521cc203c87ae690 @markburns markburns committed
Showing with 4 additions and 5 deletions.
  1. +2 −3 Gemfile.lock
  2. +1 −1 lib/slanger/api_server.rb
  3. +1 −1 slanger.gemspec
View
5 Gemfile.lock
@@ -6,7 +6,7 @@ PATH
em-hiredis (~> 0.1.0)
em-http-request (~> 0.3.0)
em-websocket (~> 0.3.5)
- eventmachine (~> 0.12.10)
+ eventmachine (~> 1.0.0)
glamazon (~> 0.3.1)
rack (~> 1.3)
rack-fiber_pool (= 0.9.1)
@@ -34,8 +34,7 @@ GEM
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
escape_utils (0.2.4)
- eventmachine (0.12.10)
- eventmachine (0.12.10-java)
+ eventmachine (1.0.0)
glamazon (0.3.1)
activesupport (>= 3.1.0)
i18n (~> 0.6.0)
View
2 lib/slanger/api_server.rb
@@ -40,7 +40,7 @@ def payload
data: request.body.read.tap{ |s| s.force_encoding('utf-8') },
channel: params[:channel_id],
socket_id: params[:socket_id]
- }.reject { |_,v| v.nil? }.to_json
+ }.select { |_,v| v }.to_json
end
end
end
View
2 slanger.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.email = 'sjtgraham@mac.com'
s.homepage = 'http://github.com/stevegraham/slanger'
- s.add_dependency 'eventmachine', '~> 0.12.10'
+ s.add_dependency 'eventmachine', '~> 1.0.0'
s.add_dependency 'em-hiredis', '~> 0.1.0'
s.add_dependency 'em-websocket', '~> 0.3.5'
s.add_dependency 'rack', '~> 1.3'

0 comments on commit 80ac779

Please sign in to comment.
Something went wrong with that request. Please try again.