sockudo 1.0.0 → 2.0.0

data/lib/sockudo/request.rb

@@ -1,27 +1,31 @@
+# frozen_string_literal: true
+
 require 'pusher-signature'
 require 'digest/md5'
 require 'multi_json'
+require 'openssl'
 
 module Sockudo
   class Request
     attr_reader :body, :params
 
     def initialize(client, verb, uri, params, body = nil, extra_headers = {})
-      @client, @verb, @uri = client, verb, uri
+      @client = client
+      @verb = verb
+      @uri = uri
       @head = {
-        'X-Pusher-Library' => 'sockudo-http-ruby ' + Sockudo::VERSION
+        'X-Pusher-Library' => "sockudo-http-ruby #{Sockudo::VERSION}"
       }
       @head.merge!(extra_headers) if extra_headers && !extra_headers.empty?
 
       @body = body
+      params = params.each_with_object({}) { |(key, value), result| result[key.to_s] = value }
       if body
-        params[:body_md5] = Digest::MD5.hexdigest(body)
+        params['body_md5'] = Digest::MD5.hexdigest(body)
         @head['Content-Type'] = 'application/json'
       end
 
-      request = Sockudo::Signature::Request.new(verb.to_s.upcase, uri.path, params)
-      request.sign(client.authentication_token)
-      @params = request.signed_params
+      @params = signed_params(params)
     end
 
     def send_sync
@@ -36,9 +40,9 @@ module Sockudo
         raise error
       end
 
-      body = response.body ? response.body.chomp : nil
+      body = response.body&.chomp
 
-      return handle_response(response.code.to_i, body)
+      handle_response(response.code.to_i, body)
     end
 
     def send_async
@@ -47,46 +51,65 @@ module Sockudo
         df = EM::DefaultDeferrable.new
 
         http = case @verb
-        when :post
-          http_client.post({
-            :query => @params, :body => @body, :head => @head
-          })
-        when :get
-          http_client.get({
-            :query => @params, :head => @head
-          })
-        else
-          raise "Unsupported verb"
+               when :post
+                 http_client.post({
+                                    query: @params, body: @body, head: @head
+                                  })
+               when :get
+                 http_client.get({
+                                   query: @params, head: @head
+                                 })
+               when :delete
+                 http_client.delete({
+                                      query: @params, head: @head
+                                    })
+               else
+                 raise 'Unsupported verb'
+               end
+        http.callback do
+          df.succeed(handle_response(http.response_header.status, http.response.chomp))
+        rescue StandardError => e
+          df.fail(e)
         end
-        http.callback {
-          begin
-            df.succeed(handle_response(http.response_header.status, http.response.chomp))
-          rescue => e
-            df.fail(e)
-          end
-        }
-        http.errback { |e|
+        http.errback do |_e|
           message = "Network error connecting to sockudo (#{http.error})"
           Sockudo.logger.debug(message)
           df.fail(Error.new(message))
-        }
+        end
 
-        return df
+        df
       else
         http = @client.sync_http_client
 
-        return http.request_async(@verb, @uri, @params, @body, @head)
+        http.request_async(@verb, @uri, @params, @body, @head)
       end
     end
 
     private
 
+    def signed_params(params)
+      @client.authentication_token
+      params = params.merge({
+                              'auth_key' => @client.key,
+                              'auth_timestamp' => Time.now.to_i.to_s,
+                              'auth_version' => '1.0'
+                            })
+      params_for_signing = params.each_with_object({}) do |(key, value), result|
+        result[key.downcase] = value
+      end
+      canonical_query = params_for_signing.sort.map { |key, value| "#{key}=#{value}" }.join('&')
+      string_to_sign = [@verb.to_s.upcase, @uri.path, canonical_query].join("\n")
+      params.merge('auth_signature' => OpenSSL::HMAC.hexdigest('sha256', @client.secret, string_to_sign))
+    end
+
     def handle_response(status_code, body)
       case status_code
-      when 200
-        return symbolize_first_level(MultiJson.decode(body))
+      when 200, 201
+        symbolize_first_level(MultiJson.decode(body))
       when 202
-        return body.empty? ? true : symbolize_first_level(MultiJson.decode(body))
+        body.empty? || symbolize_first_level(MultiJson.decode(body))
+      when 204
+        {}
       when 400
         raise Error, "Bad request: #{body}"
       when 401
@@ -94,18 +117,30 @@ module Sockudo
       when 404
         raise Error, "404 Not found (#{@uri.path})"
       when 407
-        raise Error, "Proxy Authentication Required"
+        raise Error, 'Proxy Authentication Required'
       when 413
-        raise Error, "Payload Too Large > 10KB"
+        raise Error, 'Payload Too Large > 10KB'
       else
         raise Error, "Unknown error (status code #{status_code}): #{body}"
       end
     end
 
     def symbolize_first_level(hash)
-      hash.inject({}) do |result, (key, value)|
-        result[key.to_sym] = value
-        result
+      hash.each_with_object({}) do |(key, value), result|
+        result[key.to_sym] = deep_symbolize(value)
+      end
+    end
+
+    def deep_symbolize(value)
+      case value
+      when Hash
+        value.each_with_object({}) do |(key, nested_value), result|
+          result[key.to_sym] = deep_symbolize(nested_value)
+        end
+      when Array
+        value.map { |item| deep_symbolize(item) }
+      else
+        value
       end
     end
   end

data/lib/sockudo/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sockudo
   class Resource
     def initialize(client, path)
@@ -5,12 +7,12 @@ module Sockudo
       @path = path
     end
 
-    def get(params)
-      create_request(:get, params).send_sync
+    def get(params, headers = {})
+      create_request(:get, params, nil, headers).send_sync
     end
 
-    def get_async(params)
-      create_request(:get, params).send_async
+    def get_async(params, headers = {})
+      create_request(:get, params, nil, headers).send_async
     end
 
     def post(params, headers = {})
@@ -23,6 +25,10 @@ module Sockudo
       create_request(:post, {}, body, headers).send_async
     end
 
+    def delete(params, headers = {})
+      create_request(:delete, params, nil, headers).send_sync
+    end
+
     private
 
     def create_request(verb, params, body = nil, extra_headers = {})
@@ -30,7 +36,7 @@ module Sockudo
     end
 
     def url
-      @_url ||= @client.url(@path)
+      @url ||= @client.url(@path)
     end
   end
 end

data/lib/sockudo/utils.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Sockudo
   module Utils
     def validate_socket_id(socket_id)
-      unless socket_id && /\A\d+\.\d+\z/.match(socket_id)
-        raise Sockudo::Error, "Invalid socket ID #{socket_id.inspect}"
-      end
+      return if socket_id && /\A\d+\.\d+\z/.match(socket_id)
+
+      raise Sockudo::Error, "Invalid socket ID #{socket_id.inspect}"
     end
 
     # Compute authentication string required as part of the user authentication

data/lib/sockudo/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sockudo
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

data/lib/sockudo/webhook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'multi_json'
 require 'openssl'
 
@@ -33,7 +35,7 @@ module Sockudo
       # For Rack::Request and ActionDispatch::Request
       if request.respond_to?(:env) && request.respond_to?(:content_type)
         @key = request.env['HTTP_X_PUSHER_KEY']
-        @signature = request.env["HTTP_X_PUSHER_SIGNATURE"]
+        @signature = request.env['HTTP_X_PUSHER_SIGNATURE']
         @content_type = request.content_type
 
         request.body.rewind
@@ -49,25 +51,27 @@ module Sockudo
     # matches the configured key & secret. In the case that the webhook is
     # invalid, the reason is logged
     #
-    # @param extra_tokens [Hash] If you have extra tokens for your Sockudo app, you can specify them so that they're used to attempt validation.
+    # @param extra_tokens [Hash] If you have extra tokens for your Sockudo app, you can specify them
+    #   so that they're used to attempt validation.
     #
     def valid?(extra_tokens = nil)
-      extra_tokens = [extra_tokens] if extra_tokens.kind_of?(Hash)
+      extra_tokens = [extra_tokens] if extra_tokens.is_a?(Hash)
       if @key == @client.key
-        return check_signature(@client.secret)
+        return signature_valid?(@client.secret)
       elsif extra_tokens
         extra_tokens.each do |token|
-          return check_signature(token[:secret]) if @key == token[:key]
+          return signature_valid?(token[:secret]) if @key == token[:key]
         end
       end
+
       Sockudo.logger.warn "Received webhook with unknown key: #{key}"
-      return false
+      false
     end
 
     # Array of events (as Hashes) contained inside the webhook
     #
     def events
-      data["events"]
+      data['events']
     end
 
     # The time at which the WebHook was initially triggered by Sockudo, i.e.
@@ -76,35 +80,31 @@ module Sockudo
     # @return [Time]
     #
     def time
-      Time.at(data["time_ms"].to_f/1000)
+      Time.at(data['time_ms'].to_f / 1000)
     end
 
     # Access the parsed WebHook body
     #
     def data
-      @data ||= begin
-        case @content_type
-        when 'application/json'
-          MultiJson.decode(@body)
-        else
-          raise "Unknown Content-Type (#{@content_type})"
-        end
-      end
+      @data ||= case @content_type
+                when 'application/json'
+                  MultiJson.decode(@body)
+                else
+                  raise "Unknown Content-Type (#{@content_type})"
+                end
     end
 
     private
 
     # Checks signature against secret and returns boolean
     #
-    def check_signature(secret)
-      digest = OpenSSL::Digest::SHA256.new
+    def signature_valid?(secret)
+      digest = OpenSSL::Digest.new('SHA256')
       expected = OpenSSL::HMAC.hexdigest(digest, secret, @body)
-      if @signature == expected
-        return true
-      else
-        Sockudo.logger.warn "Received WebHook with invalid signature: got #{@signature}, expected #{expected}"
-        return false
-      end
+      return true if @signature == expected
+
+      Sockudo.logger.warn "Received WebHook with invalid signature: got #{@signature}, expected #{expected}"
+      false
     end
   end
 end

data/lib/sockudo.rb

@@ -1,7 +1,10 @@
-autoload 'Logger', 'logger'
+# frozen_string_literal: true
+
+require 'logger'
 require 'securerandom'
 require 'uri'
 require 'forwardable'
+require 'pusher-signature'
 
 require 'sockudo/utils'
 require 'sockudo/client'
@@ -19,11 +22,13 @@ module Sockudo
   #   end
   class Error < RuntimeError; end
   class AuthenticationError < Error; end
+
   class ConfigurationError < Error
     def initialize(key)
-      super "missing key `#{key}' in the client configuration"
+      super("missing key `#{key}' in the client configuration")
     end
   end
+
   class HTTPError < Error; attr_accessor :original_error; end
 
   class << self
@@ -36,10 +41,21 @@ module Sockudo
 
     def_delegators :default_client, :authentication_token, :url, :cluster
     def_delegators :default_client, :encrypted=, :url=, :cluster=
-    def_delegators :default_client, :timeout=, :connect_timeout=, :send_timeout=, :receive_timeout=, :keep_alive_timeout=
+    def_delegators :default_client, :timeout=, :connect_timeout=, :send_timeout=, :receive_timeout=,
+                   :keep_alive_timeout=
 
     def_delegators :default_client, :get, :get_async, :post, :post_async
-    def_delegators :default_client, :channels, :channel_info, :channel_users
+    def_delegators :default_client, :channels, :channel_info, :channel_history, :channel_users
+    def_delegators :default_client, :get_message, :get_message_versions, :update_message,
+                   :delete_message, :append_message
+    def_delegators :default_client, :activate_device, :create_device_activation, :update_device_registration,
+                   :list_device_registrations, :get_device_registration, :delete_device_registration,
+                   :remove_device_registrations_by_client, :upsert_channel_push_subscription,
+                   :list_channel_push_subscriptions, :delete_channel_push_subscriptions,
+                   :list_channel_push_subscription_channels, :list_push_credentials,
+                   :put_push_credential, :publish_push, :publish_push_direct, :publish_push_batch,
+                   :schedule_push, :get_publish_status, :cancel_scheduled_push,
+                   :post_push_delivery_status
     def_delegators :default_client, :trigger, :trigger_batch, :trigger_async, :trigger_batch_async
     def_delegators :default_client, :authenticate, :webhook, :channel, :[]
     def_delegators :default_client, :notify

metadata

@@ -1,85 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: sockudo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sockudo
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: pusher-signature
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pusher-signature
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
+        version: 0.1.8
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +94,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,47 +136,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rbnacl
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '1.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '1.80'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 description: Wrapper for Sockudo REST API
 email:
 - support@sockudo.com
@@ -185,8 +212,8 @@ files:
 homepage: http://github.com/sockudo/sockudo-http-ruby
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -201,8 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Sockudo API client
 test_files: []