shove 1.0.7 → 1.0.8

data/lib/shove/client/channel.rb

@@ -82,6 +82,10 @@ module Shove
         @conn.send_data :opcode => AUTHORIZE, :channel => @name, :data => channel_key.to_s
       end
 
+      def auth channel_key
+        authorize channel_key
+      end
+
       private
 
       def emit event, *args

data/lib/shove/client/connection.rb

@@ -8,12 +8,9 @@ module Shove
 
       # Create a Publisher
       # +app+ the app
-      def initialize app, id
-        @id = id
+      def initialize app
         @app = app
         @parser = Yajl::Parser.new(:symbolize_keys => true)
-        @config = app.config
-        @hosts = app.hosts
         @channels = {}
         @events = {}
         @queue = []
@@ -21,10 +18,14 @@ module Shove
         @connected = false
       end
 
-      def authorize app_key=nil
-        send_data :opcode => AUTHORIZE, :data => (app_key || @config.app_key)
+      # helper to auth on all channels if app_key is supplied
+      def auth!
+        if @app.app_key
+          channel("*").auth @app.channel_key("*")
+        end
       end
 
+
       # Enable or disable debugging
       # +on+ true to enable debugging
       def debug on=true
@@ -32,7 +33,8 @@ module Shove
       end
       
       # Connect to the shove stream server
-      def connect
+      def connect connect_key=nil
+        @connect_key = connect_key
 
         if @connected
           return
@@ -49,13 +51,18 @@ module Shove
 
         @socket.onopen do
           @connected = true
-          send_data :opcode => CONNECT, :data => @id
+          send_data :opcode => CONNECT, :data => (connect_key || @app.connect_key)
+          auth!
           until @queue.empty? do
             send_data @queue.shift
           end
         end
 
         @socket.onmessage do |m, binary|
+          if @debug
+            puts "DEBUG RECV #{m}"
+          end
+
           process(Yajl::Parser.parse(m))
         end
 
@@ -88,21 +95,27 @@ module Shove
       end
 
       def url
-        if @config.ws_url
-          @url = "#{@config.ws_url}/#{@config.app_id}"
+        if @app.ws_url
+          @url = "#{@app.ws_url}/#{@app.app_id}"
         else
-          if @hosts.empty?
+          if @app.hosts.empty?
             raise "Error fetching hosts for app #{@app_id}"
           end
-          @url = "ws://#{@hosts.first}/#{@config.app_id}"
+          @url = "ws://#{@app.hosts.sample}/#{@app.app_id}"
         end
         @url
       end
       
       def send_data data
         if @connected
+          if @debug
+            puts "DEBUG SEND #{data}"
+          end
           @socket.send_message(Yajl::Encoder.encode(data))
         else
+          if @debug
+            puts "DEBUG QUEUE #{data}"
+          end
           @queue << data
         end
       end
@@ -110,7 +123,12 @@ module Shove
       protected
 
       def reconnect
-        @reconnecting = true
+        unless @forcedc
+          @reconnecting = true
+          EM.add_timer(1) do
+            connect @connect_key
+          end
+        end
       end
 
       def emit event, *args
@@ -174,7 +192,7 @@ module Shove
       end
 
       def host
-        @hosts.first
+        @app.hosts.sample
       end
     
     end

data/lib/shove/http/request.rb

@@ -6,9 +6,9 @@ module Shove
       
       attr_accessor :url, :key, :headers
       
-      def initialize url, config
+      def initialize url, app
         @url = url
-        @key = config.app_key
+        @key = app.app_key
       end
       
       # HTTP Delete request

data/lib/shove/protocol.rb

@@ -9,7 +9,9 @@ module Shove
     CONNECT_DENIED = 0x03
     DISCONNECT = 0x04
     DISCONNECT_COMPLETE = 0x06
-
+    REDIRECT = 0x07
+    SET_IDENTITY = 0x08
+    
     # Subscribe Ops
     SUBSCRIBE = 0x10 
     SUBSCRIBE_GRANTED = 0x11

data/shove.gemspec

@@ -14,9 +14,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("em-http-request", ">= 1.0.0")
   s.add_dependency("em-ws-client", ">= 0.2.0")
   s.add_dependency("yajl-ruby", ">= 1.1.0")
-  s.add_dependency("confstruct", ">= 0.2.1")
-  
-  s.bindir = "bin"
+
   s.authors = ["Dan Simpson"]
 
   s.files = `git ls-files`.split("\n")

data/spec/cassettes/should_be_able_to_authorize_with_the_server.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: get
-    uri: http://:test@api.shove.dev:8080/apps/test/validate
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/validate
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '32'
-    body: ! '{"code":"200 Ok","details":"Ok"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"200 Ok","details":"Ok"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_deny_a_connection.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/deny_connect?client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/deny_connect?client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '36'
-    body: ! '{"code":"400","error":"Invalid URL"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"400","error":"Invalid URL"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_deny_a_control_to_a_client.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/deny_control?client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/deny_control?client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '36'
-    body: ! '{"code":"400","error":"Invalid URL"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"400","error":"Invalid URL"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_deny_a_publishing_to_a_client.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/deny_publish?channel=channel&client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/deny_publish?channel=channel&client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '36'
-    body: ! '{"code":"400","error":"Invalid URL"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"400","error":"Invalid URL"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_deny_a_subscriptions_to_a_client.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/deny_subscribe?channel=channel&client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/deny_subscribe?channel=channel&client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '36'
-    body: ! '{"code":"400","error":"Invalid URL"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"400","error":"Invalid URL"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_deny_publishing_on_a_channel_context.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/deny_publish?channel=test&client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/deny_publish?channel=test&client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '36'
-    body: ! '{"code":"400","error":"Invalid URL"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"400","error":"Invalid URL"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_deny_subscriptions_on_a_channel_context.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/deny_subscribe?channel=test&client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/deny_subscribe?channel=test&client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '36'
-    body: ! '{"code":"400","error":"Invalid URL"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"400","error":"Invalid URL"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_get_a_set_of_nodes_for_the_network.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: get
-    uri: http://:test@api.shove.dev:8080/apps/test/hosts
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/hosts
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -17,8 +19,10 @@ http_interactions:
       Content-Type:
       - application/json; charset=UTF-8
       Content-Length:
-      - '19'
-    body: ! '["test-1","test-2"]'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+      - '17'
+    body:
+      encoding: US-ASCII
+      string: ! '["thor.shove.io"]'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_grant_a_connection.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/grant_connect?client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/grant_connect?client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '32'
-    body: ! '{"code":"200 Ok","details":"Ok"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"200 Ok","details":"Ok"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_grant_a_control_to_a_client.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/grant_control?client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/grant_control?client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -17,8 +19,10 @@ http_interactions:
       Content-Type:
       - application/json; charset=UTF-8
       Content-Length:
-      - '36'
-    body: ! '{"code":"400","error":"Invalid URL"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+      - '32'
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"200 Ok","details":"Ok"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1

data/spec/cassettes/should_grant_a_publishing_to_a_client.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/grant_publish?channel=channel&client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/grant_publish?channel=channel&client=dan
+    body:
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - ! '*/*'
@@ -18,7 +20,9 @@ http_interactions:
       - application/json; charset=UTF-8
       Content-Length:
       - '32'
-    body: ! '{"code":"200 Ok","details":"Ok"}'
-    http_version: !!null 
-  recorded_at: Fri, 17 Feb 2012 01:53:24 GMT
-recorded_with: VCR 2.0.0.rc1
+    body:
+      encoding: US-ASCII
+      string: ! '{"code":"200 Ok","details":"Ok"}'
+    http_version: 
+  recorded_at: Wed, 23 May 2012 02:35:38 GMT
+recorded_with: VCR 2.0.1