muck-raker 0.1.21 → 0.1.22

data/app/views/recommendations/index_js.pjs.erb

@@ -1,3 +1,7 @@
+<!-- 
+this was an experiment with randomizing order in the js instead of server side
+it is no longer used 
+-->
 <% if @recs.size > 0 %>
 function avg(aRecs){dSum = 0; for(nRec = 0; nRec < aRecs.length; nRec++) {dSum += aRecs[nRec].relevance;} return dSum/aRecs.length;}
 function std(aRecs,dAvg){dSum = 0; for(nRec = 0; nRec < aRecs.length; nRec++) {dSum += Math.pow((aRecs[nRec].relevance-dAvg),2);} return Math.sqrt(dSum/aRecs.length);}

data/app/views/recommendations/index_real_time.pjs.erb

@@ -0,0 +1,44 @@
+<%
+@json_recommendations = @entry.json_recommendations(@limit, params[:order] || "mixed", true, params[:omit_feeds] || nil) 
+if !@json_recommendations.nil? 
+@direct_link_text = params[:direct_link_text] || t('muck.raker.direct_link')
+%>
+var catalog_page = <%= !@entry.direct_link.nil? and @uri == @entry.permalink %>;
+var document_host = '<%= @host %>';
+var recs = <%= @json_recommendations %>.solr_data.docs;
+var app = "http://folksemantic.com/"; 
+<% if @details == true -%>
+function truncate(text, length) {
+	nEnd = text.indexOf(" ", 200);
+	if (nEnd < 200) return text;
+	else return text.substring(0, nEnd) + " ...";
+}
+var asMonths = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
+function format_date(published_at) {
+	date = new Date();
+	date.setTime(Date.parse(published_at));
+	return date.getDate() + " " + asMonths[date.getMonth()] + " " + date.getUTCFullYear();
+}
+<% end %>
+document.write('<div class="oer_recommender_container">');
+<% if params[:title] %>document.write('<div class="oer_recommender_title"><%= t('muck.raker.gm_title') %></div>');<% end %>
+document.write('<div class="oer_recommender_list">');
+for(nRec = 0; nRec < recs.length; nRec++) {
+	r = recs[nRec].entry;
+	metadata_link = catalog_page && document_host == r.uri.substring(0, document_host.length);
+	direct_link = metadata_link && r.direct_link;
+	document.write('<p class="oer_recommender_item">');
+	document.write('<a class="oer_recommender_recommendation_link" href="' + (r.direct_link ? r.direct_link : r.permalink) + '">' + r.title + ' (' + r.collection + ')</a>');
+	if (direct_link) document.write(' <a class="oer_recommender_direct_link" href="' + app + 'r?id=' + r.id + '&target=direct_link"><%= @direct_link_text %></a>');
+<% if @details == true -%>
+	document.write(' <span class="oer_recommender_published_at">(' + format_date(r.published_at) + ')</span>');
+	document.write(' <span class="oer_recommender_relevance_score"><%= t('muck.raker.relevance')%>: ' + Math.round(r.relevance*100)/100 + '</span>');
+	document.write('<br/><span class="oer_recommender_description">' + truncate(r.description) + '</span>');
+	document.write('<br/><span class="oer_recommender_uri">' + r.uri + '</span>');
+<% end -%>	
+	document.write('</a></p>');
+}
+document.write('</div>');	
+<% if params[:more_link] %>document.write('<div class="oer_recommender_more_link"><a href="' + app + 'documents/<%= @entry.id %>"><%= t('muck.raker.gm_more_prompt') %></a></div>');<% end %>	
+document.write('</div>');	
+<% end %>

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

@@ -0,0 +1,26 @@
+xml.instruct!
+
+if @entry.nil?
+	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.results.each do |recommendation|
+        xml.recommendation do
+            xml.title recommendation["title"]
+            xml.collection recommendation["collection"]
+            xml.link recommendation["direct_link"].empty? ? recommendation["permalink"] : recommendation["direct_link"] 
+            
+            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

data/app/views/visits/show.html.erb

@@ -0,0 +1,156 @@
+<div id="toolbar">
+  <div id="profile" class="section">
+  </div>
+  <div id="close" class="section">
+    <a id="close_frame" title="Remove frame and go to this web address." class="url_fragment" href="<%= @resource_uri %>"> </a>
+    <a id="close_frame_text" title="Remove frame and go to this web address." class="url_fragment" href="<%= @resource_uri %>"><%= t('muck.raker.close') %></a>
+  </div>
+  <div id="search" class="section">
+    <% form_tag(search_entries_path, {:method => :get}) do -%>
+      <div id="search_box"><%= text_field_tag(:q, '', :id => 'search-box') %></div>
+      <input id="search_go" class="input-button" type="submit" value="<%= t('muck.raker.search_button') %>"/>
+    <% end -%>
+  </div>
+  <div id="tools" class="section">
+    <%#= link_to t('muck.raker.remix'), new_content_path(@entry), :id => 'share'  - copy the page into the content system %>
+    <%#= link_to t('muck.raker.save'), new_content_path(@entry), :id => 'share'  - save the content for use later on  %>
+    <% if GlobalConfig.enable_raker_shares -%>
+      <% if logged_in? -%>
+        <%= link_to t('muck.raker.share'), new_user_share_path(current_user, :title => @entry.title, :uri => @resource_uri), :id => 'share' %>
+      <% else -%>
+        <%= link_to t('muck.raker.login_to_prompt'), login_path, :id => 'login' %>
+      <% end -%>
+    <% end -%>
+    <%= link_to t('muck.raker.comment_entries_count', :count => @entry.comment_count), entry_comments_path(@entry), :id => 'comment' if GlobalConfig.enable_raker_comments %>
+  </div>
+</div>
+
+<div id="comments_tool" class="tool" style="display:none;">
+  <div id="comments_tools_close_wrapper" class="close_link_wrapper">
+    <a href="#" id="comments_tools_close" class="close_link"><%= t('muck.raker.hide')%></a>
+  </div>
+  <div class="tools_container">
+    <div id="comments_wrapper" class="tools_wrapper">
+      <%= show_comments(@comments) %>
+    </div>
+    <div id="comments_control">
+      <% if logged_in? -%>
+        <%= output_errors(t('muck.comments.problem_adding_comment'), {:class => 'help-box'}, @comment) %>
+        <%= comment_form(@entry, nil, true) %>
+      <% else -%>
+        <%= link_to t('muck.raker.login_to_comment'), login_path %>
+      <% end -%>
+    </div>
+  </div>
+</div>
+
+<div id="share_tool" class="tool" style="display:none;">
+  <div id="share_tool_close_wrapper" class="close_link_wrapper">
+    <a href="#" id="share_tool_close" class="close_link"><%= t('muck.raker.hide')%></a>
+  </div>
+  <div class="tools_container">
+    <div id="shares_control">
+      <h2><%= t('muck.shares.share_title') %></h2>
+      <% if logged_in? -%>
+        <% if already_shared?(current_user, @resource_uri)-%>
+          <%= t('muck.raker.already_shared') %>
+        <% end -%>
+        <%= output_errors(t('muck.shares.problem_adding_share'), {:class => 'help-box'}, @share) %>
+        <% share_form(@share) do |f| -%>
+          <%= f.hidden_field :entry_id -%>
+          <%= hidden_field_tag :render_new, false -%>
+        <% end -%>
+      <% else -%>
+        <%= link_to t('muck.shares.login_prompt'), login_path %>
+      <% end -%>
+    </div>
+  </div>
+</div>
+
+<div id="frame_content" class="framed_content">
+  <iframe id="content_iframe" class="framed_content" name="iframe" src="<%= @resource_uri %>" frameborder="0" scrolling="auto" noresize="noresize"></iframe>
+</div>
+
+<% content_for :head do -%>
+  <%= javascript_tag %[var COMMENT_PROMPT = '#{t('muck.raker.write_comment_prompt')}';] %>
+  <%= javascript_tag %[var ADD_COMMENT_MESSAGE = '#{t('muck.raker.adding_comment_message')}';] %>
+  <%= javascript_tag %[var ADD_SHARE_MESSAGE = '#{t('muck.shares.adding_share')}';] %>
+<% end -%>
+
+<%# content_for :javascript do -%>
+  <script type="text/javascript" language="JavaScript">
+  jQuery(document).ready(function() {
+    jQuery(window).bind('resize', function() {
+      maximize_space();
+    });
+    jQuery('#comment').click(function(){
+      return show_tool('comments');
+    });
+    jQuery('#share').click(function(){
+      return show_tool('share');
+    });
+    jQuery('.close_link').click(function(){
+      jQuery('.tool').hide();
+      jQuery("#content_iframe").width('100%');
+      return false;
+    });
+    setup_comment_submit();
+    setup_share_submit();
+  });
+  function show_tool(tool) {
+    jQuery('.tool').hide();
+    jQuery("#content_iframe").width('75%');
+    jQuery('#' + tool + '_tool').show();
+    maximize_space();
+    return false;
+  }
+  function maximize_space() {
+    var container = jQuery(".tools_container");
+    var spacer = jQuery('#comments_tools_close_wrapper').height() + 5;
+    container.height(jQuery(window).height() - (jQuery('#toolbar').height() + spacer));
+  }
+  function setup_comment_submit(){
+  	jQuery(".comment-submit").click(function() {
+  		jQuery(this).siblings('textarea').hide();
+  		jQuery(this).parent().append('<p class="comment-loading"><img src="/images/spinner.gif" alt="loading..." /> ' + ADD_COMMENT_MESSAGE + '</p>');
+  		var form = jQuery(this).parents('form');
+      jQuery.post(form.attr('action'), form.serialize() + '&format=json',
+        function(data){
+          var json = eval('(' + data + ')');
+          if(!json.success){
+            jQuery.jGrowl.info(json.message);
+          } else {
+  					jQuery('.comment-loading').remove();
+  					jQuery('#comments_tool').find('textarea').show();
+  					jQuery('#comments_tool').find('textarea').val('');
+  					jQuery("#comments_container").animate({ scrollTop: jQuery("#comments_container").attr("scrollHeight") }, 3000);
+  					var contents = jQuery(json.html)
+  					contents.hide();
+  					jQuery('#comments_wrapper').append(contents);
+  					contents.fadeIn("slow");
+  				}
+        });
+      return false;
+    });
+  }
+  function setup_share_submit(){
+    jQuery('#share_submit_share_new').click(function() {
+  		jQuery(this).parent().append('<p class="share-loading"><img src="/images/spinner.gif" alt="loading..." /> ' + ADD_SHARE_MESSAGE + '</p>');
+  		jQuery('#share_submit_share_new').hide();
+  		var form = jQuery(this).parents('form');
+      jQuery.post(form.attr('action'), form.serialize() + '&format=json',
+        function(data){
+          var json = eval('(' + data + ')');
+          jQuery('.share-loading').remove();
+          jQuery('#share_submit_share_new').show();
+          if(!json.success){
+            jQuery.jGrowl.info(json.message);
+          } else {
+            jQuery.jGrowl.info(json.message);
+          }
+        });
+      return false;
+    });
+  }
+  </script>
+<%# end -%>

data/config/muck_raker_routes.rb

@@ -2,7 +2,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # admin
   map.namespace :admin do |a|
-    a.resources :feeds, :controller => 'muck/feeds', :member => { :harvest_now => :post, :ban => :post, :unban => :post }
+    a.resources :feeds, :controller => 'muck/feeds'
   end
 
   map.connect '/feed_list', :controller => 'muck/feeds', :action => 'selection_list'
@@ -12,27 +12,31 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :resources, :controller => 'muck/entries'
 
   map.connect 'r', :controller => 'muck/entries', :action => 'track_clicks'
-  map.connect 'collections', :controller => 'entries', :action => 'collections'
+  map.connect 'collections', :controller => 'muck/entries', :action => 'collections'
 
+  map.resources :visits, :controller => 'muck/visits'
   map.resources :feed_previews, :controller => 'muck/feed_previews', :collection => { :select_feeds => :post }
-  map.resources :entries
+  
+  map.resources :entries, :controller => 'muck/entries', :collection => { :search => :get } do |entries|
+    # have to map into the muck/comments controller or rails can't find the comments
+    entries.resources :comments, :controller => 'muck/comments'
+  end
+    
   map.resources :feeds, :controller => 'muck/feeds', :collection => { :new_extended => :get }, :has_many => :entries
   map.resources :recommendations, :controller => 'muck/recommendations'
 
   # redirect (and hit tracking)
 
   # search
-  map.connect 'search/relations.:format/*terms', :controller => 'search', :action => 'relations'
-  map.connect 'search/relations/*terms', :controller => 'search', :action => 'relations'
-  map.connect 'search/source_uri.:format', :controller => 'search', :action => 'source_uri'
-  map.connect 'search/source_uri', :controller => 'search', :action => 'source_uri'
-  map.connect 'search/destination_uri.:format', :controller => 'search', :action => 'destination_uri'
-  map.connect 'search/destination_uri', :controller => 'search', :action => 'destination_uri'
-  map.connect 'search/uris.:format', :controller => 'search', :action => 'uris'
-  map.connect 'search/uris', :controller => 'search', :action => 'uris'
-  map.connect 'search/results.:format', :controller => 'search', :action => 'results'
-  map.connect 'search/results', :controller => 'search', :action => 'results'
-  
-  map.connect '/frames', :controller => 'documents', :action => 'frames'
+  map.connect 'search/relations.:format/*terms', :controller => 'muck/search', :action => 'relations'
+  map.connect 'search/relations/*terms', :controller => 'muck/search', :action => 'relations'
+  map.connect 'search/source_uri.:format', :controller => 'muck/search', :action => 'source_uri'
+  map.connect 'search/source_uri', :controller => 'muck/search', :action => 'source_uri'
+  map.connect 'search/destination_uri.:format', :controller => 'muck/search', :action => 'destination_uri'
+  map.connect 'search/destination_uri', :controller => 'muck/search', :action => 'destination_uri'
+  map.connect 'search/uris.:format', :controller => 'muck/search', :action => 'uris'
+  map.connect 'search/uris', :controller => 'muck/search', :action => 'uris'
+  map.connect 'search/results.:format', :controller => 'muck/search', :action => 'results'
+  map.connect 'search/results', :controller => 'muck/search', :action => 'results'
 
 end

data/db/bootstrap/services.yml

@@ -1,6 +1,6 @@
 rss:
     id: 1
-    title: rss
+    name: rss
     uri:
     api_uri:
     uri_template:
@@ -8,7 +8,7 @@ rss:
     sequence: 1
 oai:
     id: 2
-    title: OAI 
+    name: OAI
     uri: 
     api_uri: 
     uri_template: 
@@ -16,7 +16,7 @@ oai:
     sequence: 2
 twitter:
     id: 3 
-    title: Twitter
+    name: Twitter
     uri: "http://www.twitter.com"
     api_uri: 
     uri_template: 
@@ -24,7 +24,7 @@ twitter:
     sequence: 3
 youtube:
     id: 4 
-    title: You Tube 
+    name: You Tube
     uri: "http://www.youtube.com"
     api_uri: 
     uri_template: feed://www.youtube.com/rss/user/{username}/videos.rss
@@ -32,7 +32,7 @@ youtube:
     sequence: 4
 flickr:
     id: 5 
-    title: Flickr 
+    name: Flickr
     uri: "http://www.flickr.com"
     api_uri: 
     uri_template: "http://api.flickr.com/services/feeds/activity.gne?id={username}"
@@ -40,7 +40,7 @@ flickr:
     sequence: 5
 delicious:
     id: 6
-    title: del.icio.us 
+    name: del.icio.us
     uri: "http://del.icio.us/"
     api_uri: "https://api.del.icio.us/v1/"
     uri_template: 
@@ -48,7 +48,7 @@ delicious:
     sequence: 6
 digg:
     id: 7 
-    title: Digg 
+    name: Digg
     uri: "http://www.digg.com"
     api_uri: 
     uri_template: "http://digg.com/rss/{username}/index2.xml"
@@ -56,7 +56,7 @@ digg:
     sequence: 7
 43places:
     id: 8 
-    title: 43 Places
+    name: 43 Places
     uri: "http://www.43places.com"
     api_uri: 
     uri_template: "http://www.43places.com/rss/uber/author?username={username}"
@@ -64,7 +64,7 @@ digg:
     sequence: 8
 allconsuming:
     id: 9 
-    title: All Consuming 
+    name: All Consuming
     uri: "http://allconsuming.net/"
     api_uri: 
     uri_template: "http://allconsuming.net/person/{username}/rss"
@@ -73,7 +73,7 @@ allconsuming:
 clipmarks:
     id: 10 
     sequence: 10
-    title: Clipmarks
+    name: Clipmarks
     uri: "http://www.clipmarks.com"
     api_uri: 
     uri_template: "http://rss.clipmarks.com/clipper/{username}/"
@@ -81,7 +81,7 @@ clipmarks:
 lastfm:
     id: 11 
     sequence: 11
-    title: Last.fm
+    name: Last.fm
     uri: "http://www.last.fm"
     api_uri: 
     uri_template: "http://ws.audioscrobbler.com/1.0/user/{username}/recenttracks.rss"
@@ -89,7 +89,7 @@ lastfm:
 livejournal:
     id: 12 
     sequence: 12
-    title: LiveJournal
+    name: LiveJournal
     uri: "http://www.livejournal.com"
     api_uri: 
     uri_template: "http://{username}.livejournal.com"
@@ -97,7 +97,7 @@ livejournal:
 simpy:
     id: 13 
     sequence: 13
-    title: Simpy
+    name: Simpy
     uri: "http://www.simpy.com"
     api_uri: 
     uri_template: "http://www.simpy.com/rss/user/{username}/links/"
@@ -105,7 +105,7 @@ simpy:
 wordpress:
     id: 14 
     sequence: 14
-    title: Wordpress.com
+    name: Wordpress.com
     uri: "http://www.wordpress.com/"
     api_uri: 
     uri_template: "http://{username}.wordpress.com/"
@@ -113,7 +113,7 @@ wordpress:
 xanga:
     id: 15 
     sequence: 15
-    title: Xanga
+    name: Xanga
     uri: "http://www.xanga.com"
     api_uri: 
     uri_template: "http://www.xanga.com/{username}/rss"
@@ -121,7 +121,7 @@ xanga:
 citeulike:
     id: 16 
     sequence: 16
-    title: cite u like
+    name: cite u like
     uri: "http://www.citeulike.org"
     api_uri: 
     uri_template: "http://www.citeulike.org/rss/user/{username}"
@@ -129,35 +129,35 @@ citeulike:
 googlenews:
     id: 17 
     sequence: 17
-    title: Google News
+    name: Google News
     uri: "http://news.google.com/"
     icon: googlenews.gif
 googleblogsearch:
     id: 18 
     sequence: 18
-    title: Google Blog Search
+    name: Google Blog Search
     uri: "http://blogsearch.google.com/"
     icon: googleblogs.gif
 opml:
     id: 19 
     sequence: 19
-    title: OPML
+    name: OPML
     icon: opml.gif
 tag:
     id: 20 
     sequence: 20
-    title: Tag
+    name: Tag
     icon: tag.gif
 odeo:
     id: 21 
     sequence: 21
-    title: Odeo Podcasts
+    name: Odeo Podcasts
     uri: "http://www.odeo.com"
     icon: odeo.gif
 technorati:
     id: 22 
     sequence: 22
-    title: Technorati
+    name: Technorati
     uri: "http://www.technorati.com/"
     api_uri: 
     uri_template: "http://feeds.technorati.com/faves/{username}?format=rss"
@@ -165,7 +165,7 @@ technorati:
 merlot:
     id: 23 
     sequence: 23
-    title: Merlot
+    name: Merlot
     uri: "http://www.merlot.org/"
     api_uri: 
     uri_template: