pusher 0.8.4 → 0.8.5

data/lib/pusher/channel.rb

@@ -1,4 +1,3 @@
-require 'crack/core_extensions' # Used for Hash#to_params
 require 'hmac-sha2'
 require 'multi_json'
 

data/lib/pusher/request.rb

@@ -4,6 +4,54 @@ require 'multi_json'
 
 module Pusher
   class Request
+    # Query string encoding extracted with thanks from em-http-request
+    module QueryEncoder
+      def encode_query(uri, query)
+        encoded_query = if query.kind_of?(Hash)
+          query.map { |k, v| encode_param(k, v) }.join('&')
+        else
+          query.to_s
+        end
+
+        if uri && !uri.query.to_s.empty?
+          encoded_query = [encoded_query, uri.query].reject {|part| part.empty?}.join("&")
+        end
+        encoded_query.to_s.empty? ? uri.path : "#{uri.path}?#{encoded_query}"
+      end
+
+      # URL encodes query parameters:
+      # single k=v, or a URL encoded array, if v is an array of values
+      def encode_param(k, v)
+        if v.is_a?(Array)
+          v.map { |e| escape(k) + "[]=" + escape(e) }.join("&")
+        else
+          escape(k) + "=" + escape(v)
+        end
+      end
+
+      def escape(s)
+        if defined?(EscapeUtils)
+          EscapeUtils.escape_url(s.to_s)
+        else
+          s.to_s.gsub(/([^a-zA-Z0-9_.-]+)/n) {
+            '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
+          }
+        end
+      end
+
+      if ''.respond_to?(:bytesize)
+        def bytesize(string)
+          string.bytesize
+        end
+      else
+        def bytesize(string)
+          string.size
+        end
+      end
+    end
+
+    include QueryEncoder
+
     def initialize(verb, uri, params, body = nil, token = nil)
       @verb = verb
       @uri = uri
@@ -32,11 +80,13 @@ module Pusher
       begin
         case @verb
         when :post
-          response = @http_sync.post("#{@uri.path}?#{@params.to_params}",
-            @body, { 'Content-Type'=> 'application/json' })
+          response = @http_sync.post(encode_query(@uri, @params), @body, {
+            'Content-Type'=> 'application/json'
+          })
         when :get
-          response = @http_sync.get("#{@uri.path}?#{@params.to_params}",
-            { 'Content-Type'=> 'application/json' })
+          response = @http_sync.get(encode_query(@uri, @params), {
+            'Content-Type'=> 'application/json'
+          })
         else
           raise "Unknown verb"
         end

data/pusher.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "pusher"
-  s.version     = "0.8.4"
+  s.version     = "0.8.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pusher"]
   s.email       = ["support@pusher.com"]
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   s.description = %q{Wrapper for pusher.com REST api}
 
   s.add_dependency "multi_json", "~> 1.0"
-  s.add_dependency "crack",     "~> 0.1.0"
   s.add_dependency "ruby-hmac", "~> 0.4.0"
   s.add_dependency 'signature', "~> 0.1.2"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2011-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70240168472560 !ruby/object:Gem::Requirement
+  requirement: &70170954250900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240168472560
-- !ruby/object:Gem::Dependency
-  name: crack
-  requirement: &70240168472100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70240168472100
+  version_requirements: *70170954250900
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70240168471520 !ruby/object:Gem::Requirement
+  requirement: &70170954250400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70240168471520
+  version_requirements: *70170954250400
 - !ruby/object:Gem::Dependency
   name: signature
-  requirement: &70240168470820 !ruby/object:Gem::Requirement
+  requirement: &70170954249520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70240168470820
+  version_requirements: *70170954249520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240168470200 !ruby/object:Gem::Requirement
+  requirement: &70170954248040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70240168470200
+  version_requirements: *70170954248040
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70240168469760 !ruby/object:Gem::Requirement
+  requirement: &70170954246460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240168469760
+  version_requirements: *70170954246460
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70240168468900 !ruby/object:Gem::Requirement
+  requirement: &70170954244800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70240168468900
+  version_requirements: *70170954244800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70240168467600 !ruby/object:Gem::Requirement
+  requirement: &70170954244120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240168467600
+  version_requirements: *70170954244120
 description: Wrapper for pusher.com REST api
 email:
 - support@pusher.com
@@ -142,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Pusher API client