shove 1.0.7 → 1.0.8

data/spec/cassettes/should_grant_a_subscriptions_to_a_client.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/grant_subscribe?channel=channel&client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/grant_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:
       - '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_publishing_on_a_channel_context.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/grant_publish?channel=test&client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/grant_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:
       - '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_subscriptions_on_a_channel_context.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/grant_subscribe?channel=test&client=dan
-    body: ''
+    uri: http://:test@api.shove.dev:8000/apps/test/grant_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:
       - '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_publish_on_a_channel_context.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/publish?channel=test
-    body: hi
+    uri: http://:test@api.shove.dev:8000/apps/test/publish?channel=test
+    body:
+      encoding: US-ASCII
+      string: hi
     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_publish_to_a_client.yml

@@ -2,8 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: http://:test@api.shove.dev:8080/apps/test/publish?channel=direct:dan
-    body: hi
+    uri: http://:test@api.shove.dev:8000/apps/test/publish?channel=direct:dan
+    body:
+      encoding: US-ASCII
+      string: hi
     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/helper.rb

@@ -20,8 +20,6 @@ VCR.configure do |c|
 end
 
 RSpec.configure do |c|
-  # so we can use `:vcr` rather than `:vcr => true`;
-  # in RSpec 3 this will no longer be necessary.
   c.treat_symbols_as_metadata_keys_with_true_values = true
 end
 

data/spec/shove_client_spec.rb

@@ -3,12 +3,12 @@ require File.dirname(__FILE__) + "/helper"
 describe Shove::Client do
 
   before(:all) do 
-    Shove.configure do
-      app_id "test"
-      app_key "test"
-      api_url "http://api.shove.dev:8080"
-      ws_url "ws://shove.dev:9000"
-    end
+    @app = Shove::App.new(
+      app_id: "test",
+      app_key: "test",
+      api_url: "http://api.shove.dev:8000",
+      ws_url: "ws://shove.dev:9000"
+    )
   end
 
   before do |context|
@@ -21,26 +21,25 @@ describe Shove::Client do
   end
 
   it "should spawn a client" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @client.should_not == nil
-    @client.url.should == "#{Shove.config.ws_url}/test"
+    @client.url.should == "#{@app.ws_url}/test"
   end
 
   it "should send a connect op" do
-    @client = Shove.app.connect
-    message = $queue.pop
+    @client = @app.connect
+    message = $queue.shift
     message["opcode"].should == Shove::Protocol::CONNECT
   end
 
-  it "should send a connect op with an id" do
-    @client = Shove.app.connect("monkey")
+  it "should self authorize if key is set" do
+    @client = @app.connect
     message = $queue.pop
-    message["opcode"].should == Shove::Protocol::CONNECT
-    message["data"].should == "monkey"
+    message["opcode"].should == Shove::Protocol::AUTHORIZE
   end
 
   it "should trigger a connect event" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @client.on("connect") do |client_id|
       @triggered = true
       @id = client_id
@@ -53,7 +52,7 @@ describe Shove::Client do
   end
 
   it "should trigger a connect_denied event" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @client.on("connect_denied") do |client_id|
       @triggered = true
       @id = client_id
@@ -67,7 +66,7 @@ describe Shove::Client do
 
 
   it "should trigger a disconnect event" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @client.on("disconnect") do
       @triggered = true
     end
@@ -78,7 +77,7 @@ describe Shove::Client do
   end
 
   it "should trigger an error event" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @client.on("error") do |error|
       @error = error
     end
@@ -89,13 +88,13 @@ describe Shove::Client do
   end
 
   it "should authorize oneself" do
-    @client = Shove.app.connect
-    @client.authorize("test")
+    @client = @app.connect
+    @client.auth!
     $queue.last()["opcode"].should == Shove::Protocol::AUTHORIZE
   end
 
   it "should create a channel context" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
 
     @channel.should_not == nil
@@ -103,7 +102,7 @@ describe Shove::Client do
   end
 
   it "should subscribe to a channel" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
     $queue.last["opcode"].should_not == Shove::Protocol::SUBSCRIBE
     @channel.on("message") do
@@ -112,7 +111,7 @@ describe Shove::Client do
   end
 
   it "should get a subscribe granted event" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
     @channel.on("subscribe") do
       @triggered = true
@@ -127,7 +126,7 @@ describe Shove::Client do
     @messages = 0
     @message = nil
 
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
     @channel.on("message") do |msg|
       @messages += 1
@@ -143,7 +142,7 @@ describe Shove::Client do
   it "should cancel a binding" do
     @messages = 0
 
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
     binding = @channel.on("message") do |msg|
       @messages += 1
@@ -164,7 +163,7 @@ describe Shove::Client do
   end
 
   it "should unsubscribe from a channel" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
     @channel.unsubscribe
     @message = $queue.last
@@ -172,7 +171,7 @@ describe Shove::Client do
   end
 
   it "should receive an unsubscribe event" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
     @channel.unsubscribe
     @channel.on("unsubscribe") do
@@ -186,7 +185,7 @@ describe Shove::Client do
 
 
   it "should publish" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
     @channel.publish "test"
 
@@ -194,12 +193,22 @@ describe Shove::Client do
   end
 
   it "should generate a channel key" do
-    key = Shove.channel_key "money"
+    key = @app.channel_key "money"
+    key.should == "5cf0a03b439091a07eb544832fc11c62f0b1af17"
+  end
+
+  it "should generate a subscribe key" do
+    key = @app.subscribe_key "money"
     key.should == "6f78f2ba414a482fc5c45eb080d8877ddf1fc6ba"
   end
 
+  it "should generate a publish key" do
+    key = @app.publish_key "money"
+    key.should == "5cf0a03b439091a07eb544832fc11c62f0b1af17"
+  end
+
   it "should authorize on a channel" do
-    @client = Shove.app.connect
+    @client = @app.connect
     @channel = @client.channel("channel")
     @channel.authorize "key"
 

data/spec/shove_http_spec.rb

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + "/helper"
 
-describe Shove:Http do
+describe Shove::Http do
 
   before(:all) do
-    Shove.configure do
-      app_id "test"
-      app_key "test"
-      api_url "http://api.shove.dev:8080"
-      ws_url "ws://shove.dev:9000"
-    end
+    @app = Shove::App.new(
+      app_id: "test",
+      app_key: "test",
+      api_url: "http://api.shove.dev:8000",
+      ws_url: "ws://shove.dev:9000"
+    )
   end
 
   before do |context|
@@ -23,55 +23,51 @@ describe Shove:Http do
     Shove.const_defined?("Version").should == true
   end
 
-  it "should have config" do
-    Shove.config.app_id.should == "test"
-    Shove.config.app_key.should == "test"
-  end
   
   it "should be able to authorize with the server" do
-    valid = Shove.valid?
+    valid = @app.valid?
     valid.should == true
   end
     
   it "should get a set of nodes for the network" do
-    hosts = Shove.hosts
+    hosts = @app.hosts
     hosts.size.should > 0
   end
   
   # Channel context tests, basic plumbing
 
   it "should spawn a channel context" do
-    chan = Shove.channel("test")
+    chan = @app.channel("test")
     chan.channel.should == "test"
-    chan.app.should == Shove.app
+    chan.app.should == @app
   end
 
   it "should publish on a channel context" do
-    Shove.channel("test").publish("hi") do |response|
+    @app.channel("test").publish("hi") do |response|
       response.error?.should == false
     end
   end
 
   it "should grant subscriptions on a channel context" do
-    Shove.channel("test").grant_subscribe("dan") do |response|
+    @app.channel("test").grant_subscribe("dan") do |response|
       response.error?.should == false
     end
   end
 
   it "should grant publishing on a channel context" do
-    Shove.channel("test").grant_publish("dan") do |response|
+    @app.channel("test").grant_publish("dan") do |response|
       response.error?.should == false
     end
   end
 
   it "should deny subscriptions on a channel context" do
-    Shove.channel("test").deny_subscribe("dan") do |response|
+    @app.channel("test").deny_subscribe("dan") do |response|
       response.error?.should == false
     end
   end
 
   it "should deny publishing on a channel context" do
-    Shove.channel("test").deny_publish("dan") do |response|
+    @app.channel("test").deny_publish("dan") do |response|
       response.error?.should == false
     end
   end
@@ -79,61 +75,61 @@ describe Shove:Http do
   # Client context tests, basic plumbing
 
   it "should spawn a client context" do
-    chan = Shove.client("dan")
+    chan = @app.client("dan")
     chan.id.should == "dan"
-    chan.app.should == Shove.app
+    chan.app.should == @app
   end
 
   it "should grant a connection" do
-    Shove.client("dan").grant_connect do |response|
+    @app.client("dan").grant_connect do |response|
       response.error?.should == false
     end
   end
 
   it "should deny a connection" do
-    Shove.client("dan").deny_connect do |response|
+    @app.client("dan").deny_connect do |response|
       response.error?.should == false
     end
   end
 
   it "should publish to a client" do
-    Shove.client("dan").publish("hi") do |response|
+    @app.client("dan").publish("hi") do |response|
       response.error?.should == false
     end
   end
 
   it "should grant a subscriptions to a client" do
-    Shove.client("dan").grant_subscribe("channel") do |response|
+    @app.client("dan").grant_subscribe("channel") do |response|
       response.error?.should == false
     end
   end
 
   it "should grant a publishing to a client" do
-    Shove.client("dan").grant_publish("channel") do |response|
+    @app.client("dan").grant_publish("channel") do |response|
       response.error?.should == false
     end
   end
 
   it "should grant a control to a client" do
-    Shove.client("dan").grant_control do |response|
+    @app.client("dan").grant_control do |response|
       response.error?.should == false
     end
   end
 
   it "should deny a subscriptions to a client" do
-    Shove.client("dan").deny_subscribe("channel") do |response|
+    @app.client("dan").deny_subscribe("channel") do |response|
       response.error?.should == false
     end
   end
 
   it "should deny a publishing to a client" do
-    Shove.client("dan").deny_publish("channel") do |response|
+    @app.client("dan").deny_publish("channel") do |response|
       response.error?.should == false
     end
   end
 
   it "should deny a control to a client" do
-    Shove.client("dan").deny_control do |response|
+    @app.client("dan").deny_control do |response|
       response.error?.should == false
     end
   end