muck-raker 0.1.30 → 0.1.31

data/VERSION

@@ -1 +1 @@
-0.1.30
+0.1.31

data/app/controllers/muck/recommendations_controller.rb

@@ -27,10 +27,15 @@ class Muck::RecommendationsController < ApplicationController
     @limit = 25 if @limit > 25
     
     respond_to do |format|
-      format.html {
+      format.html do
         order = params[:order] || "mixed"
-        redirect_to resource_path(@entry) + "?limit=#{@limit}&order=#{order}&details=#{@details}" if !@entry.id.nil?
-      } 
+        if !@entry.id.nil?
+          redirect_to resource_path(@entry) + "?limit=#{@limit}&order=#{order}&details=#{@details}"
+        else
+          @recommendations = @entry.ranked_recommendations(@limit, params[:order] || "mixed", @details)
+          render :template => 'recommendations/index'
+        end
+      end
       format.xml  { 
         render(:template => @entry.id.nil? ? '/recommendations/index_real_time.xml.builder' : '/recommendations/index.xml.builder', :layout => false) 
       }

data/app/views/recommendations/index.html.erb

@@ -0,0 +1,5 @@
+<% if @recommendations.results.blank? -%>
+  <%= t('muck.raker.no_recommendations') %>
+<% else -%>
+  <%= render :partial => 'entries/result', :collection => @recommendations.results -%>
+<% end -%>

data/app/views/recommendations/index_real_time.xml.builder

@@ -1,26 +1,25 @@
 xml.instruct!
 
 if @entry.nil?
-	xml.recommendations
+  xml.recommendations
 else
-
-@recommendations = @entry.ranked_recommendations(@limit, params[:order] || "mixed", @details)
-xml.recommendations(:document_id => @entry.nil? ? "" : @entry.id, :uri => @uri, :title => t("muck.raker.gm_title"), :more_prompt => t("muck.raker.gm_more_prompt"), :direct_link_text => t("muck.raker.direct_link")) do
+  @recommendations = @entry.ranked_recommendations(@limit, params[:order] || "mixed", @details)
+  xml.recommendations(:document_id => @entry.nil? ? "" : @entry.id, :uri => @uri, :title => t("muck.raker.gm_title"), :more_prompt => t("muck.raker.gm_more_prompt"), :direct_link_text => t("muck.raker.direct_link")) do
     @recommendations.results.each do |recommendation|
-        xml.recommendation do
-            xml.title recommendation["title"]
-            xml.collection recommendation["collection"]
-            xml.link "http://folksemantic.com/visits/" + recommendation["id"].to_s
-            
-            if @details == true
-	            xml.description recommendation["description"]
-	            xml.relevance round(recommendation["score"])
-	            xml.published_at recommendation["published_at"]
-	            xml.author recommendation["author"]
-	        else
-	            xml.description ""
-	        end
+      xml.recommendation do
+        xml.title recommendation["title"]
+        xml.collection recommendation["collection"]
+        xml.link "http://folksemantic.com/visits/" + recommendation["id"].to_s
+
+        if @details == true
+          xml.description recommendation["description"]
+          xml.relevance round(recommendation["score"])
+          xml.published_at recommendation["published_at"]
+          xml.author recommendation["author"]
+        else
+          xml.description ""
         end
+      end
     end
-end
+  end
 end

data/locales/en.yml

@@ -3,16 +3,17 @@ en:
     activity_templates:
       entry_comment: Comment
     raker:
-        no_tags: No tags available yet
+        no_tags: "No tags available yet"
         collections: Collections
         demo: Demo
         search_button: Go
-        collections_long: Indexed Collections
-        developers_long: Information for Developers
-        powered_by: powered by
-        no_hits: Your search - <b>{{search}}</b> - did not match any <b>{{resource_type}}</b>. Please try a different search or choose a different language.
-        no_tagged_courses: No <b>courses</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a> or show <a href='/resources/tags/{{tags}}'>all resources tagged {{tags}}</a>.
-        no_tagged_resources: No <b>resources</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a>.
+        collections_long: "Indexed Collections"
+        developers_long: "Information for Developers"
+        powered_by: "powered by"
+        no_hits: "Your search - <b>{{search}}</b> - did not match any <b>{{resource_type}}</b>. Please try a different search or choose a different language."
+        no_tagged_courses: "No <b>courses</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a> or show <a href='/resources/tags/{{tags}}'>all resources tagged {{tags}}</a>."
+        no_tagged_resources: "No <b>resources</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a>."
+        no_recommendations: "No recommendations were found."
         previous: Previous
         next: Next
         results: Results

data/muck-raker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.30"
+  s.version = "0.1.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin Justin Ball"]
@@ -173,6 +173,7 @@ Gem::Specification.new do |s|
      "app/views/raker_mailer/notification_feed_added.text.zh-TW.plain.erb",
      "app/views/raker_mailer/notification_feed_added.text.zh.html.erb",
      "app/views/raker_mailer/notification_feed_added.text.zh.plain.erb",
+     "app/views/recommendations/index.html.erb",
      "app/views/recommendations/index.pjs.erb",
      "app/views/recommendations/index.rss.builder",
      "app/views/recommendations/index.xml.builder",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -268,6 +268,7 @@ files:
 - app/views/raker_mailer/notification_feed_added.text.zh-TW.plain.erb
 - app/views/raker_mailer/notification_feed_added.text.zh.html.erb
 - app/views/raker_mailer/notification_feed_added.text.zh.plain.erb
+- app/views/recommendations/index.html.erb
 - app/views/recommendations/index.pjs.erb
 - app/views/recommendations/index.rss.builder
 - app/views/recommendations/index.xml.builder