paginative 0.0.8 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ae7b425433ba6ce629752c3648cf7e45dca111
-  data.tar.gz: 3868c57e3e2146e4b4c5afb4c237d755e2353496
+  metadata.gz: cddedd919c12871404bc714b08dbfe1c0132f8de
+  data.tar.gz: 30989c919ef281f875555229451a89910eb9b4b7
 SHA512:
-  metadata.gz: 9f3886ed72499cf45372c4040d0da5675f5c034818605c71323ca365b6bf09a24b2960aae424db669bc7ca5d0cc9e233f491a2bba7a749e8d64b1567ad8b0837
-  data.tar.gz: 7b16a2e5ded25b7deb22b68226963b28b1cd28942a9e1dfa2952ba033bb6e1b2e9d41af86f9e3b4ae0e4cafb844a56c4a55c27065519d1db5f9adaa90be58719
+  metadata.gz: e237a0c2f5c73b760146a58da1151b4364b7ee6bc0f077a5cb8e4f4587d2c1d681cd95aa13ebdde7e77f96d0e7aadf0fcab0e12037eba0e611855fcc88827d63
+  data.tar.gz: 62cc03a5ea20a24e5f77240dfc6c4179cbdc1502b9d9575399054e1e29edd1795a71a6a2729c19ec7a70bdc0bb1d86a8c74af71df31f9ce197c1cd2b484717d0

data/lib/paginative/models/model_extension.rb

@@ -5,7 +5,7 @@ module Paginative
     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})
+          distance_sql = send(:distance_sql, latitude.to_f, longitude.to_f, {:units => :km, select_bearing: false, order: "distance ASC"})
 
           self.where("#{distance_sql} > #{distance}").offset(0).limit(limit)
         end
@@ -21,6 +21,10 @@ module Paginative
 
         def self.with_field_from(field="", value="", limit=25, order="asc")
           field = "#{self.name.tableize}.#{field}"
+
+          #replaces the / when tableizing a namespaced class
+          field = field.sub('/','_')
+          
           return self.order("#{field} DESC").where("#{field} < '#{value}'").limit(limit) if order == "desc"
           self.order("#{field} ASC").where("#{field} > '#{value}'").limit(limit)
         end

data/lib/paginative/version.rb

@@ -1,3 +1,3 @@
 module Paginative
-  VERSION = "0.0.8"
+  VERSION = "0.0.11"
 end

data/spec/dummy/log/development.log

@@ -0,0 +1,83 @@
+   (2.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.4ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreatePaginativeTestModels (20140415060518)
+   (0.1ms)  begin transaction
+   (0.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) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140415060518"]]
+   (0.8ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (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) 
+   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.4ms)  select sqlite_version(*)
+   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140415060518')
+   (1.2ms)  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) 
+   (2.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.2ms)  select sqlite_version(*)
+   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (2.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140415060518')
+   (1.0ms)  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) 
+   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.4ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140415060518')
+  ActiveRecord::SchemaMigration Load (1.9ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddAddressToTestModels (20140416020706)
+   (0.1ms)  begin transaction
+   (0.2ms)  ALTER TABLE "test_models" ADD "address" varchar(255)
+SQLite3::SQLException: no such table: test_models: ALTER TABLE "test_models" ADD "address" varchar(255)
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddAddressToTestModels (20140416020706)
+   (0.1ms)  begin transaction
+   (3.0ms)  ALTER TABLE "paginative_test_models" ADD "address" varchar(255)
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140416020706"]]
+   (0.5ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.3ms)  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 "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)) 
+   (0.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.3ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140416020706')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140415060518')
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.9ms)  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)) 
+   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140416020706')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140415060518')
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateTestModels (20140416035443)
+   (0.1ms)  begin transaction
+   (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, "updated_at" datetime) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140416035443"]]
+   (1.1ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.2ms)  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)) 
+   (0.9ms)  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) 
+   (0.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.7ms)  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')
+   (1.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)) 
+   (0.9ms)  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) 
+   (0.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (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"