moromi-aws-sns 0.10.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3baab0c1c05d47236977a93d32462c195497be00
-  data.tar.gz: b9947afddc979487d1ceb5c4654b2256e79c2cfb
+SHA256:
+  metadata.gz: e81f929cb8f988e4a6fcf67076daf379b41fe5d13832f6da060bc1536d055704
+  data.tar.gz: 540652fc01c31c623c40826e01ed2edbcb99937650442a0ade6a7549cd1a8d54
 SHA512:
-  metadata.gz: f360b9ad84439904b3101fd04f8717daf6d74b715e066209642b39abaa050c750c36239b59b16b5d816ca357dab9c39f377e0d0e254e5a36958c624ed70e4abe
-  data.tar.gz: 76b14ec220be6e4eb11f6ad9a9807051ecc03e4fb8d882643b2560cd99d7aa40954e1aee212a7fde8229edbea92b6a81f0bb37f541e2582634f8ac7e4587e21d
+  metadata.gz: 8804c680b64dbe83ec4e0a5e0b66640a6e96c9a33585f0f5ff0cad642b73a7ed6a35baab4f510a781fc1405104d99dc68d3d958dacf25419b28297bf7ba033cd
+  data.tar.gz: 949e8670aa6483c3a77ccb545017a893c68bdd44f1d703755dd602118e7240e24a608c5e466097a64d0b39773fca2ae67457559af429082cd76d28cc90ab3215

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

@@ -4,9 +4,8 @@ module Moromi
   module Aws
     module Sns
       class Client
-        def initialize(access_key_id, secret_access_key, region)
-          @access_key_id = access_key_id
-          @secret_access_key = secret_access_key
+        def initialize(region, credentials: nil)
+          @credentials = credentials
           @region = region
         end
 
@@ -87,12 +86,14 @@ module Moromi
 
         private
 
-        def credentials
-          @credentials ||= ::Aws::Credentials.new(@access_key_id, @secret_access_key)
-        end
-
         def client
-          @client ||= ::Aws::SNS::Client.new(region: @region, credentials: credentials)
+          @client ||= begin
+                        if @credentials
+                          ::Aws::SNS::Client.new(region: @region, credentials: @credentials)
+                        else
+                          ::Aws::SNS::Client.new(region: @region)
+                        end
+                      end
         end
 
         def call_publish(options)

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

@@ -9,11 +9,13 @@ module Moromi
           attr_reader :content_available
           attr_reader :mutable_content
           attr_reader :category
+          attr_reader :thread_id
           attr_reader :priority
           attr_reader :type
           attr_reader :custom_data
 
-          def initialize(alert:, badge:, sound: 'default', content_available: 1, mutable_content: 0, category: nil,
+
+          def initialize(alert:, badge:, sound: 'default', content_available: 1, mutable_content: 0, category: nil, thread_id: nil,
                          priority: 10, type: nil, custom_data: {})
             @alert = alert
             @badge = badge
@@ -21,6 +23,7 @@ module Moromi
             @content_available = content_available
             @mutable_content = mutable_content
             @category = category
+            @thread_id = thread_id
             @priority = priority
             @type = type || self.class.name
             @custom_data = setup_initial_custom_data({type: @type}.merge(custom_data))
@@ -33,6 +36,7 @@ module Moromi
               sound: @sound,
               content_available: @content_available,
               mutable_content: @mutable_content,
+              thread_id: @thread_id,
               category: @category,
               priority: @priority,
               type: @type,
@@ -42,7 +46,10 @@ module Moromi
 
           def to_message_json
             aps = to_hash
-            %i[custom_data type].each { |k| aps.delete(k) }
+            %i[custom_data type content_available mutable_content].each { |k| aps.delete(k) }
+            aps['content-available'] = @content_available
+            aps['mutable-content'] = @mutable_content
+            aps['thread-id'] = @thread_id
             @custom_data.merge({aps: aps}).to_json
           end
 

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

@@ -57,10 +57,27 @@ module Moromi
             }
           end
 
+          def to_data_hash
+            base = {
+              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
+            }
+            flatten_hash(@custom_data).merge(base)
+          end
+
           def to_message_json
-            notification = to_hash
-            %i[custom_data type].each { |k| notification.delete(k) }
-            {notification: notification, data: @custom_data}.to_json
+            {data: to_data_hash}.to_json
           end
 
           private
@@ -68,6 +85,18 @@ module Moromi
           def setup_initial_custom_data(custom_data)
             custom_data
           end
+
+          def flatten_hash(hash)
+            hash.each_with_object({}) do |(k, v), h|
+              if v.is_a? Hash
+                flatten_hash(v).map do |h_k, h_v|
+                  h["#{k}_#{h_k}".to_sym] = h_v
+                end
+              else
+                h[k] = v
+              end
+            end
+          end
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Moromi
   module Aws
     module Sns
-      VERSION = '0.10.0'
+      VERSION = '0.15.0'
     end
   end
 end

data/moromi-aws-sns.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-sns', '~> 1'
   spec.add_dependency 'activesupport', ['>= 4.2']
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moromi-aws-sns
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sns
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: AWS SNS client.