moromi-aws-sns 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd0178ffca367a9cf72dd93d1e3349345e75b9b0
-  data.tar.gz: 7814bea3bf93d29b8bec1a7254bca7e145914d02
+  metadata.gz: b9be304eada55a17272c684d5700ca9778241c95
+  data.tar.gz: ef097f330567a35a4c65d863095164833e77faf8
 SHA512:
-  metadata.gz: 2f397cb91c7c5a5518efdcb93360c5033cf0e6526e73d1d2ca2e9d09dca95dd4983a364ebe1c4f846345c3620c6169c400b8d6cafacc5303c55009304ce6a485
-  data.tar.gz: dd6d0c8f1f8076c33628ff350eecf9b911f2a6f53a252f5af0d95709401e75d4ff03646f356fa64ed0122117aef35718cfe1c67b87ca9bed05f2b2e38d130c30
+  metadata.gz: e06da11f8bde51e9e3e35c83be4b95fade05b1f127dcef6f794fa4ba0b36708e35eb390811b3100f402e74b9336053253ccf044e65094245637ee34bab7eed44
+  data.tar.gz: f8b1502822a12a9bc9819fc1d73d09ec2471d03c0ba0b36079c6a1719cae7cc2c9a3fa3df9000cd7dac06cbacb5679f29ff08a196f873a9dc766d0580afef80d

data/lib/moromi/aws/sns/client.rb

@@ -56,30 +56,25 @@ module Moromi
         end
 
         # @param [String] arn
-        # @param [Moromi::Aws::Sns::Message::Base] message
-        def send_message(arn, message)
+        # @param [Moromi::Aws::Sns::Message::Parameter] parameter
+        def publish(arn, parameter)
           options = {
             target_arn: arn,
-            message: message.to_parameter.to_json,
+            message: parameter.to_json,
             message_structure: 'json'
           }
-          publish(options)
+          call_publish(options)
         end
 
         # @param [String] topic_arn
-        # @param [Moromi::Aws::Sns::Message::Base] message
-        def send_message_to_topic(topic_arn, message)
+        # @param [Moromi::Aws::Sns::Message::Parameter] parameter
+        def publish_to_topic(topic_arn, parameter)
           options = {
             topic_arn: topic_arn,
-            message: message.to_parameter.to_json,
+            message: parameter.to_json,
             message_structure: 'json'
           }
-          publish(options)
-        end
-
-        def publish(options)
-          response = client.publish(options)
-          response.message_id
+          call_publish(options)
         end
 
         def get_endpoint_attributes(endpoint_arn)
@@ -99,6 +94,11 @@ module Moromi
         def client
           @client ||= ::Aws::SNS::Client.new(region: @region, credentials: credentials)
         end
+
+        def call_publish(options)
+          response = client.publish(options)
+          response.message_id
+        end
       end
     end
   end

data/lib/moromi/aws/sns/message/apns.rb

@@ -0,0 +1,64 @@
+module Moromi
+  module Aws
+    module Sns
+      module Message
+        class Apns < Base
+          attr_reader :alert
+          attr_reader :badge
+          attr_reader :sound
+          attr_reader :content_available
+          attr_reader :mutable_content
+          attr_reader :category
+          attr_reader :priority
+          attr_reader :type
+          attr_reader :custom_data
+
+          def initialize(alert:, badge:, sound: 'default', content_available: 1, mutable_content: 0, category: nil,
+                         priority: 10, type: nil, custom_data: {})
+            @alert = alert
+            @badge = badge
+            @sound = sound
+            @content_available = content_available
+            @mutable_content = mutable_content
+            @category = category
+            @priority = priority
+            @type = type || self.class.name
+            @custom_data = setup_initial_custom_data({type: @type}.merge(custom_data))
+          end
+
+          def to_hash
+            {
+              alert: @alert,
+              badge: @badge,
+              sound: @sound,
+              content_available: @content_available,
+              mutable_content: @mutable_content,
+              category: @category,
+              priority: @priority,
+              type: @type,
+              custom_data: @custom_data
+            }
+          end
+
+          def to_message_json
+            aps = to_hash
+            %i[custom_data type].each { |k| aps.delete(k) }
+            @custom_data.merge({aps: aps}).to_json
+          end
+
+          private
+
+          def setup_initial_custom_data(custom_data)
+            custom_data
+          end
+
+          class << self
+            def build_silent_push_message(priority: 10, custom_data: {})
+              new('', nil, sound: nil, content_available: 1, priority: priority, custom_data: custom_data)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/moromi/aws/sns/message/base.rb

@@ -1,20 +1,26 @@
+require 'json'
+
 module Moromi
   module Aws
     module Sns
       module Message
-        module Base
-          # @return Moromi::Aws::Sns::Message::Parameter
-          def to_parameter
+        class Base
+          def to_hash
             raise NotImplementedError
           end
 
-          def serialize
+          def to_message_json
             raise NotImplementedError
           end
 
-          # @return Moromi::Aws::Sns::Message::Base
-          def self.unserialize(data)
-            raise NotImplementedError
+          def ==(other)
+            to_hash == other.to_hash
+          end
+
+          class << self
+            def build_from_hash(hash)
+              new(hash)
+            end
           end
         end
       end

data/lib/moromi/aws/sns/message/fcm.rb

@@ -0,0 +1,75 @@
+module Moromi
+  module Aws
+    module Sns
+      module Message
+        class Fcm < Base
+          # https://firebase.google.com/docs/cloud-messaging/http-server-ref?hl=ja#notification-payload-support
+          attr_reader :title
+          attr_reader :body
+          attr_reader :android_channel_id
+          attr_reader :icon
+          attr_reader :sound
+          attr_reader :tag
+          attr_reader :color
+          attr_reader :click_action
+          attr_reader :body_loc_key
+          attr_reader :body_loc_args
+          attr_reader :title_loc_key
+          attr_reader :title_loc_args
+
+          def initialize(title: nil, body: nil, android_channel_id: nil, icon: nil, sound: nil, tag: nil, color: nil,
+                         click_action: nil,
+                         body_loc_key: nil, body_loc_args: nil,
+                         title_loc_key: nil, title_loc_args: nil,
+                         type: nil, custom_data: {})
+            @title = title
+            @body = body
+            @android_channel_id = android_channel_id
+            @icon = icon
+            @sound = sound
+            @tag = tag
+            @color = color
+            @click_action = click_action
+            @body_loc_key = body_loc_key
+            @body_loc_args = body_loc_args
+            @title_loc_key = title_loc_key
+            @title_loc_args = title_loc_args
+            @type = type || self.class.name
+            @custom_data = setup_initial_custom_data({type: @type}.merge(custom_data))
+          end
+
+          def to_hash
+            {
+              title: @title,
+              body: @body,
+              android_channel_id: @android_channel_id,
+              icon: @icon,
+              sound: @sound,
+              tag: @tag,
+              color: @color,
+              click_action: @click_action,
+              body_loc_key: @body_loc_key,
+              body_loc_args: @body_loc_args,
+              title_loc_key: @title_loc_key,
+              title_loc_args: @title_loc_args,
+              type: @type,
+              custom_data: @custom_data
+            }
+          end
+
+          def to_message_json
+            notification = to_hash
+            %i[custom_data type].each { |k| notification.delete(k) }
+            {notification: notification, data: @custom_data}.to_json
+          end
+
+          private
+
+          def setup_initial_custom_data(custom_data)
+            custom_data
+          end
+        end
+      end
+    end
+  end
+end

data/lib/moromi/aws/sns/message/parameter.rb

@@ -5,19 +5,39 @@ module Moromi
     module Sns
       module Message
         class Parameter
+          # @param [Moromi::Aws::Sns::Message::Apns] apns
+          # @param [Moromi::Aws::Sns::Message::Fcm] gcm
           def initialize(apns: nil, gcm: nil)
             @apns = apns
             @gcm = gcm
           end
 
+          def to_hash
+            {
+              klass_name: self.class.name,
+              apns: {name: @apns&.class&.name, data: @apns&.to_hash},
+              gcm: {name: @gcm&.class&.name, data: @gcm&.to_hash}
+            }
+          end
+
           def to_json
             {
               'default': '',
-              'APNS_SANDBOX': @apns&.to_json,
-              'APNS': @apns&.to_json,
-              'GCM': @gcm&.to_json
+              'APNS_SANDBOX': @apns&.to_message_json,
+              'APNS': @apns&.to_message_json,
+              'GCM': @gcm&.to_message_json
             }.compact.to_json
           end
+
+          def self.build_from_hash(hash)
+            apns_klass = hash.dig(:apns, :name)&.safe_constantize
+            apns = apns_klass&.build_from_hash(hash.dig(:apns, :data))
+
+            gcm_klass = hash.dig(:gcm, :name)&.safe_constantize
+            gcm = gcm_klass&.build_from_hash(hash.dig(:gcm, :data))
+
+            new(apns: apns, gcm: gcm)
+          end
         end
       end
     end

data/lib/moromi/aws/sns/version.rb

@@ -1,7 +1,7 @@
 module Moromi
   module Aws
     module Sns
-      VERSION = '0.6.0'
+      VERSION = '0.7.0'
     end
   end
 end

data/lib/moromi/aws/sns.rb

@@ -1,5 +1,7 @@
 require "moromi/aws/sns/version"
 require "moromi/aws/sns/message/base"
+require "moromi/aws/sns/message/apns"
+require "moromi/aws/sns/message/fcm"
 require "moromi/aws/sns/message/parameter"
 require "moromi/aws/sns/client"
 

data/moromi-aws-sns.gemspec

@@ -19,7 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.2'
+
   spec.add_dependency 'aws-sdk', '~> 2'
+  spec.add_dependency 'activesupport', ['>= 4.2']
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moromi-aws-sns
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +98,9 @@ files:
 - circle.yml
 - lib/moromi/aws/sns.rb
 - lib/moromi/aws/sns/client.rb
+- lib/moromi/aws/sns/message/apns.rb
 - lib/moromi/aws/sns/message/base.rb
+- lib/moromi/aws/sns/message/fcm.rb
 - lib/moromi/aws/sns/message/parameter.rb
 - lib/moromi/aws/sns/version.rb
 - moromi-aws-sns.gemspec
@@ -100,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="