agilibox 1.0.15 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ed08a7d086225ae4abf9cac6f5f7a2e4e9250f0
-  data.tar.gz: c2c2fb53c41d945c973f0938f2809209090b02f4
+  metadata.gz: e7f0e59fd9a62da85e62c61abc3638382fd2e949
+  data.tar.gz: d6d180e70886773cbfcd8f43e3d54394fd7e348e
 SHA512:
-  metadata.gz: ca24f0844a6aca0e1abcac9db9d11a1620dc132034afa8aa8c737eb90b177f169cf1dfaef242e286bc7d1890f433ef23f257787d1bc2e232081ad82c288c57f5
-  data.tar.gz: 1bc57502c9ba25e4645ba42135967b258df0be8a30ff3f2f4460399056fcffdd0774a41b7d2cb46b993ade48b8d21f832b617122de0e2e81dcb45e8038c21f63
+  metadata.gz: 55fd5e237e565365e5ba3bc1bb1d6ac4478a7bbe8fe1b953437900b91c4a32c350fd38cbcb35971d5ecd81cf1b2deb8f44efff08e6e79ed0a8dde0f886a29683
+  data.tar.gz: ea0ae8d4e740b142eeb84df062aa6c00cd0c0b4b07dad7cdbdc17d1de12d174feb9d87e54ab29686123238292d571330af927a6e0a060f6a9e62b5782a2f00b0

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## Next version
+## 1.1.0
+
+- Search concern improvements
+- Date helper improvements
+- Add `boolean_icon` helper
+- Add i18n attributes
+- Add `Agilibox::PluckToHash`
+- Switch to FontAwesome 5 + `icon` helper improvements
 
 ## 1.0.15
 

data/app/assets/javascripts/agilibox/autocomplete.coffee

@@ -1,2 +1,2 @@
 $(document).on "turbolinks:load", ->
-  $("select.select2").select2()
+  $("select.select2").map -> $(this).select2()

data/app/assets/stylesheets/agilibox/all.sass

@@ -1,6 +1,7 @@
+@import agilibox/buttons
 @import agilibox/filters
-@import agilibox/forms
 @import agilibox/flash
+@import agilibox/forms
 @import agilibox/modals
 @import agilibox/pagination
 @import agilibox/print

data/app/assets/stylesheets/agilibox/buttons.sass

@@ -0,0 +1,9 @@
+// .btn-xs has been removed in Bootstrap 4
+.btn-xs
+  padding: 1px 5px
+  font-size: 12px
+
+// .btn-default has been removed in Bootstrap 4
+.btn-default
+  @extend .btn-outline-secondary !optional
+  background: white

data/app/assets/stylesheets/agilibox/filters.sass

@@ -1,8 +1,13 @@
 .filters
-  @extend .well
+  // Bootstrap 3
+  @extend .well !optional
+  // Bootstrap 4
+  @extend .card !optional
   padding: 8px
   box-shadow: none
   display: flex
+  flex-direction: initial
+  background: #F0F0F0
 
   select,
   button,
@@ -20,7 +25,10 @@
     margin: 0
 
   .form-control,
-    @extend .input-sm
+    // Bootstrap 3
+    @extend .input-sm !optional
+    // Bootstrap 4
+    @extend .form-control-sm !optional
     display: inline-block
     width: auto
 

data/app/assets/stylesheets/agilibox/print.sass

@@ -17,6 +17,7 @@
     width: auto !important
     height: auto !important
 
+  .card-title,
   .panel-title,
   .context-header,
   thead *,
@@ -41,6 +42,7 @@
   #flash,
     display: none !important
 
+  .card,
   .panel,
   .table,
   .list-group,
@@ -49,14 +51,21 @@
   p,
     margin: 1em 0 !important
 
+  .card p,
+  .card table,
   .panel table,
   .well p,
   td p,
     margin: 0 !important
 
   .well,
+  .card,
     padding: 0.5em !important
 
+  .card-header,
+  .card-title,
+  .card-body,
+  .card-footer,
   .panel-heading,
   .panel-title,
   .panel-body,
@@ -71,4 +80,5 @@
     margin: 0 !important
 
   .panel-heading .panel-title,
+  .card-header .card-title,
     padding: 0 !important

data/app/helpers/agilibox/all_helpers.rb

@@ -2,13 +2,14 @@ module Agilibox::AllHelpers
   include Agilibox::BootstrapHelper
   include Agilibox::ButtonHelper
   include Agilibox::FiltersHelper
+  include Agilibox::FontAwesomeHelper
   include Agilibox::FormHelper
+  include Agilibox::I18nHelper
   include Agilibox::LinkHelper
   include Agilibox::PaginationHelper
   include Agilibox::RoutesHelper
   include Agilibox::SortingHelper
   include Agilibox::TextHelper
-  include Agilibox::I18nHelper
 
   extend self
 end

data/app/helpers/agilibox/bootstrap_helper.rb

@@ -1,6 +1,2 @@
 module Agilibox::BootstrapHelper
-  def icon(id)
-    id = id.to_s.tr("_", "-")
-    content_tag(:span, class: "icon fa fa-#{id}") {}
-  end
 end

data/app/helpers/agilibox/button_helper.rb

@@ -48,7 +48,7 @@ module Agilibox::ButtonHelper
 
   def read_button(url, options = {})
     options = {
-      :icon   => "info-circle",
+      :icon   => :info_circle,
       :action => :read,
     }.merge(options)
 
@@ -57,7 +57,7 @@ module Agilibox::ButtonHelper
 
   def download_button(url, options = {})
     options = {
-      :icon     => "cloud-download",
+      :icon     => :cloud_download_alt,
       :action   => :download,
       :download => url,
     }.merge(options)
@@ -75,7 +75,7 @@ module Agilibox::ButtonHelper
     end
 
     options = {
-      :icon     => "cloud-download",
+      :icon     => :download,
       :action   => action,
       :download => url,
     }.merge(options)
@@ -85,7 +85,7 @@ module Agilibox::ButtonHelper
 
   def import_button(url, options = {})
     options = {
-      :icon     => "cloud-upload",
+      :icon     => :upload,
       :action   => :import,
     }.merge(options)
 
@@ -94,7 +94,7 @@ module Agilibox::ButtonHelper
 
   def update_button(url, options = {})
     options = {
-      :icon   => :pencil,
+      :icon   => :pencil_alt,
       :action => :update,
     }.merge(options)
 
@@ -136,7 +136,7 @@ module Agilibox::ButtonHelper
 
   def snooze_button(url, options = {})
     options = {
-      :icon    => :"clock-o",
+      :icon    => :clock,
       :action  => :snooze,
       :confirm => true,
       :method  => :patch,

data/app/helpers/agilibox/filters_helper.rb

@@ -5,7 +5,7 @@ module Agilibox::FiltersHelper
     options[:value] ||= "submit"
 
     text = options.delete(:text) || t("actions.filter")
-    icon = options.delete(:icon) || "filter"
+    icon = options.delete(:icon) || :filter
 
     content_tag(:button, options) do
       icon(icon) + " " + text
@@ -18,7 +18,7 @@ module Agilibox::FiltersHelper
     options[:value] ||= "reset"
 
     text = options.delete(:text) || t("actions.reset")
-    icon = options.delete(:icon) || "rotate-left"
+    icon = options.delete(:icon) || :undo
 
     content_tag(:button, options) do
       icon(icon) + " " + text

data/app/helpers/agilibox/font_awesome_helper.rb

@@ -0,0 +1,47 @@
+module Agilibox::FontAwesomeHelper
+  def icon(id, fa_style: nil, size: nil, spin: false, **options)
+    id = id.to_s.tr("_", "-").to_sym
+
+    if fa_style.nil?
+      fa_style = Agilibox::FontAwesomeHelper.database.dig(id, :styles).to_a.first
+    end
+
+    css_classes = options.delete(:class).to_s.split(" ")
+    css_classes << "icon"
+    css_classes << "fa-#{id}"
+    css_classes << "fa#{fa_style.to_s[0]}"
+    css_classes << "fa-#{size}" if size
+    css_classes << "fa-spin" if spin
+
+    attributes = options.merge(class: css_classes.sort.join(" ")).sort.to_h
+
+    content_tag(:span, attributes) {}
+  end
+
+  class << self
+    def database
+      @database ||= YAML.safe_load(database_yml).deep_symbolize_keys
+    end
+
+    def database_path
+      Rails.root.join("tmp", "fa_database_#{version}.yml")
+    end
+
+    def database_yml
+      download_database! unless File.size?(database_path)
+      File.read(database_path)
+    end
+
+    def download_database!
+      require "open-uri"
+      url  = "https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/advanced-options/metadata/icons.yml"
+      data = URI.parse(url).open.read
+      File.write(database_path, data)
+    end
+
+    def version
+      require "font_awesome/sass/version"
+      FontAwesome::Sass::VERSION
+    end
+  end # class << self
+end

data/app/helpers/agilibox/text_helper.rb

@@ -39,9 +39,17 @@ module Agilibox::TextHelper
     number_with_precision(n, opts).tr(" ", "\u00A0")
   end
 
-  def date(d)
-    return if d.nil?
-    I18n.l(d)
+  def date(d, *args)
+    I18n.l(d, *args) unless d.nil?
+  end
+
+  def boolean_icon(bool)
+    return if bool.nil?
+
+    return icon(:check, style: "color: green") if bool == true
+    return icon(:times, style: "color: red")   if bool == false
+
+    raise "#{bool} is not a boolean"
   end
 
   def hours(n)

data/app/models/concerns/agilibox/pluck_to_hash.rb

@@ -0,0 +1,9 @@
+module Agilibox::PluckToHash
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def pluck_to_hash(*attributes)
+      pluck(*attributes).map { |values| attributes.zip(values).to_h }
+    end
+  end # class_methods
+end

data/app/models/concerns/agilibox/search.rb

@@ -3,9 +3,9 @@ module Agilibox::Search
 
   class_methods do
     def default_search_fields
-      columns.map do |column|
-        "#{table_name}.#{column.name}"
-      end
+      columns
+        .select { |column| column.type.in?([:string, :text]) }
+        .map    { |column| "#{table_name}.#{column.name}" }
     end # def default_search_fields
 
     def search(q, *fields)
@@ -18,13 +18,9 @@ module Agilibox::Search
         }.join(" OR ")
       }.map { |e| "(#{e})" }.join(" AND ")
 
-      sql_params_a = words.map.with_index do |word, index|
-        ["w#{index}".to_sym, "%#{word}%"]
-      end
+      sql_params = words.map.with_index { |word, index| ["w#{index}".to_sym, "%#{word}%"] }.to_h
 
-      sql_params_h = Hash[sql_params_a]
-
-      where(sql_query, sql_params_h)
+      where(sql_query, sql_params)
     end # def search
   end # class_methods
 end # class Agilibox::Search

data/app/views/agilibox/_flash.html.slim

@@ -0,0 +1,8 @@
+#flash.container
+  - flash.map do |type, message|
+    - type = "success" if type == "notice"
+    - type = "danger"  if type == "alert"
+
+    .alert class="alert-#{type}"
+      = message
+      button.close data-dismiss="alert" aria-label="Fermer" = "×"

data/config/locales/attributes.en.yml

@@ -1,90 +1,96 @@
 en:
   attributes: &attributes
-    id                    : "Id"
-    type                  : "Type"
+    access                : "Access"
+    actions               : "Actions"
+    active                : "Active ?"
+    address               : "Address"
+    address1              : "Address"
+    address2              : "Address (rest)"
+    addressable           : "Origin"
+    amount                : "Amount"
+    attachable            : "Origin"
+    attachment            : "Attachment"
+    author                : "Author"
+    avatar                : "Avatar"
+    body                  : "Message"
+    budget                : "Budget"
+    category              : "Category"
+    city                  : "City"
     code                  : "Code"
-    reference             : "Réference"
+    color                 : "Color"
+    comment               : "Comment"
+    commentable           : "Origin"
+    comments              : "Comments"
+    corporation_name      : "Name"
+    count                 : "Number"
+    country               : "Country"
     created_at            : "Created at"
-    updated_at            : "Updated at"
-    name                  : "Name"
-    short_name            : "Short name"
-    title                 : "Title"
-    label                 : "Label"
+    current_avatar        : "Current avatar"
+    customer              : "Customer"
+    customer_guid         : "Customer"
+    data                  : "Data"
+    date                  : "Date"
+    date_begin            : "Date begin"
+    date_end              : "Date end"
+    date_start            : "Date start"
+    day                   : "Day"
+    description           : "Description"
+    details               : "Datails"
+    due_date              : "Due date"
+    email                 : "E-mail"
+    email_attachment      : "Attachment"
+    email_body            : "Message"
+    email_from            : "Sender"
+    email_subject         : "Subject"
+    email_to              : "Recipient"
+    facebook              : "Facebook"
+    fax                   : "Fax"
+    file                  : "File"
     first_name            : "First name"
+    id                    : "Id"
+    is_active             : "Active ?"
+    label                 : "Label"
     last_name             : "Last name"
-    email                 : "E-mail"
-    www                   : "Web site"
-    phone                 : "Phone"
+    length                : "Number"
+    linkedin              : "Linkedin"
+    logo                  : "Logo"
+    message               : "Message"
     mobile                : "Mobile"
-    fax                   : "Fax"
+    month                 : "Month"
+    name                  : "Name"
+    number                : "Number"
+    paid                  : "Paid ?"
     password              : "Password"
     password_confirmation : "Password (confirm)"
-    description           : "Description"
-    text                  : "Text"
-    date                  : "Date"
+    phone                 : "Phone"
+    probability           : "Probability"
+    quantity              : "Quantity"
+    reference             : "Réference"
+    sender                : "Author"
+    short_name            : "Short name"
+    skype                 : "Skype"
     state                 : "State"
     status                : "Status"
-    file                  : "File"
-    address               : "Address"
-    address1              : "Address"
-    address2              : "Address (rest)"
     street                : "Address"
     street_bis            : "Address (rest)"
-    zip                   : "Zip"
-    city                  : "City"
-    country               : "Country"
-    tags                  : "Tags"
+    subject               : "Subject"
     tag_list              : "Tags"
-    budget                : "Budget"
-    probability           : "Probability"
-    access                : "Access"
-    color                 : "Color"
-    data                  : "Data"
-    comment               : "Comment"
-    comments              : "Comments"
-    written_by            : "Written by"
-    details               : "Datails"
-    quantity              : "Quantity"
-    due_date              : "Due date"
-    paid                  : "Paid ?"
-    customer              : "Customer"
-    customer_guid         : "Customer"
+    tags                  : "Tags"
+    text                  : "Text"
+    title                 : "Title"
+    total                 : "Total"
     tracking              : "Tracking ID"
     tracking_id           : "Tracking ID"
-    unique_index          : "Tracking ID"
-    count                 : "Number"
-    length                : "Number"
-    number                : "Number"
-    message               : "Message"
-    skype                 : "Skype"
-    facebook              : "Facebook"
     twitter               : "Twitter"
-    linkedin              : "Linkedin"
-    viadeo                : "Viadeo"
-    subject               : "Subject"
-    body                  : "Message"
-    attachment            : "Attachment"
-    avatar                : "Avatar"
-    current_avatar        : "Current avatar"
-    logo                  : "Logo"
+    type                  : "Type"
+    unique_index          : "Tracking ID"
+    updated_at            : "Updated at"
     user                  : "User"
-    category              : "Category"
-    corporation_name      : "Name"
-    author                : "Author"
-    sender                : "Author"
-    total                 : "Total"
     version               : "Version"
-    commentable           : "Origin"
-    addressable           : "Origin"
-    attachable            : "Origin"
-    email_subject         : "Subject"
-    email_from            : "Sender"
-    email_to              : "Recipient"
-    email_attachment      : "Attachment"
-    email_body            : "Message"
-    active                : "Active ?"
-    is_active             : "Active ?"
-    actions               : "Actions"
+    viadeo                : "Viadeo"
+    written_by            : "Written by"
+    www                   : "Web site"
+    zip                   : "Zip"
 
   labels:
     <<: *attributes

data/config/locales/attributes.fr.yml

@@ -1,90 +1,96 @@
 fr:
   attributes: &attributes
-    id                    : "Id"
-    type                  : "Type"
+    access                : "Accès"
+    actions               : "Actions"
+    active                : "Actif ?"
+    address               : "Adresse"
+    address1              : "Adresse"
+    address2              : "Adresse (suite)"
+    addressable           : "Origine"
+    amount                : "Montant"
+    attachable            : "Origine"
+    attachment            : "Pièce jointe"
+    author                : "Auteur"
+    avatar                : "Avatar"
+    body                  : "Message"
+    budget                : "Budget"
+    category              : "Catégorie"
+    city                  : "Ville"
     code                  : "Code"
-    reference             : "Référence"
+    color                 : "Couleur"
+    comment               : "Commentaire"
+    commentable           : "Origine"
+    comments              : "Commentaires"
+    corporation_name      : "Nom"
+    count                 : "Nombre"
+    country               : "Pays"
     created_at            : "Créé le"
-    updated_at            : "Modifié le"
-    name                  : "Nom"
-    short_name            : "Initiales"
-    title                 : "Titre"
-    label                 : "Libellé"
+    current_avatar        : "Avatar actuel"
+    customer              : "Client"
+    customer_guid         : "Client"
+    data                  : "Informations"
+    date                  : "Date"
+    date_begin            : "Date de début"
+    date_end              : "Date de fin"
+    date_start            : "Date de début"
+    day                   : "Jour"
+    description           : "Description"
+    details               : "Détails"
+    due_date              : "Échéance"
+    email                 : "E-mail"
+    email_attachment      : "Pièce jointe"
+    email_body            : "Message"
+    email_from            : "Expéditeur"
+    email_subject         : "Object"
+    email_to              : "Destinataire"
+    facebook              : "Facebook"
+    fax                   : "Fax"
+    file                  : "Fichier"
     first_name            : "Prénom"
+    id                    : "Id"
+    is_active             : "Actif ?"
+    label                 : "Libellé"
     last_name             : "Nom"
-    email                 : "E-mail"
-    www                   : "Site web"
-    phone                 : "Téléphone"
+    length                : "Nombre"
+    linkedin              : "Linkedin"
+    logo                  : "Logo"
+    message               : "Message"
     mobile                : "Mobile"
-    fax                   : "Fax"
+    month                 : "Mois"
+    name                  : "Nom"
+    number                : "Nombre"
+    paid                  : "Payée ?"
     password              : "Mot de passe"
     password_confirmation : "Mot de passe (confirmer)"
-    description           : "Description"
-    text                  : "Description"
-    date                  : "Date"
+    phone                 : "Téléphone"
+    probability           : "Probabilité"
+    quantity              : "Quantité"
+    reference             : "Référence"
+    sender                : "Auteur"
+    short_name            : "Initiales"
+    skype                 : "Skype"
     state                 : "État"
     status                : "État"
-    file                  : "Fichier"
-    address               : "Adresse"
-    address1              : "Adresse"
-    address2              : "Adresse (suite)"
     street                : "Adresse"
     street_bis            : "Adresse (suite)"
-    zip                   : "Code postal"
-    city                  : "Ville"
-    country               : "Pays"
-    tags                  : "Tags"
+    subject               : "Objet"
     tag_list              : "Tags"
-    budget                : "Budget"
-    probability           : "Probabilité"
-    access                : "Accès"
-    color                 : "Couleur"
-    data                  : "Informations"
-    comment               : "Commentaire"
-    comments              : "Commentaires"
-    written_by            : "écrit par"
-    details               : "Détails"
-    quantity              : "Quantité"
-    due_date              : "Échéance"
-    paid                  : "Payée ?"
-    customer              : "Client"
-    customer_guid         : "Client"
+    tags                  : "Tags"
+    text                  : "Description"
+    title                 : "Titre"
+    total                 : "Total"
     tracking              : "Numéro"
     tracking_id           : "Numéro"
-    unique_index          : "Numéro"
-    count                 : "Nombre"
-    length                : "Nombre"
-    number                : "Nombre"
-    message               : "Message"
-    skype                 : "Skype"
-    facebook              : "Facebook"
     twitter               : "Twitter"
-    linkedin              : "Linkedin"
-    viadeo                : "Viadeo"
-    subject               : "Objet"
-    body                  : "Message"
-    attachment            : "Pièce jointe"
-    avatar                : "Avatar"
-    current_avatar        : "Avatar actuel"
-    logo                  : "Logo"
+    type                  : "Type"
+    unique_index          : "Numéro"
+    updated_at            : "Modifié le"
     user                  : "Utilisateur"
-    category              : "Catégorie"
-    corporation_name      : "Nom"
-    author                : "Auteur"
-    sender                : "Auteur"
-    total                 : "Total"
     version               : "Version"
-    commentable           : "Origine"
-    addressable           : "Origine"
-    attachable            : "Origine"
-    email_subject         : "Object"
-    email_from            : "Expéditeur"
-    email_to              : "Destinataire"
-    email_attachment      : "Pièce jointe"
-    email_body            : "Message"
-    active                : "Actif ?"
-    is_active             : "Actif ?"
-    actions               : "Actions"
+    viadeo                : "Viadeo"
+    written_by            : "écrit par"
+    www                   : "Site web"
+    zip                   : "Code postal"
 
   labels:
     <<: *attributes

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.0.15"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.1.0
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -71,6 +71,7 @@ files:
 - app/assets/javascripts/agilibox/form_reset.coffee
 - app/assets/javascripts/agilibox/modals.coffee
 - app/assets/stylesheets/agilibox/all.sass
+- app/assets/stylesheets/agilibox/buttons.sass
 - app/assets/stylesheets/agilibox/filters.sass
 - app/assets/stylesheets/agilibox/flash.sass
 - app/assets/stylesheets/agilibox/forms.sass
@@ -94,6 +95,7 @@ files:
 - app/helpers/agilibox/bootstrap_helper.rb
 - app/helpers/agilibox/button_helper.rb
 - app/helpers/agilibox/filters_helper.rb
+- app/helpers/agilibox/font_awesome_helper.rb
 - app/helpers/agilibox/form_helper.rb
 - app/helpers/agilibox/i18n_helper.rb
 - app/helpers/agilibox/link_helper.rb
@@ -112,6 +114,7 @@ files:
 - app/models/concerns/agilibox/default_values_concern.rb
 - app/models/concerns/agilibox/model_i18n.rb
 - app/models/concerns/agilibox/model_to_s.rb
+- app/models/concerns/agilibox/pluck_to_hash.rb
 - app/models/concerns/agilibox/polymorphic_id.rb
 - app/models/concerns/agilibox/search.rb
 - app/models/concerns/agilibox/timestamp_helpers.rb
@@ -125,6 +128,7 @@ files:
 - app/sms/agilibox/sms/strategies/base.rb
 - app/sms/agilibox/sms/strategies/test.rb
 - app/sorters/agilibox/sorter.rb
+- app/views/agilibox/_flash.html.slim
 - app/views/agilibox/forms/_checkboxes_dropdown.html.slim
 - app/views/agilibox/search/_form.html.slim
 - config/cucumber.yml