solarsearch 0.0.6 → 0.0.9

data/.specification

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solarsearch
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 99.99.99
 platform: ruby
 authors: 
 - Gyorgy Frivolt
@@ -247,6 +247,7 @@ post_install_message:
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
+- bin
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 

data/Rakefile

@@ -3,23 +3,16 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+desc 'Test the solarsearch plugin.'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the solarsearch plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
 desc 'Generate documentation for the solarsearch plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -30,6 +23,19 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -41,18 +47,19 @@ begin
     gem.authors = ["Gyorgy Frivolt"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
 
-    gem.add_dependency 'content_scrapper', '>=0.0.4'
+    gem.add_dependency 'content_scrapper', '>=0.0.6'
     gem.add_dependency 'compass'
     gem.add_dependency 'haml'
     gem.add_dependency 'authlogic'
     gem.add_dependency 'will_paginate'
     gem.add_dependency 'whenever'
     gem.add_dependency 'acl9'
-    gem.add_dependency 'sunspot'
+    gem.add_dependency 'sunspot', '>=0.10.9'
     # sunspot_rails was installed also as a plugin because otherwise problem with tasks appear
-    gem.add_dependency 'sunspot_rails'
+    #gem.add_dependency 'sunspot_rails'
     gem.add_dependency 'RedCloth'
     gem.add_dependency 'sanitize'
+    gem.add_dependency 'loofah'
     gem.add_dependency 'nokogiri'
     gem.add_dependency 'feedzirra'
     gem.add_dependency 'mysql'
@@ -62,15 +69,3 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.9

data/app/controllers/search_keywords_controller.rb

@@ -21,7 +21,8 @@ class SearchKeywordsController < ApplicationController
 
   def newsupdate
     page = (params[:page] || 1).to_i
-    @articles = current_user.collect_recent_articles.paginate(:page => page, :per_page => Article.per_page)
+    @articles = current_user.collect_recent_articles.paginate(:page => page,
+                                                              :per_page => Article.per_page)
   end
 
   def postnews

data/app/helpers/article_helper.rb

@@ -1,25 +1,2 @@
 module ArticleHelper
-
-  MORE_CHARACTERS_TOLERANCE = 100
-  NUMBER_OF_CHARACTERS = 1200
-
-  def shorten_text(text, number_of_characters = NUMBER_OF_CHARACTERS, more_link = nil)
-    if !(text.nil? || text.empty?)
-      if text.length <= number_of_characters
-        shorter_text = text
-      else
-        punction_char_after_end = \
-          (text[number_of_characters..number_of_characters+MORE_CHARACTERS_TOLERANCE] =~ /\.|,|;/) || 0
-        shorter_text = text[0..number_of_characters + punction_char_after_end]
-
-        if more_link
-          shorter_text += more_link
-        end
-      end
-    else
-      shorter_text = ''
-    end
-
-    shorter_text
-  end
 end

data/app/models/article.rb

@@ -33,7 +33,8 @@ class Article < ActiveRecord::Base
     time :published_at
     dynamic_boolean :status do
       article_statuses.inject({}) do |user_statuses_hash, article_status|
-        user_status_symbol = Article.give_user_status_symbol(article_status.user, article_status.status)
+        user_status_symbol = Article.give_user_status_symbol(article_status.user,
+                                                             article_status.status)
         user_statuses_hash.merge(user_status_symbol => true)
       end
     end
@@ -43,7 +44,7 @@ class Article < ActiveRecord::Base
   validates_uniqueness_of :guid, :allow_nil => true
 
   def self.give_user_status_symbol(user, status)
-    "user#{user.object_id}_status#{status}".to_sym
+    "user#{user[:id]}_status#{status}".to_sym
   end
 
   def size
@@ -63,7 +64,7 @@ class Article < ActiveRecord::Base
   end
 
   def remove_illegal_characters
-    ugly_characters = "\x00-\x1F" #"\x00-\x08\x0B\x0C\x0E-\x1F"
+    ugly_characters = "\x00-\x1F"
     exchange_character = ' '
     author.tr!(ugly_characters, exchange_character) unless author.nil?
     title.tr!(ugly_characters, exchange_character) unless title.nil?

data/app/models/article_status.rb

@@ -17,4 +17,6 @@ class ArticleStatus < ActiveRecord::Base
   validates_presence_of :status, :message => I18n.t(:status_not_set_validation_error)
   validates_uniqueness_of :status, :scope => [:user_id, :article_id],
     :message => I18n.t(:status_user_article_not_unique_validation_error)
+
+  #FIXME: after the creation the solr indices need to be updated by the information about the changed status
 end

data/app/models/user.rb

@@ -49,7 +49,6 @@ class User < ActiveRecord::Base
   acts_as_authentic
   acts_as_authorization_subject
 
-  #FIXME: is not unittested
   def post_recent_news
     recent_articles = collect_recent_articles do |article|
       article.size <= User::MAX_SIZE_OF_A_MAIL_IN_CHARACTERS
@@ -104,12 +103,13 @@ class User < ActiveRecord::Base
 
   def recent_articles_for_search_keyword(search_keyword)
     searchquery = search_keyword.query
+    self_user = self
     search = Sunspot.search(Article) do
       keywords searchquery
       with(:published_at).greater_than Time.now - NEWSUPDATE_RECENT_NUMBER_OF_DAYS.day
       dynamic :status do
-        without Article.give_user_status_symbol(self, ArticleStatus::STATUS_VIEWED), true
-        without Article.give_user_status_symbol(self, ArticleStatus::STATUS_SENT), true
+        without Article.give_user_status_symbol(self_user, ArticleStatus::STATUS_VIEWED), true
+        without Article.give_user_status_symbol(self_user, ArticleStatus::STATUS_SENT), true
       end
       order_by(:published_at, :desc)
       paginate(:page => 1, :per_page => MAX_NUMBER_OF_ARTICLES_PER_NEWSUPDATE)

data/app/models/user_session.rb

@@ -1,2 +1,2 @@
 class UserSession < Authlogic::Session::Base
-end
+end

data/app/views/article/_article.html.haml

@@ -0,0 +1,17 @@
+- sourcename = !article.infosource.nil? ? article.infosource.sourcename : t(:unknown_infosource)
+.article
+  .article_title
+    = link_to_unless_current(article.title, { :controller => 'article', :action => 'show', :id => article.id })
+  .article_source
+    - if article.url
+      = link_to sourcename, article.url
+    - else
+      = sourcename
+  .article_summary
+    = RedCloth.new(article.summary.to_s).to_html
+  %br
+  .article_body
+    = RedCloth.new(article.body.to_s).to_html
+  %br
+  .article_published
+    = I18n.localize article.published_at unless article.published_at.nil?

data/app/views/article/_article_line.html.haml

@@ -0,0 +1,14 @@
+- article = article_line
+- sourcename = !article.infosource.nil? ? article.infosource.sourcename : t(:unknown_infosource)
+.article
+  .article_title
+    = link_to_unless_current(article.title, { :controller => 'article', :action => 'show', :id => article.id })
+  .article_source
+    - if article.url
+      = link_to sourcename, article.url
+    - else
+      = sourcename
+  .article_summary
+    = RedCloth.new(article.summary.to_s).to_html
+  .article_published
+    = I18n.localize article.published_at unless article.published_at.nil?

data/app/views/article/_article_list.html.haml

@@ -0,0 +1,6 @@
+- if @articles and not @articles.empty?
+  = render :partial => "article/result_summary"
+  = render :partial => 'article/article_line', :collection => @articles
+  = render :partial => "article/result_summary"
+- elsif params[:q]
+  = t :did_not_find_any_results_for_query, :query => params[:q]

data/app/views/article/_result_summary.html.haml

@@ -0,0 +1,7 @@
+- if @articles
+  .searchsummary
+    = t :search_summary_articles_from, :articles_from => @articles.offset+1
+    = t :search_summary_articles_to, :articles_to => (@articles.current_page < @articles.total_pages) ? @articles.offset+@articles.per_page : @articles.total_entries
+    = t :search_summary_number_of_articles, :articles_total => @articles.total_entries
+    %br
+    = will_paginate @articles, {:previous_label => t(:pagination_previous_label), :next_label => t(:pagination_next_label)}

data/app/views/article/_search_form.html.haml

@@ -0,0 +1,3 @@
+- form_tag({ :action => "search" }, :method => "get") do
+  = text_field_tag "q", params[:q], :size => 50
+  %input{ :type => "submit", :value => t(:search_articles_button_label) }

data/app/views/article/search.html.haml

@@ -0,0 +1,7 @@
+- title t(:article_search_view_title)
+
+#content
+  = render :partial => "search_form"
+
+#listing
+  = render :partial => "article_list"

data/app/views/article/show.html.haml

@@ -0,0 +1,4 @@
+- title @article.title[0..30] unless @article.title.nil?
+
+#content
+  = render :partial => 'article', :locals => {:article => @article}

data/app/views/article_statuses/index.html.haml

@@ -0,0 +1,11 @@
+- title t(:article_statuses_view_title)
+
+#listing
+  = will_paginate @article_statuses
+  %ol{ :start => (@article_statuses.current_page-1)*@article_statuses.per_page+1 }
+    - for article_status in @article_statuses
+      - 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
+  = will_paginate @article_statuses

data/app/views/infosources/edit.html.haml

@@ -0,0 +1,19 @@
+- title t(:infosource_edit_view_title)
+
+#dialog
+  - form_for(@infosource) do |f|
+    = f.error_messages
+    %p
+      = f.label t(:infosources_sourcename_form_field_label)
+      %br
+      = f.text_field :sourcename
+    %p
+      = f.label t(:infosources_url_form_field_label)
+      %br
+      = f.text_field :sourcefeed
+    %p
+      = f.submit t(:infosources_change_action_label) 
+  %br
+  = link_to t(:infosources_view_action_label), @infosource
+  |
+  = link_to t(:infosources_back_to_the_list_action_label), infosources_path

data/app/views/infosources/index.html.haml

@@ -0,0 +1,16 @@
+- title t(:infosources_list_view_title)
+
+#dialog
+  %ul
+    - @infosources.each do |infosource|
+      %li
+        = link_to infosource.sourcename, infosource
+        = link_to t(:infosources_change_action_label), edit_infosource_path(infosource), :class => 'dialog_item_navigation'
+        ,
+        = link_to t(:infosources_destroy_action_label), infosource, :confirm => t(:are_you_sure_confirmation), :method => :delete, :class => 'dialog_item_navigation'
+        - if not (infosource.sourcefeed.nil? || infosource.sourcefeed.empty?)
+          %ul{ :style => "list-style: none" }
+            %li
+              = link_to infosource.sourcefeed, infosource.sourcefeed, :class => 'dialog_item_navigation'
+  %br
+  = link_to t(:infosources_new_action_label), new_infosource_path

data/app/views/infosources/new.html.haml

@@ -0,0 +1,17 @@
+- title t(:infosources_new_view_title)
+
+#dialog
+  - form_for(@infosource) do |f|
+    = f.error_messages
+    %p
+      = f.label t(:infosources_sourcename_form_field_label)
+      %br
+      = f.text_field :sourcename
+    %p
+      = f.label t(:infosources_url_form_field_label)
+      %br
+      = f.text_field :sourcefeed
+    %p
+      = f.submit t(:infosources_create_action_label)
+  %br
+  = link_to t(:infosources_back_to_the_list_action_label), infosources_path

data/app/views/infosources/show.html.haml

@@ -0,0 +1,22 @@
+- title t(:infosources_show_view_title) 
+
+#dialog
+  %p
+    %em
+      = t(:infosources_sourcename_form_field_label)
+    = @infosource.sourcename
+  %p
+    %em
+      = t(:infosources_url_form_field_label)
+    = @infosource.sourcefeed
+  %br
+  = link_to t(:infosources_fetch_action_label), :action => 'fetch', :id => @infosource
+  |
+  = link_to t(:infosources_change_action_label), edit_infosource_path(@infosource)
+  |
+  = link_to t(:infosources_destroy_action_label), @infosource, :confirm => t(:are_you_sure_confirmation), :method => :delete
+  |
+  = link_to t(:infosources_back_to_the_list_action_label), infosources_path
+
+#content
+  = render :partial => 'article/article_list', :locals => {:shorten => :no_summary}

data/app/views/infosources/tester.html.haml

@@ -0,0 +1,7 @@
+
+#content
+  - form_tag({ :action => "tester" }, :method => "get") do
+    = text_field_tag "url", params[:url], :size => 50
+    %input{ :type => "submit", :value => t(:infosources_test_scrapper_for_page_label) }
+
+      = @webpage_content.nil? ? "<em>#{t(:infosources_empty_web_page_content_text)}</em>" : @webpage_content

data/app/views/search_keywords/_form.html.haml

@@ -0,0 +1,4 @@
+- form_for @search_keyword do |f|
+  = f.error_messages
+  = f.text_field :query
+  = f.submit t(:search_keywords_submit_action_label)

data/app/views/search_keywords/edit.html.haml

@@ -0,0 +1,8 @@
+- title t(:search_keywords_change_view_title)
+
+#dialog
+  = render :partial => 'form'
+  %br
+  = link_to t(:search_keywords_view_action_label), @search_keyword
+  |
+  = link_to t(:search_keywords_back_to_the_list_action_label), search_keywords_path

data/app/views/search_keywords/index.html.haml

@@ -0,0 +1,11 @@
+- title t(:search_keywords_index_view_title)
+
+#dialog
+  = t(:search_keywords_new_search_keyword_text) 
+  = render :partial => 'form', :action => 'create'
+  = t(:search_keywords_my_search_keywords)
+  %br
+  %ul
+    - for search_keyword in @search_keywords
+      %li
+        = link_to search_keyword.query, search_keyword

data/app/views/search_keywords/new.html.haml

@@ -0,0 +1,6 @@
+- title t(:search_keywords_new_view_title)
+
+#dialog
+  = render :partial => 'form'
+  %br
+  = link_to t(:search_keywords_back_to_the_list_action_label), search_keywords_path

data/app/views/search_keywords/newsupdate.html.haml

@@ -0,0 +1,11 @@
+- title t(:search_keywords_my_news_view_title)
+
+#listing
+  = t(:this_page_shows_news_not_older_than_xy_days_text, :days => User::NEWSUPDATE_RECENT_NUMBER_OF_DAYS)
+  = t(:for_a_keyword_only_xy_results_are_listed, :results => User::MAX_NUMBER_OF_ARTICLES_PER_NEWSUPDATE)
+  = t(:news_which_were_viewed_through_the_web_and_were_of_your_interest_are_not_listed) 
+  %br
+  = render :partial => "article/article_list", :locals => { :shorten => :short_content }
+  %br
+
+  = link_to t(:search_keywords_send_to_email_action_label), postnews_path

data/app/views/search_keywords/show.html.haml

@@ -0,0 +1,12 @@
+- title t(:search_keywords_show_view_title)
+
+#dialog
+  %p
+    = t(:search_keywords_query_text)
+    = @search_keyword.query
+    %br
+    = link_to t(:search_keywords_change_action_label), edit_search_keyword_path(@search_keyword)
+    |
+    = link_to t(:search_keywords_destroy_action_label), @search_keyword, :confirm => t(:are_you_sure_confirmation), :method => :delete
+    |
+    = link_to t(:search_keywords_back_to_the_list_action_label), search_keywords_path

data/app/views/user_mailer/newsupdate.html.haml

@@ -0,0 +1,22 @@
+= h @article.title
+%br
+= !@article.infosource.nil? ? @article.infosource.sourcename : t(:infosources_unknown_source_text)
+,
+= @article.published_at
+,
+%a{ :href => url_for(@article.url) }
+  = @article.url
+%br
+- if @article.author.nil?
+  %br
+- else
+  = @article.author
+  %br
+  %br
+= @article.summary.nil? ? '' : Sanitize.clean(@article.summary, {:elements => ['p']})
+%br
+%br
+_ _ _
+%br
+%br
+= @article.body.nil? ? '' : Sanitize.clean(@article.body, {:elements => ['p']})

data/app/views/user_sessions/new.html.haml

@@ -0,0 +1,28 @@
+- title t(:user_sessions_login_view_title)
+
+#dialog
+  - form_for @user_session, :url => {:action => "create"} do |form|
+    - unless form.error_messages.empty?
+      %div.errorExplanation#errorExplanation
+        %h2
+          = t(:user_sessions_try_to_login_again)
+        %p
+          = t(:user_sessions_check_your_keyboard)
+    %table
+      %tr
+        %td
+          = form.label :username, t(:user_sessions_username_form_field_label)
+        %td
+          = form.text_field :username
+      %tr
+        %td
+          = form.label :password, t(:user_sessions_password_form_field_label)
+        %td
+          = form.password_field :password
+      %tr
+        %td
+        %td
+          = form.submit t(:user_sessions_login_action_label)
+
+#content
+  = t(:what_is_indicium_about_text)

data/app/views/users/_user.html.haml

@@ -0,0 +1,28 @@
+#dialog
+  - form_for(@user) do |form|
+    = form.error_messages
+    %table
+      %tr
+        %td
+          = form.label :username, t(:users_username_form_field_label)
+        %td
+          = form.text_field :username
+      %tr
+        %td
+          = form.label :email, t(:users_email_form_field_label)
+        %td
+          = form.text_field :email
+      %tr
+        %td
+          = form.label :password, t(:users_password_from_field_label)
+        %td
+          = form.password_field :password
+      %tr
+        %td
+          = form.label :password_confirmation, t(:users_password_confirmation_label)
+        %td
+          = form.password_field :password_confirmation
+      %tr
+        %td
+        %td
+          = form.submit t(:users_submit_form_action_label)

data/app/views/users/edit.html.haml

@@ -0,0 +1,2 @@
+- title t(:users_change_profile_view_title)
+= render @user

data/app/views/users/index.html.haml

@@ -0,0 +1,10 @@
+#dialog
+  = link_to t(:registration_action_label), register_path
+  %br
+  %br
+  = will_paginate @users, {:previous_label => t(:pagination_previous_label), :next_label => t(:pagination_next_label)}
+  - @users.each do |user|
+    = link_to user.username, show_user_path(user.username)
+    = link_to t(:agent_action_label), agent_for_user_path(user.username), :class => 'dialog_item_navigation'
+    %br
+  = will_paginate @users, {:previous_label => t(:pagination_previous_label), :next_label => t(:pagination_next_label)}

data/app/views/users/new.html.haml

@@ -0,0 +1,2 @@
+- title t(:users_registration_view_title)
+= render @user

data/app/views/users/show.html.haml

@@ -0,0 +1,18 @@
+#dialog
+  %table
+    %tr
+      %td
+        = t(:users_username_form_field_label)
+      %td
+        = @user.username
+    %tr
+      %td
+        = t(:users_email_form_field_label)
+      %td
+        = @user.email
+    %tr
+      %td
+        = t(:users_password_from_field_label)
+      %td
+        ********
+