websocket-eventmachine-base 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ced0b3713328dcec331091ac24bad63cbaadfc3
-  data.tar.gz: 7c44109ae2734698567a56d0400da618dbf21ef0
+  metadata.gz: 137d883c29ef392a43f544871f5c46d19dff9008
+  data.tar.gz: 68c696c611d9986f9dea388acfba744f24af4615
 SHA512:
-  metadata.gz: 84b7c903579be1e09741512533e84ef9c158c81c566716da95246ffc472d5498335f981ba8cc6e28c9e553edbc1383ef2693c86092c6cd479ccb90996069312e
-  data.tar.gz: 7a810e4186a71a8e9921322fdb2391f1b6829e626bcc38dcda40c3fb084d385a09b2331b7e669ef77153afbe1f3652cb273fb84e98215f74468bb1b472cbbb2c
+  metadata.gz: e76f19c4f71bcf8cd089562c670a2412d754b78d4b7231f039cac62319c2ff81f376684c7d5643239cb173e6478e72d3f935773eb91c7da46d32ea747e03beb0
+  data.tar.gz: cd9f0da603ce3477e08bfad4e0658dfe323ab47ced78033b490932ccb9d8b8fca739a35101f159cbf9f1a0cd893d10aafe88c775449f821a945180528dc17c59

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.0
+
+- provide handshake in onopen call
+
 ## 1.1.1
 
 - don't call onclose if handshake is not finished yet

data/lib/websocket/eventmachine/base.rb

@@ -132,11 +132,16 @@ module WebSocket
 
       private
 
-      ['onopen'].each do |m|
-        define_method "trigger_#{m}" do
-          callback = instance_variable_get("@#{m}")
-          callback.call if callback
-        end
+      def trigger_onopen(handshake)
+        @onopen.call(handshake) if @onopen
+      end
+
+      def trigger_onmessage(data, type)
+        @onmessage.call(data, type) if @onmessage
+      end
+
+      def trigger_onclose(code, reason)
+        @onclose.call(code, reason) if @onclose
       end
 
       ['onerror', 'onping', 'onpong'].each do |m|
@@ -146,17 +151,6 @@ module WebSocket
         end
       end
 
-      ['onclose'].each do |m|
-        define_method "trigger_#{m}" do |code, reason|
-          callback = instance_variable_get("@#{m}")
-          callback.call(code, reason) if callback
-        end
-      end
-
-      def trigger_onmessage(data, type)
-        @onmessage.call(data, type) if @onmessage
-      end
-
       def handle_connecting(data)
         @handshake << data
         return unless @handshake.finished?
@@ -164,7 +158,7 @@ module WebSocket
           send(@handshake.to_s, :type => :plain) if @handshake.should_respond?
           @frame = incoming_frame.new(:version => @handshake.version)
           @state = :open
-          trigger_onopen
+          trigger_onopen(@handshake)
           handle_open(@handshake.leftovers) if @handshake.leftovers
         else
           trigger_onerror(@handshake.error.to_s)

data/lib/websocket/eventmachine/base/version.rb

@@ -1,7 +1,7 @@
 module WebSocket
   module EventMachine
     class Base
-      VERSION = '1.1.1'
+      VERSION = '1.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-eventmachine-base
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -86,9 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: WebSocket base for Ruby client and server
 test_files: []
-has_rdoc: