Merge pull request #104 from pusher/1.2.0-rc3

1.2.0-rc3

Author: jpatel531

lib/pusher/native_notification/client.rb

@@ -5,9 +5,6 @@ class Client
 
       API_PREFIX = "server_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
@@ -45,69 +42,15 @@ def notify(interests, data = {})
       # @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)
-
+        data = deep_symbolize_keys!(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|

lib/pusher/request.rb

@@ -85,7 +85,7 @@ def handle_response(status_code, body)
       when 200
         return symbolize_first_level(MultiJson.decode(body))
       when 202
-        return true
+        return body.empty? ? true : symbolize_first_level(MultiJson.decode(body))
       when 400
         raise Error, "Bad request: #{body}"
       when 401

lib/pusher/version.rb

@@ -1,3 +1,3 @@
 module Pusher
-  VERSION = '1.2.0.rc2'
+  VERSION = '1.2.0.rc3'
 end

spec/client_spec.rb

@@ -550,10 +550,6 @@
         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: {
@@ -567,70 +563,6 @@
         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 = {
@@ -653,76 +585,8 @@
           :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)
+        res = @client.notify(["test"], payload)
+        expect(res).to eq({foo: "bar"})
       end
     end
   end