j7w1 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4046fbb0005d6a0246a41c8e633de82dc68056ad
-  data.tar.gz: 871c3075045b04ca677db37be620cf8dc0c96747
+  metadata.gz: 173f6f7c6ae362a1a8cf8068f1c12a2c949c7533
+  data.tar.gz: 252cccea60908318b7a567df86158223c89a2c1a
 SHA512:
-  metadata.gz: eaaf337cc20c7eaa47f01de60525cd45e4910aeb4bdff87b82fde235a1c4083592672c82185b45683af34a071632a05e5c61720f94af8ae201c80c6a27d57063
-  data.tar.gz: dc5272e30548103715894a83a4a7103e4a52fcee796616fc93ac18d741045fd49250f7d15fa45820760cb8222697292b6ed503c49e5749ff2302527af93edbd6
+  metadata.gz: ca59c342c914b49279d5a115d2880c890175324717068baec8695ee8d43c5fb996ab1935836fcfdf94ba8f472625364d2687b05d39403f8263d1f2a12bf73b48
+  data.tar.gz: a4d32b1d44c5a03994b10ca4e19be3b3b8412bd4092478dc9703ac3bc3376facd96b03f97d2aa49c6397c65d233142c1a26d312c75c259fe7947ad4b47d15621

data/README.md

@@ -1,6 +1,6 @@
 # J7W1
 
-A gem to send the push notification to mobile app via Amazon Simple Notification Service (SNS). Currently supports only iOS platform, but the support for Android is also scheduled.
+A gem to send the push notification to mobile app via Amazon Simple Notification Service (SNS). Currently supports only iOS platform at production quality. The support for Android is experimentally implemented.
 
 ## Installation
 
@@ -39,6 +39,8 @@ Configuration is expected to have the structure as below:
     app_endpoint:
         ios:
             arn: "<The ARN of your app.>"
+				android:
+						arn: "<The ARN of your android app.>"
     account:
         access_key_id: "<Your Access Key>"
         secret_access_key: "<Your Secret Key>"
@@ -81,4 +83,4 @@ The generator j7w1:model must be useful for you. It provides the items below:
 
 ## Author
 
-TOYODA Naoto https://github.com/condor
+TOYODA Naoto https://github.com/condor

data/lib/j7w1/configuration.rb

@@ -2,13 +2,19 @@ module J7W1
   class Configuration
     include J7W1::Util
 
+    module MobileEndpoint
+      def arn
+        self[:arn]
+      end
+    end
+
     module IOSEndpoint
-      def sandbox?
-        @sandbox
+      def self.extended(obj)
+        obj.__send__ :extend, MobileEndpoint
       end
 
-      def arn
-        self[:arn]
+      def sandbox?
+        @sandbox
       end
 
       def confirm_sandbox
@@ -17,8 +23,8 @@ module J7W1
     end
 
     module AndroidEndpoint
-      def arn
-        self[:arn]
+      def self.extended(obj)
+        obj.__send__ :extend, MobileEndpoint
       end
     end 
 
@@ -34,7 +40,9 @@ module J7W1
         ios_endpoint.extend(IOSEndpoint)
         ios_endpoint.confirm_sandbox
       end
-      android_endpoint.extend(AndroidEndpoint) if android_endpoint
+      if android_endpoint
+        android_endpoint.extend(AndroidEndpoint)
+      end
       account.extend(Account)
     end
 

data/lib/j7w1/sns_push_client.rb

@@ -4,6 +4,18 @@ module J7W1
       AWS::SNS.new configuration.account
     end
 
+    APS_TABLE = {
+        message: :alert,
+        badge: :badge,
+        sound: :sound,
+    }.freeze
+
+    ANDROID_TABLE = {
+        message: :message,
+        badge: :badge,
+        sound: :sound,
+    }.freeze
+
     def create_ios_application(name, certs, private_key, options)
       sandbox = !(options[:sandbox] == false)
       configuration = options[:sns_configuration] || J7W1.configuration
@@ -39,8 +51,16 @@ module J7W1
       sns_client ||= create_sns_client(sns_configuration || J7W1.configuration)
 
       sns_config = J7W1.configuration
-      app_arn = platform == :ios ?  sns_config.ios_endpoint.arn :
-        sns_config.android_endpoint.arn
+
+      app_arn =
+          case platform
+            when :ios
+              sns_config.ios_endpoint.arn
+            when :android
+              sns_config.android_endpoint.arn
+            else
+
+          end
 
       endpoint =
         sns_client.client.create_platform_endpoint(
@@ -70,7 +90,7 @@ module J7W1
       sns_client = options[:sns_client]
 
       message_value = {}
-      message_value.merge!(alert: message) unless message.blank?
+      message_value.merge!(message: message) unless message.blank?
       message_value.merge!(badge: badge) unless badge.blank?
       message_value.merge!(sound: sound) unless sound.blank?
 
@@ -86,10 +106,10 @@ module J7W1
 
     private
     def payload_for(message_value, platform)
-      case platform
-        when 'ios'
+      case platform.to_sym
+        when :ios
           ios_payload_for(message_value)
-        when 'android'
+        when :android
           android_payload_for(message_value)
       end
     end
@@ -97,11 +117,23 @@ module J7W1
     def ios_payload_for(message_value)
       prefix = J7W1.configuration.ios_endpoint.sandbox? ?
           :APNS_SANDBOX : :APNS
-      {prefix => {aps: message_value}.to_json}
+
+      {prefix => {aps: message_content_with_table(message_value, APS_TABLE)}.to_json}
     end
 
     def android_payload_for(message_value)
-      # TODO Android Push Implementation
+      {
+          gcm: {
+              data: message_content_with_table(message_value, ANDROID_TABLE)
+          }.to_json
+      }
+    end
+
+    def message_content_with_table(content, table)
+      table.keys.reduce({}) do |h, key|
+        h[table[key]] = content[key]
+        h
+      end
     end
 
     def content_from(argument)

data/lib/j7w1/util.rb

@@ -6,8 +6,9 @@ module J7W1
       case platform
         when :ios, :'iphone os', :'ipad os'
           :ios
+        when :android
+          :android
         else
-          # TODO Android
           platform
       end
     end

data/lib/j7w1/version.rb

@@ -1,3 +1,3 @@
 module J7W1
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j7w1
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - condor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk