effective_datatables 4.7.16 → 4.8.16

data/app/assets/stylesheets/dataTables/dataTables.bootstrap4.scss

@@ -162,9 +162,7 @@ div.dataTables_scrollFoot > .dataTables_scrollFootInner > table {
     text-align: center;
   }
 }
-table.dataTable.table-sm > thead > tr > th {
-  padding-right: 20px;
-}
+
 table.dataTable.table-sm .sorting:before,
 table.dataTable.table-sm .sorting_asc:before,
 table.dataTable.table-sm .sorting_desc:before {

data/app/helpers/effective_datatables_helper.rb

@@ -1,6 +1,6 @@
 # These are expected to be called by a developer.  They are part of the datatables DSL.
 module EffectiveDatatablesHelper
-  def render_datatable(datatable, input_js: {}, buttons: true, charts: true, entries: true, filters: true, inline: false, pagination: true, search: true, simple: false, sort: true)
+  def render_datatable(datatable, input_js: {}, buttons: true, charts: true, entries: true, filters: true, inline: false, namespace: nil, pagination: true, search: true, simple: false, sort: true)
     raise 'expected datatable to be present' unless datatable
     raise 'expected input_js to be a Hash' unless input_js.kind_of?(Hash)
 
@@ -10,6 +10,7 @@ module EffectiveDatatablesHelper
 
     datatable.attributes[:inline] = true if inline
     datatable.attributes[:sortable] = false unless sort
+    datatable.attributes[:namespace] = namespace if namespace
 
     datatable.view ||= self
 
@@ -40,10 +41,12 @@ module EffectiveDatatablesHelper
       id: datatable.to_param,
       class: html_class,
       data: {
+        'all-label' => I18n.t('effective_datatables.all'),
         'attributes' => EffectiveDatatables.encrypt(datatable.attributes),
         'authenticity-token' => form_authenticity_token,
         'bulk-actions' => datatable_bulk_actions(datatable),
         'columns' => datatable_columns(datatable),
+        'default-visibility' => datatable.default_visibility.to_json,
         'display-length' => datatable.display_length,
         'display-order' => datatable_display_order(datatable),
         'display-records' => datatable.to_json[:recordsFiltered],

data/app/helpers/effective_datatables_private_helper.rb

@@ -44,7 +44,7 @@ module EffectiveDatatablesPrivateHelper
     action = { action: :new, class: ['btn', column[:btn_class].presence].compact.join(' '), 'data-remote': true }
 
     if column[:actions][:new].kind_of?(Hash) # This might be active_record_array_collection?
-      action = action.merge(column[:actions][:new])
+      action.merge!(column[:actions][:new])
 
       effective_resource = (datatable.effective_resource || datatable.fallback_effective_resource)
       klass = (column[:actions][:new][:klass] || effective_resource&.klass || datatable.collection_class)
@@ -84,7 +84,7 @@ module EffectiveDatatablesPrivateHelper
     collection = opts[:search].delete(:collection)
     value = datatable.state[:search][name]
 
-    options = opts[:search].except(:fuzzy).merge!(
+    options = opts[:search].merge!(
       name: nil,
       feedback: false,
       label: false,
@@ -92,24 +92,26 @@ module EffectiveDatatablesPrivateHelper
       data: { 'column-name': name, 'column-index': opts[:index] }
     )
 
+    options.delete(:fuzzy)
+
     case options.delete(:as)
     when :string, :text, :number
       form.text_field name, options
     when :date, :datetime
-      form.date_field name, options.reverse_merge(
+      form.date_field name, options.reverse_merge!(
         date_linked: false, prepend: false, input_js: { useStrict: true, keepInvalid: true }
       )
     when :time
-      form.time_field name, options.reverse_merge(
+      form.time_field name, options.reverse_merge!(
         date_linked: false, prepend: false, input_js: { useStrict: false, keepInvalid: true }
       )
     when :select, :boolean
-      options[:input_js] = (options[:input_js] || {}).reverse_merge(placeholder: '')
+      options[:input_js] = (options[:input_js] || {}).reverse_merge!(placeholder: '')
 
       form.select name, collection, options
     when :bulk_actions
       options[:data]['role'] = 'bulk-actions'
-      form.check_box name, options.merge(label: ' ')
+      form.check_box name, options.merge!(label: ' ')
     end
   end
 
@@ -139,7 +141,7 @@ module EffectiveDatatablesPrivateHelper
       placeholder: (opts[:label] || name.to_s.titleize),
       value: value,
       wrapper: { class: 'form-group col-auto'}
-    }.merge(opts.except(:as, :collection, :parse))
+    }.merge!(opts.except(:as, :collection, :parse, :value))
 
     options[:name] = '' unless datatable._filters_form_required?
 
@@ -149,6 +151,8 @@ module EffectiveDatatablesPrivateHelper
     elsif as == :boolean
       collection ||= [true, false].map { |value| [t("effective_datatables.boolean_#{value}"), value] }
       form.public_send(:select, name, collection, options) # boolean
+    elsif as == :string
+      form.public_send(:text_field, name, options)
     elsif form.respond_to?(as)
       form.public_send(as, name, options) # check_box, text_area
     else
@@ -169,7 +173,7 @@ module EffectiveDatatablesPrivateHelper
       label: false,
       required: false,
       wrapper: { class: 'form-group col-auto'}
-    }.merge(opts)
+    }.merge!(opts.except(:checked, :value))
 
     form.radios :scope, collection, options
   end

data/app/models/effective/datatable.rb

@@ -1,8 +1,8 @@
 module Effective
   class Datatable
     attr_reader :attributes # Anything that we initialize our table with. That's it. Can't be changed by state.
-    attr_reader :effective_resource
     attr_reader :state
+    attr_accessor :effective_resource
 
     # Hashes of DSL options
     attr_reader :_aggregates
@@ -33,7 +33,7 @@ module Effective
     include Effective::EffectiveDatatable::Resource
     include Effective::EffectiveDatatable::State
 
-    def initialize(view = nil, attributes = nil) 
+    def initialize(view = nil, attributes = nil)
       (attributes = view; view = nil) if view.kind_of?(Hash)
 
       @attributes = (attributes || {})
@@ -49,13 +49,40 @@ module Effective
 
       raise 'expected a hash of arguments' unless @attributes.kind_of?(Hash)
       raise 'collection is defined as a method. Please use the collection do ... end syntax.' unless collection.nil?
+
       self.view = view if view
     end
 
+    def rendered(params = {})
+      raise('expected a hash of params') unless params.kind_of?(Hash)
+
+      view = ApplicationController.renderer.controller.helpers
+
+      view.class_eval do
+        attr_accessor :rendered_params
+
+        def current_user
+          rendered_params[:current_user]
+        end
+      end
+
+      if params[:current_user_id]
+        params[:current_user] = User.find(params[:current_user_id])
+      end
+
+      view.rendered_params = params
+
+      self.view = view
+      self
+    end
+
     # Once the view is assigned, we initialize everything
     def view=(view)
       @view = (view.respond_to?(:view_context) ? view.view_context : view)
-      raise 'expected view to respond to params' unless @view.respond_to?(:params)
+
+      unless @view.respond_to?(:params) || @view.respond_to?(:rendered_params)
+        raise 'expected view to respond to params'
+      end
 
       assert_attributes!
       load_attributes!
@@ -170,6 +197,10 @@ module Effective
       @fallback_effective_resource ||= Effective::Resource.new('', namespace: controller_namespace)
     end
 
+    def default_visibility
+      columns.values.inject({}) { |h, col| h[col[:index]] = col[:visible]; h }
+    end
+
     private
 
     def column_tool

data/app/models/effective/datatable_value_tool.rb

@@ -187,9 +187,3 @@ module Effective
 
   end
 end
-
-# [
-#   [1, 'title 1'],
-#   [2, 'title 2'],
-#   [3, 'title 3']
-# ]

data/app/models/effective/effective_datatable/attributes.rb

@@ -11,6 +11,7 @@ module Effective
       end
 
       def load_attributes!
+        return unless view.respond_to?(:controller_path)
         @attributes[:namespace] ||= view.controller_path.split('/')[0...-1].join('/')
       end
 

data/app/models/effective/effective_datatable/compute.rb

@@ -36,6 +36,9 @@ module Effective
         # Apply value ordering
         col = value_tool.order(col)
 
+        # Charts too
+        @charts_data = chart(collection, col) if _charts.present?
+
         # Apply pagination
         col = col.kind_of?(Array) ? value_tool.paginate(col) : column_tool.paginate(col)
 
@@ -48,9 +51,6 @@ module Effective
         # Compute aggregate data
         @aggregates_data = aggregate(col) if _aggregates.present?
 
-        # Charts too
-        @charts_data = chart(col) if _charts.present?
-
         # Format all results
         format(col)
 
@@ -64,6 +64,7 @@ module Effective
             if state[:visible][name] == false && (name != order_name)  # Sort by invisible array column
               BLANK
             elsif opts[:compute]
+
               if array_collection?
                 dsl_tool.instance_exec(obj, obj[opts[:index]], &opts[:compute])
               else
@@ -161,11 +162,11 @@ module Effective
         end || BLANK
       end
 
-      def chart(collection)
+      def chart(collection, searched_collection)
         _charts.inject({}) do |retval, (name, chart)|
           retval[name] = {
             as: chart[:as],
-            data: dsl_tool.instance_exec(collection, &chart[:compute]),
+            data: dsl_tool.instance_exec(collection, searched_collection, &chart[:compute]),
             name: chart[:name],
             options: chart[:options]
           }

data/app/models/effective/effective_datatable/cookie.rb

@@ -10,6 +10,7 @@ module Effective
 
       def load_cookie!
         return unless EffectiveDatatables.save_state
+        return unless view.respond_to?(:cookies)
 
         @dt_cookie = view.cookies.signed['_effective_dt']
 
@@ -33,6 +34,7 @@ module Effective
 
       def save_cookie!
         return unless EffectiveDatatables.save_state
+        return unless view.respond_to?(:cookies)
 
         @dt_cookie ||= []
         @dt_cookie << [cookie_key, cookie_payload]

data/app/models/effective/effective_datatable/dsl/filters.rb

@@ -20,7 +20,7 @@ module Effective
             elsif value != nil
               Effective::Attribute.new(value).type
             end
-          ) || :text
+          ) || :string
 
           datatable._filters[name.to_sym] = {
             value: value,

data/app/models/effective/effective_datatable/format.rb

@@ -16,7 +16,7 @@ module Effective
           next unless state[:visible][name]
 
           if opts[:partial]
-            locals = { datatable: self, column: opts }.merge(resource_col_locals(opts))
+            locals = { datatable: self, column: opts }.merge!(resource_col_locals(opts))
 
             rendered[name] = (view.render(
               partial: opts[:partial],
@@ -27,7 +27,6 @@ module Effective
               spacer_template: SPACER_TEMPLATE
             ) || '').split(SPACER)
           elsif opts[:as] == :actions # This is actions_col and actions_col do .. end, but not actions_col partial: 'something'
-            resources = collection.map { |row| row[opts[:index]] }
             locals = { datatable: self, column: opts, spacer_template: SPACER_TEMPLATE }
 
             atts = {
@@ -36,16 +35,17 @@ module Effective
               effective_resource: effective_resource,
               locals: locals,
               partial: opts[:actions_partial],
-            }.compact.merge(opts[:actions])
+            }.merge!(opts[:actions]).tap(&:compact!)
 
             rendered[name] = if effective_resource.blank?
-              resources.map do |resource|
+              collection.map { |row| row[opts[:index]] }.map do |resource|
                 polymorphic_resource = Effective::Resource.new(resource, namespace: controller_namespace)
                 (view.render_resource_actions(resource, atts.merge(effective_resource: polymorphic_resource), &opts[:format]) || '')
               end
             else
-              (view.render_resource_actions(resources, atts, &opts[:format]) || '').split(SPACER)
+              (view.render_resource_actions(collection.map { |row| row[opts[:index]] }, atts, &opts[:format]) || '').split(SPACER)
             end
+
           end
         end
 
@@ -88,9 +88,9 @@ module Effective
         when :currency
           view.number_to_currency(value)
         when :date
-          (value.strftime('%F') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_date) : BLANK
         when :datetime
-          (value.strftime('%F %H:%M') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_datetime) : BLANK
         when :decimal
           value
         when :duration
@@ -116,7 +116,7 @@ module Effective
           when Numeric    ; view.number_to_currency(value)
           end
         when :time
-          (value.strftime('%H:%M') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_time) : BLANK
         else
           value.to_s
         end
@@ -135,7 +135,7 @@ module Effective
         end
 
         # Merge local options. Special behaviour for remote: false
-        if column[:actions].kind_of?(Hash)
+        if column[:actions].present? && column[:actions].kind_of?(Hash)
           column[:actions].each do |action, opts|
             next unless opts.kind_of?(Hash)
 

data/app/models/effective/effective_datatable/params.rb

@@ -6,18 +6,23 @@ module Effective
 
       def datatables_ajax_request?
         return @_datatables_ajax_request unless @_datatables_ajax_request.nil?
+        return unless view.respond_to?(:params)
 
         @_datatables_ajax_request = (view.present? && view.params.key?(:draw) && view.params.key?(:columns))
       end
 
       def datatables_inline_request?
         return @_datatables_inline_request unless @_datatables_inline_request.nil?
+        return unless view.respond_to?(:params)
 
         @_datatables_inline_request = (view.present? && view.params[:_datatable_id].to_s.split('-')[0...-1] == to_param.split('-')[0...-1])
       end
 
       def params
         return {} unless view.present?
+        return view.rendered_params if view.respond_to?(:rendered_params)
+        return {} unless view.respond_to?(:request)
+
         @params ||= {}.tap do |params|
           Rack::Utils.parse_query(URI(view.request.referer.presence || '/').query).each { |k, v| params[k.to_sym] = v }
           view.params.each { |k, v| params[k.to_sym] = v }

data/app/models/effective/effective_datatable/resource.rb

@@ -4,7 +4,7 @@ module Effective
       AGGREGATE_SQL_FUNCTIONS = ['ARRAY_AGG(', 'AVG(', 'COUNT(', 'MAX(', 'MIN(', 'STRING_AGG(', 'SUM(']
 
       def admin_namespace?
-        controller_namespace == 'admin'
+        [:admin, 'admin'].include?(controller_namespace)
       end
 
       def controller_namespace
@@ -31,7 +31,7 @@ module Effective
       end
 
       def load_effective_resource!
-        @effective_resource = if active_record_collection?
+        @effective_resource ||= if active_record_collection?
           Effective::Resource.new(collection_class, namespace: controller_namespace)
         end
       end
@@ -91,14 +91,18 @@ module Effective
             opts[:sql_column] = :effective_addresses
           when :effective_roles
             opts[:sql_column] = :effective_roles
+          when :active_storage
+            opts[:sql_column] = :active_storage
           when :string  # This is the fallback
             # Anything that doesn't belong to the model or the sql table, we assume is a SELECT SUM|AVG|RANK() as fancy
             opts[:sql_as_column] = true if (effective_resource.table && effective_resource.column(name).blank?)
           end
 
-          if opts[:sql_column].present? && AGGREGATE_SQL_FUNCTIONS.any? { |str| opts[:sql_column].to_s.start_with?(str) }
-            opts[:sql_as_column] = true
+          if opts[:sql_column].present?
+            sql_column = opts[:sql_column].to_s
+            opts[:sql_as_column] = true if AGGREGATE_SQL_FUNCTIONS.any? { |str| sql_column.start_with?(str) }
           end
+
         end
       end
 
@@ -137,6 +141,10 @@ module Effective
             opts[:partial] ||= '/effective/datatables/resource_column'
           end
 
+          if opts[:as] == :active_storage
+            opts[:partial] ||= '/effective/datatables/active_storage_column'
+          end
+
           opts[:col_class] = [
             "col-#{opts[:as]}",
             "col-#{name.to_s.parameterize}",
@@ -194,6 +202,7 @@ module Effective
 
       def load_resource_belongs_tos!
         return unless active_record_collection?
+        return unless @_collection_apply_belongs_to
 
         changed = attributes.select do |attribute, value|
           attribute = attribute.to_s
@@ -204,7 +213,7 @@ module Effective
           next unless columns[associated]
 
           if columns[associated][:as] == :belongs_to
-            if @_collection_apply_belongs_to && !@_collection.where_values_hash.include?(attribute)
+            unless @_collection.where_values_hash.include?(attribute)
               @_collection = @_collection.where(attribute => value)
             end
 
@@ -212,10 +221,8 @@ module Effective
           elsif columns[associated][:as] == :belongs_to_polymorphic
             associated_type = attributes["#{associated}_type".to_sym] || raise("Expected #{associated}_type attribute to be present when #{associated}_id is present on a polymorphic belongs to")
 
-            if @_collection_apply_belongs_to
-              if !@_collection.where_values_hash.include?(attribute) && !@_collection.where_values_hash.include?("#{associated}_type")
-                @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
-              end
+            unless @_collection.where_values_hash.include?(attribute) || @_collection.where_values_hash.include?("#{associated}_type")
+              @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
             end
 
             columns.delete(associated)

data/app/models/effective/effective_datatable/state.rb

@@ -198,7 +198,7 @@ module Effective
       def parse_filter_value(filter, value)
         return filter[:parse].call(value) if filter[:parse]
         return nil if value.blank? && !filter[:required]
-        Effective::Attribute.new(filter[:value]).parse(value, name: filter[:name])
+        Effective::Attribute.new(filter[:as] || filter[:value] || :string).parse(value, name: filter[:name])
       end
 
       def cookie_state_params

data/app/views/effective/datatables/_active_storage_column.html.haml

@@ -0,0 +1,4 @@
+- Array(resource.public_send(column[:name])).each do |file|
+  .col-resource_item
+    - title = [file.content_type, number_to_human_size(file.byte_size)].map(&:presence).compact
+    = link_to(file.filename, url_for(file), title: title, target: '_blank')

data/app/views/effective/datatables/_bulk_actions_dropdown.html.haml

@@ -1,8 +1,9 @@
 .btn-group.buttons-bulk-actions
   %button.btn.btn-link.btn-sm.dropdown-toggle{'type': 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false, 'disabled': 'disabled'}
-    Bulk Actions
+    = t('effective_datatables.bulk_actions')
   .dropdown-menu
     - if datatable._bulk_actions.present?
       = datatable._bulk_actions.join.html_safe
     - else
-      %a.dropdown-item{href: '#'} No bulk actions
+      %a.dropdown-item{href: '#'}
+        = t('effective_datatables.no_bulk_actions')

data/config/effective_datatables.rb

@@ -35,8 +35,12 @@ EffectiveDatatables.setup do |config|
   config.save_state = true
 
   # Configure the _effective_dt cookie.
-  config.cookie_max_size = 2000       # String size. Final byte size is about 1.5 times bigger, after rails signs it
+  config.cookie_max_size = 1500       # String size. Final byte size is about 1.5 times bigger, after rails signs it
   config.cookie_domain = :all         # Should usually be :all
   config.cookie_tld_length = nil      # Leave nil to autodetect, or set to probably 2
 
+  # Date formatting
+  config.format_datetime = '%F %H:%M'
+  config.format_date = '%F'
+  config.format_time = '%H:%M'
 end

data/config/locales/en.yml

@@ -7,6 +7,8 @@ en:
     new: New
     actions: Actions
     bulk_actions: Bulk Actions
+    no_bulk_actions: No bulk actions
     applying: Applying...
     boolean_true: 'Yes'
-    boolean_false: 'No'
+    boolean_false: 'No'
+    all: All

data/config/locales/es.yml

@@ -7,6 +7,8 @@ es:
     new: Nuevo
     actions: Acciones
     bulk_actions: Acciones en masa
+    no_bulk_actions: Sin acciones en masa
     applying: Filtrando...
     boolean_true: 'Sí'
-    boolean_false: 'No'
+    boolean_false: 'No'
+    all: Todo

data/config/locales/nl.yml

@@ -7,6 +7,8 @@ nl:
     new: Nieuwe
     actions: Acties
     bulk_actions: Bulkacties
+    no_bulk_actions: Geen bulkacties
     applying: Toepassen...
     boolean_true: 'Ja'
-    boolean_false: 'Nee'
+    boolean_false: 'Nee'
+    all: Te doen

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.16'.freeze
+  VERSION = '4.8.16'.freeze
 end

data/lib/effective_datatables.rb

@@ -16,6 +16,10 @@ module EffectiveDatatables
   mattr_accessor :cookie_domain
   mattr_accessor :cookie_tld_length
 
+  mattr_accessor :format_datetime
+  mattr_accessor :format_date
+  mattr_accessor :format_time
+
   mattr_accessor :debug
 
   alias_method :max_cookie_size, :cookie_max_size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.7.16
+  version: 4.8.16
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,11 +129,9 @@ files:
 - app/assets/stylesheets/effective_datatables.scss
 - app/assets/stylesheets/effective_datatables/_overrides.bootstrap4.scss
 - app/controllers/effective/datatables_controller.rb
-- app/datatables/effective_style_guide_datatable.rb
 - app/helpers/effective_datatables_controller_helper.rb
 - app/helpers/effective_datatables_helper.rb
 - app/helpers/effective_datatables_private_helper.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/datatable.rb
 - app/models/effective/datatable_column.rb
 - app/models/effective/datatable_column_tool.rb
@@ -153,6 +151,7 @@ files:
 - app/models/effective/effective_datatable/params.rb
 - app/models/effective/effective_datatable/resource.rb
 - app/models/effective/effective_datatable/state.rb
+- app/views/effective/datatables/_active_storage_column.html.haml
 - app/views/effective/datatables/_bulk_actions_column.html.haml
 - app/views/effective/datatables/_bulk_actions_dropdown.html.haml
 - app/views/effective/datatables/_chart.html.haml
@@ -162,7 +161,6 @@ files:
 - app/views/effective/datatables/_resource_column.html.haml
 - app/views/effective/datatables/_spacer_template.html
 - app/views/effective/datatables/index.html.haml
-- app/views/effective/style_guide/_effective_datatables.html.haml
 - config/effective_datatables.rb
 - config/locales/en.yml
 - config/locales/es.yml
@@ -177,7 +175,7 @@ homepage: https://github.com/code-and-effect/effective_datatables
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord
   or Array collection as well as post-rendered content displayed as a frontend jQuery

data/app/datatables/effective_style_guide_datatable.rb

@@ -1,47 +0,0 @@
-class EffectiveStyleGuideDatatable < Effective::Datatable
-  datatable do
-    length 10
-
-    col :id
-    col :material, search: { collection: ['Stainless Steel', 'Copper', 'Cast Iron', 'Composite'] }
-    col :bowl, search: { collection: ['Single Bowl', 'Double Bowl', 'Triple Bowl'] }
-    col :name
-    col :date, as: :date
-
-    actions_col
-  end
-
-  # Set the permission check to the same as Effective::StyleGuide
-  def collection_class
-    defined?(Effective::StyleGuide) ? Effective::StyleGuide : super
-  end
-
-  collection do
-    now = Time.zone.now
-    [
-      [1, 'Stainless Steel', 'Single Bowl', 'KOHLER Staccato', (now + 1.day)],
-      [2, 'Stainless Steel', 'Double Bowl', 'KOHLER Vault Undercounter', (now + 1.day)],
-      [3, 'Stainless Steel', 'Triple Bowl', 'KRAUS All-In-One', (now + 1.day)],
-      [4, 'Stainless Steel', 'Single Bowl', 'KOHLER Vault Dual Mount', (now + 1.day)],
-      [5, 'Stainless Steel', 'Single Bowl', 'KRAUS All-In-One Undermount', (now + 2.days)],
-      [6, 'Stainless Steel', 'Double Bowl', 'Glacier Bay All-in-One', (now + 2.days)],
-      [7, 'Stainless Steel', 'Single Bowl', 'Elkay Neptune', (now + 2.days)],
-      [8, 'Copper', 'Single Bowl', 'ECOSINKS Apron Front Dual Mount', (now + 2.days)],
-      [9, 'Copper', 'Double Bowl', 'ECOSINKS Dual Mount Front Hammered', (now + 2.days)],
-      [10, 'Copper', 'Triple Bowl', 'Glarier Bay Undermount', (now + 3.days)],
-      [11, 'Copper', 'Single Bowl', 'Whitehaus Undermount', (now + 3.days)],
-      [12, 'Copper', 'Double Bowl', 'Belle Foret Apron Front', (now + 3.days)],
-      [13, 'Copper', 'Double Bowl', 'Pegasus Dual Mount', (now + 3.days)],
-      [14, 'Cast Iron', 'Double Bowl', 'KOHLER Whitehaven', (now + 3.days)],
-      [15, 'Cast Iron', 'Triple Bowl', 'KOHLER Hartland', (now + 3.days)],
-      [16, 'Cast Iron', 'Single Bowl', 'KOHLER Cape Dory Undercounter', (now + 4.days)],
-      [17, 'Cast Iron', 'Double Bowl', 'KOLER Bakersfield', (now + 4.days)],
-      [18, 'Cast Iron', 'Double Bowl', 'American Standard Offset', (now + 4.days)],
-      [19, 'Cast Iron', 'Single Bowl', 'Brookfield Top', (now + 4.days)],
-      [20, 'Composite', 'Single Bowl', 'Blanco Diamond Undermount', (now + 5.days)],
-      [21, 'Composite', 'Double Bowl', 'Mont Blanc Waterbrook', (now + 5.days)],
-      [22, 'Composite', 'Triple Bowl', 'Pegasus Triple Mount', (now + 5.days)],
-      [23, 'Composite', 'Single Bowl', 'Swanstone Dual Mount', (now + 5.days)]
-    ]
-  end
-end