j7w1 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01fea4879c09440293db4bbaf42f0d8bb22b2691
-  data.tar.gz: 004a6963ec9a4a14fe2104c37a6ec668d518cb7e
+  metadata.gz: 52a2b3685c81bfad527b4cb9bc43714b026c9796
+  data.tar.gz: ffd32b5f4a8215d1798aa1f94940ef13b4746858
 SHA512:
-  metadata.gz: e04db9946063b6979f00aeeebd74e21c95abcbce78fcc29c28a57bd16f70f5f8d7b827a5219878461f99bb0d1f534646b1556145e6d387f7bb50b25ebe02cd99
-  data.tar.gz: 4f26a63ab7e50f672cf8b3fd00b600f2776bd2eb3f83205b3c5f864a43806da9da0bdc73cfc44873b871596f76bf0ffcb86dadad3d990b591db854a1875c8b9c
+  metadata.gz: 2ea3959139837c519c972caae8fdb2fdd6d00a5a59830da65cf5a20b99b7ac9d2007a1e2af27e26ec35bf30bb057468198608aa27b4ae5822bb71bb494afd7d6
+  data.tar.gz: 32c522339222f1e91c614ef482f52e8d8d77effb19d61c2b3ad725cdcf23648720fe2901ff5f8d89cccb46f9ea6986f9a120c9b66a391a07048b84e1aa7d4aa0

data/lib/j7w1/sns_push_client.rb

@@ -4,7 +4,10 @@ module J7W1
       AWS::SNS.new configuration.account
     end
 
-    APNS_MAX_MESSAGE_SIZE = 40
+    APNS_MAX_PAYLOAD = 256
+
+    SHORTEN_REPLACEMENT = '...'.freeze
+    SHORTEN_REPLACEMENT_LENGTH = SHORTEN_REPLACEMENT.length
 
     INPUT_PAYLOAD_TABLE = {
       ios: {
@@ -87,6 +90,20 @@ module J7W1
       nil
     end
 
+    def create_topic(name, options)
+      sns_client = options[:sns_client]
+      sns_client ||= create_sns_client(sns_configuration || J7W1.configuration)
+
+      sns_client.topics.create name
+    end
+
+    def subscribe_topic(topic_name, endpoint_arn, options)
+      sns_client = options[:sns_client]
+      sns_client ||= create_sns_client(sns_configuration || J7W1.configuration)
+
+      sns_client.topics[name]
+    end
+
     def push(endpoint_arn, platform, options = {})
       return unless endpoint_arn && platform
 
@@ -133,16 +150,37 @@ module J7W1
       prefix = J7W1.configuration.ios_endpoint.sandbox? ?
           :APNS_SANDBOX : :APNS
 
-      if message_value[:message] && message_value[:message].length > APNS_MAX_MESSAGE_SIZE
-        message_value[:message] = message_value[:message][0...(APNS_MAX_MESSAGE_SIZE - 3)] + '...'
-      end
-
       content = {
           aps: message_content(message_value, platform: :ios),
       }
       content.merge! data: data if data
 
-      {prefix => content.to_json}
+      {prefix => ios_truncated_payload(content)}
+    end
+
+    def ios_truncated_payload(data)
+      payload = data.to_json
+
+      # Truncation is skipped when the payload is sufficiently lightweight.
+      return payload if (limit_break = payload.bytesize - APNX_MAX_PAYLOAD) >= 0
+
+      # Raise error if shortening of the alert cannot make the payload sufficiently short.
+      size_to_reduce = limit_break + SHORTEN_REPLACEMENT_LENGTH
+      raise "Payload is too heavy (#{payload.length})" unless
+        data[:alert] && data[:alert].bytesize > size_to_reduce
+
+      # Chopping the alert from its last -> first to avoid destroying the character's border
+      # and keep its content as long as possible.
+      chopped_length = 0
+      chopped_count = 0
+      while chopped_length < size_to_reduce
+        chopped_length += data[:alert][-1].bytesize
+        chopped_count += 1
+      end
+      data[:alert][-chopped_count..-1] = SHORTEN_REPLACEMENT
+      # Problem won't be occur because at least a character is truncated.
+
+      data.to_json
     end
 
     def android_payload_for(message_value, data)

data/lib/j7w1/version.rb

@@ -1,3 +1,3 @@
 module J7W1
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: j7w1
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - condor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Mobile apps push client
@@ -135,17 +135,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mobile apps push client