agilibox 1.5.13 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f2f44dd973a477f962ee2e76805ca19f698a011d9000cedcd83aae30673dbaa
-  data.tar.gz: 90ba13ccc6e08721384bb9abd608fe716166f695b7f09841abc5afa60eb1c2ab
+  metadata.gz: 21f228e7863e5274343cddda10e487d18fe613c5dc6bc520e2db03f0475cf7fa
+  data.tar.gz: b981d9c578d42bca6253c38bbb31690c3f0b417d1f43cbd23ed3a5ffac2e2bbd
 SHA512:
-  metadata.gz: 5f81afa67332d05cf6ff56d78ac408d3fbeb8bbd01bcdbee99b8d2cc7547b8318192b4ea00ecb954f39e58e8ff90f484add167d7e1f09b4120862d0008192d25
-  data.tar.gz: e6db62b2dfcd78066dec9982171b2c0a66fb02898a77e08edafd2d86b4d26e66d3bedd929457f4a7c048a0dcf416b3e282c70c0d4897ec5132abf537401aee1d
+  metadata.gz: cf9b9f217b374801aa1cff551b27dbe0454c82acd8608437918f9b3b301541bcddc40b8bc4d5d4353ba1d833a82ea3eca561c0a3111919836aafcc49e0144aef
+  data.tar.gz: 3559c5cc114505be9fac3391222f29bdde5fbe2c4f75fe385b80fc6c8713332dff084a60e73a0a45596c9d8b67e4fbf8ab532a6d341ac5a6a22f029dba9a717d

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Next version
 
+## 1.6.0
+- Remove `GetHTTP`
+- I18n fixes
+- Add `Agilibox::TapMethods`
+- Filters CSS : add flex-wrap
+- Add `bs_card` helper
+- Add `:br` separator to `info` helper
+- TextHelper refactors
+- Update dummy app to Rails 5.2
+- Replace AXLSX by SpreadsheetArchitect
+
 ## 1.5.13
 - Fix `info` helper with nested blank value
 

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

@@ -6,6 +6,7 @@
   padding: 8px
   box-shadow: none
   display: flex
+  flex-wrap: wrap
   flex-direction: initial
   background: #F0F0F0
 

data/app/helpers/agilibox/bootstrap_helper.rb

@@ -1,4 +1,19 @@
 module Agilibox::BootstrapHelper
+  class << self
+    attr_writer :card_classes
+
+    # rubocop:disable Rails/HelperInstanceVariable
+    def card_classes
+      @card_classes ||= {
+        :card   => "card",
+        :header => "card-header",
+        :body   => "card-body",
+        :footer => "card-footer",
+      }
+    end
+    # rubocop:enable Rails/HelperInstanceVariable
+  end
+
   def bs_progress_bar(percentage)
     content_tag(:div, class: "progress") do
       content_tag(:div, class: "progress-bar", style: "width:#{percentage}%") do
@@ -6,4 +21,47 @@ module Agilibox::BootstrapHelper
       end
     end
   end
+
+  def bs_card( # rubocop:disable Metrics/ParameterLists
+    header: nil,
+    body: true,
+    footer: nil,
+    card_tag: :div,
+    header_tag: :div,
+    body_tag: :div,
+    footer_tag: :div,
+    card_class: nil,
+    header_class: nil,
+    body_class: nil,
+    footer_class: nil,
+    &block
+  )
+    global_classes = Agilibox::BootstrapHelper.card_classes
+    card_classes   = ([global_classes[:card]]   + card_class.to_s.split(" ")).compact.sort
+    header_classes = ([global_classes[:header]] + header_class.to_s.split(" ")).compact.sort
+    body_classes   = ([global_classes[:body]]   + body_class.to_s.split(" ")).compact.sort
+    footer_classes = ([global_classes[:footer]] + footer_class.to_s.split(" ")).compact.sort
+
+    if header
+      header_html = content_tag(header_tag, class: header_classes) { header }
+    else
+      header_html = "".html_safe
+    end
+
+    if body
+      body_html = content_tag(body_tag, class: body_classes) { capture(&block) }
+    else
+      body_html = capture(&block)
+    end
+
+    if footer
+      footer_html = content_tag(footer_tag, class: footer_classes) { footer }
+    else
+      footer_html = "".html_safe
+    end
+
+    content_tag(card_tag, class: card_classes) do
+      header_html + body_html + footer_html
+    end
+  end
 end

data/app/helpers/agilibox/text_helper.rb

@@ -5,7 +5,7 @@ module Agilibox::TextHelper
 
   def nbsp(text = :no_argument)
     if text == :no_argument
-      " "
+      "\u00A0"
     else
       text.to_s.gsub(" ", nbsp)
     end
@@ -21,13 +21,13 @@ module Agilibox::TextHelper
     I18n.t("number.currency.format.format")
       .gsub("%n", number(n))
       .gsub("%u", u)
-      .tr(" ", "\u00A0")
+      .tr(" ", nbsp)
   end
 
   def percentage(n)
     return if n.nil?
 
-    (number(n) + " %").tr(" ", "\u00A0")
+    number(n) + nbsp + "%"
   end
 
   def number(n)
@@ -44,7 +44,7 @@ module Agilibox::TextHelper
     opts[:delimiter] = I18n.t("number.format.delimiter")
     opts[:separator] = I18n.t("number.format.separator")
 
-    number_with_precision(n, opts).tr(" ", "\u00A0")
+    number_with_precision(n, opts).tr(" ", nbsp)
   end
 
   def date(d, *args)
@@ -101,6 +101,7 @@ module Agilibox::TextHelper
     label       = options[:label]     || object.t(attribute)
     tag         = options[:tag]       || :div
     separator   = options[:separator] || " : "
+    separator   = " :<br/>".html_safe if separator == :br
     helper      = options[:helper]
     i18n_key    = "#{object.class.to_s.tableize.singularize}/#{attribute}"
     nested      = I18n.t("activerecord.attributes.#{i18n_key}", default: "").is_a?(Hash)

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

@@ -0,0 +1,23 @@
+module Agilibox::TapMethods
+  extend ActiveSupport::Concern
+
+  def tap_save!(options = {})
+    save!(options)
+    self
+  end
+
+  def tap_update!(attributes)
+    update!(attributes)
+    self
+  end
+
+  def tap_validate(context = nil)
+    validate(context)
+    self
+  end
+
+  def tap_validate!(context = nil)
+    validate!(context)
+    self
+  end
+end

data/app/serializers/agilibox/serializers/axlsx.rb

@@ -0,0 +1,21 @@
+class Agilibox::Serializers::AXLSX < Agilibox::Serializers::Base
+  def render_inline
+    xlsx.to_stream.read.force_encoding("BINARY")
+  end
+
+  def render_file(file_path)
+    xlsx.serialize(file_path)
+  end
+
+  def xlsx
+    @xlsx ||= Axlsx::Package.new do |p|
+      p.workbook.add_worksheet do |sheet|
+        formatted_data.each do |line|
+          sheet.add_row(line)
+        end
+      end
+
+      p.use_shared_strings = true
+    end
+  end
+end

data/app/serializers/agilibox/serializers/base.rb

@@ -6,6 +6,12 @@ class Agilibox::Serializers::Base
     @options = options
   end
 
+  def formatted_data
+    data.map do |line|
+      line.map { |value| self.class.format(value) }
+    end
+  end
+
   def render_inline
     raise NotImplementedError
   end

data/app/serializers/agilibox/serializers/xlsx.rb

@@ -1,22 +1,11 @@
 class Agilibox::Serializers::XLSX < Agilibox::Serializers::Base
   def render_inline
-    xlsx.to_stream.read.force_encoding("BINARY")
+    SpreadsheetArchitect.to_xlsx(data: formatted_data)
   end
 
   def render_file(file_path)
-    xlsx.serialize(file_path)
-  end
-
-  def xlsx
-    @xlsx ||= Axlsx::Package.new do |p|
-      p.workbook.add_worksheet do |sheet|
-        data.each do |line|
-          values = line.map { |value| self.class.format(value) }
-          sheet.add_row(values)
-        end
-      end
-
-      p.use_shared_strings = true
+    File.open(file_path, "w+b") do |f|
+      f.write(render_inline)
     end
   end
 end

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

@@ -5,4 +5,5 @@
 
     .alert class="alert-#{type}"
       = message
-      button.close data-dismiss="alert" aria-label="Fermer" = "×"
+      button.close data-dismiss="alert" aria-label=ta(:close) title=ta(:close)
+        = "×"

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.5.13"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.6.0
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -115,7 +115,6 @@ files:
 - app/libs/agilibox/collection_update.rb
 - app/libs/agilibox/fcm/notifier.rb
 - app/libs/agilibox/fcm/request.rb
-- app/libs/agilibox/get_http.rb
 - app/libs/agilibox/initialize_with.rb
 - app/libs/agilibox/mini_model_serializer/serialize.rb
 - app/libs/agilibox/mini_model_serializer/serializer.rb
@@ -133,8 +132,10 @@ files:
 - 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/tap_methods.rb
 - app/models/concerns/agilibox/timestamp_helpers.rb
 - app/serializers/agilibox/serializers.rb
+- app/serializers/agilibox/serializers/axlsx.rb
 - app/serializers/agilibox/serializers/base.rb
 - app/serializers/agilibox/serializers/xlsx.rb
 - app/services/agilibox/service.rb

data/app/libs/agilibox/get_http.rb

@@ -1,55 +0,0 @@
-class Agilibox::GetHTTP < Agilibox::Service
-  class Error < StandardError
-  end
-
-  EXCEPTIONS_TO_RERAISE = [
-    IOError,
-    Net::HTTPBadResponse,
-    Net::HTTPExceptions,
-    Net::HTTPHeaderSyntaxError,
-    OpenSSL::SSL::SSLError,
-    SocketError,
-    SystemCallError,
-    Timeout::Error,
-    Zlib::Error,
-  ]
-
-  TIMEOUT = 10
-
-  initialize_with :url
-
-  def uri
-    uri = URI(url.to_s)
-    raise Error, "invalid URI type : #{uri.class}" unless uri.is_a?(URI::HTTP)
-    uri
-  end
-
-  def response
-    @response ||= fetch_response
-  end
-
-  def call
-    response.body
-  end
-
-  private
-
-  def fetch_response
-    http_response = Timeout.timeout(TIMEOUT) do
-      Net::HTTP.get_response(uri)
-    end
-
-    if http_response.code.start_with?("3")
-      @url = http_response["Location"]
-      return fetch_response
-    end
-
-    unless http_response.code.start_with?("2")
-      raise Error, "invalid response code : #{http_response.code}"
-    end
-
-    http_response
-  rescue *EXCEPTIONS_TO_RERAISE => e
-    raise Error, e.message
-  end
-end