sql_search_n_sort 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b55c9a2d00587e07696f93ff19868e14d6a6c9
-  data.tar.gz: e5c0d59ba01b3545fc8a35d0bdce2a06fe262f0e
+  metadata.gz: 1920514b23a356d4fc6c486d7ac4044816fbcc2d
+  data.tar.gz: 703b1cd1000b7eb683c44f619a939b31d0409754
 SHA512:
-  metadata.gz: 9bf247d3abf1332d504d9c13894de7af486a060339ea91fa008aac62007f2845f917a669ff2b4c8a4295c86991d3232de7c42b1df1b7b81925d4b2cba90f080c
-  data.tar.gz: baa89ed908b98744a5ee90fae20d5fa36287bc99c875bdfd1a47520f0a4f6c63aa21956412352703f300e3a6b5fa6576ce9757627508a9c28cb0c7b868996003
+  metadata.gz: cf6dd49ea251cffe528eeb15d0c75bdd497139d473709adced5aaeaa0c0fb0ed8116c0608b7ce5936ccb2f63a1488cdd84b485ad3210ac48b0da386b4f50c70e
+  data.tar.gz: 7256a7ccf9afdf951723315615b71d0345a7f2c7621ad82a68a488ae8adeb9d887a73aa9f40090515806eacd2f3393696c53465e9a6ed501122912b2eb06d085

data/lib/sql_search_n_sort/model_sort_config.rb

@@ -0,0 +1,36 @@
+class ModelSortConfig < Array
+		
+	def initialize(*cols)
+		cols.each do |col|
+			if col.is_a? Hash
+				opts_hash = col.fetch(col.keys.first)
+				self << SortColumn.new(col.keys.first, opts_hash)
+			else
+				self << SortColumn.new(col)
+			end
+
+		end
+		
+	end
+
+	def get_order(sort_by, dir, def_sort_col, base_class)
+		if sort_column_obj = self.sortable_column(sort_by)
+			# {sort_by => dir}
+			ar_class = sort_column_obj.joined_table ? sort_column_obj.joined_table.to_s.classify.constantize : base_class
+			ar_class.arel_table[sort_by].send(dir)
+		else
+			{def_sort_col => dir} if def_sort_col
+		end
+	end
+ 	
+	def sortable_column(col)
+		#returns nil if no matching sortable columns
+		self.select { |model_sort_config| model_sort_config.send("column") == col.to_s }.first
+	end
+
+	def select_opts
+		return self.inject([]) do |m, sort_col|
+			m + sort_col.select_opts
+		end 
+	end
+end

data/lib/sql_search_n_sort/sort_column.rb

@@ -0,0 +1,22 @@
+class SortColumn
+	attr_reader :column, :joined_table, :show_asc, :show_desc ,:display_text
+	def initialize(column, opts={})
+		@column       = column.to_s
+		@joined_table = opts[:joined_table]
+		@display_text = opts[:display_text] 
+		@show_asc     = (opts[:show_asc].nil? ? true : opts[:show_asc])
+		@show_desc    = (opts[:show_desc].nil? ? true : opts[:show_desc])
+	end
+	def name
+		column.to_s
+	end
+	def human_name
+		name.humanize
+	end
+	def select_opts
+		arr = []
+		arr << ["#{display_text || human_name}",        "#{name}"]      if show_asc
+		arr << ["#{display_text || human_name} [desc]", "#{name} desc"] if show_desc
+		return arr
+	end
+end

data/lib/sql_search_n_sort/sql_searchable_sortable.rb

@@ -1,5 +1,8 @@
 module SqlSearchableSortable
 
+	#NOTES:
+	#Comment.joins(:article).order(Article.arel_table[:headline]).to_sql=> "SELECT `comments`.* FROM `comments` INNER JOIN `articles` ON `articles`.`id` = `comments`.`article_id`  ORDER BY `articles`.`headline`"
+
   def self.extended(base)
   	base.class_eval do
   		attr_accessor :ssns_sortable
@@ -17,7 +20,7 @@ module SqlSearchableSortable
 			scope :sql_sort, ->(scope_sort_col=nil, scope_sort_dir=nil) do
 				scope_sort_col ||= default_sort_col #use model's default sort col if no args present
 				scope_sort_dir ||= default_sort_dir || :asc #same for direction
-				order(sort_config.get_order(scope_sort_col, scope_sort_dir, default_sort_col))
+				order(sort_config.get_order(scope_sort_col, scope_sort_dir, default_sort_col, self))
 			end
 		end
 	end
@@ -56,58 +59,5 @@ module SqlSearchableSortable
 		sort_config.select_opts 
 	end
 
-	class ModelSortConfig < Array
-		
-		def initialize(*cols)
-			cols.each do |col|
-				if col.is_a? Hash
-					h = col.fetch(col.keys.first)
-					self << SortColumn.new(col.keys.first, h[:display_text], h.fetch(:show_asc, true), h.fetch(:show_desc, true))
-				else
-					self << SortColumn.new(col)
-				end
-			end
-		end
-
-		def get_order(sort_by, dir, def_sort_col)
-			if self.contains_column(sort_by)
-				{sort_by => dir}
-			else
-				{def_sort_col => dir} if def_sort_col
-			end
-		end
-	 	
-		def contains_column(col)
-			self.any? { |sc| sc.column == col }
-		end
-
-		def select_opts
-			return self.inject([]) do |m, sort_col|
-				m + sort_col.select_opts
-			end 
-		end
-	end
-	
-	class SortColumn
-		attr_reader :column, :show_asc, :show_desc ,:display_text
-		def initialize(column, display_text=nil, show_asc=true, show_desc=true)
-			@column = column
-			@display_text = display_text
-			@show_asc = show_asc
-			@show_desc = show_desc
-		end
-		def name
-			column.to_s
-		end
-		def human_name
-			name.humanize
-		end
-		def select_opts
-			arr = []
-			arr << ["#{display_text || human_name}",        "#{name}"]      if show_asc
-			arr << ["#{display_text || human_name} [desc]", "#{name} desc"] if show_desc
-			return arr
-		end
-	end
 
 end

data/lib/sql_search_n_sort/version.rb

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

data/lib/sql_search_n_sort.rb

@@ -1,4 +1,6 @@
 module SqlSearchNSort
+	require 'sql_search_n_sort/sort_column'
+	require 'sql_search_n_sort/model_sort_config'
 	require 'sql_search_n_sort/sql_searchable_sortable'
 	require "sql_search_n_sort/sql_sort_setup"
 	require 'sql_search_n_sort/railtie' if defined?(Rails)

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

@@ -1,5 +1,6 @@
 class Article < ActiveRecord::Base
 	extend SqlSearchableSortable
+	has_one :comments
 
 	sql_sortable :by_line, :headline, :body, :date_pub => { display_text: "Date Published" }
 

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

@@ -0,0 +1,6 @@
+class Comment < ActiveRecord::Base
+	extend SqlSearchableSortable
+	belongs_to :article
+
+	sql_sortable :commentator, {updated_at: { display_text: "Last Update" }}, {headline: { joined_table: :article }}, {created_at: { joined_table: :article }}
+end

data/test/dummy/db/migrate/20160121020023_create_comments.rb

@@ -0,0 +1,8 @@
+class CreateComments < ActiveRecord::Migration
+  def change
+    create_table :comments do |t|
+      t.text :ctext
+      t.string :commentator
+    end
+  end
+end

data/test/dummy/db/migrate/20160121020232_add_timestamps_to_comments.rb

@@ -0,0 +1,5 @@
+class AddTimestampsToComments < ActiveRecord::Migration
+  def change
+  	add_timestamps(:comments)
+  end
+end

data/test/dummy/db/migrate/20160121020730_add_article_id_to_comments.rb

@@ -0,0 +1,5 @@
+class AddArticleIdToComments < ActiveRecord::Migration
+  def change
+    add_column :comments, :article_id, :integer
+  end
+end

data/test/dummy/log/development.log

@@ -10559,3 +10559,40 @@ Mysql2::Error: Table 'ssns_development.members' doesn't exist: SHOW FULL FIELDS
   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`
+  ActiveRecord::SchemaMigration Load (35.8ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to CreateComments (20160121020023)
+   (62.5ms)  CREATE TABLE `comments` (`id` int(11) auto_increment PRIMARY KEY, `ctext` text, `commentator` varchar(255)) ENGINE=InnoDB
+Mysql2::Error: Table 'comments' already exists: CREATE TABLE `comments` (`id` int(11) auto_increment PRIMARY KEY, `ctext` text, `commentator` varchar(255)) ENGINE=InnoDB
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to CreateComments (20160121020023)
+   (130.4ms)  CREATE TABLE `comments` (`id` int(11) auto_increment PRIMARY KEY, `ctext` text, `commentator` varchar(255)) ENGINE=InnoDB
+   (0.2ms)  BEGIN
+  SQL (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20160121020023')
+   (0.5ms)  COMMIT
+Migrating to AddTimestampsToComments (20160121020232)
+   (217.9ms)  ALTER TABLE `comments` ADD `created_at` datetime
+   (175.7ms)  ALTER TABLE `comments` ADD `updated_at` datetime
+   (0.2ms)  BEGIN
+  SQL (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20160121020232')
+   (0.5ms)  COMMIT
+Migrating to AddArticleIdToComments (20160121020730)
+   (210.6ms)  ALTER TABLE `comments` ADD `article_id` int(11)
+   (0.2ms)  BEGIN
+  SQL (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20160121020730')
+   (28.0ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  Comment Load (1.3ms)  SELECT `comments`.* FROM `comments` INNER JOIN `articles` ON `articles`.`id` = `comments`.`article_id`  ORDER BY `articles`.`headline` ASC
+  Comment Load (1.8ms)  SELECT `comments`.* FROM `comments` INNER JOIN `articles` ON `articles`.`id` = `comments`.`article_id`  ORDER BY `articles`.`headline` ASC
+  Comment Load (0.6ms)  SELECT `comments`.* FROM `comments`   ORDER BY `articles`.`headline` ASC
+Mysql2::Error: Unknown column 'articles.headline' in 'order clause': SELECT `comments`.* FROM `comments`   ORDER BY `articles`.`headline` ASC
+  Comment Load (0.5ms)  SELECT `comments`.* FROM `comments`   ORDER BY `articles`.`headline` ASC
+Mysql2::Error: Unknown column 'articles.headline' in 'order clause': SELECT `comments`.* FROM `comments`   ORDER BY `articles`.`headline` ASC
+  Comment Load (1.7ms)  SELECT `comments`.* FROM `comments` INNER JOIN `articles` ON `articles`.`id` = `comments`.`article_id`  ORDER BY `articles`.`headline` ASC
+  Comment Load (0.4ms)  SELECT `comments`.* FROM `comments`
+  Comment Load (0.4ms)  SELECT `comments`.* FROM `comments`
+  Comment Load (0.4ms)  SELECT `comments`.* FROM `comments`
+  Comment Load (0.3ms)  SELECT `comments`.* FROM `comments`
+  Comment Load (0.4ms)  SELECT `comments`.* FROM `comments`   ORDER BY `articles`.`headline` ASC
+Mysql2::Error: Unknown column 'articles.headline' in 'order clause': SELECT `comments`.* FROM `comments`   ORDER BY `articles`.`headline` ASC
+  Comment Load (1.3ms)  SELECT `comments`.* FROM `comments` INNER JOIN `articles` ON `articles`.`id` = `comments`.`article_id`  ORDER BY `articles`.`headline` ASC
+  Comment Load (1.7ms)  SELECT `comments`.* FROM `comments` INNER JOIN `articles` ON `articles`.`id` = `comments`.`article_id`  ORDER BY `articles`.`headline` ASC