solarsearch 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/app/controllers/article_controller.rb

@@ -19,7 +19,7 @@ class ArticleController < ApplicationController
     if params[:q]
       query = params[:q]
       search = Sunspot.search(Article) do
-        keywords query
+        keywords "#{query} #{User::QUERY_AUGMENT_PARTIAL}"
         paginate(:page => page)
         order_by(:published_at, :desc)
       end

data/app/controllers/{article_statuses_controller.rb → article_status_controller.rb}

@@ -1,4 +1,4 @@
-class ArticleStatusesController < ApplicationController
+class ArticleStatusController < ApplicationController
 
   access_control do
     allow logged_in

data/app/helpers/article_status_helper.rb

@@ -0,0 +1,3 @@
+module ArticleStatusHelper
+  MAX_ARTICLE_TITLE_VIEW_SIZE = 50
+end

data/app/models/user.rb

@@ -27,9 +27,12 @@ class User < ActiveRecord::Base
   EMAIL_MAX_LENGTH = 50
   USERNAME_RANGE = USERNAME_MIN_LENGTH..USERNAME_MAX_LENGTH
   PASSWORD_RANGE = PASSWORD_MIN_LENGTH..PASSWORD_MAX_LENGTH
+
+  #configuration settings
   MAX_NUMBER_OF_ARTICLES_PER_NEWSUPDATE = 10
-  MAX_SIZE_OF_A_MAIL_IN_CHARACTERS = 10000
+  MAX_SIZE_OF_A_MAIL_IN_CHARACTERS = 20000
   NEWSUPDATE_RECENT_NUMBER_OF_DAYS = 120
+  QUERY_AUGMENT_PARTIAL = ''
 
 =begin
   validates_uniqueness_of :username, :email
@@ -95,7 +98,9 @@ class User < ActiveRecord::Base
       set_all_articles += article_update
     end
     arr_all_articles = set_all_articles.to_a
-    arr_all_articles = arr_all_articles.find_all { |article| article_condition.call(article) } if article_condition
+    arr_all_articles = arr_all_articles.find_all do |article|
+      article_condition.call(article)
+    end if article_condition
     arr_all_articles.sort! { |article1, article2| article2.published_at <=> article1.published_at }
     arr_all_articles = arr_all_articles[0, MAX_NUMBER_OF_ARTICLES_PER_NEWSUPDATE]
     arr_all_articles
@@ -105,7 +110,7 @@ class User < ActiveRecord::Base
     searchquery = search_keyword.query
     self_user = self
     search = Sunspot.search(Article) do
-      keywords searchquery
+      keywords "#{searchquery} #{QUERY_AUGMENT_PARTIAL}"
       with(:published_at).greater_than Time.now - NEWSUPDATE_RECENT_NUMBER_OF_DAYS.day
       dynamic :status do
         without Article.give_user_status_symbol(self_user, ArticleStatus::STATUS_VIEWED), true
@@ -114,7 +119,9 @@ class User < ActiveRecord::Base
       order_by(:published_at, :desc)
       paginate(:page => 1, :per_page => MAX_NUMBER_OF_ARTICLES_PER_NEWSUPDATE)
     end
-    search.results
+    #FIXME: This is for debugging purposes, trying to catch a hardly reproducably bug, which I dont understand why happens
+    STDERR << search.results.to_a.to_s
+    search.results.to_a
   end
 
   def can_be_modified_by(user)

data/app/views/{article_statuses → article_status}/index.html.haml

@@ -7,5 +7,5 @@
       - article = article_status.article
       %li
         = t :article_status_line, :article_status => h(ArticleStatus::WORD_FOR_STATUS[article_status.status]), :status_update_date => h(I18n.localize(article_status.updated_at, :format => :short))
-        = link_to shorten_text(article.title,50,'..'), :controller => 'article', :action => 'show', :id => article
+        = link_to h(article.title[0, ArticleStatusHelper::MAX_ARTICLE_TITLE_VIEW_SIZE]), :controller => 'article', :action => 'show', :id => article
   = will_paginate @article_statuses

data/lib/solarsearch/rails/routing.rb

@@ -3,7 +3,7 @@ module SolarSearch #:nodoc:
     module MapperExtensions
       def solarsearch_routes
         @set.draw do |map|
-          map.myevents 'myevents', :controller => 'article_statuses', :action => 'index'
+          map.myevents 'myevents', :controller => 'article_status', :action => 'index'
 
           map.tester 'tester', :controller => 'infosources', :action => 'tester'
           map.mynews 'mynews', :controller => 'search_keywords', :action => 'newsupdate'

data/solarsearch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solarsearch}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gyorgy Frivolt"]
-  s.date = %q{2010-02-28}
+  s.date = %q{2010-03-01}
   s.description = %q{Have a search motor built on the top of Solr, a highly customizable, scalable and well performing search engine. You are only few steps away from creating your own search motor.}
   s.email = %q{gyorgy.frivolt@gmail.com}
   s.extra_rdoc_files = [
@@ -24,13 +24,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "app/controllers/article_controller.rb",
-     "app/controllers/article_statuses_controller.rb",
+     "app/controllers/article_status_controller.rb",
      "app/controllers/infosources_controller.rb",
      "app/controllers/search_keywords_controller.rb",
      "app/controllers/user_sessions_controller.rb",
      "app/controllers/users_controller.rb",
      "app/helpers/article_helper.rb",
-     "app/helpers/article_statuses_helper.rb",
+     "app/helpers/article_status_helper.rb",
      "app/helpers/infosources_helper.rb",
      "app/helpers/layout_helper.rb",
      "app/helpers/search_keywords_helper.rb",
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
      "app/views/article/_search_form.html.haml",
      "app/views/article/search.html.haml",
      "app/views/article/show.html.haml",
-     "app/views/article_statuses/index.html.haml",
+     "app/views/article_status/index.html.haml",
      "app/views/infosources/edit.html.haml",
      "app/views/infosources/index.html.haml",
      "app/views/infosources/new.html.haml",
@@ -100,6 +100,7 @@ Gem::Specification.new do |s|
      "test/content_scrapper.rb",
      "test/database.yml",
      "test/functional/article_controller_test.rb",
+     "test/functional/article_status_controller_test.rb",
      "test/functional/email_controller_test.rb",
      "test/functional/infosources_controller_test.rb",
      "test/functional/restricted_logged_exceptions_controller_test.rb",
@@ -135,6 +136,7 @@ Gem::Specification.new do |s|
      "test/functional/infosources_controller_test.rb",
      "test/functional/article_controller_test.rb",
      "test/functional/restricted_logged_exceptions_controller_test.rb",
+     "test/functional/article_status_controller_test.rb",
      "test/functional/user_sessions_controller_test.rb",
      "test/functional/email_controller_test.rb",
      "test/test_helper.rb",

data/test/functional/article_controller_test.rb

@@ -18,22 +18,40 @@ class ArticleControllerTest < ActionController::TestCase
       should_render_template :show
     end
 
-    context "on GET to search" do
-      setup do
-        Sunspot.remove_all!
-        2.times { Article.make }
-        (Article::per_page + 1).times { Article.make(:accent_in_body) }
-        Sunspot.commit
-        get :search, :q => Sham.accented_word
+    context "on common search setup" do
+
+      setup { Sunspot.remove_all! }
+
+      context "on searching accented characters" do
+        setup do
+          User::QUERY_AUGMENT_PARTIAL = ''
+          2.times { Article.make }
+          (Article::per_page + 1).times { Article.make(:accent_in_body) }
+          Sunspot.commit
+          get :search, :q => Sham.accented_word
+        end
+        should_respond_with :success
+        should "have articles value set" do
+          articles = assigns(:articles)
+          assert_not_nil assigns(:articles)
+          assert_equal 1, articles.current_page
+          assert_equal Article::per_page + 1, articles.total_entries
+        end
+        should_render_template :search
       end
-      should_respond_with :success
-      should "have articles value set" do
-        articles = assigns(:articles)
-        assert_not_nil assigns(:articles)
-        assert_equal 1, articles.current_page
-        assert_equal Article::per_page + 1, articles.total_entries
+
+      context "on searching with query augment string" do
+        setup do
+          User::QUERY_AUGMENT_PARTIAL = '-wedontwantthis'
+          @article = Article.make
+          Article.make(:body => "#{@article.body} wedontwantthis")
+          Sunspot.commit
+          get :search, :q => @article.body
+        end
+        should "find only one result" do
+          assert_match (I18n.t :search_summary_number_of_articles, :articles_total => 1), @response.body
+        end
       end
-      should_render_template :search
     end
     #TODO should be tested for cases when the user is not logged in
   end

data/test/functional/article_status_controller_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class ArticleStatusControllerTest < ActionController::TestCase
+
+  context "for logged in user" do
+
+    setup do
+      activate_authlogic
+      UserSession.create(@user = User.make)
+      @article = Article.make
+    end
+
+    context "on GET to index on empty list of statuses" do
+      setup { get :index }
+      should_respond_with :success
+      should_render_template :index
+      should "assign article_statuses" do
+        assert_not_nil assigns(:article_statuses)
+      end
+    end
+
+    context "on GET to index on one article status set" do
+      setup do
+        @article_status = ArticleStatus.new
+        @article_status.user = @user
+        @article_status.article = @article
+        @article_status.status = ArticleStatus::STATUS_VIEWED
+        @article_status.save
+        get :index
+      end
+      should_respond_with :success
+      should_render_template :index
+      should "have article status containing an element" do
+        assert !assigns(:article_statuses).empty?
+      end
+      should "contain reference to the article" do
+        assert_match(@article.body[0, ArticleStatusHelper::MAX_ARTICLE_TITLE_VIEW_SIZE], @response.body)
+      end
+    end
+
+    #TODO should be tested for cases when the user is not logged in
+  end
+end

data/test/unit/user_test.rb

@@ -28,6 +28,22 @@ class UserTest < ActiveSupport::TestCase
     setup do
       Sunspot.remove_all!
       @user = User.make
+      User::QUERY_AUGMENT_PARTIAL = ''
+    end
+
+    context "on empty set of collected articles" do
+      setup do
+        ActionMailer::Base.deliveries = []
+        query = SearchKeyword.make(:user => @user)
+        Sunspot.commit
+      end
+      should "not collect any articles" do
+        assert_equal 0, @user.collect_recent_articles.count
+      end
+      should "not post any article" do
+        @user.post_recent_news
+        assert_did_not_send_email
+      end
     end
 
     context "for results having a common item for two search queries" do
@@ -85,6 +101,7 @@ class UserTest < ActiveSupport::TestCase
           articles[iteration] = Article.make(:body => query,
                                              :published_at => (Time.now - iteration.day))
         end
+        Sunspot.commit
       end
       should "sort the recent articles fetched for one source" do
         recent_articles = @user.recent_articles_for_search_keyword(@search_keyword)
@@ -108,6 +125,7 @@ class UserTest < ActiveSupport::TestCase
         @search_keyword = SearchKeyword.make(:user => @user, :query => 'spam')
         Article.make(:body => "spam #{'x'*User::MAX_SIZE_OF_A_MAIL_IN_CHARACTERS}",
                      :published_at => Time.now)
+        Sunspot.commit
       end
       should "filter the long articles out, we do not want to send spams" do
         collected_articles = @user.collect_recent_articles do |article|
@@ -120,5 +138,17 @@ class UserTest < ActiveSupport::TestCase
         assert_did_not_send_email
       end
     end
+
+    context "on query augmenting partial" do 
+      setup do
+        User::QUERY_AUGMENT_PARTIAL = '-dontwantthis'
+        @search_keyword = SearchKeyword.make(:user => @user)
+        Article.make(:body => "#{@search_keyword.query} dontwantthis", :published_at => Time.now)
+        Sunspot.commit
+      end
+      should "not find the article as it was excluded by query augmentation" do
+        assert @user.recent_articles_for_search_keyword(@search_keyword).empty?
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solarsearch
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Gyorgy Frivolt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 +01:00
+date: 2010-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,13 +179,13 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/article_controller.rb
-- app/controllers/article_statuses_controller.rb
+- app/controllers/article_status_controller.rb
 - app/controllers/infosources_controller.rb
 - app/controllers/search_keywords_controller.rb
 - app/controllers/user_sessions_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/article_helper.rb
-- app/helpers/article_statuses_helper.rb
+- app/helpers/article_status_helper.rb
 - app/helpers/infosources_helper.rb
 - app/helpers/layout_helper.rb
 - app/helpers/search_keywords_helper.rb
@@ -208,7 +208,7 @@ files:
 - app/views/article/_search_form.html.haml
 - app/views/article/search.html.haml
 - app/views/article/show.html.haml
-- app/views/article_statuses/index.html.haml
+- app/views/article_status/index.html.haml
 - app/views/infosources/edit.html.haml
 - app/views/infosources/index.html.haml
 - app/views/infosources/new.html.haml
@@ -255,6 +255,7 @@ files:
 - test/content_scrapper.rb
 - test/database.yml
 - test/functional/article_controller_test.rb
+- test/functional/article_status_controller_test.rb
 - test/functional/email_controller_test.rb
 - test/functional/infosources_controller_test.rb
 - test/functional/restricted_logged_exceptions_controller_test.rb
@@ -312,6 +313,7 @@ test_files:
 - test/functional/infosources_controller_test.rb
 - test/functional/article_controller_test.rb
 - test/functional/restricted_logged_exceptions_controller_test.rb
+- test/functional/article_status_controller_test.rb
 - test/functional/user_sessions_controller_test.rb
 - test/functional/email_controller_test.rb
 - test/test_helper.rb

data/app/helpers/article_statuses_helper.rb

@@ -1,2 +0,0 @@
-module ArticleStatusesHelper
-end