sql_search_n_sort 2.1.2 → 2.1.3

data/test/dummy/spec/factories/factory.rb

@@ -25,18 +25,24 @@ FactoryGirl.define do
 
   factory :product do
     sequence(:name) { |n| "cog_#{n}" }
-    descr { "random description #{Random.rand(1..20)}" }
-    price { "#{Random.rand(1..250)}" }
-    date_produced { Time.now - Random.rand(1..100).days }
-    manufacturer { "Company #{Random.rand(1..5)}" } 
+    sequence(:descr) { |n| "random description #{n}" }
+    sequence(:price) { |n| "#{n}" }
+    sequence(:date_produced) { |n| Time.now - n.days }
+    sequence(:manufacturer) { |n| "Company #{n}" } 
   end
 
 
   factory :article do
-    headline "Headline #{Random.rand(1..100)}"
-    by_line "Journalist #{Random.rand(1..5)}"
-    date_pub { Time.now - Random.rand(1..100).days }
-    body "The main article... #{Random.rand(0..50)}"
+    sequence(:headline) { |n| "Headline #{n}" }
+    sequence(:by_line) { |n| "Journalist #{n}" }
+    sequence(:date_pub) { |n| Time.now - n.days }
+    sequence(:body) { |n| "The main article... #{n}" }
+  end
+
+  factory :comment do
+    article
+    sequence(:ctext) { |n| "These are comments __#{n}__" }
+    sequence(:commentator) { |n| "myHandle_#{n}" }
   end
 
 end

data/test/dummy/spec/models/comment_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Comment do
+
+ 	describe "Associations" do
+ 	  it { is_expected.to respond_to(:article) }
+ 	end
+ 	describe "Modules" do
+ 		#just to verify the model is extending the module
+	 	it "extends SqlSearchableSortable module" do
+	 		Comment.singleton_class.included_modules.include?(SqlSearchableSortable)
+	 	end
+	end
+
+	describe "#sql_sort" do
+	  
+		before do
+			Article.record_timestamps = false
+			Comment.record_timestamps = false
+			(1..5).each do
+				article = FactoryGirl.create(:article, headline: "Some Article Headline #{rand(1..9)}", updated_at: Time.now + (rand(1..9)).minutes, created_at: Time.now - (rand(1..9)).minutes)
+				(1..3).each do
+					FactoryGirl.create(:comment, article: article, updated_at: Time.now + (rand(1..9)).minutes, created_at: Time.now - (rand(1..9)).minutes)
+				end  	
+			end
+			expect(Comment.count).to be > 0 #non-trivial for sorting
+		end
+		
+
+		describe "Allows sorting by joined model column" do
+		  it "sorts by article.headline as defined in the model" do
+		  	comments = Comment.joins(:article).sql_sort("headline")
+		  	expect(comments.pluck(:headline)).to eq(comments.pluck(:headline).sort)
+		  end
+		end
+		
+		describe "Column Naming Conflicts" do
+			context "when joined tables share a column name" do
+				let!(:comments_1) { Comment.joins(:article).sql_sort("updated_at") }
+				let!(:comments_2) { Comment.joins(:article).sql_sort("created_at") }
+				describe "sorts by the column from the table specified within the hash (or the base table)" do
+					it "sorts using the comments table for updated_at" do
+						expect(comments_1.pluck("comments.updated_at")).to eq(comments_1.pluck("comments.updated_at").sort)
+					end
+					it "sorts using the articles table for created_at" do
+						expect(comments_2.pluck("articles.created_at")).to eq(comments_2.pluck("articles.created_at").sort)
+					end
+				end
+		  end
+		end
+	end
+	
+
+ 
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_search_n_sort
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - John O'Malley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -195,7 +195,9 @@ files:
 - lib/sql_search_n_sort.rb
 - lib/sql_search_n_sort/app/helpers/sql_search_n_sort_helper.rb
 - lib/sql_search_n_sort/exceptions.rb
+- lib/sql_search_n_sort/model_sort_config.rb
 - lib/sql_search_n_sort/railtie.rb
+- lib/sql_search_n_sort/sort_column.rb
 - lib/sql_search_n_sort/sql_searchable_sortable.rb
 - lib/sql_search_n_sort/sql_sort_setup.rb
 - lib/sql_search_n_sort/version.rb
@@ -216,6 +218,7 @@ files:
 - test/dummy/app/helpers/articles_helper.rb
 - test/dummy/app/models/admin/member.rb
 - test/dummy/app/models/article.rb
+- test/dummy/app/models/comment.rb
 - test/dummy/app/models/item.rb
 - test/dummy/app/models/person.rb
 - test/dummy/app/models/product.rb
@@ -263,6 +266,9 @@ files:
 - test/dummy/db/migrate/20140725161555_add_dob_and_grade_to_people.rb
 - test/dummy/db/migrate/20141003015903_create_unsearchables.rb
 - test/dummy/db/migrate/20150306040113_create_members.rb
+- test/dummy/db/migrate/20160121020023_create_comments.rb
+- test/dummy/db/migrate/20160121020232_add_timestamps_to_comments.rb
+- test/dummy/db/migrate/20160121020730_add_article_id_to_comments.rb
 - test/dummy/db/migrate/20160128023040_create_items.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
@@ -275,6 +281,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/spec/factories/factory.rb
 - test/dummy/spec/helpers/sql_search_n_sort_helper_spec.rb
+- test/dummy/spec/models/comment_spec.rb
 - test/dummy/spec/models/member_spec.rb
 - test/dummy/spec/models/person_spec.rb
 - test/dummy/spec/models/product_spec.rb
@@ -363,6 +370,7 @@ test_files:
 - test/dummy/app/helpers/articles_helper.rb
 - test/dummy/app/models/admin/member.rb
 - test/dummy/app/models/article.rb
+- test/dummy/app/models/comment.rb
 - test/dummy/app/models/item.rb
 - test/dummy/app/models/person.rb
 - test/dummy/app/models/product.rb
@@ -410,6 +418,9 @@ test_files:
 - test/dummy/db/migrate/20140725161555_add_dob_and_grade_to_people.rb
 - test/dummy/db/migrate/20141003015903_create_unsearchables.rb
 - test/dummy/db/migrate/20150306040113_create_members.rb
+- test/dummy/db/migrate/20160121020023_create_comments.rb
+- test/dummy/db/migrate/20160121020232_add_timestamps_to_comments.rb
+- test/dummy/db/migrate/20160121020730_add_article_id_to_comments.rb
 - test/dummy/db/migrate/20160128023040_create_items.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
@@ -424,6 +435,7 @@ test_files:
 - test/dummy/README.rdoc
 - test/dummy/spec/factories/factory.rb
 - test/dummy/spec/helpers/sql_search_n_sort_helper_spec.rb
+- test/dummy/spec/models/comment_spec.rb
 - test/dummy/spec/models/member_spec.rb
 - test/dummy/spec/models/person_spec.rb
 - test/dummy/spec/models/product_spec.rb