jera_push 1.1.5 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8f7190ed7d4d195bd1be7507def4c2241bb3bac3
-  data.tar.gz: 7ecc8a712f1b4e73afb6f50acd233f63e95e9e21
+SHA256:
+  metadata.gz: e6f63d90cf49a65d29029d1c6597afb8e813537a7b60ed9b045a885eb1799f81
+  data.tar.gz: 57af32466be12fbc0828920abc1f556b9351452f491e4981cf54a93a1dda060e
 SHA512:
-  metadata.gz: 075ab4957c61b8479e5da78623e1b8e5e7d52d31ede32e931fb8ee2ed2be0f06ae3e48a5d0507d95deac38e159c58d5a124c21a561ec19452b958309d4ee4076
-  data.tar.gz: 8cf5010e1aa458071da21aa81ff5bfed8db0bbf1e49dee6c7fd63e665afd144c35bfb92007dd69c881da43bed9e7eb249174d3d3289087d271e603602dc255c5
+  metadata.gz: 7bfd9f73d69b6650e536549022c378eb34404ff494ff71d718974af27236f3b0cfe56107c130b6149485398675b86b47cc02815e3a0cb487691c86ca0d99b2b9
+  data.tar.gz: 7c6c7e81a5efb2eff4de42167b54d55953d8ac8522e0a74628146b911c6a5cb2de2dbe38df5e13b03d182a7b2df8ada0874c55f89cb8389259f8b8180bc8119a

data/README.rdoc

@@ -1,4 +1,4 @@
-![Jera Logo](http://jera.com.br/images/logo-jera-header.png)
+![Jera Logo](https://raw.github.com/jera/jera-push/master/update-compatibility-rails/logo_jera.png)
 
 JeraPush is a easy tool to work with push messages and firebase API.
 

data/app/assets/styles/jera_push/components/_devices.scss

@@ -1,6 +1,5 @@
 .devices-list {
-  overflow-y: scroll;
-  height: 500px;
+  overflow: hidden;
   width: 100%;
   margin-bottom: 40px;
 
@@ -13,4 +12,4 @@
     font-size: 14px;
     font-weight: 400;
   }
-}
+}

data/app/assets/styles/jera_push/jera_push.scss

@@ -13,5 +13,5 @@
 @import "pages/messages/new";
 
 .brand-logo{
-  margin: 10px 0 0 22px;
-}
+  margin: 0px 0 0 22px;
+}

data/app/assets/styles/jera_push/materialize/components/_global.scss

@@ -371,6 +371,10 @@ table {
   width:100%;
   display: table;
 
+  tbody > tr {
+    word-break: break-all;
+  }
+
   &.bordered > thead > tr,
   &.bordered > tbody > tr {
     border-bottom: 1px solid $table-border-color;
@@ -406,7 +410,7 @@ thead {
 }
 
 td, th{
-  padding: 15px 5px;
+  padding: 20px 20px 20px 4px;
   display: table-cell;
   text-align: left;
   vertical-align: middle;

data/app/assets/styles/jera_push/materialize/components/_navbar.scss

@@ -1,7 +1,7 @@
 nav {
   color: $navbar-font-color;
   @extend .z-depth-1;
-  background-color: $primary-color;
+  background-color: $navbar-background-color;
   width: 100%;
   height: $navbar-height-mobile;
   line-height: $navbar-height-mobile;
@@ -20,6 +20,12 @@ nav {
   .nav-wrapper {
     position: relative;
     height: 100%;
+
+    li {
+      a {
+        font-weight: 500;
+      }
+    }
   }
 
   @media #{$large-and-up} {
@@ -51,6 +57,12 @@ nav {
     padding: 0;
     white-space: nowrap;
 
+    img {
+      width: 100px;
+      height: auto;
+      vertical-align: middle;
+    }
+
     &.center {
       left: 50%;
       transform: translateX(-50%);

data/app/assets/styles/jera_push/materialize/components/_variables.scss

@@ -221,6 +221,7 @@ $navbar-height-mobile: 56px !default;
 $navbar-font-size: 1rem !default;
 $navbar-font-color: #fff !default;
 $navbar-brand-font-size: 2.1rem !default;
+$navbar-background-color: rgba(0, 0, 0, 0.87);
 
 /* 14. Side Navigation
    ========================================================================== */

data/app/assets/styles/jera_push/pages/devices/_list.scss

@@ -1,3 +1,12 @@
 .devices-list-container {
   padding-bottom: 40px;
-}
+
+  .custom-col {
+    width: auto !important;
+    margin-left: -9px !important;
+  }
+
+  .fix-left-label {
+    left: 22px !important;
+  }
+}

data/app/assets/styles/jera_push/pages/messages/_new.scss

@@ -1,7 +1,15 @@
 .container-messages-new {
 
+  h3 {
+    margin-left: -14px;
+  }
+
   .options {
     margin-bottom: 32px;
+
+    label {
+      margin-left: -4px;
+    }
   }
 
   .message-attributes {
@@ -12,13 +20,14 @@
     text-decoration: underline;
     color: #0000EE;
     cursor: pointer;
+    float: left;
   }
 
   .btn-submit {
-    margin-right: 24px;
+    margin-left: -10px;
   }
 }
 
 #message_devices {
   display: none;
-}
+}

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

@@ -3,7 +3,7 @@ module JeraPush
 
     def index
       @filter = JeraPush::DeviceFilter.new params_filter
-      @devices = @filter.search.order(created_at: :desc).page(params[:page]).per(params[:per])
+      @devices = @filter.search.order(created_at: :desc).page(params[:page]).per(10)
 
       respond_to do |format|
         format.js {}

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::Service::SendMessage.new(message_params).call
 
       if push_message
         flash[:notice] = t('jera_push.admin.messages.new.toast.success')
@@ -45,12 +45,15 @@ module JeraPush
       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(:pushable, :device).where('message_id = :id and device_id in (:device_ids)', id: params[:id], device_ids: @devices.pluck(:id))
+        @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 message_params
+        params.permit(:type, devices: [], message: [:key, :value])
       end
 
       def device_filter_params
         params.permit(:value, :field, :resource_name, platform: []).merge({ message_id: params[:id] })
       end
-
   end
 end

data/app/controllers/jera_push/v1/version_controller.rb

@@ -1,7 +1,4 @@
 module JeraPush
   class V1::VersionController < JeraPush::JeraPushController
-
-    
-
   end
 end

data/app/helpers/jera_push/admin/devices_helper.rb

@@ -2,25 +2,35 @@ module JeraPush::Admin::DevicesHelper
 
   def resource_extras(device)
     if JeraPush.resource_attributes && JeraPush.resource_attributes.any?
-      return resource_attributes(JeraPush.resource_attributes, device.pushable)
+      return resource_attributes(JeraPush.resource_attributes, device.try(:pushable))
     end
-    return [device.pushable]
+    return [device.try(:pushable)]
   end
 
   def resource_attributes(attributes, resource)
-    if resource
-      attrs = attributes.collect do |attribute|
-        "#{attribute}: #{resource.send(attribute)}"
+    return [] unless resource.present?
+
+    attrs = attributes.collect do |attribute|
+      if resource&.send(attribute)
+        "#{I18n.t("activerecord.attributes.#{resource.class.to_s.downcase}.#{attribute}")}: #{resource.send(attribute)}"
       end
-      return attrs.delete_if { |v| v.nil?}
+    end
+    attrs.delete_if { |v| v.nil?}
+  end
+
+  def translate_resource_names(resources_name=[])
+    resources_name.collect do |resource|
+      ["#{I18n.t("activerecord.models.#{resource.downcase}.one")}", resource]
     end
   end
 
   def devices_fields_for_filter_select
-    fields = [:token]
+    fields = []
+    fields << [I18n.t("jera_push.admin.attributes.token"), "token"]
+
     if JeraPush.resource_attributes && JeraPush.resource_attributes.any?
       JeraPush.resource_attributes.each do |attribute|
-        fields << attribute
+        fields << ["#{I18n.t("jera_push.admin.attributes.#{attribute}")}", attribute]
       end
     end
     fields

data/app/views/jera_push/admin/devices/_checkbox_list.html.erb

@@ -1,4 +1,4 @@
-<table class="highlight">
+<table class="striped">
   <thead>
     <tr>
       <th data-field="checkbox"></th>
@@ -22,7 +22,7 @@
           <%= label_tag "device_#{device.id}", ''%>
         </td>
         <td><%= device.id %></td>
-        <td><%= device.token.truncate(40) %></td>
+        <td><%= device.token.truncate(50) %></td>
         <td><%= device.platform %></td>
         <td colspan="4">
           <% resource_extras(device).each do |attribute| %>
@@ -32,4 +32,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

data/app/views/jera_push/admin/devices/_filter.html.erb

@@ -2,7 +2,7 @@
   <%= form_tag filter_path, method: :get, class: 'col s12', remote: true do |f| %>
     <div class="row">
       <% JeraPush::Device.platform.values.each do |platform|  %>
-        <div class="input-field col s2">
+        <div class="input-field col s2 custom-col">
           <p>
             <%= check_box_tag :"platform[]", platform, filter.platform.include?(platform), id: "platform_#{platform}"  %>
             <label for="platform_<%= platform %>"><%= platform %><label>
@@ -12,7 +12,7 @@
     </div>
     <div class="row">
       <div class="input-field col s12">
-        <%= select_tag :resource_name, options_for_select(JeraPush.resources_name, filter.resource_name) %>
+        <%= select_tag :resource_name, options_for_select(translate_resource_names(JeraPush.resources_name), filter.resource_name) %>
       </div>
     </div>
     <div class="row">
@@ -22,7 +22,7 @@
       <div class="input-field col s9">
         <div class="col s6">
           <%= text_field_tag :value, filter.value %>
-          <label for="value"><%= t('jera_push.admin.filter.value') %></label>
+          <label class="fix-left-label" for="value"><%= t('jera_push.admin.filter.value') %></label>
         </div>
 
         <div class="input-field col s3">
@@ -31,4 +31,4 @@
       </div>
     </div>
   <% end %>
-</div>
+</div>

data/app/views/jera_push/admin/devices/_list.html.erb

@@ -1,24 +1,24 @@
-<table class="highlight">
+<table class="highlight bordered">
   <thead>
     <tr>
       <th data-field="id"><%= t('jera_push.admin.devices.attributes.id') %></th>
-      <th data-field="token"><%= t('jera_push.admin.devices.attributes.token') %></th>
       <th data-field="platform"><%= t('jera_push.admin.devices.attributes.platform') %></th>
       <th data-field="resource"><%= t('jera_push.admin.devices.attributes.resource') %></th>
+      <th data-field="token"><%= t('jera_push.admin.devices.attributes.token') %></th>
     </tr>
   </thead>
   <tbody>
     <% devices.each do |device| %>
       <tr>
-        <td><%= device.id %></td>
-        <td><%= device.token.truncate(50) %></td>
-        <td><%= device.platform %></td>
-        <td>
+        <td class="col s2"><%= device.id %></td>
+        <td class="col s2"><%= device.platform %></td>
+        <td class="col s2">
           <% resource_extras(device).each do |attribute| %>
             <div><%= attribute %></div>
           <% end %>
         </td>
+        <td class="col s2"><%= device.token %></td>
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

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

@@ -19,9 +19,9 @@
     <% @messages.each do |message| %>
       <tr>
         <td width="5%"><%= message.id %></td>
-        <td width="75%"><div class="json-message"><%= message.list_content %></div></td>
-        <td width="20%"><%= message.display_created_at %></td>
-        <td width="10%"><%= message.show_link %></td>
+        <td width="60%"><div class="json-message"><%= message.list_content %></div></td>
+        <td width="15%"><%= message.display_created_at %></td>
+        <td width="25%"><%= message.show_link %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/kaminari/_gap.html.erb

@@ -1,3 +1,4 @@
-<li class="disabled">
-  <%= content_tag :a, raw(t 'views.pagination.truncate') %>
+<!-- <li class="disabled">
+  < %= content_tag :a, raw(t 'views.pagination.truncate') %>
 </li>
+ -->

data/app/views/layouts/jera_push/_navbar.html.erb

@@ -1,7 +1,7 @@
 <nav>
   <div class="nav-wrapper">
     <a href="<%= jera_push_admin_path %>" class="brand-logo">
-      <img src="http://jera.com.br/images/logo-jera-header.png" alt="Jera Software Logo">
+      <img src="https://jera.com.br/images/logo-jera-light.svg" alt="Jera Software Logo">
     </a>
     <ul id="nav-mobile" class="right hide-on-med-and-down">
       <li class="<%= 'active' if current_page?(jera_push_admin_devices_path) %>">
@@ -21,4 +21,4 @@
       </li>
     </ul>
   </div>
-</nav>
+</nav>

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

@@ -27,6 +27,10 @@ pt-BR:
           id: ID
           platform: Plataforma
     admin:
+      attributes:
+        id: Identificador
+        name: Nome
+        email: Email
       navbar:
         devices: Aparelhos
         messages: Mensagens
@@ -39,6 +43,12 @@ pt-BR:
         send: Enviar
         send_all: Todos
         remove_all: Nenhum
+      devices:
+        attributes:
+          id: Identificador
+          token: Token
+          platform: Plataforma
+          resource: Recurso
       message_devices:
         attributes:
           device: Aparelho

data/lib/generators/active_record/jera_push_generator.rb

@@ -6,13 +6,26 @@ module ActiveRecord
       source_root File.expand_path("../templates", __FILE__)
 
       def create_devices_table
-        migration_template "create_jera_push_devices.rb", "db/migrate/create_jera_push_devices.rb"
+        migration_template "create_jera_push_devices.rb", "db/migrate/create_jera_push_devices.rb", migration_version: migration_version
       end
 
       def create_messages_table
-        migration_template "create_jera_push_messages.rb", "db/migrate/create_jera_push_messages.rb"
-        migration_template "create_jera_push_messages_devices.rb", "db/migrate/create_jera_push_messages_devices.rb"
+        migration_template "create_jera_push_messages.rb", "db/migrate/create_jera_push_messages.rb", migration_version: migration_version
+        migration_template "create_jera_push_messages_devices.rb", "db/migrate/create_jera_push_messages_devices.rb", migration_version: migration_version
       end
+
+      private
+
+      def rails5_and_up?
+        Rails::VERSION::MAJOR >= 5
+      end
+
+      def migration_version
+        if rails5_and_up?
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
+
     end
   end
 end

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

@@ -1,4 +1,4 @@
-class CreateJeraPushDevices < ActiveRecord::Migration[5.2]
+class CreateJeraPushDevices < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :jera_push_devices do |t|
       t.string :token, index: true

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

@@ -1,4 +1,4 @@
-class CreateJeraPushMessages < ActiveRecord::Migration[5.2]
+class CreateJeraPushMessages < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :jera_push_messages do |t|
       t.text :content

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

@@ -1,4 +1,4 @@
-class CreateJeraPushMessagesDevices < ActiveRecord::Migration[5.2]
+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

data/lib/jera_push/models/message_device.rb

@@ -7,6 +7,4 @@ class JeraPush::MessageDevice < ActiveRecord::Base
   belongs_to :message
 
   enumerize :status, in: [:error, :success], predicate: true
-
-  has_one :pushable, through: :device
 end

data/lib/jera_push/services/send_message.rb

@@ -3,15 +3,16 @@ module JeraPush
     class SendMessage
 
       def initialize(*args)
-        args[0].map { |attr_name, value| instance_variable_set("@#{attr_name}", value) }
+        @type = args.first[:type].to_sym
+        @message = args.first[:message]
+        @devices = args.first[:devices]
       end
 
       def call
         return false unless valid?
 
         message_content = JeraPush::Message.format_hash @message
-
-        case @type.to_sym
+        case @type
         when :broadcast
           JeraPush::Message.send_broadcast(content: message_content)
         when :specific

data/lib/jera_push/version.rb

@@ -1,3 +1,3 @@
 module JeraPush
-  VERSION = "1.1.5"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jera_push
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.4
 platform: ruby
 authors:
 - Jera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: enumerize
   requirement: !ruby/object:Gem::Requirement
@@ -44,26 +44,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
@@ -317,59 +317,58 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.7
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Gem to use firebase push messages.
 test_files:
-- test/dummy/app/models/user.rb
+- test/dummy/db/migrate/20161005121035_create_users.rb
+- test/dummy/db/schema.rb
+- test/dummy/db/seeds.rb
+- test/dummy/README.rdoc
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/test/models/user_test.rb
-- test/dummy/test/fixtures/users.yml
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/config/secrets.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/locales/pt-BR.yml
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/application.rb
-- test/dummy/config/database.yml
+- test/dummy/app/models/user.rb
+- test/dummy/public/500.html
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/404.html
 - test/dummy/config/boot.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/locales/pt-BR.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/database.yml
+- test/dummy/config/secrets.yml
+- test/dummy/test/models/user_test.rb
+- test/dummy/test/fixtures/users.yml
 - test/dummy/Rakefile
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/db/schema.rb
-- test/dummy/db/seeds.rb
-- test/dummy/db/migrate/20161005121035_create_users.rb
-- test/dummy/README.rdoc
-- test/jera_push_test.rb
+- test/dummy/config.ru
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/bundle
+- test/dummy/bin/setup
 - test/test_helper.rb
+- test/jera_push_test.rb