maia 0.0.8 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzVlMDhkY2RiZjA5YjlhODlhZmFiODM0NmU4NDJhZWQxY2M4NGFhMA==
+    NjUwMmY4YjUwNzE4YmU2ZWZkNjUxNTA2MWUyZTllYTE2MTI3OTI4Nw==
   data.tar.gz: !binary |-
-    NDVlNjBhZGY3MTBhYjI4MDJkYmM4NDIwN2IwMmFlM2M4ZGJjMjQyZA==
+    NGZlYzZmODgwYjAxNTQzOWU5ZDk5MWQ5NDJmNjU2ZjY4M2IyOWNkOA==
 SHA512:
   metadata.gz: !binary |-
-    YjI4MDhjMWM1ODgzMjA3MTAzMzU5ZTk4MDE2ZGQzZjViZTFmNjQyYTczZjk4
-    NDlkMDY5MmM0MWJiNTdhMmY3ZDJhZDI2ZTZhZmIxNjcyYTI5YjA3OGZhMjk1
-    OTZlODg0MGMyYjY5MGEyMGRjZTg2MGVhMTM4NDk5YzQ3YWEwMjI=
+    NjQ2ODJjNWY1NzkxMDZjY2I2MzMxMDhjYjZjM2JlMTBiZWI2M2NlN2ZjMDIx
+    ZWJmNGEwZTUwNGEzODU3ZmEzNDQ0NDBjYjNkYzYxNmE4NmI4MDJjMWVjZDQ4
+    MmU5ZWYxOTRmNjFlMzFiNzhkZDFmNzBmYTRmOTk3NDBmNTNhNmE=
   data.tar.gz: !binary |-
-    NWViZTVlODljZjVjZDNiMjQzYWRmYjcyYWU5YzE4ZWJiNmQ5Nzk0MDAxNDg3
-    NDFkYjJmOWRhOGVlMmEwMjdkMTY5YzIzZDc4YjQzY2Q5MmMyODkxODhhMGYx
-    NzI1ODI5NDFmNGYyYzc3YjFkYjc1ODU4ZTY5ZmU1NGM4NGVmNGM=
+    N2JhMDJiMzYwNDQ3MWI1NWMyZGI1MTAyNWRjMzhjNjFiNDM0NmU4ODFkMjQz
+    ODliOTE0NmY0OTYzNTllMjhhYzlkYzBiZDZiY2RjYjY0ZTY3ZjMxNDc1MzBl
+    YWVkMGJmNGM2NTEzMzIyN2IzMjc3YTA1YzMxZTU2MTI1ODQ4Yzk=

data/app/controllers/concerns/maia/controller.rb

@@ -42,7 +42,7 @@ module Maia
       end
 
       def permitted_params
-        params.require(:device).permit :token
+        params.require(:device).permit :token, :platform
       end
   end
 end

data/app/models/maia/device.rb

@@ -3,6 +3,7 @@ module Maia
     belongs_to :pushable, polymorphic: true
 
     validates :token, presence: true, uniqueness: { scope: :pushable }
+    validates :platform, inclusion: { in: %w(ios android) }, allow_nil: true
 
     before_save :reset_token_expiry
 
@@ -19,13 +20,19 @@ module Maia
     end
 
     def self.owned_by(pushable)
-      klass = pushable.klass.name
-      table = pushable.table.name
-      joins("JOIN #{table} ON #{table}.id = #{table_name}.pushable_id").
-        where(pushable_type: klass).
-        merge(pushable).
-        uniq
+      where(pushable: pushable).uniq
     end
 
+    def self.ios
+      where platform: 'ios'
+    end
+
+    def self.android
+      where platform: 'android'
+    end
+
+    def self.unknown
+      where platform: nil
+    end
   end
 end

data/db/migrate/20150302191320_create_maia_devices.rb

@@ -3,6 +3,7 @@ class CreateMaiaDevices < ActiveRecord::Migration
     create_table :maia_devices do |t|
       t.references :pushable, polymorphic: true, index: true
       t.string :token
+      t.string :platform
       t.datetime :token_expires_at
 
       t.timestamps null: false

data/lib/maia/dry_run.rb

@@ -1,6 +1,10 @@
 module Maia
   class DryRun < Message
-    def alert
+    def title
+      ''
+    end
+
+    def body
       ''
     end
 

data/lib/maia/message.rb

@@ -3,43 +3,55 @@ module Maia
     MAX_TOKENS_AT_ONCE = 999
 
     def send_to(pushable, wait: false)
-      devices =
-        case pushable
-        when ActiveRecord::Relation
-          Device.owned_by pushable
-        when ActiveRecord::Base
-          pushable.devices
-        else
-          fail 'Maia can only send to ActiveRecord objects!'
-        end
+      devices = Device.owned_by pushable
+      worker = wait ? Maia::Messenger.set(wait: wait) : Maia::Messenger
 
-      enqueue devices, to_h, wait: wait
+      enqueue worker, devices.android, to_h(notify: notify?(:android))
+      enqueue worker, devices.ios, to_h(notify: notify?(:ios))
+      enqueue worker, devices.unknown, to_h(notify: notify?(:unknown))
     end
 
-    def enqueue(devices, payload, wait: false)
-      worker = wait ? Maia::Messenger.set(wait: wait) : Maia::Messenger
-
-      devices.pluck(:token).each_slice(MAX_TOKENS_AT_ONCE) do |tokens|
+    def enqueue(worker, devices, payload)
+      devices.pluck(:token).each_slice MAX_TOKENS_AT_ONCE do |tokens|
         worker.perform_later tokens, payload.deep_stringify_keys
       end
     end
 
-    def alert
-      ''
+    def title
     end
 
-    def badge
+    def body
+    end
+
+    def icon
     end
 
     def sound
       'default'
     end
 
-    def other
-      {}
+    def badge
+    end
+
+    def color
+    end
+
+    def action
+    end
+
+    def title_i18n
+      []
+    end
+
+    def body_i18n
+      []
+    end
+
+    def data
     end
 
     def priority
+      :normal
     end
 
     def content_available?
@@ -50,21 +62,60 @@ module Maia
       false
     end
 
-    def to_h
-      hash = {
-        data: other,
-        notification: {
-          title: alert,
-          body: alert,
-          sound: sound,
-          badge: badge
-        }.compact
+    def notify?(_platform = :unknown)
+      true
+    end
+
+    def notification
+      {
+        title: title,
+        body: body,
+        icon: icon,
+        sound: sound,
+        badge: badge,
+        color: color,
+        click_action: action
+      }.merge(i18n).compact
+    end
+
+    def to_h(notify: true)
+      payload = {
+        priority: priority.to_s,
+        dry_run: dry_run?,
+        content_available: content_available?,
+        data: data
       }
 
-      hash.merge!(priority: priority.to_s) if priority
-      hash.merge!(dry_run: true) if dry_run?
-      hash.merge!(content_available: true) if content_available?
-      hash
+      payload[:notification] = notification if notify
+      payload.compact
     end
+
+    private
+      def i18n
+        {}.tap do |hash|
+          hash[:body_loc_key] = body_i18n.first
+          hash[:body_loc_args] = body_i18n_args
+          hash[:title_loc_key] = title_i18n_key
+          hash[:title_loc_args] = title_i18n_args
+        end.compact
+      end
+
+      def body_i18n_key
+        body_i18n.first
+      end
+
+      def body_i18n_args
+        args = body_i18n.drop 1
+        args if args.any?
+      end
+
+      def title_i18n_key
+        title_i18n.first
+      end
+
+      def title_i18n_args
+        args = title_i18n.drop 1
+        args if args.any?
+      end
   end
 end

data/lib/maia/poke.rb

@@ -1,6 +1,10 @@
 module Maia
   class Poke < Message
-    def alert
+    def title
+      'Poke'
+    end
+
+    def body
       'Poke'
     end
   end

data/lib/maia/version.rb

@@ -1,3 +1,3 @@
 module Maia
-  VERSION = '0.0.8'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maia
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails