shove 1.0.2 → 1.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shove (1.0.1)
+    shove (1.0.3)
       confstruct (>= 0.2.1)
       em-http-request (>= 1.0.0)
       em-ws-client (>= 0.1.2)
@@ -13,11 +13,11 @@ GEM
     addressable (2.2.6)
     albino (1.3.3)
       posix-spawn (>= 0.3.6)
-    confstruct (0.2.1)
+    confstruct (0.2.2)
     cookiejar (0.3.0)
     crack (0.3.1)
     diff-lcs (1.1.3)
-    em-http-request (1.0.1)
+    em-http-request (1.0.2)
       addressable (>= 2.2.3)
       cookiejar
       em-socksify

data/bin/shove

@@ -107,12 +107,21 @@ begin
         client = Shove.connect
         client.authorize(app_dir.key(app))
 
+        client.on("connect") do |error|
+          puts "Connected"
+        end
+
         client.on("error") do |error|
           puts "Watch Error #{error}"
           EM.stop
         end
 
         channel = client.channel(channel)
+
+        channel.on("subscribe_denied") do
+          puts "Subscribe Denied"
+        end
+
         channel.on("subscribe") do
           puts "Subscribed"
         end
@@ -120,6 +129,7 @@ begin
         channel.on("message") do |msg|
           puts "#{Time.now}: #{msg}"
         end
+
       end
 
     else

data/lib/shove/app.rb

@@ -17,6 +17,11 @@ module Shove
     end
 
     def configure params={}, &block
+
+      @config.configure do
+        api_url Shove.config.api_url || "https://api.shove.io"
+      end
+
       if params
         @config.configure params
       end
@@ -25,8 +30,8 @@ module Shove
         @config.configure(&block)
       end
 
-      unless @config.app_id && @config.app_key
-        raise ShoveException.new("App ID and App Key are required")
+      unless @config.app_id
+        raise ShoveException.new("App ID required")
       end
     end
 

data/lib/shove/client/connection.rb

@@ -24,6 +24,12 @@ module Shove
       def authorize app_key=nil
         send_data :opcode => AUTHORIZE, :data => (app_key || @config.app_key)
       end
+
+      # Enable or disable debugging
+      # +on+ true to enable debugging
+      def debug on=true
+        @debug = on
+      end
       
       # Connect to the shove stream server
       def connect
@@ -89,7 +95,7 @@ module Shove
           if @hosts.empty?
             raise "Error fetching hosts for app #{@app_id}"
           end
-          @url = "ws://#{@hosts.first}.shove.io/#{@config.app_id}"
+          @url = "ws://#{@hosts.first}/#{@config.app_id}"
         end
         @url
       end

data/lib/shove/http/channel_context.rb

@@ -15,8 +15,8 @@ module Shove
       def publish message, &block
         if @channel == "*"
           raise ShoveException.new("Cannot publish to *")
-        elsif message.size > 8096
-          raise ShoveException.new("Max message size is 8,096 bytes")
+        elsif message.size > 2048
+          raise ShoveException.new("Max message size is 2 KiB")
         end
         @app.request("publish?channel=#{@channel}").post(message, &block)
       end

data/lib/shove/http/request.rb

@@ -43,9 +43,11 @@ module Shove
         
         req.basic_auth "", key
 
-        res = Net::HTTP.start(uri.host, uri.port) { |http|
-          http.request(req, normalize_body(params))
-        }
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.scheme == "https"
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+        res = http.request(req, normalize_body(params))
 
         result = Response.new(res.code, res.body, res.code.to_i >= 400)
         if block_given?
@@ -65,13 +67,17 @@ module Shove
         
         # handle error
         http.errback {
-          block.call(Response.new(http.response_header.status, http.response, true)) 
+          if block
+            block.call(Response.new(http.response_header.status, http.response, true))
+          end
         }
         
         # handle success
         http.callback {
           status = http.response_header.status
-          block.call(Response.new(status, http.response, status >= 400))
+          if block
+            block.call(Response.new(status, http.response, status >= 400))
+          end
         }
       end
       

data/lib/shove.rb

@@ -2,6 +2,7 @@ $:.unshift File.dirname(__FILE__)
 
 require "rubygems"
 require "net/http"
+require "net/https"
 require "em-http-request"
 require "em-ws-client"
 require "yajl"
@@ -16,7 +17,7 @@ require "confstruct"
 # See https://github.com/shove/shove for client documentation
 module Shove
   
-  Version = "1.0.2"
+  Version = "1.0.3"
   
   class ShoveException < Exception; end
   
@@ -31,7 +32,7 @@ module Shove
 
       unless defined? @config
         @config = Confstruct::Configuration.new do
-          api_url "https://api.shove.io/"
+          api_url "https://api.shove.io"
         end
       end
       

data/shove.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = "shove"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
   s.date = "2012-02-08"
   s.summary = "Ruby gem for leveraging shove.io, the web push platform"
   s.email = "dan@shove.io"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shove
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &20127560 !ruby/object:Gem::Requirement
+  requirement: &22523120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *20127560
+  version_requirements: *22523120
 - !ruby/object:Gem::Dependency
   name: em-ws-client
-  requirement: &20102540 !ruby/object:Gem::Requirement
+  requirement: &22522380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *20102540
+  version_requirements: *22522380
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &20101540 !ruby/object:Gem::Requirement
+  requirement: &22521920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *20101540
+  version_requirements: *22521920
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &20099280 !ruby/object:Gem::Requirement
+  requirement: &22521440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *20099280
+  version_requirements: *22521440
 description: Client side implementation for the shove.io API.  See http://shove.io/documentation
 email: dan@shove.io
 executables: