solarsearch 0.0.6 → 0.0.9

data/solarsearch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solarsearch}
-  s.version = "0.0.6"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gyorgy Frivolt"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-02-28}
   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 = [
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "Solarsearch.gemspec",
      "VERSION",
      "app/controllers/article_controller.rb",
      "app/controllers/article_statuses_controller.rb",
@@ -47,15 +46,49 @@ Gem::Specification.new do |s|
      "app/models/user.rb",
      "app/models/user_mailer.rb",
      "app/models/user_session.rb",
+     "app/views/article/_article.html.haml",
+     "app/views/article/_article_line.html.haml",
+     "app/views/article/_article_list.html.haml",
+     "app/views/article/_result_summary.html.haml",
+     "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/infosources/edit.html.haml",
+     "app/views/infosources/index.html.haml",
+     "app/views/infosources/new.html.haml",
+     "app/views/infosources/show.html.haml",
+     "app/views/infosources/tester.html.haml",
+     "app/views/search_keywords/_form.html.haml",
+     "app/views/search_keywords/edit.html.haml",
+     "app/views/search_keywords/index.html.haml",
+     "app/views/search_keywords/new.html.haml",
+     "app/views/search_keywords/newsupdate.html.haml",
+     "app/views/search_keywords/show.html.haml",
+     "app/views/user_mailer/newsupdate.html.haml",
+     "app/views/user_sessions/new.html.haml",
+     "app/views/users/_user.html.haml",
+     "app/views/users/edit.html.haml",
+     "app/views/users/index.html.haml",
+     "app/views/users/new.html.haml",
+     "app/views/users/show.html.haml",
+     "app/views/users/update.html.haml",
      "config/locales/hu.yml",
      "config/locales/sk.yml",
      "init.rb",
      "install.rb",
      "lib/solarsearch.rb",
-     "lib/solarsearch/locales.rb",
-     "lib/solarsearch/routing.rb",
+     "lib/solarsearch/compass.rb",
+     "lib/solarsearch/rails.rb",
+     "lib/solarsearch/rails/locales.rb",
+     "lib/solarsearch/rails/routing.rb",
      "rails/init.rb",
      "solarsearch.gemspec",
+     "stylesheets/solarsearch/ie.sass",
+     "stylesheets/solarsearch/partials/_article.sass",
+     "stylesheets/solarsearch/partials/_base.sass",
+     "stylesheets/solarsearch/print.sass",
+     "stylesheets/solarsearch/screen.sass",
      "tasks/solarsearch_tasks.rake",
      "test/blueprints.rb",
      "test/blueprints/articles.rb",
@@ -76,7 +109,6 @@ Gem::Specification.new do |s|
      "test/schema.rb",
      "test/test_helper.rb",
      "test/unit/article_test.rb",
-     "test/unit/helpers/article_helper_test.rb",
      "test/unit/helpers/email_helper_test.rb",
      "test/unit/helpers/user_sessions_helper_test.rb",
      "test/unit/helpers/users_helper_test.rb",
@@ -112,7 +144,6 @@ Gem::Specification.new do |s|
      "test/unit/role_test.rb",
      "test/unit/article_test.rb",
      "test/unit/user_mailer_test.rb",
-     "test/unit/helpers/article_helper_test.rb",
      "test/unit/helpers/email_helper_test.rb",
      "test/unit/helpers/user_sessions_helper_test.rb",
      "test/unit/helpers/users_helper_test.rb",
@@ -126,50 +157,50 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<content_scrapper>, [">= 0.0.4"])
+      s.add_runtime_dependency(%q<content_scrapper>, [">= 0.0.6"])
       s.add_runtime_dependency(%q<compass>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
       s.add_runtime_dependency(%q<authlogic>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
       s.add_runtime_dependency(%q<whenever>, [">= 0"])
       s.add_runtime_dependency(%q<acl9>, [">= 0"])
-      s.add_runtime_dependency(%q<sunspot>, [">= 0"])
-      s.add_runtime_dependency(%q<sunspot_rails>, [">= 0"])
+      s.add_runtime_dependency(%q<sunspot>, [">= 0.10.9"])
       s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
       s.add_runtime_dependency(%q<sanitize>, [">= 0"])
+      s.add_runtime_dependency(%q<loofah>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<feedzirra>, [">= 0"])
       s.add_runtime_dependency(%q<mysql>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<content_scrapper>, [">= 0.0.4"])
+      s.add_dependency(%q<content_scrapper>, [">= 0.0.6"])
       s.add_dependency(%q<compass>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<authlogic>, [">= 0"])
       s.add_dependency(%q<will_paginate>, [">= 0"])
       s.add_dependency(%q<whenever>, [">= 0"])
       s.add_dependency(%q<acl9>, [">= 0"])
-      s.add_dependency(%q<sunspot>, [">= 0"])
-      s.add_dependency(%q<sunspot_rails>, [">= 0"])
+      s.add_dependency(%q<sunspot>, [">= 0.10.9"])
       s.add_dependency(%q<RedCloth>, [">= 0"])
       s.add_dependency(%q<sanitize>, [">= 0"])
+      s.add_dependency(%q<loofah>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<feedzirra>, [">= 0"])
       s.add_dependency(%q<mysql>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<content_scrapper>, [">= 0.0.4"])
+    s.add_dependency(%q<content_scrapper>, [">= 0.0.6"])
     s.add_dependency(%q<compass>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
     s.add_dependency(%q<authlogic>, [">= 0"])
     s.add_dependency(%q<will_paginate>, [">= 0"])
     s.add_dependency(%q<whenever>, [">= 0"])
     s.add_dependency(%q<acl9>, [">= 0"])
-    s.add_dependency(%q<sunspot>, [">= 0"])
-    s.add_dependency(%q<sunspot_rails>, [">= 0"])
+    s.add_dependency(%q<sunspot>, [">= 0.10.9"])
     s.add_dependency(%q<RedCloth>, [">= 0"])
     s.add_dependency(%q<sanitize>, [">= 0"])
+    s.add_dependency(%q<loofah>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<feedzirra>, [">= 0"])
     s.add_dependency(%q<mysql>, [">= 0"])

data/stylesheets/solarsearch/ie.sass

@@ -0,0 +1,15 @@
+@import blueprint.sass
+
++blueprint-ie 
+
+// Note :
+//
+// Compass will center text to fix IE6 container centering.
+// This means all your texts will be centered under all version of IE by default.
+// Please don't forget to restore the correct behavior to your main container (but not the body tag!)
+//
+// Example :
+//
+// .container, .footer
+//   :text-align left
+

data/stylesheets/solarsearch/partials/_article.sass

@@ -0,0 +1,120 @@
+
+.article
+  padding-top: 20px
+  text-align: left
+
+  .article_title
+    font-weight: bold
+    font-size: 13pt
+    font-family: arial
+    color: #222222
+    text-decoration: none 
+
+    a
+      font:
+        weight: bold
+        size: 13pt
+        family: arial
+      color: #222222
+      text-decoration: none
+
+      &:visited
+        color: #444444
+        text-decoration: none
+
+      &:hover
+        color: #444444
+        text-decoration: underline
+
+  .article_source
+    font-size: 8pt
+    font-family: arial
+
+    a
+      font-size: 8pt
+      font-family: arial
+      color: #222222
+      text-decoration: none 
+
+      &:visited
+        font-size: 8pt
+        font-family: arial
+        color: #444444
+        text-decoration: none 
+
+      &:hover
+        font-size: 8pt
+        font-family: arial
+        color: #444444
+        text-decoration: underline 
+
+  .article_published
+    text-decoration: underline
+
+  .article_summary
+    font-style: italic
+
+  .article_body
+    color: #444444
+    font-family: arial
+    font-size: 11pt
+    font-weight: normal
+    text-align: justify
+
+    a
+      color: #222222
+      font:
+        family: arial
+        size: 11pt
+        style: italic
+      text-decoration: none
+
+      &:visited
+        color: #444444
+        font:
+          family: arial
+          size: 11pt
+          style: italic
+        text-decoration: none
+
+
+      &:hover
+        color: #444444
+        font:
+          family: arial
+          size: 11pt
+          style: italic
+        text-decoration: underline
+
+    em
+      color: #444444
+      font:
+        family: arial
+        size: 11pt
+        style: italic
+      text-decoration: none
+
+    strong, b
+      color: #111111
+      font:
+        family: arial
+        size: 11pt
+        weight: normal
+      text-decoration: none
+
+    u
+      color: #444444
+      font:
+        family: arial
+        size: 11pt
+        decoration: underline
+
+    h1
+      color: #000000
+      font:
+        family: arial
+        size: 12pt
+        weight: normal
+        style: none
+      text-decoration: none
+

data/stylesheets/solarsearch/partials/_base.sass

@@ -0,0 +1,11 @@
+// Here is where you can define your constants for your application and to configure the blueprint framework.
+// Feel free to delete these if you want keep the defaults:
+
+!blueprint_grid_columns = 24
+!blueprint_container_size = 800px
+!blueprint_grid_margin  = 10px
+
+// Use this to calculate the width based on the total width.
+// Or you can set !blueprint_grid_width to a fixed value and unset !blueprint_container_size -- it will be calculated for you.
+!blueprint_grid_width   = (!blueprint_container_size + !blueprint_grid_margin) / !blueprint_grid_columns - !blueprint_grid_margin
+

data/stylesheets/solarsearch/print.sass

@@ -0,0 +1,3 @@
+@import blueprint.sass
+
++blueprint-print

data/stylesheets/solarsearch/screen.sass

@@ -0,0 +1,286 @@
+// This import applies a global reset to any page that imports this stylesheet.
+@import blueprint/reset.sass
+// To configure blueprint, edit the partials/base.sass file.
+@import partials/base.sass
+// Import all the default blueprint modules so that we can access their mixins.
+@import blueprint
+// Import the non-default scaffolding module.
+@import blueprint/modules/scaffolding.sass
+
+// Georg Frivolt added: imports of application specific partials
+@import partials/article.sass
+
+// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
+// +blueprint
+
+//Recommended Blueprint configuration with scoping and semantic layout:
++blueprint-typography("body.bp")
++blueprint-scaffolding("body.bp")
+body.bp
+  +blueprint-utilities
+  +blueprint-debug
+  +blueprint-interaction
+  // Remove the scaffolding when you're ready to start doing visual design.
+  // Or leave it in if you're happy with how blueprint looks out-of-the-box
+form.bp
+  +blueprint-form
+
+=links
+  a
+    color: #222222
+    text-decoration: none
+    &:visited
+      color: #444444
+      text-decoration: none
+    &:hover
+      color: #444444
+      text-decoration: underline
+
+=blindlinks
+  a
+    color: #222222
+    text-decoration: none
+    &:visited
+      text-decoration: none
+    &:hover
+      text-decoration: none
+
+=contentcontainer
+  +container
+  +links
+  +prepend-top
+  +append-bottom(3em)
+
+  .pagination
+    +links
+    background: white
+    border:
+      bottom: 1px solid #E5E5E5
+      top: 1px solid #E5E5E5
+    text-align: left
+
+    span
+      &.disabled
+        color: #aaa
+
+      &.current
+        font-weight: bold
+        background: transparent url(apple-circle.gif) no-repeat 50% 50%
+
+    font:
+      weight: normal
+      size: 11pt
+      family: arial
+
+    h1
+      font:
+        weight: bold
+        size: 16px
+        family: arial
+      text-decoration: none
+
+    ul
+      list-style: disc
+      margin-left: 0
+      padding-left: 16px
+
+// Page layout can be done using mixins applied to your semantic classes and IDs:
+body.big-col
+  font:
+    size: 11pt
+    family: arial
+    weight: normal
+  color: #444444
+
+  i, em
+    color: #444444
+    font-style: italic
+    text-decoration: none
+
+  h2, h3
+    color: #000000
+    font:
+      family: arial
+      size: 12pt
+      weight: normal
+      style: none
+    text-decoration: none
+
+  #container
+    +container
+
+    #header
+      +column(!blueprint_grid_columns, true)
+      +prepend-top
+      text-align: center
+      text:
+        align: center
+        decoration: none
+      font: normal
+        size: 8pt
+        family: arial
+      color: #444444
+
+      h1
+        +blindlinks
+        font:
+          family: arial
+          size: 48px
+          weight: bold
+          style: none
+        text:
+          align: center
+          decoration: none
+
+    #footer
+      +column(!blueprint_grid_columns, true)
+      +links
+      text-align: center
+      font:
+        weight: normal
+        size: 8pt
+        family: arial
+
+    #menu
+      +column(!blueprint_grid_columns, true)
+      +prepend-top(1em)
+      +append-bottom
+      +links
+      text-align: center
+      font:
+        weight: normal
+        size: 8pt
+        family: arial
+
+    #content
+      // Two thirds of the grid columns, rounding up.
+      // With 24 cols, this is 16.
+      !content_columns = !blueprint_grid_columns
+      // true means it's the last column in the row
+      +column(!content_columns, true)
+      +contentcontainer
+      text-align: center
+
+    #listing
+      // Two thirds of the grid columns, rounding up.
+      // With 24 cols, this is 16.
+      !content_columns = !blueprint_grid_columns
+      // true means it's the last column in the row
+      +column(!content_columns, true)
+      +contentcontainer
+      text-align: left
+
+    #dialog
+      // true means it's the last column in the row
+      !margin_columns = ceil(!blueprint_grid_columns / 3)
+      !content_columns = ceil(!blueprint_grid_columns / 3)
+      +column(!content_columns, true)
+      +prepend(!margin_columns)
+      +append(!margin_columns)
+      +contentcontainer
+
+      text-align: left
+
+      a.dialog_item_navigation
+        font:
+          weight: normal
+          size: 10px
+          family: arial
+        color: #222222
+        text-decoration: none
+
+        &:visited.dialog_item_navigation
+          color: #4444444
+          text-decoration: none
+
+        &:hover.dialog_item_navigation
+          color: #444444
+          text-decoration: underline
+
+      .detailpagenav a
+        font:
+          weight: normal
+          size: 11pt
+          family: arial
+        color: #222222
+        text-decoration: none
+
+        &:visited
+          color: #444444
+          text-decoration: none
+
+        &:hover
+          color: #444444
+          text-decoration: underline
+
+  #notice
+    position: absolute
+    top: 20px
+    right: 10px
+    max-width: 200px
+    border: 1px solid green
+    padding: 1em
+    margin: 1em
+      bottom: 2em
+    font: bold smaller sans-serif
+
+  fieldset.debug_info
+    text-align: left
+    margin: 1em
+    color: black
+    background: white
+
+  .fieldWithErrors label
+    background: red
+    color: white
+
+  .searchsummary
+    padding:
+      top: 20px
+      bottom: 20px
+    text-align: center
+    +links
+
+  #errorExplanation
+    position: absolute
+    top: 20px
+    left: 10px
+    max-width: 200px
+    border: 2px solid black
+    padding: 7px
+      bottom: 12px
+    margin-bottom: 20px
+
+    h2
+      text-align: left
+      font:
+        weight: normal
+        size: 14px
+      padding: 5px 5px 5px 15px
+      margin: -7px
+      background-color: black
+      color: white
+
+    p
+      color: black
+      font:
+        size: 14px
+      padding: 15px 5px 5px 5px
+      margin-bottom: 0
+
+    ul
+      list-style: square
+      padding-left: 20px
+
+    li
+      color: black
+      font-size: 14px
+      padding: 5px 5px 5px 5px
+
+  #debug
+    +links
+    margin-top: 1em
+    font-size: 8pt
+    text-align: center
+    background: black
+    color: white

data/test/unit/article_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ArticleTest < ActiveSupport::TestCase
 
-  context "for sunspot" do
+  context "for basic article tests" do
 
     should "create valid article" do
       assert_difference('Article.count') do
@@ -27,10 +27,13 @@ class ArticleTest < ActiveSupport::TestCase
       article.url = Sham.incorrect_url
       assert !article.valid?
     end
+  end
+
+  context "for sunspot" do
+    setup { Sunspot.remove_all! }
 
     context "on indexing and searching central-european characters" do
       setup do
-        Sunspot.remove_all!
         10.times { Article.make }
         [:accent_in_title, :accent_in_summary, :accent_in_body].each { |i| Article.make(i) }
         Sunspot.commit
@@ -46,11 +49,44 @@ class ArticleTest < ActiveSupport::TestCase
     end
 
     context "on indexing characters prohibited in XML documents" do
-      setup { Sunspot.remove_all! }
       should "not raise expcetion" do
         assert_nothing_raised { Article.make(:with_corrupt_xml_chars) }
       end
     end
+
+    context "on article status" do
+      setup do
+        @user = User.make
+        @article = Article.make
+        @article.set_user_status(@user, ArticleStatus::STATUS_SENT)
+        Sunspot.commit
+      end
+      should "change the status of the article for the user" do
+        assert_equal @user, @article.article_statuses.first.user
+      end
+      should "not find the article if the status is excluded from the search" do
+        query = @article.title
+        self_user = @user
+        search = Sunspot.search(Article) do
+          keywords query
+          dynamic :status do
+            without Article.give_user_status_symbol(self_user, ArticleStatus::STATUS_SENT), true
+          end
+        end
+        assert_equal 0, search.results.count
+      end
+      should "find the article if the status is included to the search" do
+        query = @article.title
+        self_user = @user
+        search = Sunspot.search(Article) do
+          keywords query
+          dynamic :status do
+            with Article.give_user_status_symbol(self_user, ArticleStatus::STATUS_SENT), true
+          end
+        end
+        assert_equal 1, search.results.count
+      end
+    end
   end
 end