paginative 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff823b1b6ebd583bbae59ddf13ba3adc566df9de
-  data.tar.gz: cdc241f9c59a3cb63c883e26e690730ff6ba57ff
+  metadata.gz: 82ddbfff48eba50ec39b4044458fb08d929835c2
+  data.tar.gz: 99fb78305cfbb619d8d6541024f2822b1707013b
 SHA512:
-  metadata.gz: 99103ac2c9a8dbbf33504f96d29ae09a3a4c756253417d073ad41539229b3aca3f672020d3e7daed6ff9008ef7581f01aa5460f48144a2f0beae43a8e237e297
-  data.tar.gz: 751ea40dc1fbd7e32837ad7beb6b60bf242ce315096e9ad589d541f874032a095632679445c76d59bba82d86bee0417e66f96c0158b3c15ba1e265ebdd65004b
+  metadata.gz: 4b0c90ada294bad16087b7a70a32cf162ab08ec71bdfbea4742e19cd86aeaa7c66ffc7d71d3d4b06d6e7d9fb8ae66003eef3a8e40f6665151ed6b048d0428e45
+  data.tar.gz: 94a997ef26cb8d3412bbdb657de9b0842f43513806192ecd5a96999302328d707b0e1d5b22e278231b5559877341d2deb052f201ee2e71e839474b6c518639a8

data/lib/paginative/models/model_extension.rb

@@ -1,13 +1,14 @@
 module Paginative
   module ModelExtension
     extend ActiveSupport::Concern
+    include Paginative::OrderingHelpers
 
     included do
         def self.by_distance_from(latitude, longitude, distance=0, limit=25)
           return [] unless latitude.present? && longitude.present?
           distance_sql = send(:distance_sql, latitude.to_f, longitude.to_f, {:units => :km, select_bearing: false})
 
-          self.where("#{distance_sql} > #{distance}").offset(0).limit(limit)
+          self.where("#{distance_sql} >  ?", distance).offset(0).limit(limit)
         end
 
         def self.with_name_from(name="", limit=25, order="asc")
@@ -20,12 +21,19 @@ module Paginative
         end
 
         def self.with_field_from(field="", value="", limit=25, order="asc")
-          field = "#{self.table_name}.#{field}"
-
-          return self.order("#{field} DESC").where("#{field} < ?", value).limit(limit) if order == "desc"
-          self.order("#{field} ASC").where("#{field} > ?", value).limit(limit)
+          if field.is_a? Array
+            return raise "Wrong number of sorting fields. Expected 2, got #{field.length}. If you want to sort by a singular field please pass field argument as a string rather than an array." unless field.length == 2
+            # You can now pass in an array of 'field' params so that you can have a secondary sort order.
+            # This is important if your primary sort field could have duplicate values
+            primary_sort_field = field[0]
+            secondary_sort_field = field[1]
+            return self.order(sanitized_ordering(self.table_name, primary_sort_field, order), sanitized_ordering(self.table_name, secondary_sort_field, order)).where("#{field} < ?", value).limit(limit) if order.downcase == "desc"
+            self.order(sanitized_ordering(self.table_name, primary_sort_field, order), sanitized_ordering(self.table_name, secondary_sort_field, order)).where("#{field} > ?", value).limit(limit)
+          else
+            return self.order(sanitized_ordering(self.table_name, field, order)).where("#{field} < ?", value).limit(limit) if order.downcase == "desc"
+            self.order(sanitized_ordering(self.table_name, field, order)).where("#{field} > ?", value).limit(limit)
+          end
         end
-      # RUBY
     end
   end
 end

data/lib/paginative/models/ordering_helpers.rb

@@ -0,0 +1,23 @@
+module Paginative
+  module OrderingHelpers
+    extend AcitveModel::Concern
+
+    def sanitized_ordering(table_name, field, order)
+      "#{table_name}.#{sanitize_column(field)} #{sanitize_column_direction(order)}"
+    end
+
+    private
+    def sanitize_column(column)
+      resource.column_names.include?(column) ? column : "created_at"
+    end
+
+    def sanitize_column_direction(direction)
+      direction = direction.upcase
+      ['DESC', 'ASC'].include?(direction) ? direction : "DESC"
+    end
+
+    def resource
+      controller_name.camelize.singularize.safe_constantize
+    end
+  end
+end

data/lib/paginative/version.rb

@@ -1,3 +1,3 @@
 module Paginative
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paginative
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Isaac Norman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,6 +145,7 @@ files:
 - lib/paginative.rb
 - lib/paginative/engine.rb
 - lib/paginative/models/model_extension.rb
+- lib/paginative/models/ordering_helpers.rb
 - lib/paginative/railtie.rb
 - lib/paginative/version.rb
 - lib/tasks/paginative_tasks.rake
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A new way to paginate your Rails API