web47core 1.1.11 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88fe31aee5eea282393cfd45b0da78a4a295fe259f5fed562182e3e3d2bab3f
-  data.tar.gz: 44eb5b74fce3169a1080d82785341e83e39e2d7d0897700f5c75805ccf0280d0
+  metadata.gz: c7e886a348260b75a1a9bc39a1442cb96736b86568acc693eb9e68e2cd060cf3
+  data.tar.gz: 343664865ffe80bd9a1b459edf147f42315174900e05e2fa61dc35d1a8a15e62
 SHA512:
-  metadata.gz: 49ade944da83d0465d6d9fb9b91647b8bf5e1e845eea99b424598c814d703afe8930117f0ff0daab92660ad0847bc752f2617c12841f492b1c975ad2d7ec572e
-  data.tar.gz: 438c967ff87ce0888e2c559f69b4c8a7fa560e3ce988acea52ae87a77a94322cfe3ee543bbfb30b2c22a3f0e177fd057d2fb74fda6f723540aceb954d857b6b4
+  metadata.gz: 0fab6ed638e678f9daaef7afb26440579b142536f551ee368156491fe51a83534addb675c09e028aa54dbb5559ad0b647d60612d1e44135be2ebd4f308777d76
+  data.tar.gz: fc649419956e85eb0c3d084ae655e1bf3067416c1a5a847e8f79a9cbf5472edc799e6de0f1834764907534145676defe841822f7c4f796d014ffd9e61f09ed31

data/app/helpers/core_link_helper.rb

@@ -54,11 +54,15 @@ module CoreLinkHelper
   #
   # Add a favorite tag
   #
-  def favorite_tag(favorite)
+  def favorite_tag(favorite, options = {})
+    data = {}
+    link_classes = tooltip_data(options, data, I18n.t('ui_form.actions.favorite'))
+    link_classes += %w[material-icons pointer favorite]
     content_tag(:i,
-                class: 'material-icons pointer favorite',
+                class: link_classes.join(' '),
+                data: data,
                 id: favorite.id.to_s,
-                type: favorite.favorite_type) { concat('favorite_border') }
+                type: favorite.favorite_type) { concat(icon_name(options, 'favorite_border')) }
   end
 
   #
@@ -126,6 +130,7 @@ module CoreLinkHelper
     return unless can? :edit, obj
 
     data = {}
+    options[:icon_name] ||= 'replay'
     confirmation_data(options, data, t('links.replay_confirmation', name: obj.class.to_s.underscore.humanize))
     link_classes = tooltip_data(options, data)
     content_tag(:a, href: path, data: data, class: link_classes.join(' ')) do
@@ -146,6 +151,23 @@ module CoreLinkHelper
     end
   end
 
+  #
+  # Restart a thingy
+  #
+  def replay_button_tag(obj, path, options = {})
+    return unless can? :edit, obj
+
+    data = {}
+    options[:icon_name] ||= 'replay'
+    confirmation_data(options, data, t('links.replay_confirmation', name: obj.class.to_s.underscore.humanize))
+    link_classes = tooltip_data(options, data)
+    link_classes << 'btn' unless link_classes.include?('btn')
+    content_tag(:a, href: path, data: data, class: link_classes) do
+      concat(materialize_icon(icon_name(options), options))
+      concat(options[:label]) if options[:label].present?
+    end
+  end
+
   #
   # Details of a thingy in a pull down list
   #
@@ -219,13 +241,29 @@ module CoreLinkHelper
 
     data = { method: :delete }
     confirmation_data(options, data, t('links.deletion_confirmation', name: obj.class.to_s.underscore.humanize))
-    link_classes = tooltip_data(options, data)
+    link_classes = tooltip_data(options, data, I18n.t('ui_form.actions.delete'))
     content_tag(:a, href: path, class: link_classes, data: data) do
       concat(materialize_icon(icon_name(options, 'delete'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
 
+  #
+  # Delete an thingy
+  #
+  def delete_button_tag(obj, path, options = {})
+    return unless can? :destroy, obj
+
+    data = { method: :delete }
+    confirmation_data(options, data, t('links.deletion_confirmation', name: obj.class.to_s.underscore.humanize))
+    link_classes = tooltip_data(options, data)
+    %w[btn red].each { |c| link_classes << c unless link_classes.include?(c) }
+    content_tag(:a, class: link_classes, href: path, data: data) do
+      concat(materialize_icon(icon_name(options, 'delete'), options))
+      concat(options[:label]) if options[:label].present?
+    end
+  end
+
   #
   # Create a thingy in a pull-down list
   #

data/config/locales/en.yml

@@ -32,6 +32,7 @@ en:
       delete: Delete
       info: View
       replay: Restart
+      favorite: Favorite
     system_configuration:
       placeholders:
         switchboard_base_url: https://switchboard.app47.com

data/lib/app/models/notification.rb

@@ -100,10 +100,11 @@ class Notification
   #
   def finish_processing(processing_message = nil)
     if processing_message.present?
-      set state: STATE_INVALID, error_message: processing_message
+      assign_attributes state: STATE_INVALID, error_message: processing_message
     else
-      set state: STATE_PROCESSED, error_message: ''
+      assign_attributes state: STATE_PROCESSED, error_message: ''
     end
+    save(validate: false)
   end
 
   #

data/lib/app/models/sms_notification.rb

@@ -35,12 +35,15 @@ class SmsNotification < Notification
     account_sid = config.twilio_account_id
     auth_token = config.twilio_auth_token
     client = Twilio::REST::Client.new account_sid, auth_token
-
-    twilio_message = client.account.messages.create(
-      body: message,
-      to: to,
-      from: config.twilio_phone_number
-    )
+    twilio_message = if client.respond_to?(:account)
+                       client.account.messages.create(body: message,
+                                                      to: to,
+                                                      from: config.twilio_phone_number)
+                     else
+                       client.messages.create(body: message,
+                                              to: to,
+                                              from: config.twilio_phone_number)
+                     end
     # We are saved in the calling class, no reason to save again
     set sid: twilio_message.sid
   end

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '1.1.11'
+  VERSION = '1.1.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.16
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -278,20 +278,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement