grid_table 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2be2017a419f82b1e67189ec8d7bac5ab5e23eda
-  data.tar.gz: 2b15115fd9480db7a9dc83dfe8de2c73af690678
+  metadata.gz: 4e0f68c331f3af5023c4259e67dd20e1a54e5679
+  data.tar.gz: 2cf32700cc72c621f88e8d0fb94f76094c638021
 SHA512:
-  metadata.gz: 8e7133ad725d439b8ca7c2848938eff5402af46c69bee188807a629c33e4674f7df146181c4f0d303f67e4b5249639c0b6a455d528dca12f644c7686b8278727
-  data.tar.gz: dbd6739a159c4ab75bad5a3cf2b091dc39770040cae3863837817da707bbcf34a68263909c644d5ab27ec8a1e5d8cf74212ff09a1053664c16bfdea77abf03ad
+  metadata.gz: a164408606bd8da871a3e434b5896bad3aba26cb666df8e19a22ef0215b6ee1dc40c7f892083f55f87805f4b6940192e87c5dd9a3b8dff849c1f57700ac87fca
+  data.tar.gz: 12f2edc524f24d218b0ec301a1d59de22853c7a87c146156491b2c593547433573fea095507d05cc49c6c581f7588cd22bd5352e92cac2afeb3c68acc4a07523

data/.rubocop.yml

@@ -0,0 +1,42 @@
+AllCops:
+  Include:
+    - Rakefile
+    - '**/Gemfile'
+    - config.ru
+    - lib/**/*.rake
+  Exclude:
+    - db/schema.rb
+    - spec/*
+    - test/*
+
+Metrics/AbcSize:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Enabled: false
+
+# Offense count: 16
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Enabled: false
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 4
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in gridtable.gemspec
 gemspec
 
-gem 'activemodel', require: "active_model"
+gem 'activemodel', require: 'active_model'
+gem 'rubocop', require: false

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/grid_table.gemspec

@@ -1,23 +1,24 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'grid_table/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "grid_table"
+  spec.name          = 'grid_table'
   spec.version       = GridTable::VERSION
-  spec.authors       = ["Jon Principe", "Mike Raimondi"]
-  spec.email         = ["jp@adharmonics.com"]
-  spec.summary       = %q{Utility for powerful HTML Tables}
-  spec.description   = %q{Library to help manage powerful HTML Tables through the Model, View and Controller.}
-  spec.homepage      = "http://github.com/jprincipe/grid_table"
-  spec.license       = "MIT"
+  spec.authors       = ['Jon Principe', 'Mike Raimondi']
+  spec.email         = ['jonathan.principe@gmail.com']
+  spec.summary       = 'Utility for powerful HTML Tables'
+  spec.description   = 'Library to help manage powerful HTML Tables through the Model, View and Controller.'
+  spec.homepage      = 'http://github.com/jprincipe/grid_table'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake'
 end

data/lib/grid_table/control.rb

@@ -15,10 +15,8 @@ class GridTable::Control
   #   person = Person.new(name: 'bob', age: '18')
   #   person.name # => "bob"
   #   person.age  # => "18"
-  def initialize(params={})
-    params.each do |attr, value|
-      self.public_send("#{attr}=", value)
-    end if params
+  def initialize(params = {})
+    params&.each { |attr, value| public_send("#{attr}=", value) }
 
     super()
   end
@@ -36,36 +34,32 @@ class GridTable::Control
     false
   end
 
-  attr_writer :model, :attribute, :source, :source_class, :source_column, :filter, :polymorphic
+  attr_writer :model, :attribute, :source, :source_class, :source_column, :source_alias, :filter, :polymorphic
 
   def filter(param_filter_value, records)
-    unless @filter == false
-      arel_query = nil
-      strategy_map = {
-        exact_match: ->(col) { col.eq(param_filter_value) },
-        prefix:      ->(col) { col.matches("#{param_filter_value}%") },
-        suffix:      ->(col) { col.matches("%#{param_filter_value}") },
-        fuzzy:       ->(col) { col.matches("%#{param_filter_value}%") },
-        array:       ->(col) { "#{column.to_s} @> ARRAY[#{[param_filter_value].flatten.join(',')}]" },
-        date_range:  ->(col) { "#{source_table.name}.#{column.to_s} BETWEEN #{param_filter_value}" }
-      }
-
-      polymorphic_models.each_with_index do |klass, i|
-        # TODO implement array filtering
-        if i == 0
-          arel_query = strategy_map[strategy].call(klass.arel_table[column])
-        else
-          arel_query = arel_query.or(strategy_map[strategy].call(klass.arel_table[column]))
-        end
-      end
-
-      arel_query ||= strategy_map[strategy].call(source_table[column])
-      prepared_records(records).where(arel_query)
+    return if @filter.nil?
+
+    arel_query = nil
+    strategy_map = {
+      exact_match: ->(col) { col.eq(param_filter_value) },
+      prefix:      ->(col) { col.matches("#{param_filter_value}%") },
+      suffix:      ->(col) { col.matches("%#{param_filter_value}") },
+      fuzzy:       ->(col) { col.matches("%#{param_filter_value}%") },
+      array:       ->(_col) { "#{column} @> ARRAY[#{[param_filter_value].flatten.join(',')}]" },
+      date_range:  ->(_col) { "#{source_table.name}.#{column} BETWEEN #{param_filter_value}" }
+    }
+
+    polymorphic_models.each_with_index do |klass, i|
+      # TODO: implement array filtering
+      arel_query = i.zero? ? strategy_map[strategy].call(klass.arel_table[column]) : arel_query.or(strategy_map[strategy].call(klass.arel_table[column]))
     end
+
+    arel_query ||= strategy_map[strategy].call(source_table[column])
+    prepared_records(records).where(arel_query)
   end
 
   def sort(param_sort_order, records)
-    sort_order = %w[asc, desc].include?(param_sort_order) ? param_sort_order : 'asc'
+    sort_order = %w[asc desc].include?(param_sort_order) ? param_sort_order : 'asc'
 
     if @polymorphic
       models = polymorphic_models
@@ -119,7 +113,7 @@ class GridTable::Control
   end
 
   def table_with_column
-    "#{source_table.name}.#{column}"
+    @source_alias || "#{source_table.name}.#{column}"
   end
 
   def model_fk
@@ -132,7 +126,7 @@ class GridTable::Control
     models.each_with_index do |klass, i|
       if models.length == 1
         sql = "#{klass.table_name}.#{column}"
-      elsif i == 0
+      elsif i.zero?
         sql << "(CASE WHEN #{klass.table_name}.#{column} IS NOT NULL THEN #{klass.table_name}.#{column}"
       elsif i == models.length - 1
         sql << " ELSE #{klass.table_name}.#{column} END)"

data/lib/grid_table/controller.rb

@@ -18,7 +18,7 @@ module GridTable
       end
     end
 
-    def grid_table_export_for(resource, params, options = {})
+    def grid_table_export_for(resource, params)
       grid_table = resource.grid_table
       params[:skip_paging] ||= true
       grid_table.populate!(resource, params)

data/lib/grid_table/table.rb

@@ -7,15 +7,15 @@ class GridTable::Table
 
   def add_control(model, attribute, options)
     @controls << GridTable::Control.new(
-      {
-        model: model.name.underscore.to_sym,
-        attribute: attribute,
-        source: options[:source],
-        source_class: options[:source_class],
-        source_column: options[:source_column],
-        filter: options[:filter],
-        polymorphic: options[:polymorphic]
-      })
+      model: model.name.underscore.to_sym,
+      attribute: attribute,
+      source: options[:source],
+      source_class: options[:source_class],
+      source_column: options[:source_column],
+      source_alias: options[:source_alias],
+      filter: options[:filter],
+      polymorphic: options[:polymorphic]
+    )
   end
 
   def populate!(resource, params)
@@ -26,8 +26,8 @@ class GridTable::Table
     @records  = resource
 
     filter! unless params[:skip_filtering]
+    @total_rows = @records.length
     sort! unless params[:skip_sorting]
-    @total_rows = @records.size
     page! unless params[:skip_paging]
 
     @records
@@ -42,7 +42,7 @@ class GridTable::Table
   private
 
   def common_strong_params
-    [:page, :page_size, :sort, :sort_order]
+    %w[page page_size sort sort_order]
   end
 
   def page
@@ -54,7 +54,8 @@ class GridTable::Table
   end
 
   def filter!
-    @params.each do |attribute, attribute_value|
+    filter_params = @params.reject { |k| common_strong_params.include?(k) }
+    filter_params.each do |attribute, attribute_value|
       control = GridTable::Control.find_by_param(attribute, @controls)
       @records = control.filter(attribute_value, @records) if control.present?
     end
@@ -63,13 +64,10 @@ class GridTable::Table
   def sort!
     control = GridTable::Control.find_by_param(@params[:sort], @controls)
 
-    if control.present?
-      @records = control.sort(@params[:sort_order], records)
-    end
+    @records = control.sort(@params[:sort_order], records) if control.present?
   end
 
   def page!
     @records = @records.offset(page * page_size).limit(page_size)
   end
-
 end

data/lib/grid_table/version.rb

@@ -1,3 +1,3 @@
 module GridTable
-  VERSION = "1.3"
+  VERSION = '1.4'.freeze
 end

data/lib/grid_table.rb

@@ -1,8 +1,8 @@
-require "grid_table/version"
-require "grid_table/control"
-require "grid_table/table"
-require "grid_table/controller"
-require "grid_table/model"
+require 'grid_table/version'
+require 'grid_table/control'
+require 'grid_table/table'
+require 'grid_table/controller'
+require 'grid_table/model'
 
 module GridTable
   class Engine < ::Rails::Engine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_table
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Jon Principe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,12 +42,13 @@ dependencies:
 description: Library to help manage powerful HTML Tables through the Model, View and
   Controller.
 email:
-- jp@adharmonics.com
+- jonathan.principe@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Utility for powerful HTML Tables