maia 3.0.0 → 5.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maia
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -65,41 +65,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: googleauth
   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-rails
-  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: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -107,7 +79,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,7 +93,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -148,20 +120,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock-rspec-helper
-  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: Manage device tokens and push messaging with Rails and FCM.
 email:
 - loganserman@gmail.com
@@ -181,20 +139,26 @@ files:
 - config/routes.rb
 - db/migrate/20150302191320_create_maia_devices.rb
 - lib/maia.rb
-- lib/maia/dry_run.rb
+- lib/maia/devices.rb
 - lib/maia/engine.rb
-- lib/maia/error.rb
-- lib/maia/fcm.rb
+- lib/maia/error/generic.rb
+- lib/maia/error/no_credentials.rb
+- lib/maia/error/unregistered.rb
 - lib/maia/fcm/connection.rb
+- lib/maia/fcm/credentials.rb
+- lib/maia/fcm/gateway.rb
 - lib/maia/fcm/notification.rb
+- lib/maia/fcm/platform/android.rb
+- lib/maia/fcm/platform/apns.rb
 - lib/maia/fcm/response.rb
-- lib/maia/fcm/response_collection.rb
-- lib/maia/fcm/result.rb
-- lib/maia/fcm/result_collection.rb
-- lib/maia/fcm/service.rb
+- lib/maia/fcm/serializer.rb
 - lib/maia/message.rb
-- lib/maia/messenger.rb
+- lib/maia/messengers/activejob.rb
+- lib/maia/messengers/array.rb
+- lib/maia/messengers/inline.rb
 - lib/maia/poke.rb
+- lib/maia/token.rb
+- lib/maia/topic.rb
 - lib/maia/version.rb
 homepage: https://github.com/lserman/maia
 licenses:
@@ -216,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Manage device tokens and push messaging with Rails and FCM.

data/lib/maia/dry_run.rb

@@ -1,15 +0,0 @@
-module Maia
-  class DryRun < Message
-    def title
-      ''
-    end
-
-    def body
-      ''
-    end
-
-    def dry_run?
-      true
-    end
-  end
-end

data/lib/maia/error.rb

@@ -1,4 +0,0 @@
-module Maia
-  class Error < StandardError
-  end
-end

data/lib/maia/fcm.rb

@@ -1,7 +0,0 @@
-module Maia
-  module FCM
-    class << self
-      attr_accessor :key
-    end
-  end
-end

data/lib/maia/fcm/response_collection.rb

@@ -1,34 +0,0 @@
-module Maia
-  module FCM
-    class ResponseCollection
-      include Enumerable
-
-      def initialize(notification, responses = [])
-        @notification = notification
-        @responses = responses
-      end
-
-      def results
-        collection = ResultCollection.new
-        @responses.each do |response|
-          response.results.each do |result|
-            collection << result
-          end
-        end
-        collection
-      end
-
-      def [](index)
-        @responses[index]
-      end
-
-      def <<(response)
-        @responses.concat Array(response).flatten
-      end
-
-      def each(&block)
-        @responses.each(&block)
-      end
-    end
-  end
-end

data/lib/maia/fcm/result.rb

@@ -1,31 +0,0 @@
-module Maia
-  module FCM
-    class Result
-      include ActiveModel::Model
-
-      attr_accessor :message_id, :registration_id, :error
-      attr_reader :token
-
-      def initialize(attributes, token)
-        super attributes
-        @token = token
-      end
-
-      def success?
-        message_id.present?
-      end
-
-      def fail?
-        !success?
-      end
-
-      def canonical_id
-        registration_id
-      end
-
-      def has_canonical_id?
-        canonical_id.present?
-      end
-    end
-  end
-end

data/lib/maia/fcm/result_collection.rb

@@ -1,35 +0,0 @@
-module Maia
-  module FCM
-    class ResultCollection
-      include Enumerable
-
-      def initialize(results = [])
-        @results = results
-      end
-
-      def succeeded
-        @results.select(&:success?)
-      end
-
-      def failed
-        @results.select(&:fail?)
-      end
-
-      def with_canonical_ids
-        @results.select(&:has_canonical_id?)
-      end
-
-      def [](index)
-        @results[index]
-      end
-
-      def <<(result)
-        @results << result
-      end
-
-      def each(&block)
-        @results.each(&block)
-      end
-    end
-  end
-end

data/lib/maia/fcm/service.rb

@@ -1,48 +0,0 @@
-module Maia
-  module FCM
-    class Service
-      def initialize
-        @connection ||= FCM::Connection.new key
-      end
-
-      def key
-        ENV.fetch 'FCM_KEY', Maia::FCM.key
-      end
-
-      def deliver(notification, *tokens, topic: nil)
-        responses = ResponseCollection.new notification
-        responses << deliver_all(notification, tokens)
-        responses << deliver_all(notification, topic) if topic
-        responses
-      end
-
-      private
-        def deliver_all(notification, recipients)
-          batch(recipients).map do |batch|
-            if batch.many?
-              multicast notification, batch
-            elsif batch.one?
-              unicast notification, batch.first
-            end
-          end
-        end
-
-        def unicast(notification, recipient)
-          deliver! notification, recipient, to: recipient
-        end
-
-        def multicast(notification, recipients)
-          deliver! notification, recipients, registration_ids: recipients
-        end
-
-        def deliver!(notification, recipients, params = {})
-          payload = notification.to_h.merge params
-          Response.new @connection.write(payload), Array(recipients)
-        end
-
-        def batch(recipients, batch_size: Maia::BATCH_SIZE)
-          Array(recipients).flatten.compact.each_slice batch_size
-        end
-    end
-  end
-end

data/lib/maia/messenger.rb

@@ -1,61 +0,0 @@
-module Maia
-  class Messenger < ActiveJob::Base
-    def perform(tokens, payload)
-      logger.info "Pushing to #{tokens.size} token(s)..."
-      logger.info "Payload: #{payload}"
-
-      notification = FCM::Notification.new payload
-      responses    = fcm.deliver notification, tokens
-
-      responses.each do |response|
-        raise Maia::Error, response.error if response.error
-        handle_errors response.results.failed
-        update_devices_to_use_canonical_ids response.results.with_canonical_ids
-      end
-    end
-
-    private
-      def fcm
-        @_service ||= FCM::Service.new
-      end
-
-      def handle_errors(results)
-        results.each do |result|
-          device = Maia::Device.find_by token: result.token
-          next unless device.present?
-
-          if device_unrecoverable? result.error
-            log_error "Destroying device #{device.id}", result, device
-            device.destroy
-          else
-            log_error "Push to device #{device.id} failed", result, device
-          end
-        end
-      end
-
-      def device_unrecoverable?(error)
-        error =~ /InvalidRegistration|NotRegistered|MismatchSenderId/
-      end
-
-      def log_error(message, result, device)
-        logger.info "#{message} (error: #{result.error}, token: #{device.token})"
-      end
-
-      def update_devices_to_use_canonical_ids(results)
-        results.each do |result|
-          device = Maia::Device.find_by token: result.token
-          next if device.nil?
-
-          if user_already_has_token_registered?(device.pushable, result.canonical_id)
-            device.destroy
-          else
-            device.update token: result.canonical_id
-          end
-        end
-      end
-
-      def user_already_has_token_registered?(user, token)
-        user.devices.exists? token: token
-      end
-  end
-end