socky 0.0.6 → 0.0.7

data/Rakefile

@@ -8,6 +8,7 @@ begin
     gemspec.homepage = "http://github.com/imanel/socky_gem"
     gemspec.authors = ["Bernard Potocki"]
     gemspec.add_dependency('em-websocket', '>= 0.0.6')
+    gemspec.add_dependency('em-http-request')
     gemspec.files.exclude ".gitignore"
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/socky.rb

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'logger'
 require 'fileutils'
 require 'em-websocket'
-require 'em-websocket_hacks'
 $:.unshift(File.dirname(__FILE__))
+require 'em-websocket_hacks'
 
 module Socky
 

data/lib/socky/connection/authentication.rb

@@ -3,28 +3,27 @@ module Socky
     module Authentication
 
       def subscribe_request
-        if authenticated?
-          debug [self.name, "authentication successed"]
-          add_to_pool
-        else
-          debug [self.name, "authentication failed"]
-          disconnect
-        end
+        send_subscribe_request do |response|
+          if response
+            debug [self.name, "authentication successed"]
+            add_to_pool
+            @authenticated_by_url = true
+          else
+            debug [self.name, "authentication failed"]
+            disconnect
+          end
+        end unless authenticated?
       end
 
       def unsubscribe_request
         if authenticated?
           remove_from_pool
-          send_unsubscribe_request unless admin
+          send_unsubscribe_request{} unless admin
         end
       end
 
       def authenticated?
-        if @authenticated.nil?
-          @authenticated = (admin ? authenticate_as_admin : authenticate_as_user)
-        else
-          @authenticated
-        end
+        @authenticated ||= (admin ? authenticate_as_admin : authenticate_as_user)
       end
 
       def authenticate_as_admin
@@ -36,24 +35,24 @@ module Socky
       end
 
       def authenticated_by_url?
-        send_subscribe_request
+        @authenticated_by_url
       end
 
-      def send_subscribe_request
+      def send_subscribe_request(&block)
         subscribe_url = options[:subscribe_url]
         if subscribe_url
           debug [self.name, "sending subscribe request to", subscribe_url]
-          Socky::NetRequest.post(subscribe_url, params_for_request)
-        else
+          Socky::NetRequest.post(subscribe_url, params_for_request, &block)
           true
         end
+        true
       end
 
-      def send_unsubscribe_request
+      def send_unsubscribe_request(&block)
         unsubscribe_url = options[:unsubscribe_url]
         if unsubscribe_url
           debug [self.name, "sending unsubscribe request to", unsubscribe_url]
-          Socky::NetRequest.post(unsubscribe_url, params_for_request)
+          Socky::NetRequest.post(unsubscribe_url, params_for_request, &block)
         else
           true
         end

data/lib/socky/net_request.rb

@@ -1,8 +1,4 @@
-require 'timeout'
-require 'net/http'
-require 'net/https'
-require 'uri'
-require 'cgi'
+require 'em-http'
 
 module Socky
   class NetRequest
@@ -10,38 +6,14 @@ module Socky
 
     class << self
 
-      def post(url, params = { })
-        uri = URI.parse(url)
-        params = params_from_hash(params)
-        headers = {"User-Agent" => "Ruby/#{RUBY_VERSION}"}
-        begin
-          http = Net::HTTP.new(uri.host, uri.port)
-          if uri.scheme == 'https'
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          end
-          http.read_timeout = options[:timeout] || 5
-          resp, data = http.post(uri.path, params, headers)
-          return resp.is_a?(Net::HTTPOK)
-        rescue => e
-          debug ["Bad request", url.to_s, e.class, e.message]
-          return false
-        rescue Timeout::Error
-          debug [url.to_s, "timeout"]
-          return false
-        end
-      end
-
-      def params_from_hash(params)
-        result = []
-        params.each do |key, value|
-          if value.is_a? Array
-            value.each{ |v| result << "#{key}[]=#{CGI::escape(v.to_s)}"}
-          else
-            result << "#{key}=#{CGI::escape(value.to_s)}"
-          end
-        end
-        result.join('&')
+      def post(url, params = {}, &block)
+        http = EventMachine::HttpRequest.new(url).post :body => params, :timeout => options[:timeout] || 3
+        http.errback  { yield false }
+        http.callback { yield http.response_header.status == 200 }
+        true
+      rescue => e
+        error "Bad request", e
+        false
       end
 
     end

data/lib/socky/options/config.rb

@@ -32,6 +32,8 @@ module Socky
 :unsubscribe_url: http://localhost:3000/socky/unsubscribe
 
 :secret: my_secret_key
+
+# :timeout: 3
 EOF
 
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Bernard Potocki
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +02:00
+date: 2010-05-26 00:00:00 +02:00
 default_executable: socky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,18 @@ dependencies:
         version: 0.0.6
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Socky is a WebSocket server and client for Ruby on Rails
 email: b.potocki@imanel.org
 executables: