j7w1 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 015073b124bf0e8f9a4a37f2c553c1238be903ca
-  data.tar.gz: 6e1cd196723d5d748a530d0c6db2c05fc47e005e
+  metadata.gz: c1a71b5172329b1a6d8ee0fb802550a281603a64
+  data.tar.gz: b1ab7f15f14a6c33192ae52f1a49264e2d4ddb91
 SHA512:
-  metadata.gz: 2f110d6d06ec461d4055d8eaac0c6863e7d0f4f3ba4a1911b11c87a1dddf2b7562cae90293c3fb40548b98c7fcd11bf148c24819bfd0fab6d4634c597c83082e
-  data.tar.gz: 6ec532b203caa78acc6d65dda12c85f1406783cc59054f5d932debbf42f32a57762286a4d3b745d7c63c9033b93769bccf86ed94696c7e8f641ed99ebd0f68e6
+  metadata.gz: 8e3f78f9fcfbaab49c2678469569d84c716c03579506ee345db909eba02324d2aa03aaf5c7258d710a7e1716f436bd3266e03eec09078a663d19287fed9ea163
+  data.tar.gz: e994c3b606b851329e6222b7827821ae713edec0f97ff99c766c814c3451da979b8ab1f0ef1d8dd50d91106e6504c1690d1fecf6912442f546209abefc0687a0

data/lib/j7w1.rb

@@ -1,12 +1,13 @@
 require 'yaml'
 
 module J7W1
-  autoload :Configuration, 'j7w1/configuration'
-  autoload :Util, 'j7w1/util'
-  autoload :Version, 'j7w1/version'
-  autoload :ActiveRecordExt, 'j7w1/active_record_ext'
-  autoload :MockPushClient, 'j7w1/mock_push_client'
-  autoload :SNSPushClient, 'j7w1/sns_push_client'
+  autoload :Configuration,    'j7w1/configuration'
+  autoload :Util,             'j7w1/util'
+  autoload :Version,          'j7w1/version'
+  autoload :ActiveRecordExt,  'j7w1/active_record_ext'
+  autoload :MockPushClient,   'j7w1/mock_push_client'
+  autoload :SNSPushClient,    'j7w1/sns_push_client'
+  autoload :PushRefused,      'j7w1/exceptions'
 
   ActiveRecord::Base.__send__(:include, ActiveRecordExt) if defined? ActiveRecord::Base
 

data/lib/j7w1/sns_push_client.rb

@@ -4,6 +4,8 @@ module J7W1
       AWS::SNS.new configuration.account
     end
 
+    APNS_MAX_MESSAGE_SIZE = 40
+
     APS_TABLE = {
         message: :alert,
         badge: :badge,
@@ -14,6 +16,7 @@ module J7W1
         message: :message,
         badge: :badge,
         sound: :sound,
+        data: :data,
     }.freeze
 
     def create_ios_application(name, certs, private_key, options)
@@ -86,6 +89,7 @@ module J7W1
       message = options[:message]
       badge = options[:badge]
       sound = options[:sound]
+      data = options[:data]
       sns_configuration = options[:sns_configuration]
       sns_client = options[:sns_client]
 
@@ -94,7 +98,7 @@ module J7W1
       message_value.merge!(badge: badge) unless badge.blank?
       message_value.merge!(sound: sound) unless sound.blank?
 
-      payload = payload_for(message_value, platform)
+      payload = payload_for(message_value, data, platform)
 
       sns_client ||= create_sns_client(sns_configuration || J7W1.configuration)
       client = sns_client.client
@@ -112,23 +116,33 @@ module J7W1
     end
 
     private
-    def payload_for(message_value, platform)
+    def payload_for(message_value, data, platform)
       case platform.to_sym
         when :ios
-          ios_payload_for(message_value)
+          ios_payload_for(message_value, data)
         when :android
-          android_payload_for(message_value)
+          android_payload_for(message_value, data)
       end
     end
 
-    def ios_payload_for(message_value)
+    def ios_payload_for(message_value, data)
       prefix = J7W1.configuration.ios_endpoint.sandbox? ?
           :APNS_SANDBOX : :APNS
 
-      {prefix => {aps: message_content_with_table(message_value, APS_TABLE)}.to_json}
+      if message_value[:message] && message_value[:message] > APNS_MAX_MESSAGE_SIZE
+        message_value[:message] = message_value[:message][0...(APNS_MAX_MESSAGE_SIZE - 3)] + '...'
+      end
+
+      content = {
+          aps: message_content_with_table(message_value, APS_TABLE),
+      }
+      content.merge! data: data if data
+
+      {prefix => content.to_json}
     end
 
-    def android_payload_for(message_value)
+    def android_payload_for(message_value, data)
+      message_value.merge!(data: data)
       {
           GCM: {
               data: message_content_with_table(message_value, ANDROID_TABLE)

data/lib/j7w1/version.rb

@@ -1,3 +1,3 @@
 module J7W1
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j7w1
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - condor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk