search box also queries attachment titles and descriptions as well as…

… page bodies.

vendor/engines/your_platform/app/controllers/search_controller.rb

@@ -16,7 +16,7 @@ def index
       q = "%" + query_string.gsub( ' ', '%' ) + "%"
       @users = User.where("CONCAT(first_name, ' ', last_name) LIKE ?", q)
         .order( :last_name, :first_name )
-      @pages = Page.where( "title like ?", q )
+      @pages = Page.where("title like ? OR content like ?", q, q)
         .order( :title )
       @groups = Group.where( "name like ?", q )
 
@@ -33,6 +33,11 @@ def index
         end
       end
 
+      # browse attachments
+      #
+      attachments = Attachment.where("title like ? or description like ?", q, q).where(parent_type: 'Page')
+      @pages += attachments.collect { |attachment| attachment.parent }
+
       # eleminiate duplicate results
       #
       @users.uniq!

vendor/engines/your_platform/spec/features/search_field_spec.rb

@@ -65,12 +65,35 @@
 
   describe "finding pages" do
     before do
-      @page = create( :page, title: "foo" )
+      @page = create(:page, title: "foo", content: "some page content")
+    end
+    specify "searching for page titles should list the pages" do
       fill_in 'query', with: "foo"
       press_enter in: 'query'
+      page.should have_content @page.title
+    end
+    specify "searching for page contents (bodies) should list the pages" do
+      fill_in 'query', with: "some page content"
+      press_enter in: 'query'
+      page.should have_content @page.title
+    end
+  end
+
+  describe "finding attachments" do
+    before do
+      @page = create(:page, title: "foo page")
+      @attachment = @page.attachments.create(title: "bar attachment", description: "some attachment description")
+    end
+    specify "searching for attachment titles should list their parent pages" do
+      fill_in 'query', with: 'bar attachment'
+      press_enter in: 'query'
+      page.should have_content @page.title
+    end
+    specify "searching for attachment descriptions should list their parent pages" do
+      fill_in 'query', with: 'some attachment description'
+      press_enter in: 'query'
+      page.should have_content @page.title
     end
-    subject { page }
-    it { should have_content( @page.title ) }
   end
 
   describe "finding groups" do