table_sortable 1.0.0.pre.alpha.3 → 1.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d984c4493ecd467f57e1d03d749a1fb3b31c84e
-  data.tar.gz: 5a6e3fd9fd74ac90b5f27e285585ce0e782c1680
+  metadata.gz: b98db7d33d20b683075edac94fe5ee1df23a3816
+  data.tar.gz: 30fc8c7ba54dbd07f5fe83d5319d0e474cb8acf6
 SHA512:
-  metadata.gz: bc8748ddf802895ab307455f0db04e2c58627d22d8ef446480e23479c4a6cf66983f8f9f53773404fb6640834354117d96a89be2a3df5a42de33b02d89c63197
-  data.tar.gz: be63858bc76eefc8573ea13734381d8bb54ef24b86ebb0ebaf7f192f8c35149e34f4a08d2e182f491a04ee79a7226b7c1e1e438c9b958dd89d043be0f5e52bc7
+  metadata.gz: 572e3c065b21961613949494af13ac3f1b3f41352afa9ade5268bcf9b50cdcaad85afd4d69a2bed7597eb2ab407242b13582f6f26ba550f8d153d2324d24a271
+  data.tar.gz: 965022220b77acccc058d1f1e21df373847b1448289050f008c66905f4cd9d32daa0005af1b2d2f735db53595d3781b08166cbd038e7c260075f822643018599

data/lib/table_sortable/column.rb

@@ -15,7 +15,7 @@ module TableSortable
       template = options[:template] || col_name
       column_options = options[:options] || {}
 
-      @name = col_name
+      @name = col_name.to_sym
       @value = value.respond_to?(:call) ? value : -> (record) { record.send(value) }
       @content = content.respond_to?(:call) ? content : -> (record) { record.send(content) }
       @label = label

data/lib/table_sortable/columns.rb

@@ -18,5 +18,9 @@ module TableSortable
       end
     end
 
+    def [](name)
+      self.find{|col| col.name == name.to_sym}
+    end
+
   end
 end

data/lib/table_sortable/controller.rb

@@ -3,6 +3,7 @@ module TableSortable
   module Controller
 
     extend ActiveSupport::Concern
+    include TableSortable::Core
 
     included do
       helper_method :columns
@@ -49,84 +50,6 @@ module TableSortable
       end
     end
 
-    def define_columns(*args)
-      options = args.extract_options!
-      column_offset = options[:offset] || 0
-      translation_key = options[:translation_key]
-      template_path = options[:template_path]
-      columns   = args
-      define_translation_key translation_key
-      define_template_path template_path
-      define_column_offset column_offset
-      columns.each do |column|
-        define_column column, translation_key: translation_key
-      end
-    end
-
-    def define_column(col_name, *options)
-      options = default_column_options.merge(options.extract_options!)
-      @columns.add(col_name, options.merge(controller: self))
-    end
-
-    def define_column_order(*order)
-      @column_order = order
-    end
-
-    def define_column_offset(offset)
-      @column_offset = offset
-    end
-
-    def define_translation_key(key)
-      @translation_key = key
-    end
-
-    def define_template_path(path)
-      @template_path = path.blank? ? nil : File.join(path, "")
-    end
-
-    def columns
-      @columns.sort_by(column_order)
-    end
-
-    private
-
-    def default_column_options
-      {translation_key: @translation_key, template_path: @template_path}
-    end
-
-    def filter_and_sort(scope, params = nil)
-      populate_params(params)
-
-      actions = [->(records) { records }]
-      ordered_actions(scope.first).reverse.each_with_index do |action, i|
-        actions << ->(records) { action.used? ? (actions[i].call(action.run(records))) : actions[i].call(records) }
-      end
-      scope = actions.last.call(scope) unless scope.blank?
-      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
-      define_column_offset 0
-    end
-
-    def ordered_actions(record = nil)
-      filter_actions =  @columns.map{|col| col.filter }
-      sort_actions =    @columns.map{|col| col.sorter }
-      (filter_actions+sort_actions).sort{ |a,b| (a.method(record) && b.method(record)) ? (a.method(record) <=> b.method(record)) : b.method(record) ? 1 : -1 }
-    end
-
-    def populate_params(params = nil)
-      @query_params = QueryParams.new(params || self.params, columns, column_offset)
-    end
-
-    public
-
-    attr_reader :column_order, :column_offset, :translation_key, :template_path
 
   end
 end

data/lib/table_sortable/core.rb

@@ -0,0 +1,88 @@
+require 'table_sortable/columns'
+
+module TableSortable
+  module Core
+    extend ActiveSupport::Concern
+
+    def define_columns(*args)
+      options = args.extract_options!
+      column_offset = options[:offset] || 0
+      translation_key = options[:translation_key]
+      template_path = options[:template_path]
+      columns   = args
+      define_translation_key translation_key
+      define_template_path template_path
+      define_column_offset column_offset
+      columns.each do |column|
+        define_column column, translation_key: translation_key
+      end
+    end
+
+    def define_column(col_name, *options)
+      options = default_column_options.merge(options.extract_options!)
+      @columns.add(col_name, options.merge(controller: self))
+    end
+
+    def define_column_order(*order)
+      @column_order = order
+    end
+
+    def define_column_offset(offset)
+      @column_offset = offset
+    end
+
+    def define_translation_key(key)
+      @translation_key = key
+    end
+
+    def define_template_path(path)
+      @template_path = path.blank? ? nil : File.join(path, "")
+    end
+
+    def columns
+      @columns.sort_by(column_order)
+    end
+
+    # private
+
+    def default_column_options
+      {translation_key: @translation_key, template_path: @template_path}
+    end
+
+    def filter_and_sort(scope, params = nil)
+      populate_params(params)
+
+      actions = [->(records) { records }]
+      ordered_actions(scope.first).reverse.each_with_index do |action, i|
+        actions << ->(records) { action.used? ? (actions[i].call(action.run(records))) : actions[i].call(records) }
+      end
+      scope = actions.last.call(scope) unless scope.blank?
+      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
+      define_column_offset 0
+    end
+
+    def ordered_actions(record = nil)
+      filter_actions =  @columns.map{|col| col.filter }
+      sort_actions =    @columns.map{|col| col.sorter }
+      (filter_actions+sort_actions).sort{ |a,b| (a.method(record) && b.method(record)) ? (a.method(record) <=> b.method(record)) : b.method(record) ? 1 : -1 }
+    end
+
+    def populate_params(params = nil)
+      @query_params = QueryParams.new(params || self.params, columns, column_offset)
+    end
+
+    public
+
+    attr_reader :column_order, :column_offset, :translation_key, :template_path
+    # attr_accessor :params if defined?(self.class.params)
+
+  end
+end

data/lib/table_sortable/query_params.rb

@@ -3,7 +3,7 @@ module TableSortable
 
     attr_reader :page, :page_size
     def initialize(params, columns, column_offset = 0)
-      @page = params[PAGE].to_i
+      @page = params[PAGE] ? params[PAGE].to_i : nil
       @page_size = params[PAGESIZE].to_i
 
       # reset column filters and sorters

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "1.0.0.pre.alpha.3"
+  VERSION = "1.0.0.pre.alpha.4"
 end

data/lib/table_sortable.rb

@@ -9,7 +9,7 @@ module TableSortable
   PAGE = 'page'
   PAGESIZE = 'pagesize'
 
-  class Engine < Rails::Engine; end
+  class Engine < Rails::Engine; end if defined?(Rails)
 
 end
 
@@ -20,8 +20,8 @@ require 'table_sortable/column/sorter'
 require 'table_sortable/column/filter'
 require 'table_sortable/column'
 require 'table_sortable/result'
-require 'table_sortable/columns'
 require 'table_sortable/version'
+require 'table_sortable/core'
 require 'table_sortable/controller'
 require 'table_sortable/query_params'
 require 'table_sortable/railtie' if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sortable
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.3
+  version: 1.0.0.pre.alpha.4
 platform: ruby
 authors:
 - Oded Davidov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,6 +171,7 @@ files:
 - lib/table_sortable/columns.rb
 - lib/table_sortable/concerns/proc.rb
 - lib/table_sortable/controller.rb
+- lib/table_sortable/core.rb
 - lib/table_sortable/process.rb
 - lib/table_sortable/query_params.rb
 - lib/table_sortable/railtie.rb