skinny 0.2.0 → 0.2.1

data/lib/skinny.rb

@@ -1,3 +1,4 @@
+require 'base64'
 require 'eventmachine'
 require 'digest/md5'
 require 'thin'
@@ -180,7 +181,7 @@ module Skinny
       elsif hixie_76?
         Digest::MD5.digest(challenge)
       else
-        ActiveSupport::Base64.encode64(Digest::SHA1.digest(challenge)).strip
+        Base64.encode64(Digest::SHA1.digest(challenge)).strip
       end
     end
 
@@ -420,13 +421,20 @@ module Skinny
     end
   end
 
+  CONNECTION = 'HTTP_CONNECTION'.freeze
+  UPGRADE = 'HTTP_UPGRADE'.freeze
+  SKINNY_WEBSOCKET = 'skinny.websocket'.freeze
+
+  UPGRADE_REGEXP = /\bupgrade\b/i.freeze
+  WEBSOCKET_REGEXP = /\bwebsocket\b/i.freeze
+
   module Helpers
     def websocket?
-      env['HTTP_CONNECTION'].downcase == 'upgrade' && env['HTTP_UPGRADE'].downcase == 'websocket'
+      env[CONNECTION] =~ UPGRADE_REGEXP && env[UPGRADE] =~ WEBSOCKET_REGEXP
     end
 
     def websocket options={}, &block
-      env['skinny.websocket'] ||= begin
+      env[SKINNY_WEBSOCKET] ||= begin
         raise RuntimerError, "Not a WebSocket request" unless websocket?
         options[:on_message] = block if block_given?
         Websocket.from_env(env, options)
@@ -437,4 +445,4 @@ module Skinny
       websocket(options, &block).start!
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skinny
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-11-01 00:00:00.000000000Z
+date: 2010-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70337454861360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '0.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70337454861360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70337454860420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70337454860420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70337454859940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337454859940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70337454859320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337454859320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple, upgradable WebSockets for Thin.
 email: sj26@sj26.com
 executables: []
@@ -86,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Thin WebSockets