sql_search_n_sort 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ac91912096e4c2f8adf0cd43a32bef0cc2552e0
-  data.tar.gz: dd21e920b303b9a5ace1135f158e908d4f537931
+  metadata.gz: c9b55c9a2d00587e07696f93ff19868e14d6a6c9
+  data.tar.gz: e5c0d59ba01b3545fc8a35d0bdce2a06fe262f0e
 SHA512:
-  metadata.gz: c37f5a314fb9fb7bbbcdc8998650698727f6aafe6c56d686c4070f65b2c61c1fe8898121e5e320c6a6b7c24a984e65c80c0ae09542059a49e2c831bcf486fdf4
-  data.tar.gz: ca4c580cb2364f07d57a3158d316fd8cad3d61bd7689d5694e84f62080e1939302a47d215c7c3eb230bab1c152c32345599f6ca3d2d8aac0c9f735f0a34c8763
+  metadata.gz: 9bf247d3abf1332d504d9c13894de7af486a060339ea91fa008aac62007f2845f917a669ff2b4c8a4295c86991d3232de7c42b1df1b7b81925d4b2cba90f080c
+  data.tar.gz: baa89ed908b98744a5ee90fae20d5fa36287bc99c875bdfd1a47520f0a4f6c63aa21956412352703f300e3a6b5fa6576ce9757627508a9c28cb0c7b868996003

data/lib/generators/sql_search_n_sort/config/initializers/sql_search_n_sort.rb

@@ -0,0 +1,7 @@
+SqlSearchNSort.config do |config|
+	#Add to this array any parameters you don't want the search/sort forms to pass along . (like "page" in Kaminari)
+	config.suppress_params = {
+		search: [],
+		sort: []
+		} 
+end

data/lib/generators/sql_search_n_sort/install_generator.rb

@@ -1,10 +1,12 @@
 require 'rails/generators'
+
 module SqlSearchNSort
 	class InstallGenerator < Rails::Generators::Base
 
 		source_paths << File.expand_path('../views/application', __FILE__)
 		source_paths << File.expand_path('../assets/javascripts', __FILE__)
 		source_paths << File.expand_path('../helpers', __FILE__)
+		source_paths << File.expand_path('../config/initializers', __FILE__)
 
 		def copy_files
 			base_path = "app/views/application"
@@ -13,14 +15,19 @@ module SqlSearchNSort
 
       base_path = "app/assets/javascripts"
       copy_file('sql_search_n_sort.js', File.join(base_path, 'sql_search_n_sort.js'))
-      
+
+      base_path = "config/initializers"
+      copy_file('sql_search_n_sort.rb', File.join(base_path, 'sql_search_n_sort.rb'))
 		end
 
 		def require_jquery
-			inject_into_file "app/assets/javascripts/application.js",
+			#could be either application.js or application.js.coffee or maybe something else in the future
+			if app_js_fl = Dir["#{destination_root}/app/assets/javascripts/*"].select{|f| f =~ /application\.js/}.first
+				inject_into_file app_js_fl,
 		    before: "\n//= require_tree ." do
 		      "\n//= require jquery"
 		    end
+			end
 		end
 
 		def insert_into_app_controller

data/lib/generators/sql_search_n_sort/views/application/_search_form.html.haml

@@ -1,3 +1,4 @@
+- @mode = :search
 %form{id: "search-form"}
 	= hide_current_params("search_for").html_safe
 	=text_field_tag :search_for, params[:search_for], :placeholder => "Search"

data/lib/generators/sql_search_n_sort/views/application/_sort_form.html.haml

@@ -1,3 +1,4 @@
+- @mode = :sort
 %form
 	= hide_current_params("sort_by").html_safe
 	= label_tag :sort_by

data/lib/sql_search_n_sort/app/helpers/sql_search_n_sort_helper.rb

@@ -1,8 +1,9 @@
 module SqlSearchNSortHelper
 
-	#Should only be used for forms performing a GET
+	#Should only be used for forms performing a GET (which they all should be)
 	def hide_current_params(*suppress)
 		return "" if request.query_parameters.empty?
+		suppress.concat(SqlSearchNSort.config.suppress_params[@mode] || [])
 		request.query_parameters.reject { |k, v| suppress.include?(k) }.map do |k, v|
 			hidden_field_tag(k, v)
 		end.join("\n")

data/lib/sql_search_n_sort/version.rb

@@ -1,3 +1,3 @@
 module SqlSearchNSort
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/lib/sql_search_n_sort.rb

@@ -6,4 +6,12 @@ module SqlSearchNSort
 	require "factory_girl_rails" if Rails.env == 'test'
 	require "haml-rails"
 	require "jquery-rails"
+
+	class Engine < Rails::Engine
+	end
+
+	def self.config(&block)
+    yield Engine.config if block
+    Engine.config
+  end
 end

data/test/dummy/app/controllers/items_controller.rb

@@ -0,0 +1,5 @@
+class ItemsController < ApplicationController
+	def index
+		
+	end
+end

data/test/dummy/app/models/item.rb

@@ -0,0 +1,5 @@
+class Item < ActiveRecord::Base
+	extend SqlSearchableSortable
+	sql_searchable :name, :descr
+	sql_sortable :name, :descr
+end

data/test/dummy/app/views/items/index.html.haml

@@ -0,0 +1,2 @@
+= render 'search_form'
+= render 'sort_form' 

data/test/dummy/config/database.yml

@@ -1,25 +1,50 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
-default: &default
-  adapter: sqlite3
-  pool: 5
-  timeout: 5000
+# default: &default
+#   adapter: sqlite3
+#   pool: 5
+#   timeout: 5000
+
+# development:
+#   <<: *default
+#   database: db/development.sqlite3
+
+# test:
+#   <<: *default
+#   database: db/test.sqlite3
+
+# production:
+#   <<: *default
+#   database: db/production.sqlite3
 
 development:
-  <<: *default
-  database: db/development.sqlite3
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: ssns_development 
+  pool: 5
+  username: ssns
+  password: toolman1
+  socket: /tmp/mysql.sock
+  timeout: 5000
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  <<: *default
-  database: db/test.sqlite3
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: ssns_test
+  pool: 5
+  username: ssns
+  password: toolman1
+  socket: /tmp/mysql.sock
+  timeout: 5000
+
+# production:
+#   adapter: mysql2
+#   encoding: utf8
+#   reconnect: false
+#   database: sql-search-n-sort_production
+#   pool: 5
+#   username: ssns
+#   password: toolman1
+#   socket: /tmp/mysql.sock
+#   timeout: 5000
 
-production:
-  <<: *default
-  database: db/production.sqlite3

data/test/dummy/config/routes.rb

@@ -15,6 +15,7 @@ Rails.application.routes.draw do
   get "/search_vehicles" => 'vehicles#search_only_index'
   get "/sort_vehicles" => 'vehicles#sort_only_index'
   get "/unsearchables" => 'unsearchables#index'
+  get "/items" => "items#index"
 
   scope module: "admin" do
     get "members" => 'members#index_explicit_setup', as: 'admin_members'

data/test/dummy/db/migrate/20160128023040_create_items.rb

@@ -0,0 +1,8 @@
+class CreateItems < ActiveRecord::Migration
+  def change
+    create_table :items do |t|
+      t.string :name
+      t.text :descr
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150306040113) do
+ActiveRecord::Schema.define(version: 20160128023040) do
 
   create_table "articles", force: true do |t|
     t.string   "headline"
@@ -22,6 +22,19 @@ ActiveRecord::Schema.define(version: 20150306040113) do
     t.datetime "updated_at"
   end
 
+  create_table "comments", force: true do |t|
+    t.text     "ctext"
+    t.string   "commentator"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "article_id"
+  end
+
+  create_table "items", force: true do |t|
+    t.string "name"
+    t.text   "descr"
+  end
+
   create_table "members", force: true do |t|
     t.string   "first_name"
     t.string   "last_name"
@@ -59,8 +72,8 @@ ActiveRecord::Schema.define(version: 20150306040113) do
     t.time     "tm"
     t.datetime "dtm"
     t.boolean  "bool"
-    t.float    "flt"
-    t.decimal  "dec"
+    t.float    "flt",        limit: 24
+    t.decimal  "dec",                   precision: 10, scale: 0
     t.binary   "bn"
     t.datetime "ts"
     t.datetime "created_at"

data/test/dummy/log/development.log

@@ -10480,3 +10480,82 @@ Started GET "/assets/sql_search_n_sort.js?body=1" for 127.0.0.1 at 2015-03-11 19
 
 
 Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2015-03-11 19:47:32 -0400
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateComments (20160121020023)
+   (0.1ms)  begin transaction
+   (0.6ms)  CREATE TABLE "comments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "ctext" text, "commentator" varchar(255)) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160121020023"]]
+   (1.2ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddTimestampsToComments (20160121020232)
+   (0.1ms)  begin transaction
+   (1.0ms)  ALTER TABLE "comments" ADD "created_at" datetime
+   (0.1ms)  ALTER TABLE "comments" ADD "updated_at" datetime
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160121020232"]]
+   (5.5ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddArticleIdToComments (20160121020730)
+   (0.1ms)  begin transaction
+   (0.5ms)  ALTER TABLE "comments" ADD "article_id" integer
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160121020730"]]
+   (5.5ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateItems (20160128023040)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "items" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "descr" text) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160128023040"]]
+   (1.3ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Mysql2::Error: Table 'sql-search-n-sort_development.members' doesn't exist: SHOW FULL FIELDS FROM `members`
+Mysql2::Error: Table 'ssns_development.members' doesn't exist: SHOW FULL FIELDS FROM `members`
+Mysql2::Error: Table 'ssns_development.members' doesn't exist: SHOW FULL FIELDS FROM `members`
+Mysql2::Error: Table 'ssns_development.members' doesn't exist: SHOW FULL FIELDS FROM `members`
+Mysql2::Error: Table 'ssns_development.members' doesn't exist: SHOW FULL FIELDS FROM `members`
+   (119.9ms)  CREATE TABLE `articles` (`id` int(11) auto_increment PRIMARY KEY, `headline` varchar(255), `by_line` varchar(255), `date_pub` datetime, `body` text, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (180.4ms)  CREATE TABLE `comments` (`id` int(11) auto_increment PRIMARY KEY, `ctext` text, `commentator` varchar(255), `created_at` datetime, `updated_at` datetime, `article_id` int(11)) ENGINE=InnoDB
+   (215.1ms)  CREATE TABLE `items` (`id` int(11) auto_increment PRIMARY KEY, `name` varchar(255), `descr` text) ENGINE=InnoDB
+   (174.9ms)  CREATE TABLE `people` (`id` int(11) auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `age` int(11), `email` varchar(255), `bio` text, `nickname` varchar(255), `created_at` datetime, `updated_at` datetime, `dob` datetime, `grade` int(11)) ENGINE=InnoDB
+   (197.9ms)  CREATE TABLE `products` (`id` int(11) auto_increment PRIMARY KEY, `name` varchar(255), `descr` text, `price` int(11), `date_produced` datetime, `manufacturer` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (188.5ms)  CREATE TABLE `unsearchables` (`id` int(11) auto_increment PRIMARY KEY, `int` int(11), `dt` date, `tm` time, `dtm` datetime, `bool` tinyint(1), `flt` float, `dec` decimal, `bn` blob, `ts` datetime, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (166.2ms)  CREATE TABLE `vehicles` (`id` int(11) auto_increment PRIMARY KEY, `year` int(11), `manufacturer` varchar(255), `model` varchar(255), `color` varchar(255), `engine` varchar(255), `doorrs` int(11), `cylinders` int(11), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (158.1ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (201.4ms)  CREATE UNIQUE INDEX `unique_schema_migrations`  ON `schema_migrations` (`version`) 
+   (0.3ms)  SELECT version FROM `schema_migrations`
+   (0.5ms)  INSERT INTO `schema_migrations` (version) VALUES ('20160128023040')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140713221826')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140715080028')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140723223003')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140725015524')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140725161555')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20141003015903')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20150306040113')
+Mysql2::Error: Table 'ssns_development.members' doesn't exist: SHOW FULL FIELDS FROM `members`
+   (16.5ms)  DROP DATABASE IF EXISTS `ssns_development`
+   (0.5ms)  DROP DATABASE IF EXISTS `ssns_test`
+   (0.5ms)  CREATE DATABASE `ssns_development` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (0.5ms)  CREATE DATABASE `ssns_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (177.2ms)  CREATE TABLE `articles` (`id` int(11) auto_increment PRIMARY KEY, `headline` varchar(255), `by_line` varchar(255), `date_pub` datetime, `body` text, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (463.7ms)  CREATE TABLE `comments` (`id` int(11) auto_increment PRIMARY KEY, `ctext` text, `commentator` varchar(255), `created_at` datetime, `updated_at` datetime, `article_id` int(11)) ENGINE=InnoDB
+   (144.4ms)  CREATE TABLE `items` (`id` int(11) auto_increment PRIMARY KEY, `name` varchar(255), `descr` text) ENGINE=InnoDB
+   (153.6ms)  CREATE TABLE `members` (`id` int(11) auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `email` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (179.2ms)  CREATE TABLE `people` (`id` int(11) auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `age` int(11), `email` varchar(255), `bio` text, `nickname` varchar(255), `created_at` datetime, `updated_at` datetime, `dob` datetime, `grade` int(11)) ENGINE=InnoDB
+   (156.7ms)  CREATE TABLE `products` (`id` int(11) auto_increment PRIMARY KEY, `name` varchar(255), `descr` text, `price` int(11), `date_produced` datetime, `manufacturer` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (165.4ms)  CREATE TABLE `unsearchables` (`id` int(11) auto_increment PRIMARY KEY, `int` int(11), `dt` date, `tm` time, `dtm` datetime, `bool` tinyint(1), `flt` float, `dec` decimal, `bn` blob, `ts` datetime, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (154.3ms)  CREATE TABLE `vehicles` (`id` int(11) auto_increment PRIMARY KEY, `year` int(11), `manufacturer` varchar(255), `model` varchar(255), `color` varchar(255), `engine` varchar(255), `doorrs` int(11), `cylinders` int(11), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (342.8ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (268.2ms)  CREATE UNIQUE INDEX `unique_schema_migrations`  ON `schema_migrations` (`version`) 
+   (0.3ms)  SELECT version FROM `schema_migrations`
+   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20160128023040')
+   (0.5ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140713221826')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140715080028')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140723223003')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140725015524')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20140725161555')
+   (0.5ms)  INSERT INTO `schema_migrations` (version) VALUES ('20141003015903')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20150306040113')
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT `schema_migrations`.* FROM `schema_migrations`