table_sortable 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea868dab316c188a2e54ad685f06a17675b8cccd
-  data.tar.gz: c065b1ce4568a2db812ba5805685a8d1c5efe7d8
+  metadata.gz: 3a484255d4071117e14633714581e5392da418bd
+  data.tar.gz: 063b9bcd1e5dab7c85b8473f06d9b9349351df36
 SHA512:
-  metadata.gz: 2d15f0e1053f207597d19bba44b49adb2cd758cbcb216ac5f461d7dd99dd34f4fe0bab78f2031baf0f933c85e4a2566fd07a8e1dc30e5fc0ba66066d04024132
-  data.tar.gz: 3000f22be7c289aa9b6e07f71a6538bddea58eb60f2a1b4ea5af0da1fa3013ba84616f09722d19d2e55a934c8795a4bb32387199c5d98ec94b76fe6834def5e9
+  metadata.gz: cff13059ff3aa2f36bed53861db9ce00eef623b90a7fc18a233c4523cba19a724ed5b3fc803fcf5687d4ddc2476f5c8356b7af10ceb42d1438a045aed7db177d
+  data.tar.gz: 847dabaa7a749389d95c0a945e2de623d974732ddcc2a357f0d1ecf7f47f9bba9faf1590fec9121b29208aa02bee1b88f9ef53944b0eefc605711eea92b88554

data/.idea/.rakeTasks

@@ -4,4 +4,4 @@ You are allowed to:
 1. Remove rake task
 2. Add existing rake tasks
 To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build table_sortable-0.1.1.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install table_sortable-0.1.1.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install table_sortable-0.1.1.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.1 and build and push table_sortable-0.1.1.gem to Rubygems" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run tests" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build table_sortable-0.1.8.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install table_sortable-0.1.8.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install table_sortable-0.1.8.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.8 and build and push table_sortable-0.1.8.gem to Rubygems" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run tests" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/table_sortable.iml

@@ -34,7 +34,7 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
       <method />
     </configuration>
-    <configuration default="false" name="Run spec 'test_controller_spec': table_sortable" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+    <configuration default="false" name="Run spec 'proc_spec': table_sortable" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
       <predefined_log_file id="RUBY_RSPEC" enabled="true" />
       <module name="table_sortable" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -53,7 +53,7 @@
         </COVERAGE_PATTERN>
       </EXTENSION>
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/controllers/test_controller_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/lib/table_sortable/concerns/proc_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
@@ -67,7 +67,7 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
       <method />
     </configuration>
-    <configuration default="false" name="Run spec 'proc_spec': table_sortable" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+    <configuration default="false" name="Run spec 'filter_spec': table_sortable" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
       <predefined_log_file id="RUBY_RSPEC" enabled="true" />
       <module name="table_sortable" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -86,7 +86,7 @@
         </COVERAGE_PATTERN>
       </EXTENSION>
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/lib/table_sortable/concerns/proc_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/lib/table_sortable/column/filter_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
@@ -100,7 +100,7 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
       <method />
     </configuration>
-    <configuration default="false" name="Run spec 'filter_spec': table_sortable" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+    <configuration default="false" name="TableSortable::Controller filter_and_sort filters using a single filter: table_sortable" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
       <predefined_log_file id="RUBY_RSPEC" enabled="true" />
       <module name="table_sortable" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -118,11 +118,44 @@
           <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
         </COVERAGE_PATTERN>
       </EXTENSION>
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/lib/table_sortable/column/filter_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="$MODULE_DIR$/spec" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/lib/table_sortable/controller_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="TableSortable::Controller filter_and_sort filters using a single filter" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
+      <method />
+    </configuration>
+    <configuration default="false" name="TableSortable::Controller filter_and_sort sorts a record set based on the column to sort: table_sortable" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+      <predefined_log_file id="RUBY_RSPEC" enabled="true" />
+      <module name="table_sortable" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
+      <envs>
+        <env name="JRUBY_OPTS" value="-X+O" />
+      </envs>
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+        <COVERAGE_PATTERN ENABLED="true">
+          <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+        </COVERAGE_PATTERN>
+      </EXTENSION>
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="$MODULE_DIR$/spec" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/lib/table_sortable/controller_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="TableSortable::Controller filter_and_sort sorts a record set based on the column to sort" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -155,6 +188,8 @@
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="erubi (v1.6.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.8.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.8.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.1, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
@@ -180,6 +215,7 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.6.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.1, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.0, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.3.13, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.4, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.3, RVM: ruby-2.4.1 [tablesortable]) [gem]" level="application" />

data/README.md

@@ -2,17 +2,21 @@
 
 [![Build Status](https://travis-ci.org/odedd/table_sortable.svg?branch=master)](https://travis-ci.org/odedd/table_sortable)
 
-TableSortable is a Rails complementation of The **tableSorter jQuery plugin**.
+TableSortable adds multi-column, **server-side** filtering, sorting and pagination 
+to the **tableSorter jQuery plugin**, so you don't have to worry about interpreting the query parameters,
+combining multiple queries, columns to sort by, or figuring out how to send the correct page back to the client.
 
-The tableSorter jQuery plugin is an excellent tool for filtering and sorting tables. 
-When dealing with lots of rows, we usually want to split the table into multiple pages. tableSorter has a nifty [widget](https://mottie.github.io/tablesorter/docs/example-pager-ajax.html) for that, which requires using [mottie's fork](https://mottie.github.io/tablesorter/docs/index.html) of tableSorter.
+It is a Rails backend complementation to the frontend tableSorter.js.
 
-Usually this is a scenario where we don't want to send our entire set of records to the front end,
-which consequently means that the front end no longer knows the entire set of records to filter and sort through.
-This requires our *server* to handle all that stuff, plus the pagination of the results. 
+### The Problem
+The jQuery tableSorter plugin is an excellent tool for filtering and sorting tables. 
+Often, when dealing with lots of rows, we may want to split the table into multiple pages. tableSorter.js has a nifty [widget](https://mottie.github.io/tablesorter/docs/example-pager-ajax.html) for that, which requires using [mottie's fork](https://mottie.github.io/tablesorter/docs/index.html) of tableSorter.
 
-#### That's where TableSortable comes in!
+Usually this is a scenario where we don't want to send our entire set of records to the frontend,
+which consequently means that the frontend no longer knows the entire set of records to filter and sort through,
+which eventually requires our *server* to handle all that stuff as well as the pagination of the results.
 
+### The Solution: TableSortable
 TableSortable will handle all the backend filtering, sorting and pagination for you.
 
 NOTICE: This gem is in very early stages of development, and is not yet fully documented.  Any input will be more than welcome.
@@ -28,13 +32,13 @@ gem 'table_sortable'
 Then run `bundle install` and you're ready to start
 
 You should also probably be using jquery-tablesorter.  
-For information regarding integration or tableSorter into your Rails project, 
+For information regarding integration or tableSorter.js into your Rails project, 
 please see the [jQuery tablesorter plugin for Rails](https://github.com/themilkman/jquery-tablesorter-rails) page.
 
 ## Usage
 
-First, we need to setup our controller.  
-Let's say we have our users controller. Let's include TableSortable so that we can use its methods.
+First, we need to setup our controller. For this example this will be a users controller.  
+Let's `include TableSortable` so that we can use its methods.
 
 ```ruby
 #controllers/users_controller.rb
@@ -50,7 +54,7 @@ class UsersController < ApplicationController
   
   define_colunns :first_name, :last_name, :email, :created_at
 ```
-That's the basic setup of columns. For more configuration options, please see [advanced configuration](#advanced-configuration).
+That's just the basic setup of columns. For more configuration options, please see [advanced configuration](#advanced-configuration).
 
 Now we need to make sure our `index` action filters, sorts and paginates the records.  
 We can do that using the `filter_and_sort` method.
@@ -61,27 +65,50 @@ def index
   @users = filter_and_sort(User.all)
   
   respond_to do |format|
-        format.html {}
-        format.json {render layout: false}
+    format.html {}
+    format.json {render layout: false}
   end
 end
 ```
 
-In our view we can use TableSortable's [view helpers](#view-helpers) to render our table.
+Let's write the `index` view. We can use TableSortable's [view helpers](#view-helpers) to render our table.
 ```erb
-#views/users/index.html.erb
-<div id="usersPager"><%= table_sortable_pager %></div>
+<!-- views/users/index.html.erb -->
+<div id="usersPager">
+    <%= table_sortable_pager %>
+</div>
+
 <table id="usersTable" data-query="<%= users_path %>">
     <thead>
         <tr>
             <%= table_sortable_headers %>
         </tr>
     </thead>
+    <tbody>
+    </tbody>
 </table>
 ```
+Notice how `index.html` doesn't render the actual rows. They will later be polled via ajax by tableSorter.js.
 
-Let's say we have a tableSorter table which poll's the database for data. Here's a simple configuration example for that:
+Let's create `index.json.jbuilder` to send the users' info back to the frontend.
+```ruby
+# views/users/index.json.jbuilder
+# Since we only send out the current page of users, 
+# we must also send the total number of records.
+# We'll use TableSortable's total_count method for that.
+json.total @users.total_count
+json.rows @users.map{|user| render partial: 'user_row.html.erb', locals: {user: user}}.join
+json.pager_output 'Users {startRow} to {endRow} of {totalRows}'
+```
+We should also create the _user_row.html partial. In it, we may also use TableSortable's [helpers](#view-helpers).
+```erb
+<!-- views/users/_user_row.html.erb -->
+<tr>
+    <%= table_sortable_columns user %>
+</tr>
+```
 
+Now that we are done configuring the backend - let's continue to frontend. Here's a simple tableSorter.js configuration example:
 ```javascript
 var table = $('#usersTable');
 table.tablesorter({
@@ -89,9 +116,7 @@ table.tablesorter({
     widgetOptions: {
         // show 10 records at a time
         pager_size: 10,
-        // Poll our users_index_path.
-        // A better practice would be to use the table's 
-        // data-query attribute instead, but more on that later)
+        // Poll our users_index_path, which we receive from the table's data-query attribute.
         pager_ajaxUrl: table.data('query') + '?pagesize={size}&page={page}&{filterList:fcol}&{sortList:scol}',
         // Parse the incoming result
         pager_ajaxProcessing: function (data) {
@@ -100,15 +125,15 @@ table.tablesorter({
                 this.pager_output = data.pager_output;
                 // return total records, the rows HTML data,
                 // and the headers information.
-                return [data.total, $(data.rows), data.headers];
+                return [data.total, $(data.rows)];
             }
         }
     }
 });
 ```
-For full documentation regarding the usage of tableSorter please go [here](https://mottie.github.io/tablesorter/docs/index.html) for the very popular fork by mottie, or [here](http://tablesorter.com/docs/) for the original version of the plugin.
+That's it! The results fetched from the server are now filtered, sorted and paginated by TableSortable.
 
-Now, the results fetched from the server would be filtered, sorter and paginated by TableSortable.
+For full documentation of the usage of tableSorter.js please go [here](https://mottie.github.io/tablesorter/docs/index.html) for the very popular fork by mottie, or [here](http://tablesorter.com/docs/) for the original version of the plugin.
 
 Of course there are many more configuration options that make TableSortable flexible and adaptable. For those, please see [advanced configuration](#advanced-configuration)
 

data/lib/table_sortable/column/filter.rb

@@ -3,8 +3,10 @@ module TableSortable
     class Filter
       include TableSortable::Concerns::Proc
 
-      def initialize(*options)
-        super :filter, *options
+      attr_accessor :query
+
+      def initialize(*args)
+        super :filter, *args
       end
 
       def array_proc
@@ -12,8 +14,21 @@ module TableSortable
       end
 
       def sql_proc
-        -> (value, col=nil) { where("? LIKE (?)", filter.to_s.underscore, "%#{value}%") }
+        -> (value, col=nil) { where("LOWER(?) LIKE (?)", filter.to_s.underscore, "%#{value.to_s.downcase}%") }
+      end
+
+      def proc_wrapper(proc)
+        -> (value, col=nil) { instance_exec(value, &proc) }
+      end
+
+      def run(records)
+        records.instance_exec(query, column, &proc)
+      end
+
+      def used?
+        !query.nil?
       end
+
     end
   end
 end

data/lib/table_sortable/column/sorter.rb

@@ -3,16 +3,30 @@ module TableSortable
     class Sorter
       include TableSortable::Concerns::Proc
 
-      def initialize(*options)
-        super :sort, *options
+      attr_accessor :sort_order
+
+      def initialize(*args)
+        super :sort, *args
       end
 
       def array_proc
-        -> (col=nil) { sort{ |a,b| col.value(a) <=> col.value(b) }}
+        -> (sort_order, col=nil) { sort{ |a,b| col.value(sort_order == :asc ? a : b) <=> col.value(sort_order == :asc ? b : a) } }
       end
 
       def sql_proc
-        -> (col=nil) { order(sorter) }
+        -> (sort_order, col=nil) { order(sorter => sort_order) }
+      end
+
+      def proc_wrapper(proc)
+        -> (sort_order, col=nil) { instance_exec(sort_order , &proc) }
+      end
+
+      def run(records)
+        records.instance_exec(sort_order, column, &proc)
+      end
+
+      def used?
+        !sort_order.nil?
       end
 
     end

data/lib/table_sortable/column.rb

@@ -16,8 +16,8 @@ module TableSortable
       @label = label
       @placeholder = placeholder
       @template = template
-      @filter = TableSortable::Column::Filter.new(options.merge(:column_name => @name) )
-      @sorter = TableSortable::Column::Sorter.new(options.merge(:column_name => @name) )
+      @filter = TableSortable::Column::Filter.new(options.merge(:column => self) )
+      @sorter = TableSortable::Column::Sorter.new(options.merge(:column => self) )
 
     end
 

data/lib/table_sortable/columns.rb

@@ -1,26 +1,22 @@
 module TableSortable
-  class Columns
+  class Columns < Array
 
     def initialize
-      @columns = []
+      super
     end
 
     def add(col_name, *options)
       options = options.extract_options!
-      @columns << TableSortable::Column.new(col_name, options)
+      self << TableSortable::Column.new(col_name, options)
     end
 
     def sort_by(sort_key)
       if sort_key
-        sort_key.map{|c| @columns.find{|col| (c.is_a?(String) ? (col.label == c) : col.name == c)}}
+        sort_key.map{|c| self.find{|col| (c.is_a?(String) ? (col.label == c) : col.name == c)}}
       else
-        @columns
+        self
       end
     end
 
-    def sort(&sort_proc)
-      @columns.sort(&sort_proc)
-    end
-
   end
 end

data/lib/table_sortable/concerns/proc.rb

@@ -4,18 +4,20 @@ module TableSortable
       extend ActiveSupport::Concern
 
       included do
-        attr_reader :proc, :method
+        attr_reader :proc, :method, :column, :type
       end
 
       def initialize(option_name, *options)
         options = options.extract_options!
         unless options[option_name] == false
-          filter = options[option_name] || options[:column_name]
+          @type = option_name
+          @column = options[:column]
+          the_proc = options[option_name] || @column.name if @column
           @method = options["#{option_name.to_s}_method".to_sym] || :array
-          if filter.respond_to? :call
-            @proc = -> (records, col=nil) { instance_exec(records, &filter) }
+          if the_proc.respond_to? :call
+            @proc = proc_wrapper(the_proc)
             @method = detect_method(@proc)
-          elsif !filter.nil?
+          elsif !the_proc.nil?
             case @method
               when :array
                 @proc = array_proc
@@ -27,8 +29,13 @@ module TableSortable
       end
 
       def detect_method(proc)
-        method = [].instance_exec('', &proc) rescue :failed
-        method == :failed ? :sql : :array
+        begin
+          [].instance_exec('', &proc)
+          method = :array
+        rescue NoMethodError
+          method = :sql
+        end
+        method
       end
 
       def disabled?
@@ -43,6 +50,17 @@ module TableSortable
         raise NotImplementedError
       end
 
+      def proc_wrapper(proc)
+        raise NotImplementedError
+      end
+
+      def run(records)
+        raise NotImplementedError
+      end
+
+      def used?
+        raise NotImplementedError
+      end
     end
   end
 end

data/lib/table_sortable/controller.rb

@@ -36,52 +36,38 @@ module TableSortable
 
     private
 
-    def filter_and_sort(scope)
-      cols = @columns.sort_by(display_order)
-
-      page = params[:page].to_i
-      page_size = params[:pagesize].to_i
-      sort_by_col_data = params[SCOL] ? params[SCOL].keys.first : column_offset
-      sort_order = params[SCOL] ? params[SCOL].values.first : SORT_ASC
-
-      sort_column = cols.at(sort_by_col_data.to_i - column_offset)
-      sort_proc = ->(records) { records.instance_exec(sort_column, &sort_column.sorter.proc)}
-      ordered_sort_proc = ->(records) {sort_order == SORT_ASC ? sort_proc.call(records) : sort_proc.call(records).reverse}
-
-      filters = [->(records) { ordered_sort_proc.call(records) }]
-
-      # a filter exists
-      if params[FCOL]
-        @columns.sort_by(filter_order.reverse).each_with_index do |col, i|
-          column_index = cols.index(col) + column_offset
-          filter_value = params[FCOL][column_index.to_s]
-          filters << ->(records){ filter_value.nil? ? filters[i].call(records) : filters[i].call(records.instance_exec(filter_value, col, &col.filter.proc)) }
-        end
+    def filter_and_sort(scope, params = nil)
+      populate_params(params)
+
+      actions = [->(records) { records }]
+      ordered_actions.reverse.each_with_index do |action, i|
+        actions << ->(records) { action.used? ? actions[i].call(action.run(records)) : actions[i].call(records) }
       end
-      scope = filters.last.call(scope)
-      if page
-        scope = Result.new(scope, page, page_size)
+      scope = actions.last.call(scope)
+      if @query_params.page
+        scope = Result.new(scope, @query_params.page, @query_params.page_size)
       end
+
       scope
     end
 
     def initialize_table_sortable
-
-      @columns ||= TableSortable::Columns.new
+      @columns = TableSortable::Columns.new
       self.column_offset = 0
-
     end
 
-    def columns(record = nil)
+    def columns
       @columns.sort_by(display_order)
     end
 
-    def filter_order
-      @filter_order || @columns.sort{ |a,b| a.filter.method && b.filter.method ? b.filter.method <=> a.filter.method : a.filter.method ? 1 : -1 }.compact.map{|col| col.name}
+    def ordered_actions
+      filter_actions =  @columns.map{|col| col.filter }
+      sort_actions =    @columns.map{|col| col.sorter }
+      (filter_actions+sort_actions).sort{ |a,b| (a.method && b.method) ? (b.method <=> a.method) : a.method ? 1 : -1 }
     end
 
-    def sort_order
-      @sort_order || @columns.sort{ |a,b| a.sorter.method && b.sorter.method ? b.sorter.method <=> a.sorter.method : a.filter.method ? 1 : -1 }.compact.map{|col| col.name}
+    def populate_params(params = nil)
+      @query_params = QueryParams.new(params || self.params, columns, column_offset)
     end
 
     public

data/lib/table_sortable/process.rb

@@ -0,0 +1,5 @@
+module TableSortable
+  class Process
+
+  end
+end

data/lib/table_sortable/query_params.rb

@@ -0,0 +1,17 @@
+module TableSortable
+  class QueryParams
+
+    attr_reader :page, :page_size
+    def initialize(params, columns, column_offset = 0)
+      @page = params[PAGE].to_i
+      @page_size = params[PAGESIZE].to_i
+
+      # reset column filters and sorters
+      columns.each do |col|
+        col_index = (columns.find_index(col) + column_offset)
+        col.filter.query = params[FCOL] ? params[FCOL][col_index.to_s] : nil
+        col.sorter.sort_order = params[SCOL] && params[SCOL][col_index.to_s] ? ((params[SCOL][col_index.to_s] == SORT_ASC) ? :asc : :desc) : nil
+      end
+    end
+  end
+end

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/lib/table_sortable.rb

@@ -8,6 +8,8 @@ module TableSortable
   SCOL = 'scol'
   SORT_ASC = '0'
   SORT_DESC = '1'
+  PAGE = 'page'
+  PAGESIZE = 'pagesize'
 
   class Engine < Rails::Engine; end
 
@@ -23,4 +25,5 @@ require 'table_sortable/column'
 require 'table_sortable/result'
 require 'table_sortable/columns'
 require 'table_sortable/version'
-require 'table_sortable/controller'
+require 'table_sortable/controller'
+require 'table_sortable/query_params'

data/spec/concerns/proc_class_spec.rb

@@ -6,8 +6,11 @@ shared_examples_for 'proc_class' do |parameter_name|
   it 'includes TableSortable::Concerns::Proc' do
     expect(described_class.included_modules).to include TableSortable::Concerns::Proc
   end
-  it 'defines array_proc and sql_proc that return a proc' do
+  it 'defines methods of its own' do
     expect(dummy_class.array_proc).to respond_to :call
     expect(dummy_class.sql_proc).to respond_to :call
+    expect(dummy_class.send(:proc_wrapper, -> {x})).to respond_to :call
+    expect(dummy_class).to respond_to :run
+    expect(dummy_class).to respond_to :used?
   end
 end

data/spec/lib/table_sortable/concerns/proc_spec.rb

@@ -12,23 +12,27 @@ describe TableSortable::Concerns::Proc do
       def sql_proc
         -> (x) {x * 3}
       end
+
+      def proc_wrapper(proc)
+        proc
+      end
     end
   end
 
   let :dummy_proc do
-    proc_class.new(:proc, proc: dummy_col)
+    proc_class.new(:proc, column: TableSortable::Column.new(:proc), proc: dummy_col)
   end
 
   context 'on initialization' do
     context 'given a proc' do
       it 'should keep it' do
         example_proc = -> (x) { x * 100 }
-        proc = proc_class.new(:proc, proc: example_proc )
+        proc = proc_class.new(:proc, column: TableSortable::Column.new(:proc),proc: example_proc )
         expect(5.instance_eval(&proc.proc)).to eq 500
       end
       context 'it is an sql proc' do
         it 'should detect it as sql' do
-          proc = proc_class.new(:proc, proc: -> (value) { where(name: value) } )
+          proc = proc_class.new(:proc, column: TableSortable::Column.new(:proc), proc: -> (value) { where(name: value) } )
           expect(proc.method).to eq :sql
         end
       end
@@ -51,13 +55,13 @@ describe TableSortable::Concerns::Proc do
         end
         context '== :sql' do
           it 'should replace it with sql_proc' do
-            dummy_proc = proc_class.new(:proc, column_name: :proc, proc_method: :sql)
+            dummy_proc = proc_class.new(:proc, column: TableSortable::Column.new(:proc), proc_method: :sql)
             expect(5.instance_eval(&dummy_proc.proc)).to eq 5.instance_eval(&dummy_proc.sql_proc)
           end
         end
         context '== :array' do
           it 'should replace it with sql_proc' do
-            dummy_proc = proc_class.new(:proc, column_name: :proc, proc_method: :array)
+            dummy_proc = proc_class.new(:proc, column: TableSortable::Column.new(:proc), proc_method: :array)
             expect(5.instance_eval(&dummy_proc.proc)).to eq 5.instance_eval(&dummy_proc.array_proc)
           end
         end

data/spec/lib/table_sortable/controller_spec.rb

@@ -6,22 +6,33 @@ describe TableSortable::Controller do
     controller.instance_eval('initialize_table_sortable')
     controller
   end
-  let :populated_controller do
+  let :controller_with_columns do
+
     controller.send(:define_column,
-                    :column_with_sql_procs_a,
-                    filter: -> (value) { where(column: value)},
-                    sort: -> { order(:column)})
+                    :first_name,
+                    filter: -> (value) { where('UPPER(first_name) LIKE (?)', "%#{value.upcase}%") },
+                    sort: -> (sort_order) { order(:first_name => sort_order) })
+
     controller.send(:define_column,
-                    :column_with_array_procs,
-                    filter: -> (value) { select{|record| record == value}},
-                    sort: -> (col) { sort{ |a,b| col.value(a) <=> col.value(b) }})
+                    :last_name,
+                    filter: -> (value) { select{|record| value.downcase.in? record.last_name.downcase }},
+                    sort: -> (sort_order) { sort{ |a,b| (sort_order == :asc ? a : b).last_name <=> (sort_order == :asc ? b : a).last_name }})
+
     controller.send(:define_column,
-                    :column_with_sql_procs_b,
-                    filter: -> (value) { where(last_name: value)},
-                    sort: -> { order(:column)})
+                    :email,
+                    filter: -> (value) { where('UPPER(email) LIKE (?)', "%#{value.upcase}%") },
+                    sort: -> (sort_order) { order(:email => sort_order) })
+
     controller
   end
 
+  before(:all) do
+    create :user, first_name: 'Bob', last_name: 'Doe', email: 'misterbob@gmail.com'
+    create :user, first_name: 'David', last_name: 'Copperfield', email: 'alphadavid@gmail.com'
+    create :user, first_name: 'Aaron', last_name: 'Marks', email: 'super_aaron@gmail.com'
+    create :user, first_name: 'Jim', last_name: 'Jones', email: 'aaron_is_not_my_name@gmail.com'
+  end
+
   context 'initialization' do
     it 'creates a columns collection' do
       expect(controller.instance_eval('@columns')).to be_a TableSortable::Columns
@@ -37,20 +48,34 @@ describe TableSortable::Controller do
     end
   end
 
-  context 'filter_order' do
-    it 'orders sql filters before array filters' do
-      expect(populated_controller.send(:filter_order)).to eq [:column_with_sql_procs_a, :column_with_sql_procs_b, :column_with_array_procs]
+  context 'ordered_actions' do
+    it 'orders sql actions before array filters' do
+      expect(controller_with_columns.send(:ordered_actions).map{|action| action.method}).to eq [:sql, :sql, :sql, :sql, :array, :array]
     end
   end
 
-  context 'sort_order' do
-    it 'orders sql filters before array filters' do
-      expect(populated_controller.send(:sort_order)).to eq [:column_with_sql_procs_a, :column_with_sql_procs_b, :column_with_array_procs]
+  context 'filter_and_sort' do
+    it 'filters using a single filter' do
+      filter_by_first_name = controller_with_columns.send(:filter_and_sort, User.all, {TableSortable::PAGESIZE => '10', TableSortable::PAGE => '0', TableSortable::FCOL => {'0' => 'a'}, TableSortable::SCOL => {'0' => TableSortable::SORT_ASC}})
+      expect(filter_by_first_name.pluck(:first_name)).to eq %w(Aaron David)
+    end
+    it 'filters using multiple filters' do
+      filter_by_first_name = controller_with_columns.send(:filter_and_sort, User.all, {TableSortable::PAGESIZE => '10', TableSortable::PAGE => '0', TableSortable::FCOL => {'0' => 'a', '1' => 'c'}, TableSortable::SCOL => {'0' => TableSortable::SORT_ASC}})
+      expect(filter_by_first_name.pluck(:first_name)).to eq %w(David)
+    end
+    it 'sorts a record set based on the column to sort' do
+      sort_by_first_name = controller_with_columns.send(:filter_and_sort, User.all, {TableSortable::PAGESIZE => '10', TableSortable::PAGE => '0', TableSortable::SCOL => {'0' => TableSortable::SORT_ASC}})
+      expect(sort_by_first_name.pluck(:first_name)).to eq %w(Aaron Bob David Jim)
+
+      sort_by_email = controller_with_columns.send(:filter_and_sort, User.all, {TableSortable::PAGESIZE => '10', TableSortable::PAGE => '0', TableSortable::SCOL => {'2' => TableSortable::SORT_ASC}})
+      expect(sort_by_email.pluck(:first_name)).to eq %w(Jim David Bob Aaron)
+    end
+    context "sort order parameter equals #{TableSortable::SORT_DESC}" do
+      it 'sorts in descending order' do
+        sort_by_last_name_desc = controller_with_columns.send(:filter_and_sort, User.all, {TableSortable::PAGESIZE => '10', TableSortable::PAGE => '0', TableSortable::SCOL => {'1' => TableSortable::SORT_DESC}})
+        expect(sort_by_last_name_desc.pluck(:first_name)).to eq %w(Aaron Jim Bob David)
+      end
     end
-  end
 
-  context 'filter_and_sort' do
-    it 'should filter a record_set based on its filters'
-    it 'should sort a record_set based on its filters'
   end
 end

data/spec/lib/table_sortable/process_spec.rb

@@ -0,0 +1,7 @@
+# describe TableSortable::Process do
+#   context 'initialize'
+#
+#   context 'filter' do
+#     it 'should filter a result based on filter options'
+#   end
+# end

data/spec/spec_helper.rb

@@ -15,9 +15,23 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
 require 'table_sortable'
-require 'support/controller_macros'
-require 'support/matchers/have_filters'
-require 'support/shared_stuff'
+require 'factory_girl'
+require 'active_record'
+
+Dir['spec/support/**/*.rb'].each {|f| require f.gsub('spec/', '')}
+# Dir['spec/models/**/*.rb'].each {|f| require f.gsub('spec/', '')}
+# Dir['spec/factories/**/*.rb'].each {|f| require f.gsub('spec/', '')}
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Schema.define do
+  self.verbose = false
+
+  create_table :users, :force => true do |t|
+    t.string :first_name
+    t.string :last_name
+    t.string :email
+  end
+end
 
 RSpec.configure do |config|
 

data/spec/support/factories/user.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :user do |f|
+    f.first_name  'John'
+    f.last_name   'Doe'
+    f.email       'johndoe@gmail.com'
+  end
+end

data/spec/support/factory_girl.rb

@@ -0,0 +1,4 @@
+# spec/support/factory_girl.rb
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

data/spec/support/models/user.rb

@@ -0,0 +1 @@
+class User < ActiveRecord::Base ; end

data/table_sortable.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Use jquery-tablesorter.js with server side filtering, pagination and sorting'
   spec.description   = 'Use jquery-tablesorter.js with server side filtering, pagination and sorting'
-  # spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.homepage      = 'https://github.com/odedd/table_sortable'
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -32,5 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency "sqlite3", "~> 1.3"
+  spec.add_development_dependency "factory_girl_rails", "~> 4.8"
   spec.add_dependency "rails", '~> 5.1', '>= 5.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sortable
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Oded Davidov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +138,8 @@ files:
 - lib/table_sortable/columns.rb
 - lib/table_sortable/concerns/proc.rb
 - lib/table_sortable/controller.rb
+- lib/table_sortable/process.rb
+- lib/table_sortable/query_params.rb
 - lib/table_sortable/result.rb
 - lib/table_sortable/version.rb
 - spec/concerns/proc_class_spec.rb
@@ -118,12 +148,16 @@ files:
 - spec/lib/table_sortable/column/sorter_spec.rb
 - spec/lib/table_sortable/concerns/proc_spec.rb
 - spec/lib/table_sortable/controller_spec.rb
+- spec/lib/table_sortable/process_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
+- spec/support/factories/user.rb
+- spec/support/factory_girl.rb
 - spec/support/matchers/have_filters.rb
+- spec/support/models/user.rb
 - spec/support/shared_stuff.rb
 - table_sortable.gemspec
-homepage: 
+homepage: https://github.com/odedd/table_sortable
 licenses:
 - MIT
 metadata: {}
@@ -154,7 +188,11 @@ test_files:
 - spec/lib/table_sortable/column/sorter_spec.rb
 - spec/lib/table_sortable/concerns/proc_spec.rb
 - spec/lib/table_sortable/controller_spec.rb
+- spec/lib/table_sortable/process_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
+- spec/support/factories/user.rb
+- spec/support/factory_girl.rb
 - spec/support/matchers/have_filters.rb
+- spec/support/models/user.rb
 - spec/support/shared_stuff.rb