flexible_datatables 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22a22794a1f6a65928133accc5770f4f8bcc2567
-  data.tar.gz: afeb755aaa7c2f7525a2c9f3c9a19aea0d17e197
+  metadata.gz: 954ecfb0dc491d590399d366e0d1ab7b102aefef
+  data.tar.gz: 28e89d97b8f83f54549099197d8a14141e198f93
 SHA512:
-  metadata.gz: f1da69724072382a1b800f9e5eb7d7264a0e3095469b2da4538997963c6c210355b1192ced4aca938296b79b476298ef4974ca71cecb5abc28088604030385a2
-  data.tar.gz: 534c1713cd72815d2b4a1f6c4e4fd529aa10d45173def7ba4032152efea5308969a0795ff164a768e455d2f5f02ee3d0bfb51fd1c0efd56f9843d537c17c0461
+  metadata.gz: 1afe923adbb6c6236ac6604de583fb9a9c62a72aac794e61a65933a973a7ef6f3e86a62d216dfcba8fdfae35558cdd2817d41bbd1e95cd421dc36d6b949e2c8d
+  data.tar.gz: 6301cd5f284f6ace86ea407a7a239c8a1b02156f10039087d25daa3c6c49ac642871905a33b5182efac38ecad8fc7bec109e62a31822e74a02d6b8d7fe767eeb

data/CHANGELOG

@@ -1,20 +1,27 @@
-Change Log
-==========
+# Change Log
 
 All notable changes to the project are documented in this file.
 
-[v1.0.1] - 2015-02-15
---------------------
+## [Unreleased][unreleased]
 
-ca4badc Don't use 'blank?', which is an enhancement to Ruby from Rails, because obviously the code won't work outside of Rails
-e621434 refer to the default DummyPaginator using the full namespace
-4bb3085 Instantiate a Settings object when Configurator is defined, so default settings are available without needing to call Configurator.configuration first
-513db65 pull in paginators and configurator definitions first
-95d38a5 tweak file list
-2308215 use rdoc for the README
+## [v1.0.2] - 2015-02-16
 
-[v1.0.0] - 2015-02-14
---------------------
+### Changed
+* Refactored sorting code into separate modules
 
-38c6db1 initial commit
+### Fixed
+* When sorting, if we do not have a collection of ActiveRecord::Relation objects, assume the collection responds to the Enumerable#sort
 
+## [v1.0.1] - 2015-02-15
+
+### Fixed
+* Don't use 'blank?', which is an enhancement to Ruby from Rails, because obviously the code won't work outside of Rails
+* refer to the default DummyPaginator using the full namespace
+* Instantiate a Settings object when Configurator is defined, so default settings are available without needing to call Configurator.configuration first
+* pull in paginators and configurator definitions first
+
+## v1.0.0 - 2015-02-14
+
+[unreleased]: https://github.com/davecorning/flexible_datatables/compare/v1.0.2...HEAD
+[v1.0.2]: https://github.com/davecorning/flexible_datatables/compare/v1.0.1...v1.0.2
+[v1.0.1]: https://github.com/davecorning/flexible_datatables/compare/v1.0.0...v1.0.1

data/CHANGELOG.md

@@ -1,20 +1,27 @@
-Change Log
-==========
+# Change Log
 
 All notable changes to the project are documented in this file.
 
-[v1.0.1] - 2015-02-15
---------------------
+## [Unreleased][unreleased]
 
-ca4badc Don't use 'blank?', which is an enhancement to Ruby from Rails, because obviously the code won't work outside of Rails
-e621434 refer to the default DummyPaginator using the full namespace
-4bb3085 Instantiate a Settings object when Configurator is defined, so default settings are available without needing to call Configurator.configuration first
-513db65 pull in paginators and configurator definitions first
-95d38a5 tweak file list
-2308215 use rdoc for the README
+## [v1.0.2] - 2015-02-16
 
-[v1.0.0] - 2015-02-14
---------------------
+### Changed
+* Refactored sorting code into separate modules
 
-38c6db1 initial commit
+### Fixed
+* When sorting, if we do not have a collection of ActiveRecord::Relation objects, assume the collection responds to the Enumerable#sort
 
+## [v1.0.1] - 2015-02-15
+
+### Fixed
+* Don't use 'blank?', which is an enhancement to Ruby from Rails, because obviously the code won't work outside of Rails
+* refer to the default DummyPaginator using the full namespace
+* Instantiate a Settings object when Configurator is defined, so default settings are available without needing to call Configurator.configuration first
+* pull in paginators and configurator definitions first
+
+## v1.0.0 - 2015-02-14
+
+[unreleased]: https://github.com/davecorning/flexible_datatables/compare/v1.0.2...HEAD
+[v1.0.2]: https://github.com/davecorning/flexible_datatables/compare/v1.0.1...v1.0.2
+[v1.0.1]: https://github.com/davecorning/flexible_datatables/compare/v1.0.0...v1.0.1

data/README.rdoc

@@ -1,4 +1,4 @@
-= Flexible Datatables
+= Flexible Datatables {<img src="https://badge.fury.io/rb/flexible_datatables.svg" alt="Gem Version" />}[http://badge.fury.io/rb/flexible_datatables]
 Easily integrate {JQuery Datatables}[https://www.datatables.net] (with Ajax) into your Ruby / Rails web applications.
 
 == Introduction

data/lib/flexible_datatables.rb

@@ -1,5 +1,6 @@
 require 'ostruct'
 require 'flexible_datatables/paginators'
+require 'flexible_datatables/sorters'
 require 'flexible_datatables/configurator'
 require 'flexible_datatables/datatable'
 

data/lib/flexible_datatables/configurator.rb

@@ -1,11 +1,12 @@
 module FlexibleDatatables
   module Configurator
     class Settings
-      attr_accessor :items_per_page, :paginator
+      attr_accessor :items_per_page, :paginator, :sorter
 
       def initialize
         @items_per_page = 10
         @paginator = ::FlexibleDatatables::DummyPaginator
+        @sorter    = ::FlexibleDatatables::ProxySorter
       end
     end
 

data/lib/flexible_datatables/datatable.rb

@@ -9,6 +9,7 @@ module FlexibleDatatables
       @length    = args.fetch(:length, Configurator.settings.items_per_page).to_i
       @order     = args.fetch(:order, {})
       @paginator = args.fetch(:paginator, Configurator.settings.paginator)
+      @sorter    = Configurator.settings.sorter
       @start     = args.fetch(:start, 0).to_i
     end
 
@@ -23,7 +24,7 @@ module FlexibleDatatables
 
     def format_grid(cols = [])
       @columns = cols unless cols.empty?
-      records = collection.order("#{sort_column} #{sort_direction}")
+      records = sort(records)
       @grid = paginate(records).map { |record| yield(record) }
     end
 
@@ -32,18 +33,15 @@ module FlexibleDatatables
                 :length,
                 :order,
                 :paginator,
-                :start
-
-    def sort_column
-      @columns[order["0"].fetch(:column).to_i]
-    end
-
-    def sort_direction
-      order["0"].fetch(:dir) == "desc" ? "desc" : "asc"
-    end
+                :start,
+                :sorter
 
     def paginate(records)
       paginator.paginate(start: start, length: length, records: records)
     end
+
+    def sort(records)
+      sorter.sort(columns: @columns, records: collection, order: order)
+    end
   end
 end

data/lib/flexible_datatables/sorters.rb

@@ -0,0 +1,3 @@
+require 'flexible_datatables/sorters/proxy_sorter'
+require 'flexible_datatables/sorters/active_record_sorter'
+require 'flexible_datatables/sorters/enumerable_sorter'

data/lib/flexible_datatables/sorters/active_record_sorter.rb

@@ -0,0 +1,12 @@
+module FlexibleDatatables
+  module ActiveRecordSorter
+    def self.sort(opts = {})
+      columns = opts.fetch(:columns)
+      records = opts.fetch(:records, [])
+      order_opts = opts.fetch(:order)
+      sort_col = columns[order_opts['0'].fetch(:column).to_i]
+      sort_dir = order_opts['0'].fetch(:dir) == 'desc' ? 'desc' : 'asc'
+      records.order("#{sort_col} #{sort_dir}")
+    end
+  end
+end

data/lib/flexible_datatables/sorters/enumerable_sorter.rb

@@ -0,0 +1,16 @@
+module FlexibleDatatables
+  module EnumerableSorter
+    def self.sort(opts = {})
+      order     = opts.fetch(:order)
+      sort_dir = order['0'].fetch(:dir) == 'desc' ? 'desc' : 'asc'
+      sort_col = order['0'].fetch(:column).to_i
+      records   = opts.fetch(:records, [])
+
+      sorted_records = records.sort_by do |row|
+        row[sort_col]
+      end
+      sorted_records.reverse if sort_dir == 'desc'
+      sorted_records
+    end
+  end
+end

data/lib/flexible_datatables/sorters/proxy_sorter.rb

@@ -0,0 +1,18 @@
+module FlexibleDatatables
+  module ProxySorter
+    def self.sort(opts = {})
+      columns    = opts.fetch(:columns)
+      records    = opts.fetch(:records, [])
+      order_opts = opts.fetch(:order)
+      sorted_records = []
+      begin
+        sorted_records =
+          ActiveRecordSorter.sort(records: records, columns: columns, order: order_opts)
+      rescue NoMethodError
+        sorted_records =
+          EnumerableSorter.sort(records: records, order: order_opts)
+      end
+      sorted_records
+    end
+  end
+end

data/lib/flexible_datatables/version.rb

@@ -1,3 +1,3 @@
 module FlexibleDatatables
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexible_datatables
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dave Corning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies: []
 description: Flexible Datatables wraps array-like objects (ActiveRecord::Relation
   collections, etc) that JQuery Datatables can read (via ajax) from your Ruby / Rails
@@ -28,6 +28,10 @@ files:
 - lib/flexible_datatables/paginators/dummy_paginator.rb
 - lib/flexible_datatables/paginators/kaminari_paginator.rb
 - lib/flexible_datatables/paginators/simple_paginator.rb
+- lib/flexible_datatables/sorters.rb
+- lib/flexible_datatables/sorters/active_record_sorter.rb
+- lib/flexible_datatables/sorters/enumerable_sorter.rb
+- lib/flexible_datatables/sorters/proxy_sorter.rb
 - lib/flexible_datatables/version.rb
 homepage: https://github.com/davecorning/flexible_datatables
 licenses:
@@ -41,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="