em-websocket-server 0.1.2 → 0.13

data/lib/web_socket/util.rb

@@ -1,17 +1,17 @@
 module WebSocket
 
-	class Util
+  class Util
 
-		@@path_regex    = /^GET (\/[^\s]*) HTTP\/1\.1$/
-		@@hs_regex      = /^HTTP\/1\.1 101 Web Socket Protocol Handshake$/
-		@@header_regex  = /^([^:]+):\s*([^$]+)/
+    @@path_regex    = /^GET (\/[^\s]*) HTTP\/1\.1$/
+    @@hs_regex      = /^HTTP\/1\.1 101 Web Socket Protocol Handshake$/
+    @@header_regex  = /^([^:]+):\s*([^$]+)/
 
-		# Parse http style headers into a ruby hash
-		def self.parse_headers data
-			lines = data.split("\r\n")
+    # Parse http style headers into a ruby hash
+    def self.parse_headers data
+      lines = data.split("\r\n")
       line  = lines.shift
       
-			headers = {}
+      headers = {}
       
       case line
       when @@path_regex
@@ -22,29 +22,34 @@ module WebSocket
         throw "Unrecognized Header!"
       end
       
+      while line = lines.shift
+        if line.chomp.empty?
+          break
+        end
+        
+        kvp = @@header_regex.match(line)
+        headers[kvp[1].strip.downcase.to_sym] = kvp[2].strip
+      end
       
-			lines.each do |line|
-				kvp = @@header_regex.match(line)
-				headers[kvp[1].strip.downcase.to_sym] = kvp[2].strip
-			end
+      challenge = lines.pop if lines
 
-			headers
-		end
+      [headers, challenge]
+    end
 
-		# encode ruby hash into HTTP style headers
-		def self.encode_headers data
-			result = ""
+    # encode ruby hash into HTTP style headers
+    def self.encode_headers data
+      result = ""
 
-			data.each_pair do |k,v|
-				result << k.to_s
-				result << ": "
-				result << v.to_s
-				result << "\r\n"
-			end
+      data.each_pair do |k,v|
+        result << k.to_s
+        result << ": "
+        result << v.to_s
+        result << "\r\n"
+      end
 
-			result << "\r\n"
-			result
-		end
-	  
+      result << "\r\n"
+      result
+    end
+    
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: em-websocket-server
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  hash: 17
+  prerelease: false
+  segments: 
+  - 0
+  - 13
+  version: "0.13"
 platform: ruby
 authors: 
 - Dan Simpson
@@ -14,14 +19,20 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 12
+        - 4
         version: 0.12.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: An evented ruby websocket server built on top of EventMachine
 email: dan.simpson@gmail.com
 executables: []
@@ -33,11 +44,18 @@ extra_rdoc_files: []
 files: 
 - README.markdown
 - em-websocket-server.gemspec
+- examples/chat.rb
+- examples/chat.html
+- examples/timesync.html
+- examples/timesync.rb
+- examples/tictactoe/tictactoe.html
+- examples/tictactoe/tictactoe.js
+- examples/tictactoe/tictactoe.rb
 - lib/web_socket.rb
-- lib/web_socket/util.rb
-- lib/web_socket/frame.rb
 - lib/web_socket/client.rb
 - lib/web_socket/server.rb
+- lib/web_socket/frame.rb
+- lib/web_socket/util.rb
 has_rdoc: true
 homepage: http://github.com/dansimpson/em-websocket-server
 licenses: []
@@ -48,21 +66,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An evented ruby websocket server built on top of EventMachine