ct_table_for 1.0.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4c048a968042ebb3909b69a45ae079082698350af7714678e032a6f59cddb8
-  data.tar.gz: bea7445d0dd0cdc74e6b9df76de9d59152bc4fd5fdbddface41e3670db9e43dc
+  metadata.gz: 4ed64782cf3f8a5963571ae9f299b2e5638119f12d39a500bc3e8bcca41a4486
+  data.tar.gz: 6b2fee9d9181d27a1626087d0936434938211beeb1db8b5964ff96e40df5c479
 SHA512:
-  metadata.gz: 3797d1adc5fa0ee49b510a74cbafcd8f8d9be35b0403fad2628ee0d18f6947ad14bb752339a2225ca5de462b8bb34a340d9a1a6fea75e9903c6ba5dd2633a5e4
-  data.tar.gz: 411971b3b1452bc20d54714000eee5e73f122520b7941bcbca377aa392cb5758e179348b42cdc767fe312c3f86b61e7b0684497055a0ef4a019062e8970864a7
+  metadata.gz: d699345c49749cd4e5f2dd1e679195cf0ec1936cbaa911ba74b487315d3872296a016b102d43ffb084049b6a2decf8d8d46a0ab7e7742b45eae0578b7e8ae9cb
+  data.tar.gz: 7545d61265dcf373140a8cf46d828b1e2f2699676742c95f1a0350300cf42f47a39fbe54adf54bed6678eafabd24de06d2aced9652af5aefc0ef7df41105fd68

data/README.md

@@ -84,6 +84,7 @@ CtTableFor.setup do |config|
   config.table_for_truncate_length = 50
   config.table_for_truncate_separator = " "
   config.table_for_truncate_omission = "..."
+  config.table_for_td_default_prefix_class = "td-item"
 end
 ```
 You can also define the breakpoint in your `sass` before importing `table_for`:

data/app/assets/stylesheets/table_for.scss.erb

@@ -1,4 +1,4 @@
-$table-for-breakpoint: <%= CtTableFor.table_for_breakpoint %> !default;
+$table-for-breakpoint: <%= CtTableFor.config.table_for_breakpoint %> !default;
 
 @media (max-width: $table-for-breakpoint) {
   // table as cards

data/app/helpers/ct_table_for/application_helper.rb

@@ -6,6 +6,7 @@ module CtTableFor
     # RWD Table
     # use as: table_for Model, @collection, options: {}
     # options: {
+    #   style: "lambda {|model| method(model)}"  // String: adds a method for css class
     #   actions: {
     #     buttons: %w(show, edit)},          // Hash: with array of buttons for actions
     #     premodel: [:bo, :admin],           // Array: of symbols for nested namespaces/models
@@ -28,8 +29,8 @@ module CtTableFor
 
     def table_for model, collection, options: {}
       custom_id = options[:id].present? ? %Q{id="#{options[:id]}"} : ""
-      html = %Q{<div class="table-for-wrapper #{CtTableFor.table_for_wrapper_default_class}">}
-        html << %Q{<table #{custom_id} class="table-for #{CtTableFor.table_for_default_class} #{options[:class]} #{("table-clickable") if options[:clickable]}">}
+      html = %Q{<div class="table-for-wrapper #{CtTableFor.config.table_for_wrapper_default_class}">}
+        html << %Q{<table #{custom_id} class="table-for #{CtTableFor.config.table_for_default_class} #{options[:class]} #{("table-clickable") if options[:clickable]}">}
           html << table_for_header(model, has_actions: options[:actions].present?, options: options)
           html << table_for_content(model, collection, options: options)
         html << %Q{</table>}
@@ -49,7 +50,7 @@ module CtTableFor
             html << %Q{<th>}
               attribute, *params = attribute.split(":")
               html << if defined?(Ransack) and params.include? "sortable"
-                if params.length > 1 && !params.include?("l")
+                if params.length > 1 && (params & ['l', 'currency']).empty?
                   sort_link(@q, "#{attribute}_#{params.first}", I18n.t("#{attribute.to_s.underscore}_#{params.first}", scope: [:activerecord, :attributes, model.to_s.underscore]).capitalize )
                 else
                   sort_link(@q, attribute, I18n.t("#{attribute}", scope: [:activerecord, :attributes, model.to_s.underscore]).capitalize )
@@ -69,9 +70,9 @@ module CtTableFor
       html = ""
       html << %Q{<tbody>}
         if collection.present?
-          custom_tr_class = options[:tr_class].present? ? %Q{class="#{options[:tr_class]}"} : ""
           collection.each do |record|
-            html << %Q{<tr data-colection-id="#{record.try(:id)}" #{custom_tr_class} #{row_data_link(record, options)}>}
+            css_classes = get_css_classes(record, options)
+            html << %Q{<tr data-colection-id="#{record.try(:id)}" #{css_classes} #{row_data_link(record, options)}>}
               table_for_attributes(model, options).each do |attribute|
                 attribute, *params = attribute.split(":")
                 html << table_for_cell( model, record, attribute, cell_options: params )
@@ -110,7 +111,7 @@ module CtTableFor
                 nil
               end
 
-      html << %Q{<td data-title="#{model.human_attribute_name("#{attribute}")}">}
+      html << %Q{<td data-title="#{model.human_attribute_name("#{attribute}")}" class="#{CtTableFor.config.table_for_td_default_prefix_class}-#{attribute}">}
         case value
         when NilClass
           html << %Q{<i class="fa fa-minus text-muted"></i>}
@@ -120,13 +121,15 @@ module CtTableFor
           if cell_options.include? "currency"
             html << number_to_currency(value)
           elsif cell_options.include? "percentage"
-            html << number_to_percentage(value, precision: CtTableFor.table_for_numeric_percentage_precision)
+            html << number_to_percentage(value, precision: CtTableFor.config.table_for_numeric_percentage_precision)
           else
-            html << %Q{<code>#{value}</code>}
+            html << %Q{#{number_with_delimiter(value)}}
           end
         when ActiveSupport::TimeWithZone
           # TODO: value.in_time_zone
           html << %Q{<code>#{value.strftime("%d/%m/%Y %H:%M:%S")}</code>}
+        when Date
+          html << %Q{#{value.strftime("%d/%m/%Y")}}
         when Time
           # TODO: value.in_time_zone
           html << %Q{<code>#{value.strftime("%H:%M:%S")}</code>}
@@ -139,7 +142,9 @@ module CtTableFor
         when ActiveRecord::Associations::CollectionProxy
           html << %Q{#{value.count}}
         else
-          if uri?(value)
+          if defined?(ActiveStorage) && value.is_a?(ActiveStorage::Attached::One)
+            html << table_for_cell_for_image( record, attribute, cell_options: cell_options )
+          elsif uri?(value)
             html << link_to(value, value)
           elsif defined?(Paperclip) and value.is_a?(Paperclip::Attachment)
             html << table_for_cell_for_image( record, attribute, cell_options: cell_options )
@@ -150,9 +155,9 @@ module CtTableFor
               html << value.to_s
             else
               html << value.to_s.truncate(
-                CtTableFor.table_for_truncate_length,
-                separator: CtTableFor.table_for_truncate_separator,
-                omission: CtTableFor.table_for_truncate_omission
+                CtTableFor.config.table_for_truncate_length,
+                separator: CtTableFor.config.table_for_truncate_separator,
+                omission: CtTableFor.config.table_for_truncate_omission
               )
             end
           end
@@ -164,8 +169,14 @@ module CtTableFor
     def table_for_cell_for_image record, attribute, cell_options: {}
       html = ""
       size = cell_options.select{ |opt| ["thumb", "original", "small", "medium"].include? opt }.first || "thumb"
+      value = record.send(attribute)
+      return html unless value.present?
 
-      html << image_tag(record.send(attribute).url(size), class: CtTableFor.table_for_cell_for_image_image_class, style: "max-height: 100px;")
+      if value.is_a?(ActiveStorage::Attached::One)
+        html << image_tag(value, class: CtTableFor.config.table_for_cell_for_image_image_class, style: "max-height: 100px;")
+      else
+        html << image_tag(value.url(size), class: CtTableFor.config.table_for_cell_for_image_image_class, style: "max-height: 100px;")
+      end
       html.html_safe
     end
 
@@ -177,7 +188,7 @@ module CtTableFor
     def table_for_actions(record, options: {} )
       return "" if options[:actions].blank?
       html = ""
-      html << %Q{<td data-link-enabled="false">}
+      html << %Q{<td data-link-enabled="false" class="#{CtTableFor.config.table_for_td_default_prefix_class}-actions">}
         html << %Q{<div class="btn-group btn-group-sm" role="group" aria-label="#{I18n.t(:actions, scope: [:table_for]).capitalize}">}
         nesting = (options[:actions][:premodel] || []) + [record]
         buttons = options[:actions][:buttons].map{ |b| b.split("|")}
@@ -189,16 +200,18 @@ module CtTableFor
             when :show
               html << link_to(label_for_action(action, options[:actions][:icons]).html_safe, polymorphic_path(nesting), class: class_for_action(action, options))
             when :edit
-              html << link_to(label_for_action(action, options[:actions][:icons]).html_safe, edit_polymorphic_path(nesting), class: class_for_action(action, options))
+              url_helper = options.dig(:actions, :urls, :edit) || lambda{|obj| edit_polymorphic_path(nesting)}
+              html << link_to(label_for_action(action, options[:actions][:icons]).html_safe, url_helper.(nesting), class: class_for_action(action, options))
             when :destroy
-              html << link_to(label_for_action(action, options[:actions][:icons]).html_safe, polymorphic_path(nesting),
+              url_helper = options.dig(:actions, :urls, :destroy) || lambda{|obj| polymorphic_path(nesting)}
+              html << link_to(label_for_action(action, options[:actions][:icons]).html_safe, url_helper.(nesting),
                               method: :delete, class: class_for_action(action, options), data: { confirm: I18n.t('table_for.messages.are_you_sure').capitalize })
             when :custom
               html << button_for_custom_action(record, options, extras)
             else
               # TODO:
               # nesting_custom = nesting + btn_options[0]
-              # label = icon CtTableFor.table_for_action_icons[:custom] if options[:actions][:icons] != false and defined?(FontAwesome)
+              # label = icon CtTableFor.config.table_for_action_icons[:custom] if options[:actions][:icons] != false and defined?(FontAwesome)
               # html << link_to(label, polymorphic_path(nesting_custom), class: "btn btn-default btn-sm")
             end
           end
@@ -211,13 +224,13 @@ module CtTableFor
     def label_for_action action, icons = true
       label = I18n.t(action.to_sym, scope: [:table_for, :buttons]).capitalize
       if icons != false
-        label = %Q{<i class="#{CtTableFor.table_for_icon_font_base_class} #{CtTableFor.table_for_icon_font_base_class}-#{CtTableFor.table_for_action_icons[action.to_sym]}"></i>}
+        label = %Q{<i class="#{CtTableFor.config.table_for_icon_font_base_class} #{CtTableFor.config.table_for_icon_font_base_class}-#{CtTableFor.config.table_for_action_icons[action.to_sym]}"></i>}
       end
       label
     end
 
     def class_for_action action, options
-      %Q{#{CtTableFor.table_for_default_action_base_class} #{options.dig(:btn_class, action.to_sym) || CtTableFor.table_for_action_class[action.to_sym]}}
+      %Q{#{CtTableFor.config.table_for_default_action_base_class} #{options.dig(:btn_class, action.to_sym) || CtTableFor.config.table_for_action_class[action.to_sym]}}
     end
 
     def button_for_custom_action record, options, extras
@@ -226,18 +239,20 @@ module CtTableFor
       label = if parsed_extras[:icons].to_s == "false"
         parsed_extras[:title].presence || ""
       else
-        %Q{<i class="#{CtTableFor.table_for_icon_font_base_class} #{CtTableFor.table_for_icon_font_base_class}-#{parsed_extras[:icon]}"></i>}
+        %Q{<i class="#{CtTableFor.config.table_for_icon_font_base_class} #{CtTableFor.config.table_for_icon_font_base_class}-#{parsed_extras[:icon]}"></i>}
       end
       ancestors_list = parsed_extras[:ancestors].presence || ""
       ancestors = ancestors_list.split(",").map do |ancestor|
         record.send(ancestor)
       end
-      custom_action_class = %Q{#{CtTableFor.table_for_default_action_base_class} #{parsed_extras[:class]}}
-      link_to(label.html_safe,
-              polymorphic_path([parsed_extras[:link], *ancestors, record]),
-              class: custom_action_class,
-              method: parsed_extras[:method],
-              title: parsed_extras[:title])
+      custom_action_class = %Q{#{CtTableFor.config.table_for_default_action_base_class} #{parsed_extras[:class]}}
+      options= {
+        class: custom_action_class,
+        method: parsed_extras[:method],
+        title: parsed_extras[:title]
+      }
+      options[:target]= parsed_extras[:target] if parsed_extras[:target].present?
+      link_to(label.html_safe, polymorphic_path([parsed_extras[:link]&.to_sym, *ancestors, record]), options)
     end
 
     def uri?(string)
@@ -253,5 +268,11 @@ module CtTableFor
     def parse_extras(extras)
       Hash[extras.collect { |extra| [extra.split(":").first, extra.split(":").last] } ].with_indifferent_access
     end
+
+    def get_css_classes(record, options = {})
+      style = options[:style].try(:call, record) || ""
+      tr_class = options[:tr_class] || ""
+      "class='#{tr_class} #{style}'"
+    end
   end
 end

data/lib/ct_table_for/engine.rb

@@ -1,17 +1,18 @@
 module CtTableFor
-  class << self
-    mattr_accessor :table_for_default_class
-    mattr_accessor :table_for_wrapper_default_class
-    mattr_accessor :table_for_default_action_base_class
-    mattr_accessor :table_for_action_class
-    mattr_accessor :table_for_breakpoint
-    mattr_accessor :table_for_icon_font_base_class
-    mattr_accessor :table_for_action_icons
-    mattr_accessor :table_for_numeric_percentage_precision
-    mattr_accessor :table_for_cell_for_image_image_class
-    mattr_accessor :table_for_truncate_length
-    mattr_accessor :table_for_truncate_separator
-    mattr_accessor :table_for_truncate_omission
+  class Config
+    self.mattr_accessor :table_for_default_class
+    self.mattr_accessor :table_for_wrapper_default_class
+    self.mattr_accessor :table_for_default_action_base_class
+    self.mattr_accessor :table_for_action_class
+    self.mattr_accessor :table_for_breakpoint
+    self.mattr_accessor :table_for_icon_font_base_class
+    self.mattr_accessor :table_for_action_icons
+    self.mattr_accessor :table_for_numeric_percentage_precision
+    self.mattr_accessor :table_for_cell_for_image_image_class
+    self.mattr_accessor :table_for_truncate_length
+    self.mattr_accessor :table_for_truncate_separator
+    self.mattr_accessor :table_for_truncate_omission
+    self.mattr_accessor :table_for_td_default_prefix_class
 
     self.table_for_wrapper_default_class = "table-responsive"
     self.table_for_default_class = "table table-striped table-bordered table-condensed table-hover"
@@ -25,11 +26,16 @@ module CtTableFor
     self.table_for_truncate_length = 50
     self.table_for_truncate_separator = " "
     self.table_for_truncate_omission = "..."
+    self.table_for_td_default_prefix_class = "td-item"
+  end
+
+  def self.config
+    @config||= Config.new
   end
 
   # this function maps the vars from your app into your engine
   def self.setup(&block)
-    yield self
+    yield config
   end
 
   class Engine < ::Rails::Engine

data/lib/ct_table_for/version.rb

@@ -1,3 +1,3 @@
 module CtTableFor
-  VERSION = '1.0.2'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,36 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ct_table_for
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Agustí B.R.
 - Isaac Massot
 - Marc Reniu
+- Oliver Valls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2021-10-22 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: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 description: table_for is a rails table builder given an ActiveRecord
 email:
-- agusti.br@coditramuntana.com
-- issac.mg@coditramuntana.com
-- marc.rs@coditramuntana.com
+- info@coditramuntana.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -67,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails table builder that makes it easy to do responsive tables ActiveRecord