push_to_sns 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad9057539c78782ad4272ae2f7512b049ef936d9
-  data.tar.gz: ba38b3f2353d564a6742bb245722e66b02b272d4
+  metadata.gz: bdb88b92dcd3dc7f89ad71992c1f05bcb496765f
+  data.tar.gz: 2c64da57edee3c5d6a8b668b26fde82861a6c89e
 SHA512:
-  metadata.gz: 2adc4366f07897ff8785e2df0f5add0a0f566d2590a2c296ca28e66970f9f4ae5fb251ed926e876aa39513a4304afc8912bdc2d3307fdc12d366cc569b66763e
-  data.tar.gz: 64f605e044a03a23433e8da8b490090ef2b689c3101d212a00bf3224cb309d3e974d60a49ff93b9086fc46f38f57db346f4e8c55ae05d5c20770e6cbe7fe1b11
+  metadata.gz: e11f5cbead59e666895f74ce48f5dbb1b2964c74a304acad1694751876ad955bc6cf0230ffca7cff0dfb4af1438e6b7e4f47afad0ef763497e3b80a84819f197
+  data.tar.gz: d3da5122c6ac0d62601d7d22fc009671b423de37cbc0de4d2f29eda298f310f159f1e860a14718751c19db011c7e6583afa9aab83cb0fe5f9127ea442998255b

data/lib/push_to_sns/android_push_notification.rb

@@ -9,9 +9,13 @@ module PushToSNS
     private
 
     def default_payload
-      {
+      basic_message = {
         message: payload[:message] || DEFAULT_MESSAGE
       }
+      basic_message[:smallIcon] = payload[:badge] if payload[:badge]
+      basic_message[:sound] = payload[:sound] if payload[:sound]
+
+      basic_message
     end
   end
 end

data/lib/push_to_sns/ios_push_notification.rb

@@ -3,12 +3,18 @@ module PushToSNS
     DEFAULT_MESSAGE = "IOS Push Notification"
 
     def message
-      {
+      basic_message = {
         apns => {
-          aps: { alert: payload[:message] || DEFAULT_MESSAGE },
+          aps: {
+            alert: payload[:message] || DEFAULT_MESSAGE
+          },
           data: payload
-        }.to_json
+        }
       }
+      basic_message[apns][:aps][:badge] = payload[:badge] if payload[:badge]
+      basic_message[apns][:aps][:sound] = payload[:sound] if payload[:sound]
+      basic_message[apns] = basic_message[apns].to_json
+      basic_message
     end
 
     private

data/lib/push_to_sns/push_notifier.rb

@@ -23,7 +23,12 @@ module PushToSNS
     private
 
     def full_notification_for_device(device)
-      defaults = { type: type, message: message }
+      defaults = {
+        type: call_or_read(type, device),
+        message: call_or_read(message, device),
+        badge: call_or_read(badge, device),
+        sound: call_or_read(sound, device)
+      }.reject { |key, value| value.nil? }
       defaults.merge(notification(device))
     end
 
@@ -35,22 +40,37 @@ module PushToSNS
       @message ||= self.class.message
     end
 
-    class << self
-      attr_accessor :input_type, :input_message
+    def badge
+      @badge ||= self.class.badge
+    end
 
-      def type(input_type = nil)
-        if input_type.nil?
-          self.input_type
-        else
-          self.input_type = input_type
-        end
+    def sound
+      @sound ||= self.class.sound
+    end
+
+    private
+
+    def call_or_read(proc_or_object, *arguments)
+      if proc_or_object.respond_to?(:call)
+        proc_or_object.call(*arguments)
+      else
+        proc_or_object
       end
+    end
+
+    class << self
+      [:type, :message, :badge, :sound].each do |method_name|
+        property_name = "input_#{method_name}".to_sym
+        attr_accessor property_name
 
-      def message(input_message = nil)
-        if input_message.nil?
-          self.input_message
-        else
-          self.input_message = input_message
+        define_method(method_name) do |input = nil, &block|
+          if input.nil? && block.nil?
+            public_send(property_name)
+          elsif input.nil? && !block.nil?
+            public_send("#{property_name}=", block)
+          elsif !input.nil?
+            public_send("#{property_name}=", input)
+          end
         end
       end
     end

data/lib/push_to_sns/version.rb

@@ -1,3 +1,3 @@
 module PushToSNS
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: push_to_sns
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler