pusher 1.1.0 → 1.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6daeeb10cfc7c29540cc4640cda4379f08c97a0a
-  data.tar.gz: d1387f40e14a45e68c5b7c2ba457d68d0e6f04e8
+  metadata.gz: 32ce70117350a8d8229d42a09cfa152b95cbfbbd
+  data.tar.gz: 19e237323cf2d8d311de41eb2b72097f96d7f101
 SHA512:
-  metadata.gz: 68870356440d4b596c15ad6a51d65769d89cb036e782cffaedccc9f47d4d4707020c4e02671919ccd3c519019da9bb02505a6bfa9739e7e96fe358e38adfef4c
-  data.tar.gz: 3eeaa5528655dd1fc071e93adff493a39fc21843aea95f38b9076f8f9aebbb025f5b68afcd06f82bea733f985fa29f5e07611305051d5cc7bc4b8b04b95471af
+  metadata.gz: 00bbae6c4dd13a9672d53e7fe102990bb2afce06acfeaf0ad3b670d02a38d099c7a111e8ed805975ee9b75bced43caa202769e1a75a8669a6831e472093b572e
+  data.tar.gz: e1437819fb5d29c6e8036ac659496553cb93cf1ed2b1bb5cf3ebec16f15b869ee00fb9ee5c0c48f9b2230574149dc847c40d87d78f39fa6f147588198089e001

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.2.0.rc1 / 2016-07-18
+==================
+
+  * Add support for Native notifications
 
 1.1.0 / 2016-05-20
 ==================

data/README.md

@@ -247,3 +247,67 @@ else
   render text: 'invalid', status: 401
 end
 ```
+
+## Push Notifications (BETA)
+
+Pusher now allows sending native notifications to iOS and Android devices. Check out the [documentation](https://pusher.com/docs/push_notifications) for information on how to set up push notifications on Android and iOS. There is no additional setup required to use it with this library. It works out of the box with the same Pusher instance. All you need are the same pusher credentials. To install the release:
+
+```
+$ gem install pusher -v 1.2.0-rc1
+```
+
+### Sending native pushes
+
+The native notifications API is hosted at `nativepush-cluster1.pusher.com` and only accepts https requests.
+
+You can send pushes by using the `notify` method, either globally or on the instance. The method takes two parameters:
+
+- `interests`: An Array of strings which represents the interests your devices are subscribed to. These are akin to channels in the DDN with less of an epehemeral nature. Note that currently, you can only send to _one_ interest.
+- `data`: The content of the notification represented by a Hash. You must supply either the `gcm` or `apns` key. For a detailed list of the acceptable keys, take a look at the [iOS](https://pusher.com/docs/push_notifications/ios/server) and [Android](https://pusher.com/docs/push_notifications/android/server) docs.
+
+Example:
+
+```ruby
+data = {
+  apns: {
+    aps: {
+      alert: {
+        body: 'tada'
+      }
+    }
+  }
+}
+
+pusher.notify(["my-favourite-interest"], data)
+```
+
+### Errors
+
+Push notification requests, once submitted to the service are executed asynchronously. To make reporting errors easier, you can supply a `webhook_url` field in the body of the request. This will be used by the service to send a webhook to the supplied URL if there are errors.
+
+You may also supply a `webhook_level` field in the body, which can either be INFO or DEBUG. It defaults to INFO - where INFO only reports customer facing errors, while DEBUG reports all errors.
+
+For example:
+
+```ruby
+data = {
+  apns: {
+    aps: {
+      alert: {
+        body: "hello"
+      }
+    }
+  },
+  gcm: {
+    notification: {
+      title: "hello",
+      icon: "icon"
+    }
+  },
+  webhook_url: "http://yolo.com",
+  webhook_level: "INFO"
+}
+```
+
+**NOTE:** This is currently a BETA feature and there might be minor bugs and issues. Changes to the API will be kept to a minimum, but changes are expected. If you come across any bugs or issues, please do get in touch via [support](support@pusher.com) or create an issue here.
+

data/lib/pusher.rb

@@ -28,7 +28,9 @@ module Pusher
     extend Forwardable
 
     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=
@@ -37,6 +39,7 @@ module Pusher
     def_delegators :default_client, :get, :get_async, :post, :post_async
     def_delegators :default_client, :channels, :channel_info, :channel_users, :trigger, :trigger_async
     def_delegators :default_client, :authenticate, :webhook, :channel, :[]
+    def_delegators :default_client, :notify
 
     attr_writer :logger
 
@@ -61,3 +64,4 @@ require 'pusher/channel'
 require 'pusher/request'
 require 'pusher/resource'
 require 'pusher/webhook'
+require 'pusher/native_notification/client'

data/lib/pusher/client.rb

@@ -2,7 +2,7 @@ require 'pusher-signature'
 
 module Pusher
   class Client
-    attr_accessor :scheme, :host, :port, :app_id, :key, :secret
+    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
@@ -32,9 +32,17 @@ module Pusher
         merged_options[:host] = "api.pusherapp.com"
       end
 
-      @scheme, @host, @port, @app_id, @key, @secret = merged_options.values_at(
-        :scheme, :host, :port, :app_id, :key, :secret
-      )
+      # TODO: Change host name when finalized
+      merged_options[:notification_host] =
+        options.fetch(:notification_host, "nativepush-cluster1.pusher.com")
+
+      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, :notification_scheme
+        )
 
       @http_proxy = nil
       self.http_proxy = options[:http_proxy] if options[:http_proxy]
@@ -298,6 +306,25 @@ module Pusher
       post_async('/batch_events', trigger_batch_params(events.flatten))
     end
 
+    def notification_client
+      @notification_client ||=
+        NativeNotification::Client.new(@app_id, @notification_host, @notification_scheme, self)
+    end
+
+
+    # Send a push notification
+    #
+    # POST /apps/[app_id]/notifications
+    #
+    # @param interests [Array] An array of interests
+    # @param message [String] Message to send
+    # @param options [Hash] Additional platform specific options
+    #
+    # @return [Hash]
+    def notify(interests, data = {})
+      notification_client.notify(interests, data)
+    end
+
     # Generate the expected response for an authentication endpoint.
     # See http://pusher.com/docs/authenticating_users for details.
     #

data/lib/pusher/native_notification/client.rb

@@ -0,0 +1,123 @@
+module Pusher
+  module NativeNotification
+    class Client
+      attr_reader :app_id, :host
+
+      API_PREFIX = "customer_api"
+      API_VERSION = "v1"
+      GCM_TTL = 241920
+      RESTRICTED_GCM_PAYLOAD_KEYS = [:to, :registration_ids]
+      WEBHOOK_LEVELS = ["DEBUG", "INFO"]
+
+      def initialize(app_id, host, scheme, pusher_client)
+        @app_id = app_id
+        @host = host
+        @scheme = scheme
+        @pusher_client = pusher_client
+      end
+
+      # Send a notification via the native notifications API
+      def notify(interests, data = {})
+        Request.new(
+          @pusher_client,
+          :post,
+          url("/notifications"),
+          {},
+          payload(interests, data)
+        ).send_sync
+      end
+
+      private
+
+      # TODO: Actual links
+      #
+      # {
+      #   interests: [Array of interests],
+      #   apns: {
+      #     See https://pusher.com/docs/push_notifications/ios/server
+      #   },
+      #   gcm: {
+      #     See https://pusher.com/docs/push_notifications/android/server
+      #   }
+      # }
+      #
+      # @raise [Pusher::Error] if the `apns` or `gcm` key does not exist
+      # @return [String]
+      def payload(interests, data)
+        interests = Array(interests).map(&:to_s)
+
+        raise Pusher::Error, "Too many interests provided" if interests.length > 1
+
+        data = deep_symbolize_keys!(data)
+        validate_payload(data)
+
+        data.merge!(interests: interests)
+
+        MultiJson.encode(data)
+      end
+
+      def url(path = nil)
+        URI.parse("#{@scheme}://#{@host}/#{API_PREFIX}/#{API_VERSION}/apps/#{@app_id}#{path}")
+      end
+
+      # Validate payload
+      # `time_to_live` -> value b/w 0 and 241920
+      # If the `notification` key is provided, ensure
+      # that there is an accompanying `title` and `icon`
+      # field
+      def validate_payload(payload)
+        unless (payload.has_key?(:apns) || payload.has_key?(:gcm))
+          raise Pusher::Error, "GCM or APNS data must be provided"
+        end
+
+        if (gcm_payload = payload[:gcm])
+          # Restricted keys
+          RESTRICTED_GCM_PAYLOAD_KEYS.each { |k| gcm_payload.delete(k) }
+          if (ttl = gcm_payload[:time_to_live])
+
+            if ttl.to_i < 0 || ttl.to_i > GCM_TTL
+              raise Pusher::Error, "Time to live must be between 0 and 241920 (4 weeks)"
+            end
+          end
+
+          # If the notification key is provided
+          # validate the `icon` and `title`keys
+          if (notification = gcm_payload[:notification])
+            notification_title, notification_icon = notification.values_at(:title, :icon)
+
+            if (!notification_title || notification_title.empty?)
+              raise Pusher::Error, "Notification title is a required field"
+            end
+
+            if (!notification_icon || notification_icon.empty?)
+              raise Pusher::Error, "Notification icon is a required field"
+            end
+          end
+        end
+
+        if (webhook_url = payload[:webhook_url])
+          raise Pusher::Error, "Webhook url is invalid" unless webhook_url =~ /\A#{URI::regexp(['http', 'https'])}\z/
+        end
+
+        if (webhook_level = payload[:webhook_level])
+          raise Pusher::Error, "Webhook level cannot be used without a webhook url" if !payload.has_key?(:webhook_url)
+
+          unless WEBHOOK_LEVELS.include?(webhook_level.upcase)
+            raise Pusher::Error, "Webhook level must either be INFO or DEBUG"
+          end
+        end
+      end
+
+      # Symbolize all keys in the hash recursively
+      def deep_symbolize_keys!(hash)
+        hash.keys.each do |k|
+          ks = k.respond_to?(:to_sym) ? k.to_sym : k
+          hash[ks] = hash.delete(k)
+          deep_symbolize_keys!(hash[ks]) if hash[ks].kind_of?(Hash)
+        end
+
+        hash
+      end
+    end
+  end
+end

data/pusher.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "pusher"
-  s.version     = "1.1.0"
+  s.version     = "1.2.0.rc1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pusher"]
   s.email       = ["support@pusher.com"]
@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "webmock"
   s.add_development_dependency "em-http-request", "~> 1.1.0"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rack"
-  s.add_development_dependency "json"
+  s.add_development_dependency "rake", "~> 10.4.2"
+  s.add_development_dependency "rack", "~> 1.6.4"
+  s.add_development_dependency "json", "~> 1.8.3"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/client_spec.rb

@@ -525,6 +525,206 @@ describe Pusher do
         end
       end
     end
+
+    describe "native notifications" do
+      before :each do
+        @client.app_id = "20"
+        @client.key = "testytest"
+        @client.secret = "mysupersecretkey"
+      end
+
+      it "should configure a native notification client using the pusher client object" do
+        expect(@client.notification_client).to_not be(nil)
+      end
+
+      it "should use the default host if not provided" do
+        expect(@client.notification_host).to eq("nativepush-cluster1.pusher.com")
+      end
+
+      it "should use a newly provided host" do
+        @client.notification_host = "test.com"
+        expect(@client.notification_host).to eq("test.com")
+      end
+
+      it "should set the native notification client host to the same one" do
+        expect(@client.notification_host).to eq(@client.notification_client.host)
+      end
+
+      it "should raise an error if the gcm or apns key isn't provided in the payload" do
+        expect { @client.notify(["test"], { foo: "bar" }) }.to raise_error(Pusher::Error)
+      end
+
+      it "should raise an error if more than one interest is provided" do
+        payload = {
+          gcm: {
+            notification: {
+              title: "Hello",
+              icon: "icon",
+            }
+          }
+        }
+
+        expect { @client.notify(["test1", "test2"], payload) }.to raise_error(Pusher::Error)
+      end
+
+      it "should raise an error if the notification hash is missing the title field" do
+        payload = {
+          gcm: {
+            notification: {
+              icon: "someicon"
+            }
+          }
+        }
+
+        expect{ @client.notify(["test"], payload) }.to raise_error(Pusher::Error)
+      end
+
+      it "should raise an error if the notification title is empty" do
+        payload = {
+          gcm: {
+            notification: {
+              title: "",
+              icon: "myicon"
+            }
+          }
+        }
+
+        expect { @client.notify(["test"], payload) }.to raise_error(Pusher::Error)
+      end
+
+      it "should raise an error if the notification hash is missing the icon field" do
+        payload = {
+          gcm: {
+            notification: {
+              title: "sometitle"
+            }
+          }
+        }
+
+        expect{ @client.notify(["test"], payload) }.to raise_error(Pusher::Error)
+      end
+
+      it "should raise an error if the notification icon is empty" do
+        payload = {
+          gcm: {
+            notification: {
+              title: "title",
+              icon: ""
+            }
+          }
+        }
+
+        expect { @client.notify(["test"], payload) }.to raise_error(Pusher::Error)
+      end
+
+      it "should raise an error if the ttl field is provided and has an illegal value" do
+        payload = {
+          gcm: {
+            time_to_live: 98091283,
+            notification: {
+              title: "title",
+              icon: "icon",
+            }
+          }
+        }
+
+        expect{ @client.notify(["test"], payload) }.to raise_error(Pusher::Error)
+      end
+
+      it "should send a request to the notifications endpoint" do
+        notification_host_regexp = %r{nativepush-cluster1.pusher.com}
+        payload = {
+          interests: ["test"],
+          gcm: {
+            notification: {
+              title: "Hello",
+              icon: "icon",
+            }
+          }
+        }
+
+        stub_request(
+          :post,
+          notification_host_regexp,
+        ).with(
+          body: MultiJson.encode(payload)
+        ).to_return({
+          :status => 200,
+          :body => MultiJson.encode({ :foo => "bar" })
+        })
+
+        @client.notify(["test"], payload)
+      end
+
+      it "should delete restricted gcm keys before sending a notification" do
+        notification_host_regexp = %r{nativepush-cluster1.pusher.com}
+        payload = {
+          interests: ["test"],
+          gcm: {
+            notification: {
+              title: "Hello",
+              icon: "icon",
+            }
+          }
+        }
+
+        stub_request(
+          :post,
+          notification_host_regexp,
+        ).with(
+          body: MultiJson.encode(payload)
+        ).to_return({
+          :status => 200,
+          :body => MultiJson.encode({ :foo => "bar" })
+        })
+
+        payload[:gcm].merge!(to: "blah", registration_ids: ["reg1", "reg2"])
+        @client.notify(["test"], payload)
+      end
+
+      it "should raise an error for an invalid webhook url field" do
+        payload = {
+          gcm: {
+            notification: {
+              title: "Hello",
+              icon: "icon"
+            }
+          },
+          webhook_url: "totallyinvalid"
+        }
+
+        expect { @client.notify(["test"], payload) }.to raise_error(Pusher::Error)
+      end
+
+      it "should raise an error if the webhook level is not supported" do
+        payload = {
+          gcm: {
+            notification: {
+              title: "Hello",
+              icon: "icon"
+            }
+          },
+          webhook_url: "http://test.com/wh",
+          webhook_level: "meh"
+        }
+
+        expect { @client.notify(["test"], payload) }.to raise_error(Pusher::Error)
+      end
+
+      it "should raise an error if the webhook level is used without the webhook url" do
+        payload = {
+          gcm: {
+            notification: {
+              title: "Hello",
+              icon: "icon"
+            }
+          },
+          webhook_level: "meh"
+        }
+
+        expect { @client.notify(["test"], payload) }.to raise_error(Pusher::Error)
+      end
+    end
   end
 
   describe 'configuring cluster' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.rc1
 platform: ruby
 authors:
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -98,44 +98,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
 description: Wrapper for pusher.com REST api
 email:
 - support@pusher.com
@@ -156,6 +156,7 @@ files:
 - lib/pusher.rb
 - lib/pusher/channel.rb
 - lib/pusher/client.rb
+- lib/pusher/native_notification/client.rb
 - lib/pusher/request.rb
 - lib/pusher/resource.rb
 - lib/pusher/webhook.rb
@@ -179,9 +180,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.2