paginative 0.0.23 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2642afe5cdba6115566e177eb2414467e99a31b
-  data.tar.gz: d9c517c793c053edd25df1c4834cf0c2bf727d7f
+  metadata.gz: 97984ef48fec7c34fd8ab3dd073f4bf463786805
+  data.tar.gz: 48d2ebf5b44cb52b06f3ac8effbb164bed2149cd
 SHA512:
-  metadata.gz: ea2dc1b6140adb5b00fe17ac2c3a4dc45e5048e6e1f554b9c6f1e1c6bffb89f3dc81f374366c11bd2d39736be27ee9b48eba74aed37475578f64ca69ea4f0421
-  data.tar.gz: a65fe086f1b61fa33c7cb9cf16ae73d7f611e7bd30d7d0d9ef65076c5cf0dafe1d3bdb96f0954a92d5517be2f6bfed94f077671447127aecdebee9d88bd933d7
+  metadata.gz: 0de5ec95993076ac5ef7cde82295fd2536d2fcbbfbcaf6f6f0cc59ae526e0328628c377f304e0036979ce587372bc604cd063e2ac46031595e42e95c9d6f1900
+  data.tar.gz: 7f73c15ed9b1a05bfe7a9703d664e26a0fb873901c43a05ca2996b7bed7cf723c8cb551a6fd52c692362678469a9d7f772ba5ca670fc223b5eb1e7e2cf645d56

data/lib/paginative/models/model_extension.rb

@@ -5,36 +5,40 @@ module Paginative
     included do
       include Paginative::OrderingHelpers
 
-        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})
+      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)
-        end
+        self.where("#{distance_sql} >  ?", distance).offset(0).limit(limit)
+      end
 
-        def self.with_name_from(name="", limit=25, order="asc")
-          return self.order("name DESC").where("lower(name) < ?", name.downcase).offset(0).limit(limit) if order == "desc"
-          self.order(name: :asc).where("lower(#{self.table_name}.name) > ?", name.downcase).offset(0).limit(limit)
-        end
+      def self.with_name_from(name="", limit=25, order="asc")
+        return self.order("name DESC").where("lower(name) < ?", name.downcase).offset(0).limit(limit) if order == "desc"
+        self.order(name: :asc).where("lower(#{self.table_name}.name) > ?", name.downcase).offset(0).limit(limit)
+      end
 
-        def self.with_id_from(id=0, limit=25)
-          self.order(id: :asc).where("id > ?", id).limit(limit)
-        end
+      def self.with_id_from(id=0, limit=25)
+        self.order(id: :asc).where("id > ?", id).limit(limit)
+      end
 
-        def self.with_field_from(field="", value="", limit=25, order="asc")
-          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
+      def self.with_field_from(field="", value="", limit=25, order="asc")
+        if field.is_a? Array
+          return raise "Wrong number of values. Expected 2, got #{value.try(:length)}. You must pass a value for each field that you are sorting by" unless value.is_a?(Array) && value.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]
+            primary_value = value[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("#{secondary_sort_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("#{secondary_sort_field} > ?", value).limit(limit)
+            secondary_value = value[1]
+            # Postgres sorts strings differently to Rails. We use the Postgres string concat and sort so that there is no confusion here.
+            # We need to treat the 2 columns as one string to accurately paginate from a certain point when 2 columns are passed into the argument
+            return self.order(sanitized_ordering(self.table_name, field, order)).where("#{primary_sort_field} || #{secondary_sort_field} < ?", "#{primary_value}#{secondary_value}").limit(limit) if order.downcase == "desc"
+            self.order(sanitized_ordering(self.table_name, field, order)).where("#{primary_sort_field} || #{secondary_sort_field} > ?", "#{primary_value}#{secondary_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
+      end
     end
   end
-end

data/lib/paginative/models/ordering_helpers.rb

@@ -2,22 +2,25 @@ module Paginative
   module OrderingHelpers
     extend ActiveSupport::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
+    included do
+      def self.sanitized_ordering(table_name, field, order)
+        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
+          "#{table_name}.#{sanitize_column(field[0])} || #{table_name}.#{sanitize_column(field[1])} #{sanitize_column_direction(order)}"
+        else
+          "#{table_name}.#{sanitize_column(field)} #{sanitize_column_direction(order)}"
+        end
+      end
 
-    def sanitize_column_direction(direction)
-      direction = direction.upcase
-      ['DESC', 'ASC'].include?(direction) ? direction : "DESC"
-    end
+      private
+      def self.sanitize_column(column)
+        self.column_names.include?(column) ? column : "created_at"
+      end
 
-    def resource
-      controller_name.camelize.singularize.safe_constantize
+      def self.sanitize_column_direction(direction)
+        direction = direction.upcase
+        ['DESC', 'ASC'].include?(direction) ? direction : "DESC"
+      end
     end
   end
 end

data/lib/paginative/version.rb

@@ -1,3 +1,3 @@
 module Paginative
-  VERSION = "0.0.23"
+  VERSION = "0.1.0"
 end

data/spec/dummy/app/models/test_model.rb

@@ -2,5 +2,4 @@ class TestModel < ActiveRecord::Base
   include Paginative::ModelExtension
 
   reverse_geocoded_by :latitude, :longitude
-  after_validation :reverse_geocode          # auto-fetch coordinates
 end

data/spec/dummy/config/environments/development.rb

@@ -1,4 +1,4 @@
-Rails.application.configure do
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
@@ -20,7 +20,7 @@ Rails.application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
+  # config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large

data/spec/dummy/config/environments/test.rb

@@ -1,4 +1,4 @@
-Rails.application.configure do
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's

data/spec/dummy/db/schema.rb

@@ -9,26 +9,17 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended that you check this file into your version control system.
+# It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140416035443) do
+ActiveRecord::Schema.define(:version => 20140416035443) do
 
-  create_table "paginative_test_models", force: true do |t|
-    t.string   "name"
-    t.float    "latitude"
-    t.float    "longitude"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "address"
-  end
-
-  create_table "test_models", force: true do |t|
+  create_table "test_models", :force => true do |t|
     t.string   "name"
     t.string   "address"
     t.float    "latitude"
     t.float    "longitude"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
 end

data/spec/dummy/log/development.log

@@ -81,3 +81,56 @@ Migrating to CreateTestModels (20140416035443)
    (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140416035443')
   ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Connecting to database specified by database.yml
+   (0.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePaginativeTestModels (20140415060518)
+Migrating to AddAddressToTestModels (20140416020706)
+Migrating to CreateTestModels (20140416035443)
+   (0.1ms)  select sqlite_version(*)
+   (0.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Connecting to database specified by database.yml
+   (0.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePaginativeTestModels (20140415060518)
+Migrating to AddAddressToTestModels (20140416020706)
+Migrating to CreateTestModels (20140416035443)
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Connecting to database specified by database.yml
+   (1.6ms)  select sqlite_version(*)
+   (3.6ms)  CREATE TABLE "paginative_test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "latitude" float, "longitude" float, "created_at" datetime, "updated_at" datetime, "address" varchar(255)) 
+   (1.1ms)  CREATE TABLE "test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "address" varchar(255), "latitude" float, "longitude" float, "created_at" datetime, "updated_at" datetime) 
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.3ms)  SELECT version FROM "schema_migrations"
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140416035443')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140415060518')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140416020706')
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Connecting to database specified by database.yml
+   (1.4ms)  select sqlite_version(*)
+   (1.1ms)  CREATE TABLE "paginative_test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "latitude" float, "longitude" float, "created_at" datetime, "updated_at" datetime, "address" varchar(255)) 
+   (1.6ms)  CREATE TABLE "test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "address" varchar(255), "latitude" float, "longitude" float, "created_at" datetime, "updated_at" datetime) 
+   (1.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (2.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140416035443')
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Connecting to database specified by database.yml
+   (0.1ms)  select sqlite_version(*)
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTestModels (20140416035443)
+   (0.0ms)  begin transaction
+   (0.6ms)  CREATE TABLE "test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "address" varchar(255), "latitude" float, "longitude" float, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20140416035443')
+   (0.8ms)  commit transaction
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.0ms)  CREATE TABLE "test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "address" varchar(255), "latitude" float, "longitude" float, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140416035443')