jera_push 1.2.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94afb52f8fb32e6554bdb73f7b03ba48a1ea0cc57cd1789df19f914593739b45
-  data.tar.gz: 7586cb6aebe1df7119a2bd9a87ec1cb9de37ac8343c8488477cc5cc99dfc234c
+  metadata.gz: f808be96eee74520b6a4907d7147a1cc4881cacb9a01a2d12a08ad81a2003d8f
+  data.tar.gz: 301f267535f6edc5f5f614f829c11e5fcbeb49e6541ac9a23e6ec5c230c4778b
 SHA512:
-  metadata.gz: 9d917503e6bc9904fab6e3c309856491f2c1230baa7b8cd8e946c9560c9aa938a0be3fc40dbb9e9329869cad622cbf49bf9e88701204b383a94f11e871f7858b
-  data.tar.gz: b2147d84acdead00ff1351f65e5da1e2ff1061c397b5a754a870f4c112f7bb9c84b57849653fd8bef7adadb0d9207a070755f91a35ad1e1942ea3311114273b0
+  metadata.gz: d5494f51637a7f208dd28e7bbad74937b9ce9ccbea88c7f75264a9e1eda79bd3b69197daf5be9f12f5259f0a5582b5a28eb62efbccda64071004aee63602ebe2
+  data.tar.gz: 82a894de332a1d3d6af5c95c388a74cf0f937c087d79a2df507322afbb5ea0ed96116ab93f86e4737229d4229595041eca99093ee5283b683f03bd760b40873c

data/Rakefile

@@ -1,10 +1,16 @@
+require 'rake'
+
 begin
   require 'bundler/setup'
+
+  Bundler::GemHelper.install_tasks
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts 'although not required, bundler is recommended for running the tests'
 end
 
-require 'rdoc/task'
+task default: :spec
+
+require 'rspec/core/rake_task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -14,21 +20,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+require 'rubocop/rake_task'
 
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+RuboCop::RakeTask.new do |task|
+  task.requires << 'rubocop-performance'
+  task.requires << 'rubocop-rspec'
 end
-
-
-task default: :test

data/app/controllers/jera_push/admin/messages_controller.rb

@@ -28,7 +28,7 @@ module JeraPush
     end
 
     def create
-      push_message = JeraPush::Service::SendMessage.new(params).call
+      push_message = JeraPush::Services::SendMessage.new(params).call
 
       if push_message
         flash[:notice] = t('jera_push.admin.messages.new.toast.success')
@@ -40,16 +40,29 @@ module JeraPush
       end
     end
 
+    def resend_push
+      message = JeraPush::Message.find(params[:id])
+      message.devices.find_each do |device|
+        JeraPush::Services::SendPushService.new(device: device, 
+          message: message,
+          message_device: message.message_devices.where(device: device).last
+        ).call
+      end
+      flash[:notice] = t('jera_push.admin.messages.new.toast.success')
+      redirect_to jera_push_admin_message_path(message)
+    end
+
     private
 
-      def apply_filter
-        @filter = JeraPush::DeviceFilter.new device_filter_params
-        @devices = @filter.search.limit(params[:limit]).order(created_at: :desc)
-        @message_devices = JeraPush::MessageDevice.includes(:device).where('message_id = :id and device_id in (:device_ids)', id: params[:id], device_ids: @devices.pluck(:id))
-      end
+    def apply_filter
+      @filter = JeraPush::DeviceFilter.new device_filter_params
+      @devices = @filter.search.limit(params[:limit]).order(created_at: :desc)
+      @message_devices = JeraPush::MessageDevice.includes(:device).where(message_id: params[:id], device_id: @devices.pluck(:id))
+    end
+
+    def device_filter_params
+      params.permit(:value, :field, platform: []).merge({ message_id: params[:id] })
+    end
 
-      def device_filter_params
-        params.permit(:value, :field, :resource_name, platform: []).merge({ message_id: params[:id] })
-      end
   end
-end
+end

data/app/presenters/jera_push/message_presenter.rb

@@ -1,25 +1,29 @@
 class JeraPush::MessagePresenter < BasePresenter
 
-	def list_content
-		JSON.pretty_generate({
-			title: item.content["title"],
-			body: item.content["body"]
-		})
-	end
+  def list_content
+    JSON.pretty_generate({
+      title: item.title,
+      body: item.body
+    })
+  end
 
-	def display_content
-		JSON.pretty_generate(item.content)
-	end
+  def display_content
+    JSON.pretty_generate({
+      title: item.title,
+      body: item.body,
+      data: item.data
+    })
+  end
 
-	def display_created_at
-		item.created_at.strftime('%d/%m/%Y %H:%M')
-	end
+  def display_created_at
+    item.created_at.strftime('%d/%m/%Y %H:%M')
+  end
 
-	def show_link
-		helpers.link_to(
-			helpers.t('jera_push.admin.buttons.details'),
-			Rails.application.routes.url_helpers.jera_push_admin_message_path(item), class: 'waves-effect waves-light btn'
-		)
-	end
+  def show_link
+    helpers.link_to(
+      helpers.t('jera_push.admin.buttons.details'),
+      Rails.application.routes.url_helpers.jera_push_admin_message_path(item), class: 'waves-effect waves-light btn'
+    )
+  end
 
 end

data/app/views/jera_push/admin/messages/show.html.erb

@@ -2,7 +2,10 @@
 
   <div class="details">
     <h3><%= t('jera_push.active_record.model.message.one') %></h3>
-
+    <%= form_tag resend_push_jera_push_admin_message_path(@message), method: :get, class: 'col s12', remote: true do |f| %>
+      <%= submit_tag t('jera_push.admin.messages.resend'), class: 'btn' %>
+    <% end %>
+    <br>
     <span class="field">
       <%= t('jera_push.active_record.messages.attributes.id') %>
     </span>
@@ -13,7 +16,7 @@
     </span>
     <blockquote class="json-message"><%= @message.display_content %></blockquote>
 
-    <% unless @message.kind.broadcast? %>
+    <% unless @message.kind.everyone? %>
       <span class="field">
         <%= t('jera_push.active_record.messages.attributes.status') %>
       </span>
@@ -25,8 +28,8 @@
     <% end %>
   </div>
 
-  <% if @message.kind.broadcast? %>
-    <h3><%= JeraPush::Message.kind.broadcast.text %></h3>
+  <% if @message.kind.everyone? %>
+    <h3><%= JeraPush::Message.kind.everyone.text %></h3>
 
     <div class="message-info">
       <%= render partial: 'jera_push/admin/messages/broadcast_message', message: @message %>

data/config/locale/jera_push.pt-BR.yml

@@ -29,6 +29,7 @@ pt-BR:
     admin:
       attributes:
         id: Identificador
+        token: Token
         name: Nome
         email: Email
       navbar:
@@ -62,6 +63,7 @@ pt-BR:
       messages:
         failures: "Falhas: %{value}"
         success: "Sucessos: %{value}"
+        resend: Reenviar a push
         show:
           broadcast:
             platform: Plataforma
@@ -76,3 +78,8 @@ pt-BR:
           new_attribute: Novo Atributo
           specific: Específico
           broadcast: Broadcast
+    services:
+      errors:
+        not_found:
+          device: Dispositivo não pode ficar em branco
+

data/config/routes.rb

@@ -10,6 +10,7 @@ Rails.application.routes.draw do
         end
         member do
           get :message_devices_filter, format: :js
+          get :resend_push, format: :js
         end
       end
       resources :devices, only: [:index]

data/lib/generators/active_record/templates/create_jera_push_devices.rb

@@ -5,8 +5,9 @@ class CreateJeraPushDevices < ActiveRecord::Migration<%= migration_version %>
       t.string :platform, index: true
       t.references :pushable, polymorphic: true, index: true
 
-      t.timestamps null: false
+      t.timestamps
     end
+
     add_index :jera_push_devices, [:token, :platform], unique: true
   end
 end

data/lib/generators/active_record/templates/create_jera_push_messages.rb

@@ -1,17 +1,20 @@
 class CreateJeraPushMessages < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :jera_push_messages do |t|
-      t.text :content
+      t.string :title
+      t.text :body
+      t.json :data
+      t.string :multicast_id
       t.text :broadcast_result
       t.string :status
       t.string :kind
       t.string :topic
       t.string :firebase_id
-      t.string :error_message
+      t.json :error_message
       t.integer :failure_count, default: 0
       t.integer :success_count, default: 0
 
-      t.timestamps null: false
+      t.timestamps
     end
   end
 end

data/lib/generators/active_record/templates/create_jera_push_messages_devices.rb

@@ -1,13 +1,13 @@
 class CreateJeraPushMessagesDevices < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :jera_push_messages_devices do |t|
-      t.integer :device_id, index: true, foreign_key: true
-      t.integer :message_id, index: true, foreign_key: true
+      t.integer :device_id, index: true
+      t.integer :message_id, index: true
       t.string :status
       t.string :error_message
       t.string :firebase_id
 
-      t.timestamps null: false
+      t.timestamps
     end
 
     add_index :jera_push_messages_devices, [:device_id, :message_id], unique: true, name: :jera_push_index_messages_id_devices_id

data/lib/generators/jera_push/templates/jera_push.rb

@@ -4,7 +4,8 @@ JeraPush.setup do |config|
   config.firebase_api_key = "YOUR_API_KEY"
   # Change this for every new model
   config.resources_name = ["<%= file_name.classify %>"]
-
+  config.project_name = "YOUR_PROJECT_NAME"
+  config.credentials_path = "YOUR_CREDENTIALS_PATH" #https://firebase.google.com/docs/cloud-messaging/migrate-v1?hl=pt-br#provide-credentials-manually
   ######################################################
   # Resource attribute showed in views                 #
   # IMPORTANT: All models need to have this attributes #

data/lib/jera_push/firebase/client.rb

@@ -1,69 +1,66 @@
-module JeraPush
-  module Firebase
-    class Client
-
-      cattr_accessor :client
-
-      FIREBASE_URL = "https://fcm.googleapis.com/fcm/send"
-      FIREBASE_INSTANCE_ID_URL = "https://iid.googleapis.com/iid"
-
-      def default_headers
-        return {
-          "Authorization" => "key=#{::JeraPush.firebase_api_key}",
-          "Content-Type" => "application/json"
-        }
-      end
+module JeraPush::Firebase
+  class Client
+    FIREBASE_API_VERSION = 'v1'.freeze
+    FIREBASE_INSTANCE_ID_URL = 'https://iid.googleapis.com/iid'.freeze
+    SCOPE = 'https://www.googleapis.com/auth/firebase.messaging'.freeze
+    
+    def initialize
+      @client = Google::Apis::FcmV1::FirebaseCloudMessagingService.new
+      @authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
+        json_key_io: File.open(::JeraPush::credentials_path),
+        scope: SCOPE
+      )
+      @client.authorization = fetch_access_token  
+    end
+      
+    def send_to_device(message:)
+      @client.send_message("projects/#{::JeraPush.project_name}", message, options: { retries: 3, multiplier: 1, max_interval: 2 })
+    end
 
-      def self.instance
-        @@client ||= JeraPush::Firebase::Client.new
-      end
+    def add_device_to_topic(topic:, device:)
+      send(url: "#{FIREBASE_INSTANCE_ID_URL}/v1/#{device.token}/rel/topics/#{topic}")
+    end
 
-      def send_message(message:, devices: [])
-        registration_ids = devices.map(&:token)
-        body = { registration_ids: registration_ids, priority: 'high' }
-        response = HTTParty.post(FIREBASE_URL, { body: body.merge!(message).to_json, headers: default_headers })
-        puts response
-        ApiResult.new(response, registration_ids: registration_ids)
-      end
+    def remove_device_from_topic(topic:, devices: [])
+      send(
+        url: "#{FIREBASE_INSTANCE_ID_URL}/v1:batchRemove",
+        body: {
+          to: "/topics/#{topic}",
+          registration_tokens: devices.pluck(:token)
+        }.to_json
+      )
+    end
 
-      def send_message_to_topic(message:, topic:)
-        body = { to: "/topics/#{topic}", priority: 'high' }
-        response = HTTParty.post(FIREBASE_URL, { body: body.merge!(message).to_json, headers: default_headers })
-        puts response
-        ApiResult.new(response, topic: topic)
-      end
+    def send_message_to_topic(message:, topic:)
+      send(
+        url: FIREBASE_URL,
+        body: {
+          title: message.title,
+          body: message.body,
+          to: "/topics/#{topic}",
+          priority: 'high'
+        }.to_json
+      )
+    end
 
-      def device_details(device:)
-        url = "#{FIREBASE_INSTANCE_ID_URL}/info/#{device.token}/"
-        response = HTTParty.post(url, { body: Hash.new.to_json, headers: default_headers })
-        ApiResult.new(response)
-      end
+    private
 
-      def add_device_to_topic(topic:, device:)
-        url = "#{FIREBASE_INSTANCE_ID_URL}/v1/#{device.token}/rel/topics/#{topic}"
-        response = HTTParty.post(url, { body: Hash.new.to_json, headers: default_headers })
-        ApiResult.new(response)
-      end
+    def send(url:, body: {})
+      response = HTTParty.post(url, { body: body, headers: default_headers })
+      JSON.parse(response)
+    end
 
-      def add_devices_to_topic(topic:, devices: [])
-        url = "#{FIREBASE_INSTANCE_ID_URL}/v1:batchAdd"
-        body = {
-          "to": "/topics/#{topic}",
-          "registration_tokens": devices.map(&:token),
-        }
-        response = HTTParty.post(url, { body: body.to_json, headers: default_headers })
-        ApiResult.new(response)
-      end
+    def fetch_access_token
+      @authorizer.fetch_access_token! if @authorizer.needs_access_token?
+  
+      @authorizer
+    end  
 
-      def remove_device_from_topic(topic:, devices: [])
-        url = "#{FIREBASE_INSTANCE_ID_URL}/v1:batchRemove"
-        body = {
-          "to": "/topics/#{topic}",
-          "registration_tokens": devices.map(&:token),
-        }
-        response = HTTParty.post(url, { body: body.to_json, headers: default_headers })
-        ApiResult.new(response)
-      end
+    def default_headers
+      {
+        "Authorization" => "key=#{::JeraPush.firebase_api_key}",
+        "Content-Type" => "application/json"
+      }
     end
   end
 end

data/lib/jera_push/models/device.rb

@@ -3,21 +3,16 @@ require 'enumerize'
 class JeraPush::Device < ActiveRecord::Base
   extend Enumerize
 
-  DEFAULT_TOPIC = 'general'
-
   self.table_name = "jera_push_devices"
 
-  has_many :message_devices, table_name: "jera_push_message_devices"
-  has_many :messages, through: :message_devices, table_name: "jera_push_messages"
-
   belongs_to :pushable, polymorphic: true
 
+  has_many :message_devices, class_name: "JeraPush::MessageDevice"
+  has_many :messages, through: :message_devices, class_name: "JeraPush::Message"
+
   validates :token, :platform, presence: true
   validates :token, uniqueness: { scope: :platform }
 
-  after_create :register_to_current_topic
-  before_destroy :unregister_from_current_topic
-
   enumerize :platform, in: [:android, :ios, :chrome], predicate: true
 
   scope :ios,  -> { where(platform: :ios) }
@@ -25,27 +20,4 @@ class JeraPush::Device < ActiveRecord::Base
   scope :chrome, -> { where(platform: :chrome) }
   scope :with_joins, -> (resource_type) { joins("INNER JOIN #{resource_type.downcase.pluralize} ON  jera_push_devices.pushable_id = #{resource_type.downcase.pluralize}.id AND jera_push_devices.pushable_type  = '#{resource_type}'") }
 
-  def send_message(message)
-    JeraPush::Message.send_to self, content: message
-  end
-
-  def subscribe(topic)
-    client = JeraPush::Firebase::Client.instance
-    client.add_device_to_topic(topic: topic, device: self)
-  end
-
-  def unsubscribe(topic)
-    client = JeraPush::Firebase::Client.instance
-    client.remove_device_from_topic(topic: topic, devices: [self])
-  end
-
-  private
-
-    def register_to_current_topic
-      subscribe(JeraPush.send("topic_#{self.platform}"))
-    end
-
-    def unregister_from_current_topic
-      unsubscribe(JeraPush.send("topic_#{self.platform}"))
-    end
 end

data/lib/jera_push/models/message.rb

@@ -2,152 +2,12 @@ require 'enumerize'
 
 class JeraPush::Message < ActiveRecord::Base
   extend Enumerize
+
   self.table_name = "jera_push_messages"
 
   has_many :message_devices
   has_many :devices, through: :message_devices
 
-  serialize :broadcast_result
-
-  enumerize :kind, in: [:broadcast, :specific], predicate: true, default: :specific
-
-  def self.send_to(target, content: {})
-    return nil if target.blank? || content.blank?
-
-    push_message = JeraPush::Message.create content: content
-    push_message.devices << target
-
-    if push_message && target.is_a?(JeraPush::Device)
-      push_message.send_to_device device: target
-    else
-      push_message.send_to_devices devices: target
-    end
-    push_message
-  end
-
-  def self.send_broadcast(content:)
-    return nil if content.blank?
-
-    push_message = JeraPush::Message.create content: content, kind: :broadcast
-    @@client ||= JeraPush::Firebase::Client.instance
-
-    results = []
-    results << push_message.to_android_topic
-    results << push_message.to_ios_topic
-    results << push_message.to_chrome_topic
-
-    JeraPush::Firebase::ApiResult.broadcast_result(message: push_message, results: results)
-    push_message
-  end
-
-  def self.send_to_topic(topic: , content: {})
-    return nil if topic.blank? || content.blank?
-
-    push_message = JeraPush::Message.create content: content, topic: topic
-    client = JeraPush::Firebase::Client.instance
-    response = client.send_message_to_topic(message: { data: content }, topic: topic)
-    response.topic_result(message: push_message)
-    push_message
-  end
-
-  def self.format_hash(messages = [])
-    return false if messages.blank?
-    messages.collect do |obj|
-      hash = { obj[:key].to_sym => obj[:value] }
-      hash.delete_if { |key, value| key.blank? || value.blank? }
-    end.reduce(:merge)
-  end
-
-  def content=(content)
-    raise 'Invalid message format. Hash format expected' unless content.is_a? Hash
-
-    super(content.to_json)
-  end
-
-  def content
-    if super()
-      JSON.parse(super())
-    else
-      return {}
-    end
-  end
-
-  def send_to_devices(devices: [])
-    return nil if devices.empty?
-    platform_devices = devices.group_by { |device| device.platform }
-    client = JeraPush::Firebase::Client.instance
-
-    platform_devices.keys.each do |platform|
-      payload = self.send("body_#{platform.to_s}", self.content)
-      response = client.send_message(message: payload, devices: platform_devices[platform])
-      if response
-        response.result_to(message: self)
-      end
-    end
-  end
-
-  def send_to_device(device: nil)
-    return nil if device.nil?
-
-    payload = {}
-    if device.platform.ios?
-      payload = body_ios(self.content)
-    elsif device.platform.android?
-      payload = body_android(self.content)
-    elsif device.platform.chrome?
-      payload = body_chrome(self.content)
-    end
-    client = JeraPush::Firebase::Client.instance
-    response = client.send_message(message: payload, devices: [device])
-    if response
-      response.result_to(message: self)
-    end
-  end
-
-  def to_android_topic
-    @@client.send_message_to_topic(
-      message: body_android(content),
-      topic: JeraPush.topic_android
-    )
-  end
-
-  def to_ios_topic
-    @@client.send_message_to_topic(
-      message: body_ios(content),
-      topic: JeraPush.topic_ios
-    )
-  end
-
-  def to_chrome_topic
-    @@client.send_message_to_topic(
-      message: body_chrome(content),
-      topic: JeraPush.topic_chrome
-    )
-  end
-
-  private
-
-    def body_ios(content)
-      params = [:title, :body, :'content-available', :sound, :badge, :click_action, :body_loc_key, :body_loc_args, :title_loc_key, :title_loc_args]
-
-      content.symbolize_keys!
-      content[:sound] = 'default' unless content.has_key?(:sound)
-
-      return {
-        notification: content.select { |key, value| params.include?(key) },
-        data: content.reject { |key, value| params.include?(key) }
-      }
-    end
-
-    def body_android(content)
-      return {
-        data: content
-      }
-    end
+  enumerize :kind, in: [:specific, :everyone, :topic], predicate: true, default: :specific
 
-    def body_chrome(content)
-      return {
-        data: content
-      }
-    end
 end

data/lib/jera_push/models/message_device.rb

@@ -1,6 +1,7 @@
 require 'enumerize'
 class JeraPush::MessageDevice < ActiveRecord::Base
   extend Enumerize
+
   self.table_name = "jera_push_messages_devices"
 
   belongs_to :device

data/lib/jera_push/services/base_service.rb

@@ -0,0 +1,23 @@
+module JeraPush::Services
+  class BaseService
+    extend ActiveModel::Naming
+
+    def initialize(*)
+      @errors = ActiveModel::Errors.new(self)
+      @firebase = JeraPush::Firebase::Client.new
+    end
+
+    def read_attribute_for_validation(attr)
+      send(attr)
+    end
+  
+    def self.human_attribute_name(attr, options = {})
+      attr
+    end
+  
+    def self.lookup_ancestors
+      [self]
+    end
+
+  end
+end