Introduce a notification_scheme option to specify the scheme for push

notifications

Author: vivangkumar

lib/pusher.rb

@@ -27,8 +27,10 @@ class HTTPError < Error; attr_accessor :original_error; end
   class << self
     extend Forwardable
 
-    def_delegators :default_client, :scheme, :host, :port, :app_id, :key, :secret, :http_proxy, :notification_host
-    def_delegators :default_client, :scheme=, :host=, :port=, :app_id=, :key=, :secret=, :http_proxy=, :notification_host=
+    def_delegators :default_client, :scheme, :host, :port, :app_id, :key, :secret, :http_proxy
+    def_delegators :default_client, :notification_host, :notification_scheme
+    def_delegators :default_client, :scheme=, :host=, :port=, :app_id=, :key=, :secret=, :http_proxy=
+    def_delegators :default_client, :notification_host=, :notification_scheme=
 
     def_delegators :default_client, :authentication_token, :url
     def_delegators :default_client, :encrypted=, :url=, :cluster=

lib/pusher/client.rb

@@ -2,7 +2,7 @@
 
 module Pusher
   class Client
-    attr_accessor :scheme, :host, :port, :app_id, :key, :secret, :notification_host
+    attr_accessor :scheme, :host, :port, :app_id, :key, :secret, :notification_host, :notification_scheme
     attr_reader :http_proxy, :proxy
     attr_writer :connect_timeout, :send_timeout, :receive_timeout,
                 :keep_alive_timeout
@@ -36,9 +36,12 @@ def initialize(options = {})
       merged_options[:notification_host] =
         options.fetch(:notification_host, "hedwig-staging.herokuapp.com")
 
-      @scheme, @host, @port, @app_id, @key, @secret, @notification_host =
+      merged_options[:notification_scheme] =
+        options.fetch(:notification_scheme, "https")
+
+      @scheme, @host, @port, @app_id, @key, @secret, @notification_host, @notification_scheme =
         merged_options.values_at(
-          :scheme, :host, :port, :app_id, :key, :secret, :notification_host
+          :scheme, :host, :port, :app_id, :key, :secret, :notification_host, :notification_scheme
         )
 
       @http_proxy = nil
@@ -304,7 +307,8 @@ def trigger_batch_async(*events)
     end
 
     def notification_client
-      @notification_client ||= NativeNotification::Client.new(@app_id, @notification_host, self)
+      @notification_client ||=
+        NativeNotification::Client.new(@app_id, @notification_host, @notification_scheme, self)
     end
 
 

lib/pusher/native_notification/client.rb

@@ -9,9 +9,10 @@ class Client
       RESTRICTED_GCM_PAYLOAD_KEYS = [:to, :registration_ids]
       WEBHOOK_LEVELS = ["DEBUG", "INFO"]
 
-      def initialize(app_id, host, pusher_client)
+      def initialize(app_id, host, scheme, pusher_client)
         @app_id = app_id
         @host = host
+        @scheme = scheme
         @pusher_client = pusher_client
       end
 
@@ -56,7 +57,7 @@ def payload(interests, data)
       end
 
       def url(path = nil)
-        URI.parse("https://#{@host}/#{API_PREFIX}/#{API_VERSION}/apps/#{@app_id}#{path}")
+        URI.parse("#{@scheme}://#{@host}/#{API_PREFIX}/#{API_VERSION}/apps/#{@app_id}#{path}")
       end
 
       # Validate payload