shove 0.51 → 0.52

data/README.md

@@ -20,7 +20,7 @@
       :cluster => "cluster"
     )
 
-##Broadcast messages
+##Broadcasting
 
     # broadcast the "hello" event on the "default" channel with
     # Hello World! as the data
@@ -30,20 +30,20 @@
       puts response.message
     end
   
-##Direct messages
+##Send direct messages
 
     Shove.direct(userid, "hello", "Hello World!") do |response|
       # handle response
     end
 
-##Authorize a user
+##Subscription Authorization
 
     # authorize user with id userid on channel "default"
     Shove.authorize(userid, "default") do |response|
       # handle response
     end
     
-##Stream all data from a channel
+##Channel Streaming
 
     # stream all data on channel "default"
     Shove.stream("default") do |msg|
@@ -56,36 +56,6 @@
       puts msg[:data] # the payload
 
     end
-    
-##Channel Management
-Creating channels is a privileged operation.  You can do it from the shove.io management console, or via the management API. 
-In the case of the ruby gem, you can manage it straight from ruby.
-
-    # Create a channel
-    options = {
-      :name => "funchannel", #this is the only required field
-      :restricted => false, #require authorization for subscription
-      :broadcastable => true, #allow clients to broadcast to other clients
-      :presence => true #when users subscribe/unsubscribe all other subscribers are notified
-    }
-    Shove.create_channel(options) do |response|
-      if response.error?
-        puts "boooo"
-        puts response.message
-      end
-    end
-    
-    # Update a channel
-    Shove.update_channel("funchannel", :presence => false) do |response|
-      # ...
-    end
-    
-    # Delete channel
-    # this will unsubscribe all subscribers from this channel
-    # nearly immediately, so make sure you want to do that.
-    Shove.delete_channel("funchannel") do |response|
-      # ...
-    end
   
 ##Block and Non-blocking
   shover does both.  If the shover code happens to run inside of an EM.run block, the HTTP calls

data/lib/shove/client.rb

@@ -11,8 +11,7 @@ module Shove
       @network = opts[:network]
       @cluster = opts[:cluster] || "a01"
       @secure = opts[:secure] || false
-      @host = opts[:host] || "api.#{@cluster}.shove.io"
-      @web_host = opts[:web_host] || "shove.io"
+      @host = opts[:host] || "api-#{@cluster}.shove.io"
     end
     
     # broadcast a message
@@ -44,39 +43,12 @@ module Shove
         return response
       end
     end
-    
-    # Channel methods
-    
-    # create a channel
-    # +opts+ the hash containing channel options
-    #   :restricted
-    #   :name
-    def create_channel opts, &block
-      Request.new("#{channel_uri}").post({ :channel => opts }, &block)
-    end
-    
-    # delete a channel
-    # +name+ the name of the channel to delete
-    def delete_channel name, &block
-      Request.new("#{channel_uri}/#{name}").delete(&block)
-    end
-    
-    # update the attributes of a channel
-    # +name+ the name of the channel
-    # +opts+ the options hash to update
-    def update_channel name, opts, &block
-      Request.new("#{channel_uri}/#{name}").put({ :channel => opts }, &block)
-    end
-    
+        
     protected
     
     def uri
       (@secure ? "https" : "http") + "://#{@host}/#{@network}"
     end
     
-    def channel_uri
-      (@secure ? "https" : "http") + "://#{@web_host}/api/#{@network}/channels"
-    end
-    
   end
 end

data/lib/shove.rb

@@ -9,10 +9,11 @@ require "yaml"
 ##
 # Shove
 # 
-# See http://shove.io for an account
+# See http://shove.io for an account and client documentation
+# See https://github.com/shove/shover for gem documentation
 module Shove
   
-  Version = 0.51
+  Version = 0.52
   
   class << self
   
@@ -61,29 +62,7 @@ module Shove
     def validate
       client.validate
     end
-
-    # Channel methods
-
-    # create a channel
-    # +opts+ the hash containing channel options
-    def create_channel opts, &block
-      client.create_channel opts, &block
-    end
     
-    # delete a channel
-    # +name+ the name of the channel to delete
-    def delete_channel name, &block
-      client.delete_channel name, &block
-    end
-    
-    # update the attributes of a channel
-    # +name+ the name of the channel
-    # +opts+ the options hash to update
-    def update_channel name, opts, &block
-      client.update_channel name, opts, &block
-    end
-    
-
     # act as a stream client.  requires EM
     # +channel+ the channel to stream
     def stream channel, &block
@@ -105,9 +84,7 @@ module Shove
       }
 
       http.stream { |msg|
-        
-        puts msg
-        
+
         parts = msg.split "!"
         
         case parts[1]

data/shove.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = "shove"
-  s.version = "0.51"
-  s.date = "2011-03-12"
+  s.version = "0.52"
+  s.date = "2011-03-26"
   s.summary = "Ruby gem for leveraging shove.io, the web push platform"
   s.email = "dan@shove.io"
   s.homepage = "https://github.com/shove/shover"

data/spec/shove_spec.rb

@@ -11,8 +11,30 @@ describe Shove do
   end
 
   it "should have config" do
-    Shove.config["network"].should == "shove"
+    Shove.config[:network].should == "deadbeef"
   end
   
+  it "should be able to authorize with the server" do
+    response = Shove.validate
+    response.error?.should == false
+  end
+  
+  it "should be able to broadcast a message" do
+    Shove.broadcast("default", "event", "test") do |response|
+      response.error?.should == false
+    end
+  end
+    
+  it "should be able to broadcast a message with EM" do
+    EM.run do
+      Shove.broadcast("default", "event", "test") do |response|
+        response.error?.should == false
+      end
+      
+      EM.add_timer(0.5) do
+          EM.stop
+      end
+    end
+  end
 
 end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 51
-  version: "0.51"
+  - 52
+  version: "0.52"
 platform: ruby
 authors: 
 - Dan Simpson
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -08:00
+date: 2011-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency