active_list 6.7.3 → 6.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3f58a6cda58d2e022d1114a9207a395ac25ade3
-  data.tar.gz: 06eb367cb174b01eb25252266d0f5d8da02eb600
+  metadata.gz: b0fee98280d5ca65c397076a72d92e766296dae7
+  data.tar.gz: 8067cd16ede90cdee14e3dff5283835dfad8a27f
 SHA512:
-  metadata.gz: 090c9f29bfd1bf8933d7406fb4e7e5af51f3def7f9a714d2d121120442bed65cbde7e7745885ad974ac84612229fd12847bc9e67af044e2c9facd261e9ec9720
-  data.tar.gz: dada39b2afb84a1dfe68807e6a00b6b0423abd0847baaefba25a63f54fcdf8cbc392ba81b97eebf9193b17669a8af882c550c69ad08ac2da02fb5316bec73dc0
+  metadata.gz: 58efa00509d17a9f49db4671b2ea07490ef7a2b0ee5a5ebac748412ae8ba978f1fa4f7c8788d4e923861ce35e20449e03a51196ec761695661a70adbdfc24358
+  data.tar.gz: 5418a1860ad6ef8e6d6eacc0dec5a7f3a7e588734c728e9a4e4dd36ee4d5e925f0b5bbd8e9d426a3f91d629153abd07c7d577ea46a1e9ed7171fd5110f99b86b

data/lib/active_list.rb

@@ -24,11 +24,11 @@ module ActiveList
   # Set the temporary directory
   # Pathname or callable are acceptable
   def self.temporary_directory=(dir)
-    if dir.respond_to?(:call) || dir.is_a?(Pathname)
-      @@temporary_directory = dir
-    else
-      @@temporary_directory = Pathname(dir)
-    end
+    @@temporary_directory = if dir.respond_to?(:call) || dir.is_a?(Pathname)
+                              dir
+                            else
+                              Pathname(dir)
+                            end
   end
 
   # Returns the temporary directory
@@ -45,7 +45,7 @@ module ActiveList
 
   def self.register_renderer(name, renderer)
     unless renderer < ActiveList::Renderers::AbstractRenderer
-      fail ArgumentError, 'A renderer must be ActiveList::Renderers::Renderer'
+      raise ArgumentError, 'A renderer must be ActiveList::Renderers::Renderer'
     end
     @@renderers[name] = renderer
   end
@@ -55,7 +55,7 @@ module ActiveList
 
   def self.register_exporter(name, exporter)
     unless exporter < ActiveList::Exporters::AbstractExporter
-      fail ArgumentError, "ActiveList::Exporters::AbstractExporter expected (got #{exporter.name}/#{exporter.ancestors.inspect})"
+      raise ArgumentError, "ActiveList::Exporters::AbstractExporter expected (got #{exporter.name}/#{exporter.ancestors.inspect})"
     end
     @@exporters[name] = exporter
   end

data/lib/active_list/definition/abstract_column.rb

@@ -12,7 +12,7 @@ module ActiveList
       end
 
       def header_code
-        fail NotImplementedError, "#{self.class.name}#header_code is not implemented."
+        raise NotImplementedError, "#{self.class.name}#header_code is not implemented."
       end
 
       def hidden?
@@ -41,11 +41,11 @@ module ActiveList
         @id
       end
 
-      alias_method :sort_id, :name
+      alias sort_id name
 
       def check_options!(options, *keys)
         for key in options.keys
-          fail ArgumentError, "Key :#{key} is unexpected. (Expecting: #{keys.to_sentence})"
+          raise ArgumentError, "Key :#{key} is unexpected. (Expecting: #{keys.to_sentence})"
         end
       end
     end

data/lib/active_list/definition/action_column.rb

@@ -4,9 +4,9 @@ module ActiveList
     class ActionColumn < AbstractColumn
       include ActiveList::Helpers
 
-      ID_PLACEHOLDER = '##IDS##'
+      ID_PLACEHOLDER = '##IDS##'.freeze
 
-      USE_MODES = [:none, :single, :many, :both]
+      USE_MODES = [:none, :single, :many, :both].freeze
 
       attr_reader :use_mode
 
@@ -14,7 +14,7 @@ module ActiveList
         super(table, name, options)
         @use_mode = (@options.delete(:on) || :single).to_sym
         unless USE_MODES.include?(@use_mode)
-          fail "Invalid use mode: #{@use_mode.inspect}"
+          raise "Invalid use mode: #{@use_mode.inspect}"
         end
         if @name.to_s == 'destroy' && !@options.key?(:method)
           @options[:method] = :delete
@@ -40,7 +40,7 @@ module ActiveList
       end
 
       def global?
-        self.use_none? || self.use_many?
+        use_none? || use_many?
       end
 
       def header_code
@@ -67,7 +67,7 @@ module ActiveList
         action = @name
         format = @options[:format] ? ", format: '#{@options[:format]}'" : ''
         if @options[:remote]
-          fail StandardError, 'Sure to use :remote ?'
+          raise StandardError, 'Sure to use :remote ?'
         # remote_options = @options.dup
         # remote_options['data-confirm'] = "#{@options[:confirm].inspect}.tl".c unless @options[:confirm].nil?
         # remote_options.delete :remote
@@ -81,10 +81,10 @@ module ActiveList
         # code += ")"
         elsif @options[:actions]
           unless use_single?
-            fail StandardError, 'Only compatible with single actions'
+            raise StandardError, 'Only compatible with single actions'
           end
           unless @options[:actions].is_a? Hash
-            fail StandardError, ':actions parameter have to be a Hash.'
+            raise StandardError, ':actions parameter have to be a Hash.'
           end
           cases = []
           for expected, url in @options[:actions]

data/lib/active_list/definition/association_column.rb

@@ -6,7 +6,7 @@ module ActiveList
       def initialize(table, name, options = {})
         super(table, name, options)
         unless @options[:through]
-          fail ArgumentError, 'Option :through must be given'
+          raise ArgumentError, 'Option :through must be given'
         end
         reflection_name = @options.delete(:through).to_sym
         if @reflection = @table.model.reflect_on_association(reflection_name)
@@ -15,23 +15,23 @@ module ActiveList
           elsif @reflection.macro == :has_one
           # Do some stuff
           else
-            fail ArgumentError, "Only belongs_to are usable. Can't handle: #{reflection.macro} :#{reflection.name}."
+            raise ArgumentError, "Only belongs_to are usable. Can't handle: #{reflection.macro} :#{reflection.name}."
           end
         else
-          fail UnknownReflection, "Reflection #{reflection_name} cannot be found for #{table.model.name}."
+          raise UnknownReflection, "Reflection #{reflection_name} cannot be found for #{table.model.name}."
         end
         unless klass = begin
                          @reflection.class_name.constantize
                        rescue
                          nil
                        end
-          fail StandardError, "Given reflection #{reflection_name} seems to be invalid"
+          raise StandardError, "Given reflection #{reflection_name} seems to be invalid"
         end
         columns_def = klass.columns_hash.keys.map(&:to_sym)
         unless @label_method = @options.delete(:label_method)
           columns = columns_def + @reflection.class_name.constantize.instance_methods.map(&:to_sym)
           unless @label_method = LABELS_COLUMNS.detect { |m| columns.include?(m) }
-            fail ArgumentError, ":label_method option must be given for association #{name}. (#{columns.inspect})"
+            raise ArgumentError, ":label_method option must be given for association #{name}. (#{columns.inspect})"
           end
         end
         unless @sort_column = @options.delete(:sort)
@@ -48,16 +48,16 @@ module ActiveList
       # Code for rows
       def datum_code(record = 'record_of_the_death', child = false)
         code = ''
-        if child
-          code = 'nil'
-        # if @options[:children].is_a?(FalseClass)
-        #   code = "nil"
-        # else
-        #   code = "#{record}.#{table.options[:children]}.#{@reflection.name}.#{@options[:children] || @label_method}"
-        # end
-        else
-          code = "(#{record}.#{@reflection.name} ? #{record}.#{@reflection.name}.#{@label_method} : nil)"
-        end
+        code = if child
+                 'nil'
+               # if @options[:children].is_a?(FalseClass)
+               #   code = "nil"
+               # else
+               #   code = "#{record}.#{table.options[:children]}.#{@reflection.name}.#{@options[:children] || @label_method}"
+               # end
+               else
+                 "(#{record}.#{@reflection.name} ? #{record}.#{@reflection.name}.#{@label_method} : nil)"
+               end
         code.c
       end
 

data/lib/active_list/definition/attribute_column.rb

@@ -7,13 +7,11 @@ module ActiveList
         super(table, name, options)
         @label_method = (options[:label_method] || @name).to_sym
         unless @sort_column = options[:sort]
-          if @table.model.columns_hash[@label_method.to_s]
-            @sort_column = @label_method
-          elsif @table.model.columns_hash[@name.to_s]
-            @sort_column = @name
-          else
-            @sort_column = nil
-          end
+          @sort_column = if @table.model.columns_hash[@label_method.to_s]
+                           @label_method
+                         elsif @table.model.columns_hash[@name.to_s]
+                           @name
+                         end
         end
         @computation_method = options[:on_select]
         @column = @table.model.columns_hash[@label_method.to_s]
@@ -22,15 +20,15 @@ module ActiveList
       # Code for rows
       def datum_code(record = 'record_of_the_death', child = false)
         code = ''
-        if child
-          if @options[:children].is_a?(FalseClass)
-            code = 'nil'
-          else
-            code = "#{record}.#{table.options[:children]}.#{@options[:children] || @label_method}"
-          end
-        else
-          code = "#{record}.#{@label_method}"
-        end
+        code = if child
+                 if @options[:children].is_a?(FalseClass)
+                   'nil'
+                 else
+                   "#{record}.#{table.options[:children]}.#{@options[:children] || @label_method}"
+                        end
+               else
+                 "#{record}.#{@label_method}"
+               end
         code.c
       end
 

data/lib/active_list/definition/data_column.rb

@@ -1,7 +1,7 @@
 module ActiveList
   module Definition
     class DataColumn < AbstractColumn
-      LABELS_COLUMNS = [:full_name, :label, :name, :number, :coordinate]
+      LABELS_COLUMNS = [:full_name, :label, :name, :number, :coordinate].freeze
 
       def header_code
         if @options[:label]
@@ -19,12 +19,7 @@ module ActiveList
         elsif datatype == :date
           datum = "(#{datum}.nil? ? '' : #{datum}.l)"
         elsif datatype == :decimal && !noview
-          currency = nil
-          if currency = options[:currency]
-            currency = currency[:body] if currency.is_a?(Hash)
-            currency = :currency if currency.is_a?(TrueClass)
-            currency = "#{record}.#{currency}".c if currency.is_a?(Symbol)
-          end
+          currency = currency_for(record)
           datum = "(#{datum}.nil? ? '' : #{datum}.l(#{'currency: ' + currency.inspect if currency}))"
         elsif @name.to_s.match(/(^|\_)currency$/) && datatype == :string
           datum = "(Nomen::Currencies[#{datum}] ? Nomen::Currencies[#{datum}].human_name : '')"
@@ -32,7 +27,7 @@ module ActiveList
           datum = "(Nomen::Countries[#{datum}] ? Nomen::Countries[#{datum}].human_name : '')"
         elsif @name.to_s.match(/(^|\_)language$/) && datatype == :string
           datum = "(Nomen::Languages[#{datum}] ? Nomen::Languages[#{datum}].human_name : '')"
-        elsif self.enumerize?
+        elsif enumerize?
           datum = "(#{datum}.nil? ? '' : #{datum}.text)"
         end
         datum
@@ -47,6 +42,16 @@ module ActiveList
         false
       end
 
+      def currency_for(record)
+        currency = options[:currency]
+        if currency
+          currency = currency[:body] if currency.is_a?(Hash)
+          currency = :currency if currency.is_a?(TrueClass)
+          currency = "#{record}.#{currency}".c if currency.is_a?(Symbol)
+        end
+        currency
+      end
+
       def state_machine?
         false
       end
@@ -67,9 +72,9 @@ module ActiveList
 
       # Check if a column is sortable
       def sortable?
-        return true
+        true
         # not self.action? and
-        #!options[:through] && !@column.nil?
+        # !options[:through] && !@column.nil?
       end
 
       # Generate code in order to get the (foreign) record of the column
@@ -78,7 +83,7 @@ module ActiveList
       end
 
       def sort_expression
-        fail NotImplementedError, 'sort_expression must be implemented'
+        raise NotImplementedError, 'sort_expression must be implemented'
       end
     end
   end

data/lib/active_list/definition/table.rb

@@ -158,14 +158,14 @@ module ActiveList
                 end
         if klass && klass < AbstractColumn
           unless name.is_a?(Symbol)
-            fail ArgumentError, "Name of a column must be a Symbol (got #{name.inspect})."
+            raise ArgumentError, "Name of a column must be a Symbol (got #{name.inspect})."
           end
           if @columns.detect { |c| c.name == name }
-            fail ArgumentError, "Column name must be unique. #{name.inspect} is already used in #{self.name}"
+            raise ArgumentError, "Column name must be unique. #{name.inspect} is already used in #{self.name}"
           end
           @columns << klass.new(self, name, options)
         else
-          fail ArgumentError, "Invalid column type: #{type.inspect}"
+          raise ArgumentError, "Invalid column type: #{type.inspect}"
         end
       end
     end

data/lib/active_list/exporters/abstract_exporter.rb

@@ -17,7 +17,7 @@ module ActiveList
       end
 
       def send_data_code
-        fail NotImplementedError, "#{self.class.name}#format_data_code is not implemented."
+        raise NotImplementedError, "#{self.class.name}#format_data_code is not implemented."
       end
 
       def columns_headers(options = {})
@@ -37,11 +37,11 @@ module ActiveList
         record = options[:record] || 'record_of_the_death'
         for column in columns
           next unless column.is_a?(ActiveList::Definition::AbstractColumn)
-          if nature == :header
-            datum = column.header_code
-          else
-            datum = column.exporting_datum_code(record)
-          end
+          datum = if nature == :header
+                    column.header_code
+                  else
+                    column.exporting_datum_code(record)
+                  end
           array << (options[:encoding] ? datum + ".to_s.encode('#{options[:encoding]}', invalid: :replace, undef: :replace)" : datum)
         end
         array

data/lib/active_list/exporters/open_document_spreadsheet_exporter.rb

@@ -8,10 +8,10 @@ module ActiveList
   module Exporters
     class OpenDocumentSpreadsheetExporter < AbstractExporter
       DATE_ELEMENTS = {
-        'm' => "<number:month number:style=\"long\"/>",
-        'd' => "<number:day number:style=\"long\"/>",
+        'm' => '<number:month number:style="long"/>',
+        'd' => '<number:day number:style="long"/>',
         'Y' => '<number:year/>'
-      }
+      }.freeze
 
       def file_extension
         'ods'
@@ -42,9 +42,9 @@ module ActiveList
         code << "  zile << ('<?xml version=\"1.0\" encoding=\"UTF-8\"?><office:document-content xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\" xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\" xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\" xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\" xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\" xmlns:presentation=\"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0\" xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\" xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\" xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\" xmlns:math=\"http://www.w3.org/1998/Math/MathML\" xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\" xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\" xmlns:ooo=\"http://openoffice.org/2004/office\" xmlns:ooow=\"http://openoffice.org/2004/writer\" xmlns:oooc=\"http://openoffice.org/2004/calc\" xmlns:dom=\"http://www.w3.org/2001/xml-events\" xmlns:xforms=\"http://www.w3.org/2002/xforms\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:field=\"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:field:1.0\" office:version=\"1.1\"><office:scripts/>')\n"
         # Styles
         code << "  zile << ('<office:automatic-styles>"\
-                "<style:style style:name=\"co1\" style:family=\"table-column\"><style:table-column-properties fo:break-before=\"auto\" style:use-optimal-column-width=\"true\"/></style:style>"\
-                "<style:style style:name=\"header\" style:family=\"table-cell\"><style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\" style:font-weight-complex=\"bold\"/></style:style>"\
-                "<number:date-style style:name=\"K4D\" number:automatic-order=\"true\"><number:text>" + ::I18n.translate('date.formats.default').gsub(/\%./) { |x| '</number:text>' + DATE_ELEMENTS[x[1..1]] + '<number:text>' } + "</number:text></number:date-style><style:style style:name=\"ce1\" style:family=\"table-cell\" style:data-style-name=\"K4D\"/>"\
+                '<style:style style:name="co1" style:family="table-column"><style:table-column-properties fo:break-before="auto" style:use-optimal-column-width="true"/></style:style>'\
+                '<style:style style:name="header" style:family="table-cell"><style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/></style:style>'\
+                '<number:date-style style:name="K4D" number:automatic-order="true"><number:text>' + ::I18n.translate('date.formats.default').gsub(/\%./) { |x| '</number:text>' + DATE_ELEMENTS[x[1..1]] + '<number:text>' } + '</number:text></number:date-style><style:style style:name="ce1" style:family="table-cell" style:data-style-name="K4D"/>'\
                                                                                                                                                                                                                                    "</office:automatic-styles>')\n"
 
         # Tables
@@ -60,7 +60,7 @@ module ActiveList
                                  elsif column.datatype == :date
                                    " office:value-type=\"date\" table:style-name=\"ce1\" office:date-value=\"'+(#{column.datum_code(record)}).#{xml_escape}+'\""
                                  else
-                                   " office:value-type=\"string\""
+                                   ' office:value-type="string"'
                                  end) + "><text:p>'+(" + column.exporting_datum_code(record, true) + ").#{xml_escape}+'</text:p></table:table-cell>"
         end.join + "</table:table-row>')\n"
         code << "  end\n"

data/lib/active_list/generator/finder.rb

@@ -11,10 +11,10 @@ module ActiveList
       end
 
       class_name = @table.model.name
-      class_name = "(controller_name != '#{class_name.tableize}' ? controller_name.to_s.classify.constantize : #{class_name})" if self.collection?
+      class_name = "(controller_name != '#{class_name.tableize}' ? controller_name.to_s.classify.constantize : #{class_name})" if collection?
 
       # Find data
-      query_code = "#{class_name}"
+      query_code = class_name.to_s
       query_code << scope_code if scope_code
       query_code << ".select(#{select_code})" if select_code
       query_code << ".where(#{conditions_code})" unless @table.options[:conditions].blank?
@@ -90,12 +90,12 @@ module ActiveList
           code << conditions[1..-1].collect { |p| ', ' + sanitize_condition(p) }.join if conditions.size > 1
           code << ']'
         when Symbol # Method
-          fail 'What?' # Amazingly explicit.
+          raise 'What?' # Amazingly explicit.
         # code << conditions.first.to_s + '('
         # code << conditions[1..-1].collect { |p| sanitize_condition(p) }.join(', ') if conditions.size > 1
         # code << ')'
         else
-          fail ArgumentError, 'First element of an Array can only be String or Symbol.'
+          raise ArgumentError, 'First element of an Array can only be String or Symbol.'
         end
       when Hash # SQL
         code << '{' + conditions.collect { |key, value| key.to_s + ': ' + sanitize_condition(value) }.join(',') + '}'
@@ -106,7 +106,7 @@ module ActiveList
       when String
         code << conditions.inspect
       else
-        fail ArgumentError, "Unsupported type for conditions: #{conditions.inspect}"
+        raise ArgumentError, "Unsupported type for conditions: #{conditions.inspect}"
       end
       code
     end

data/lib/active_list/helpers.rb

@@ -2,29 +2,29 @@ module ActiveList
   module Helpers
     def recordify!(value, record_name)
       if value.is_a?(Symbol)
-        return record_name + '.' + value.to_s
+        record_name + '.' + value.to_s
       elsif value.is_a?(CodeString)
-        return '(' + value.gsub(/RECORD/, record_name) + ')'
+        '(' + value.gsub(/RECORD/, record_name) + ')'
       else
-        fail ArgumentError, 'CodeString or Symbol must be given to be recordified)'
+        raise ArgumentError, 'CodeString or Symbol must be given to be recordified)'
       end
     end
 
     def recordify(value, record_name)
       if value.is_a?(Symbol)
-        return record_name + '.' + value.to_s
+        record_name + '.' + value.to_s
       elsif value.is_a?(CodeString)
-        return '(' + value.gsub(/RECORD/, record_name) + ')'
+        '(' + value.gsub(/RECORD/, record_name) + ')'
       else
-        return value.inspect
+        value.inspect
       end
     end
 
     def urlify(value, record_name)
       if value.is_a?(CodeString)
-        return '(' + value.gsub(/RECORD/, record_name) + ')'
+        '(' + value.gsub(/RECORD/, record_name) + ')'
       else
-        return value.inspect
+        value.inspect
       end
     end
   end

data/lib/active_list/rails/integration.rb

@@ -29,7 +29,7 @@ module ActiveList
           begin
             helper_method = "_#{kontroller.controller_name}_#{__method__}_#{name || kontroller.controller_name}_tag".to_sym
             kontroller = kontroller.superclass
-          end until self.respond_to?(helper_method)
+          end until respond_to?(helper_method)
           send(helper_method, options, &block)
         end
       end

data/lib/active_list/renderers/abstract_renderer.rb

@@ -13,11 +13,11 @@ module ActiveList
       end
 
       def remote_update_code
-        fail NotImplementedError, "#{self.class.name}#remote_update_code is not implemented."
+        raise NotImplementedError, "#{self.class.name}#remote_update_code is not implemented."
       end
 
       def build_data_code
-        fail NotImplementedError, "#{self.class.name}#build_table_code is not implemented."
+        raise NotImplementedError, "#{self.class.name}#build_table_code is not implemented."
       end
     end
   end

data/lib/active_list/renderers/simple_renderer.rb

@@ -16,7 +16,7 @@ module ActiveList
         text:      :txt,
         time:      :tim,
         timestamp: :dtt
-      }
+      }.freeze
 
       def remote_update_code
         code = "if params[:column] && params[:visibility]\n"
@@ -77,7 +77,7 @@ module ActiveList
           code << " computation_row << '<td></td>'\n" if table.selectable?
           table.columns.each do |column|
             value = ''
-            code << "    computation_row << \"<td"
+            code << '    computation_row << "<td'
             if column.computable?
               code << " data-list-result-for='#{column.short_id}'"
               value = "<div><span><strong>#{I18n.translate("list.results.#{column.computation_method}")}:</strong></span>"
@@ -86,7 +86,7 @@ module ActiveList
             if column.is_a? ActiveList::Definition::DataColumn
               code << "\#\{' class=\"#{column.short_id}' + (#{var_name(:params)}[:hidden_columns].include?(:#{column.name}) ? ' hidden\"' : '\"')\}"
             end
-            code << ">"
+            code << '>'
             code << value
             code << "</td>\"\n"
           end
@@ -139,7 +139,7 @@ module ActiveList
       def columns_to_cells(nature, options = {})
         code = ''
         unless [:body, :children].include?(nature)
-          fail ArgumentError, 'Nature is invalid'
+          raise ArgumentError, 'Nature is invalid'
         end
         record = options[:record] || 'record_of_the_death'
         if table.selectable?
@@ -263,7 +263,7 @@ module ActiveList
           list = [5, 10, 20, 50, 100, 200]
           list << table.options[:per_page].to_i if table.options[:per_page].to_i > 0
           list = list.uniq.sort
-          menu << "<li class=\"parent\">"
+          menu << '<li class="parent">'
           menu << "<a class=\"pages\"><i></i>' + h('list.items_per_page'.t) + '</a><ul>"
           for n in list
             menu << "<li data-list-change-page-size=\"#{n}\" '+(#{var_name(:params)}[:per_page] == #{n} ? ' class=\"check\"' : '') + '><a><i></i>' + h('list.x_per_page'.t(count: #{n})) + '</a></li>"
@@ -272,7 +272,7 @@ module ActiveList
         end
 
         # Column selector
-        menu << "<li class=\"parent\">"
+        menu << '<li class="parent">'
         menu << "<a class=\"columns\"><i></i>' + h('list.columns'.t) + '</a><ul>"
         for column in table.data_columns
           menu << "<li data-list-toggle-column=\"#{column.name}\" class=\"' + (#{var_name(:params)}[:hidden_columns].include?(:#{column.name}) ? 'unchecked' : 'checked') + '\"><a><i></i>' + h(#{column.header_code}) + '</a></li>"
@@ -280,9 +280,9 @@ module ActiveList
         menu << '</ul></li>'
 
         # Separator
-        menu << "<li class=\"separator\"></li>"
+        menu << '<li class="separator"></li>'
         # Exports
-        for format, exporter in ActiveList.exporters
+        ActiveList.exporters.each do |format, _exporter|
           menu << "<li class=\"export export-#{format}\">' + link_to(content_tag(:i) + h('list.export_as'.t(exported: :#{format}.t(scope: 'list.export.formats'))), params.merge(action: :#{generator.controller_method_name}, sort: #{var_name(:params)}[:sort], dir: #{var_name(:params)}[:dir], format: '#{format}')) + '</li>"
         end
         menu << '</ul></span>'
@@ -293,20 +293,17 @@ module ActiveList
       # and pagination management
       def header_code
         code = ''
-        if table.columns.any? { |column| column.is_a?(ActiveList::Definition::DataColumn) && column.options[:currency] }
-          code << "currency = Nomen::Currencies[#{generator.records_variable_name}.first.currency] if #{generator.records_variable_name}.any?\n"
-        end
         code << "'<thead><tr>"
-        code << "<th class=\"list-selector\"></th>" if table.selectable?
-        for column in table.columns
+        code << '<th class="list-selector"></th>' if table.selectable?
+        table.columns.each do |column|
           next if column.is_a?(ActiveList::Definition::ActionColumn) && !column.use_single?
           code << "<th data-list-column=\"#{column.sort_id}\""
           code << " data-list-column-cells=\"#{column.short_id}\""
           code << " data-list-column-sort=\"'+(#{var_name(:params)}[:sort] != '#{column.sort_id}' ? 'asc' : #{var_name(:params)}[:dir] == 'asc' ? 'desc' : 'asc')+'\"" if column.sortable?
           code << " data-list-column-computation=\"#{column.computation_method}\"" if column.computable?
-          if column.is_a?(ActiveList::Definition::DataColumn) && column.options[:currency]
-            code << " data-list-column-currency-symbol=\"' + (currency ? currency.symbol : '') + '\""
-            code << " data-list-column-currency-precision=\"' + (currency ? currency.precision.to_s : '') + '\""
+          if table.selectable? && column.is_a?(ActiveList::Definition::DataColumn) && column.options[:currency] &&
+             code << " data-list-column-currency-symbol=\"' + (#{generator.records_variable_name}.any? ? Nomen::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').symbol.to_s : '') + '\""
+            code << " data-list-column-currency-precision=\"' + (#{generator.records_variable_name}.any? ? Nomen::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').precision.to_s : '') + '\""
           end
           code << " class=\"#{column_classes(column, true, true)}\""
           code << '>'
@@ -342,13 +339,13 @@ module ActiveList
 
         if table.paginate?
           pagination = ''
-          current_page = "#{var_name(:page)}"
-          last_page = "#{var_name(:last)}"
+          current_page = var_name(:page).to_s
+          last_page = var_name(:last).to_s
 
           pagination << "<span class=\"list-pagination\" data-list-ref=\"#{uid}\">"
           pagination << "<span class=\"status\">' + 'list.pagination.x_to_y_of_total'.t(x: (#{var_name(:offset)} + (#{var_name(:count)} > 0 ? 1 : 0)), y: ((#{var_name(:last)} == #{var_name(:page)}) ? #{var_name(:count)} : #{var_name(:offset)} + #{var_name(:limit)}), total: #{var_name(:count)}) + '</span>"
 
-          pagination << "<span class=\"paginator\">"
+          pagination << '<span class="paginator">'
           pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} - 1).to_s + '\" class=\"btn previous-page\"' + (#{current_page} != 1 ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.previous') + '</a>"
 
           x = '@@PAGE-NUMBER@@'

data/lib/active_list/version.rb

@@ -1,3 +1,3 @@
 module ActiveList
-  VERSION = '6.7.3'
+  VERSION = '6.7.4'.freeze
 end

data/test/dummy/app/controllers/contacts_controller.rb

@@ -1,5 +1,4 @@
 class ContactsController < ApplicationController
-
   # GET /contacts
   # GET /contacts.json
   def index

data/test/dummy/db/schema.rb

@@ -11,26 +11,24 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20120510134500) do
-
-  create_table "contacts", force: :cascade do |t|
-    t.integer  "person_id"
-    t.text     "address"
-    t.string   "phone"
-    t.string   "fax"
-    t.string   "country"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+ActiveRecord::Schema.define(version: 20_120_510_134_500) do
+  create_table 'contacts', force: :cascade do |t|
+    t.integer  'person_id'
+    t.text     'address'
+    t.string   'phone'
+    t.string   'fax'
+    t.string   'country'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "people", force: :cascade do |t|
-    t.string   "name"
-    t.date     "born_on"
-    t.decimal  "height"
-    t.decimal  "balance_amount"
-    t.string   "currency"
-    t.datetime "created_at",     null: false
-    t.datetime "updated_at",     null: false
+  create_table 'people', force: :cascade do |t|
+    t.string   'name'
+    t.date     'born_on'
+    t.decimal  'height'
+    t.decimal  'balance_amount'
+    t.string   'currency'
+    t.datetime 'created_at',     null: false
+    t.datetime 'updated_at',     null: false
   end
-
 end

data/test/test_helper.rb

@@ -7,7 +7,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'active_list'
 dummy_path = Pathname.new(__FILE__).dirname.join('dummy')
 
-ENV["BUNDLE_GEMFILE"] = ""
+ENV['BUNDLE_GEMFILE'] = ''
 Kernel.system("cd #{dummy_path} && bundle install && bundle exec rake db:drop db:create db:migrate db:seed RAILS_ENV=test")
 
 # CURRENT FILE :: test/test_helper.rb
@@ -27,8 +27,8 @@ module ActionView
     module Nomen
       class Currencies
         def self.[](_)
-          klass = Struct.const_defined?(:Currency) ? Struct::Currency : Struct.new("Currency", :precision, :symbol)
-          return klass.new(2, "€")
+          klass = Struct.const_defined?(:Currency) ? Struct::Currency : Struct.new('Currency', :precision, :symbol)
+          klass.new(2, '€')
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.7.3
+  version: 6.7.4
 platform: ruby
 authors:
 - Brice Texier