tabulatr2 0.9.31 → 0.9.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21719e71fe7654c3881b1abf925168d7ee09bb5f
-  data.tar.gz: df5a0301ac3c3e608a96dd62ccf87eb350f884b6
+  metadata.gz: 8925e114b7d2dc500bb27471320b8c81ad86773c
+  data.tar.gz: ca9a67f02bd9d69763d502fd9c5fd1ecaa321ae9
 SHA512:
-  metadata.gz: 81785a96b3deb0249269a0b2487ed70b231f0fc810e14383e9bd088aeb97f80e47b0116c916436fefb372985fe829bc9462d49cf8dfc04de199593322617ecdd
-  data.tar.gz: ef55f54530aa2906db178edca61b1ff56ffdd97ec5ca60c88f502baafdcd85ca9d4ac8f6c94f52e0622acf07e740881280f846b749d0b034cd7533375d0558c7
+  metadata.gz: 96a7faf7a4ad05a24433a3e67355775fa0340919c6d7a325bc82fea6a155c5514aeb0f7cbe4523506cb28a332b0cf2b1daecbf6ec867f0cbfb08c0f7c0795d16
+  data.tar.gz: 53c823ee7b120e983cd9281245b9b4118953c9aa595c0a4807e960c4b0014a655613abb6a170779e8e51598ba1a12bbdd9c2a13d2050ae68d5aab26670d5fce5

data/app/assets/javascripts/tabulatr/_events.js

@@ -1,4 +1,4 @@
-$(document).on('ready page:load', function(){
+$(function(){
   tabulatr_tables = [];
 
   $('th.tabulatr-sortable').click(function(){

data/lib/tabulatr/data/data.rb

@@ -40,10 +40,11 @@ class Tabulatr::Data
     end
   end
 
-  def data_for_table(params, locals: {}, controller: nil, &block)
+  def data_for_table(params, locals: {}, default_order: nil, controller: nil, &block)
 
     @batch_actions = block if block_given?
-    @controller = controller
+    @controller    = controller
+    @default_order = default_order
 
     # count
     total = @relation.count

data/lib/tabulatr/data/filtering.rb

@@ -43,7 +43,7 @@ module Tabulatr::Data::Filtering
 
   def apply_filters(filter_params)
     return unless filter_params
-    filter_params.each do |param|
+    filter_params.permit!.to_hash.with_indifferent_access.each do |param|
       name, value = param
       next unless value.present?
 
@@ -52,14 +52,15 @@ module Tabulatr::Data::Filtering
   end
 
   def apply_condition(n,v)
+    # puts "FILTER: »#{n.filter.inspect}«, »#{n.filter.class}«"
     case n.filter
     when :checkbox then apply_boolean_condition(n, v)
     when :decimal  then apply_string_condition("#{n.col_options.filter_sql} = ?", v.to_f)
     when :integer, :enum  then apply_string_condition("#{n.col_options.filter_sql} = ?", v.to_i)
     when :enum_multiselect then apply_array_condition(n, v)
     when :exact, Hash, Array then apply_string_condition("#{n.col_options.filter_sql} = ?", v)
-    when :like     then apply_like_condition(n, v[:like])
-    when :date     then apply_date_condition(n, v[:date])
+    when :like     then apply_like_condition(n, v['like'])
+    when :date     then apply_date_condition(n, v['date'])
     when :range    then apply_range_condition(n, v)
     when :custom   then apply_custom_filter(n, v)
     else raise "Wrong filter type for #{n.name}: #{n.filter}"
@@ -73,7 +74,7 @@ module Tabulatr::Data::Filtering
   def apply_date_condition(n, cond)
     today = Date.today
     yesterday = today - 1.day
-    case cond[:simple]
+    case cond['simple']
     when 'none' then return
     when 'today' then date_in_between(today, today.at_end_of_day, n)
     when 'yesterday' then date_in_between(yesterday, yesterday.at_end_of_day, n)
@@ -83,7 +84,7 @@ module Tabulatr::Data::Filtering
     when 'this_month' then date_in_between(today.at_beginning_of_month.beginning_of_day,
                               today.at_end_of_month.end_of_day, n)
     when 'last_30_days' then date_in_between((today - 29.day).beginning_of_day, today.at_end_of_day, n)
-    when 'from_to' then date_in_between((Date.parse(cond[:from]) rescue nil), (Date.parse(cond[:to]) rescue nil), n)
+    when 'from_to' then date_in_between((Date.parse(cond['from']) rescue nil), (Date.parse(cond['to']) rescue nil), n)
     end
   end
 

data/lib/tabulatr/data/sorting.rb

@@ -40,6 +40,8 @@ module Tabulatr::Data::Sorting
         column = table_columns.find{|c| c.name == name}
       end
       sort_by(column, orientation)
+    elsif @default_order.present?
+      @relation = @relation.reorder(@default_order)
     else
       @relation = @relation.reorder("#{@table_name}.#{@base.primary_key} desc")
     end

data/lib/tabulatr/rails/action_controller.rb

@@ -22,16 +22,16 @@
 #++
 
 class ActionController::Base
-  before_filter do
+  before_action do
     @_tabulatr_table_index = 0
   end
 
-  def tabulatr_for(relation, tabulatr_data_class: nil, serializer: nil, render_action: nil, locals: {}, &block)
+  def tabulatr_for(relation, tabulatr_data_class: nil, serializer: nil, render_action: nil, default_order: nil, locals: {}, &block)
     klass = relation.respond_to?(:klass) ? relation.klass : relation
     respond_to do |format|
       format.json {
         locals[:current_user] ||= current_user if respond_to?(:current_user)
-        records = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, controller: self, &block)
+        records = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, controller: self, default_order: default_order, &block)
         render json: records.to_tabulatr_json(serializer)
         records
       }

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.31"
+  VERSION = "0.9.32"
 end

data/tabulatr.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ['--charset=UTF-8']
 
 
-  s.add_runtime_dependency('rails', '~> 4.0')
+  s.add_runtime_dependency('rails', '> 4.0')
   s.add_dependency('slim', '>= 2.0')
-  s.add_dependency('tilt', '~> 1.4', '>= 1.4.1')
+  s.add_dependency('tilt', '> 1.4')
   s.add_dependency('font-awesome-rails', '>= 4.0')
-  s.add_development_dependency('rspec-rails', '~> 3.1.0')
-  s.add_development_dependency('capybara', '~> 2.4.1')
+  s.add_development_dependency('rspec-rails', '>= 3.1.0')
+  s.add_development_dependency('capybara', '>= 2.4.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.31
+  version: 0.9.32
 platform: ruby
 authors:
 - Peter Horn
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -44,22 +44,16 @@ dependencies:
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +72,28 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.1
 description: A tight DSL to build tables of ActiveRecord models with sorting, pagination,
@@ -281,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,