From 0e73c9ef9e33f0da10504ab0c49bd16db122bf72 Mon Sep 17 00:00:00 2001 From: CV-Gate Date: Sun, 4 Jan 2015 17:46:03 +0100 Subject: [PATCH 1/5] Fixes search scope bug --- lib/acts-as-messageable/message.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/acts-as-messageable/message.rb b/lib/acts-as-messageable/message.rb index 8f1df5e54..2bd128abf 100644 --- a/lib/acts-as-messageable/message.rb +++ b/lib/acts-as-messageable/message.rb @@ -10,7 +10,7 @@ class Message < ::ActiveRecord::Base attr_accessor :removed, :restored cattr_accessor :required - ActsAsMessageable.rails_api.new(self).default_scope("created_at desc") + #ActsAsMessageable.rails_api.new(self).default_scope("created_at desc") def open? self.opened? From f154fbd3261e38fdbd597f2d6c2fb1b559621d6a Mon Sep 17 00:00:00 2001 From: CV-Gate Date: Sun, 4 Jan 2015 17:53:37 +0100 Subject: [PATCH 2/5] Update message.rb --- lib/acts-as-messageable/message.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/acts-as-messageable/message.rb b/lib/acts-as-messageable/message.rb index 2bd128abf..8f1df5e54 100644 --- a/lib/acts-as-messageable/message.rb +++ b/lib/acts-as-messageable/message.rb @@ -10,7 +10,7 @@ class Message < ::ActiveRecord::Base attr_accessor :removed, :restored cattr_accessor :required - #ActsAsMessageable.rails_api.new(self).default_scope("created_at desc") + ActsAsMessageable.rails_api.new(self).default_scope("created_at desc") def open? self.opened? From dbc4cc70d752c656f93ec98ca9240feb2a1a75b8 Mon Sep 17 00:00:00 2001 From: CV-Gate Date: Sun, 4 Jan 2015 17:54:54 +0100 Subject: [PATCH 3/5] Update scopes.rb --- lib/acts-as-messageable/scopes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/acts-as-messageable/scopes.rb b/lib/acts-as-messageable/scopes.rb index fd0f4ff10..bde2bf14d 100644 --- a/lib/acts-as-messageable/scopes.rb +++ b/lib/acts-as-messageable/scopes.rb @@ -12,7 +12,7 @@ module ClassMethods def initialize_scopes scope :are_from, lambda { |*args| where(:sent_messageable_id => args.first, :sent_messageable_type => args.first.class.name) } scope :are_to, lambda { |*args| where(:received_messageable_id => args.first, :received_messageable_type => args.first.class.name) } - scope :search, lambda { |*args| where("body like :search_txt or topic like :search_txt",:search_txt => "%#{args.first}%")} + scope :text_search, lambda { |*args| where("body like :search_txt or topic like :search_txt",:search_txt => "%#{args.first}%")} scope :connected_with, lambda { |*args| where("(sent_messageable_type = :sent_type and sent_messageable_id = :sent_id and sender_delete = :s_delete and sender_permanent_delete = :s_perm_delete) or From 1b024a30ccefb7b4774268095e70616ff165e1a7 Mon Sep 17 00:00:00 2001 From: CV-Gate Date: Sun, 4 Jan 2015 17:56:40 +0100 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 25fb01ecf..4399251b8 100644 --- a/README.md +++ b/README.md @@ -350,7 +350,7 @@ Search ## Search text from messages ```ruby -@alice.messages.search("Search me") @alice seach text "Search me" from all messages +@alice.messages.text_search("Search me") @alice seach text "Search me" from all messages ``` Copyright © 2011-2012 Piotr Niełacny (http://ruby-blog.pl), released under the MIT license From 97355f7cb281e95bf9b56d26d3c7d3eb2d1506d0 Mon Sep 17 00:00:00 2001 From: CV-Gate Date: Sun, 4 Jan 2015 18:27:37 +0100 Subject: [PATCH 5/5] Update acts-as-messageable_spec.rb --- spec/acts-as-messageable_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/acts-as-messageable_spec.rb b/spec/acts-as-messageable_spec.rb index b313cef8e..7f34e7d52 100644 --- a/spec/acts-as-messageable_spec.rb +++ b/spec/acts-as-messageable_spec.rb @@ -246,7 +246,7 @@ end it "bob should be able to search text from messages" do - recordset = @bob.messages.search("I am fine") + recordset = @bob.messages.text_search("I am fine") recordset.count.should == 1 recordset.should_not be_nil end