muck-services 0.1.45 → 0.1.46

data/VERSION

@@ -1 +1 @@
-0.1.45
+0.1.46

data/app/controllers/muck/feeds_controller.rb

@@ -6,7 +6,7 @@ class Muck::FeedsController < ApplicationController
   before_filter :get_owner, :except => ['index', 'show']
   
   def index
-    @feeds = Aggregation.global_feeds(params[:order], params[:asc]).paginate(:page => @page, :per_page => @per_page)
+    @feeds = Feed.find(:all, :conditions => 'status >= 0', :order => (params[:order] || 'title') + (params[:asc] == 'false' ? ' DESC' : ' ASC') + ', title', :include => [:default_language]).paginate(:page => @page, :per_page => @per_page)
     respond_to do |format|
       format.html { render :template => 'feeds/index' }
       format.xml  { render :xml => @feeds.to_xml }

data/app/controllers/muck/recommendations_controller.rb

@@ -56,15 +56,16 @@ class Muck::RecommendationsController < ApplicationController
     respond_to do |format|
       format.html do
         @uri = params[:u]
-        @cache_key = "recommendations/real_time?u=#{CGI.escape(@uri)}"
+        @show_header = params[:show_header] == 'true'
+        @cache_key = "recommendations/real_time?show_header=#{@show_header}&u=#{CGI.escape(@uri)}"
         if !fragment_exist?(@cache_key)
-          @recommendations = Entry.real_time_recommendations(@uri, I18n.locale.to_s, 5)
+          @recommendations = Entry.real_time_recommendations(@uri, I18n.locale.to_s, 5) rescue nil
         end
         render 'recommendations/real_time', :layout => false
       end
     end
   end
-  
+
   protected
   
   def allowed_uri(uri)

data/app/helpers/muck_services_feeds_helper.rb

@@ -14,18 +14,18 @@ module MuckServicesFeedsHelper
 
   def feed_contributor_link(feed)
     if feed.contributor_id.nil?
-#      admin = Feed.find_by_login('admin')
+      admin = Feed.find_by_login('admin')
       'unknown'
     else
       link_to feed.contributor.display_name, profile_path(feed.contributor)
     end
   end
 
-  def sort_feeds_url(current_order, current_asc, new_order, admin = false)
+  def sort_feeds_link(current_order, current_asc, new_order, admin = false)
     if admin == true
       admin_feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'true' || current_asc == nil)) ? 'false' : 'true')
     else
-      feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'false' || current_asc == nil)) ? 'true' : 'false')
+      feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'true' || current_asc == nil)) ? 'false' : 'true')
     end
   end
 

data/app/models/aggregation.rb

@@ -30,21 +30,7 @@ class Aggregation < ActiveRecord::Base
   named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
   named_scope :newest, :order => "created_at DESC"
 
-
-  def self.global_feeds(order_field = 'title', ascending = 'true')
-    allowed_fields = ['languages.english_name','status','entries_count','harvested_from_title','last_harvested_at','created_at','feed_contributor']
-    order_direction = (ascending == 'false' ? ' DESC' : ' ASC')
-    order_by = allowed_fields.include?(order_field) ? (order_field  + order_direction + ', title') : ('title ' + order_direction)
-
-    Feed.find_by_sql("SELECT users.id feed_contributor_id, users.login feed_contributor, languages.english_name default_language_name, feeds.*, aggregation_id <=> 1 FROM aggregations " +
-            "INNER JOIN aggregation_feeds ON aggregations.id = aggregation_feeds.aggregation_id " +
-            "RIGHT OUTER JOIN feeds ON aggregation_feeds.feed_id = feeds.id " +
-            "INNER JOIN languages ON feeds.default_language_id = languages.id " +
-            "LEFT OUTER JOIN users ON feeds.contributor_id = users.id " +
-#            "WHERE aggregations.title = 'global_feeds' AND feeds.status >= 0 " +
-          "ORDER BY #{order_by}")
-  end
-
+    
   # Builds and then adds feeds for a given terms
   # user:         User to be associated with each feed.  Default is nil which makes each feed global.
   # service_ids:  An array of service ids.  Nil will generate a feed for every available service.

data/app/models/personal_recommendation.rb

@@ -13,14 +13,10 @@
 #
 
 class PersonalRecommendation < ActiveRecord::Base
-  unloadable
-
+  
   belongs_to :personal_recommendable, :polymorphic => true
   belongs_to :destination, :polymorphic => true
-
-  belongs_to :entry, :class_name => 'Entry', :foreign_key => 'destination_id', :include => :feed
-  belongs_to :user, :class_name => 'User', :foreign_key => 'destination_id'
-
+  
   named_scope :limit, lambda { |num| { :limit => num } }
   named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
   named_scope :newest, :order => "created_at DESC"

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

@@ -7,14 +7,13 @@
   </p>
   <table class="feeds">
     <tr>
-      <th><%= link_to t('muck.services.entries_count'), sort_feeds_url(params[:order], params[:asc], 'entries_count') %></th>
-      <th><%= link_to t('muck.services.title'), sort_feeds_url(params[:order], params[:asc], 'title')  %></th>
-      <th><%= link_to t('muck.services.contributor'), sort_feeds_url(params[:order], params[:asc], 'feed_contributor') %></th>
-      <th width="70px"><%= link_to t('muck.services.added_date'), sort_feeds_url(params[:order], params[:asc], 'created_at') %></th>
-      <th width="120px"><%= link_to t('muck.services.harvested_at'), sort_feeds_url(params[:order], params[:asc], 'last_harvested_at') %></th>
-      <th><%= link_to t('muck.services.default_language'), sort_feeds_url(params[:order], params[:asc], 'languages.english_name') %></th>
-      <th><%= link_to t('muck.services.repository'), sort_feeds_url(params[:order], params[:asc], 'harvested_from_title')  %></th>
-      <th><%= link_to t('muck.services.status'), sort_feeds_url(params[:order], params[:asc], 'status') %></th>
+      <th><%= link_to t('muck.services.status'), sort_feeds_link(params[:order], params[:asc], 'status') %></th>
+      <th><%= link_to t('muck.services.default_language'), sort_feeds_link(params[:order], params[:asc], 'languages.english_name') %></th>
+      <th><%= link_to t('muck.services.entries_count'), sort_feeds_link(params[:order], params[:asc], 'entries_count') %></th>
+      <th><%= link_to t('muck.services.repository'), sort_feeds_link(params[:order], params[:asc], 'harvested_from_title')  %></th>
+      <th><%= link_to t('muck.services.title'), sort_feeds_link(params[:order], params[:asc], 'title')  %></th>
+      <th><%= link_to t('muck.services.harvested_at'), sort_feeds_link(params[:order], params[:asc], 'last_harvested_at') %></th>
+      <th><%= link_to t('muck.services.added_date'), sort_feeds_link(params[:order], params[:asc], 'created_at') %></th>
     </tr>
     <%= render :partial => 'feeds/feed_row', :collection => @feeds %>
   </table>

data/app/views/recommendations/greasemonkey.user.js.erb

@@ -147,7 +147,7 @@ function special_website_url(url) {
                     nEnd = url.indexOf("/", nEnd + 1);
                     if (nEnd != -1)
                     {
-                        url = url.substr(0, nEnd + 1) + "CourseHome/index.htm";
+                        url = url.substr(0, nEnd);
                     }
                 }
             }
@@ -176,7 +176,7 @@ function identifySquatParent() {
         sRightMargin = "0px";
     } else {
         // MIT
-        squatParent = getElementByClassName("div", "left-nav");
+        squatParent = document.getElementById("local_navigation");
         if (bMIT && squatParent) {
             ulTags = squatParent.getElementsByTagName("ul");
             if (ulTags)

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

@@ -14,7 +14,6 @@ function truncate(text, length) {
 	if (nEnd < 200) return text;
 	else return text.substring(0, nEnd) + " ...";
 }
-            var once = true;
 var asMonths = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
 function format_date(published_at) {
     date = new Date(Date.parse(published_at.substring(0,10).replace(/-/g,"/")));

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

@@ -1,13 +1,20 @@
 <% cache(@cache_key) do %>
 <html>
 <body style="margin:0;padding:0;">
-  <div style="padding-bottom:5px;margin:0 1px 0 3px;background-color:white;border-left:1px solid black;border-right:1px solid black;border-bottom:1px solid black;">
+  <div style="padding-bottom:5px;margin:0 1px 0 3px;background-color:white;border-left:1px solid black;border-right:1px solid black;border-bottom:1px solid black;<%= @show_header == true ? "border-top:1px solid black;" : ""%>">
+<% if @show_header == true %>
+    <div style="color:#777;font-weight:bold;font-size:14px;font-family:Arial,Helvetica,sans-serif;margin: 2px 3px 0 3px; padding: 2px;"><img src="/images/folksemantic/logo-folksemantic-gm.gif" style="margin-left:2px;vertical-align:middle;"/>Related Resources</div>
+<% end %>
+<% if !@recommendations.nil? && @recommendations.results.size > 0%>
     <ul style="margin:0 2px 2px;padding:0px;font-family:Arial,Helvetica,sans-serif;">
     <% @recommendations.results.each_with_index do |r, i| %>
     <li style="margin-left: 0px; padding: 3px; list-style-type: none; font-size: 12px; <%= (i % 2 == 0) ? 'background-color:#E6E6E6;' : '' %>">
       <%= link_to "#{r.title} (#{r.collection})", visit_path(r), :target => '_top' %></li>
     <% end %>
     </ul>
+<% else %>
+    <p style="color:red;padding:6px 10px;">Unable to generate recommendations for the resource. Please try a different resource.</p>
+<% end %>
   </div>
 </body>
 </html>

data/app/views/services/_personal_recommendations.html.erb

@@ -0,0 +1,5 @@
+<ul>
+<% recommendations.each do |r| -%>
+  <li><%= link_to r.destination.title, r.destination %></li>
+<% end -%>
+</ul>    

data/config/muck_services_routes.rb

@@ -28,7 +28,7 @@ ActionController::Routing::Routes.draw do |map|
     
   map.resources :feeds, :controller => 'muck/feeds', :collection => { :new_extended => :get, :new_oai_rss => :get }, :has_many => :entries
 
-  map.connect 'recommendations/real_time', :controller => 'muck/recommendations', :action => 'real_time'
+  map.connect 'recommendations/real_time.:format', :controller => 'muck/recommendations', :action => 'real_time'
   map.connect 'recommendations/get_button', :controller => 'muck/recommendations', :action => 'get_button'
   map.connect 'recommendations/greasemonkey.user.js', :controller => 'muck/recommendations', :action => 'greasemonkey_script'
   map.resources :recommendations, :controller => 'muck/recommendations'

data/db/migrate/20100903205928_add_dead_entry_fields.rb

@@ -0,0 +1,13 @@
+class AddDeadEntryFields < ActiveRecord::Migration
+  def self.up
+    add_column :entries, :permalink_good, :boolean, :default => true
+    add_column :entries, :permalink_checked_at, :datetime, :default => '1971-01-01 01:01:01', :null => false
+    add_index :entries, :permalink_good
+  end
+
+  def self.down
+    remove_index :entries, :permalink_good
+    remove_column :entries, :permalink_good
+    remove_column :entries, :permalink_checked_at
+  end
+end

data/lib/active_record/acts/muck_recommendations.rb

@@ -11,8 +11,6 @@ module ActiveRecord
         # +has_muck_recommendations+ gives the class it is called on personalized recommendations
         def has_muck_recommendations
           has_many :personal_recommendations, :as => :personal_recommendable
-          has_many :recommended_entries, :through => :personal_recommendations, :source => :entry,
-                              :conditions => "personal_recommendations.destination_type = 'Entry'"
         end
 
         def acts_as_muck_recommendation

data/muck-services.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "0.1.45"
+  s.version = "0.1.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2010-06-01}
+  s.date = %q{2010-09-13}
   s.description = %q{This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -125,8 +125,6 @@ Gem::Specification.new do |s|
     "app/views/recommendations/index.rss.builder",
     "app/views/recommendations/index.xml.builder",
     "app/views/recommendations/real_time.html.erb",
-    "app/views/recommendations/real_time.pjs.erb",
-    "app/views/recommendations/real_time.xml.builder",
     "app/views/service_templates/_facebook.html.erb",
     "app/views/service_templates/_friendfeed.html.erb",
     "app/views/service_templates/_goodreads.html.erb",
@@ -136,6 +134,7 @@ Gem::Specification.new do |s|
     "app/views/service_templates/_zotero_group.html.erb",
     "app/views/services/_edit_service.html.erb",
     "app/views/services/_new_service.html.erb",
+    "app/views/services/_personal_recommendations.html.erb",
     "app/views/services/_summary.html.erb",
     "app/views/services/_view_service.html.erb",
     "app/views/services_mailer/notification_feed_added.text.ar.html.erb",
@@ -366,6 +365,7 @@ Gem::Specification.new do |s|
     "db/migrate/20091115011828_add_aggregations_for_personal_recs.rb",
     "db/migrate/20091116094447_rename_action_table.rb",
     "db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb",
+    "db/migrate/20100903205928_add_dead_entry_fields.rb",
     "lib/active_record/acts/muck_aggregation_owner.rb",
     "lib/active_record/acts/muck_feed_owner.rb",
     "lib/active_record/acts/muck_feed_parent.rb",
@@ -433,7 +433,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-services}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Feeds, aggregations and services for muck}
   s.test_files = [
     "test/rails_root/app/controllers/application_controller.rb",
@@ -550,7 +550,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])

data/public/javascripts/muck_services.js

@@ -100,5 +100,5 @@ function initRecsPanel() {
     panel.append("<div id='rec_close_box' title='Close'>x</div>");
     jQuery("#rec_close_box").click(function() {jQuery("#recs_panel").hide();jQuery("#show_recommendations_link").show();return false;});
     panel.css("left", jQuery("#toolbar").width() - 250);
-    panel.draggable();
+    if (panel.draggable) panel.draggable();
 }

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  version: 0.1.45
+  hash: 71
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 46
+  version: 0.1.46
 platform: ruby
 authors: 
 - Joel Duffin
@@ -10,129 +16,177 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -06:00
+date: 2010-09-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts-as-taggable-on
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: muck-feedbag
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: river
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: overlord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: feedzirra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: muck-engine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: muck-users
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: muck-comments
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id012
 description: This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.
 email: justin@tatemae.com
 executables: []
@@ -251,8 +305,6 @@ files:
 - app/views/recommendations/index.rss.builder
 - app/views/recommendations/index.xml.builder
 - app/views/recommendations/real_time.html.erb
-- app/views/recommendations/real_time.pjs.erb
-- app/views/recommendations/real_time.xml.builder
 - app/views/service_templates/_facebook.html.erb
 - app/views/service_templates/_friendfeed.html.erb
 - app/views/service_templates/_goodreads.html.erb
@@ -262,6 +314,7 @@ files:
 - app/views/service_templates/_zotero_group.html.erb
 - app/views/services/_edit_service.html.erb
 - app/views/services/_new_service.html.erb
+- app/views/services/_personal_recommendations.html.erb
 - app/views/services/_summary.html.erb
 - app/views/services/_view_service.html.erb
 - app/views/services_mailer/notification_feed_added.text.ar.html.erb
@@ -492,6 +545,7 @@ files:
 - db/migrate/20091115011828_add_aggregations_for_personal_recs.rb
 - db/migrate/20091116094447_rename_action_table.rb
 - db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb
+- db/migrate/20100903205928_add_dead_entry_fields.rb
 - lib/active_record/acts/muck_aggregation_owner.rb
 - lib/active_record/acts/muck_feed_owner.rb
 - lib/active_record/acts/muck_feed_parent.rb
@@ -554,6 +608,114 @@ files:
 - public/stylesheets/frame.css
 - public/stylesheets/muck-services.css
 - rails/init.rb
+- test/rails_root/app/controllers/application_controller.rb
+- test/rails_root/app/controllers/default_controller.rb
+- test/rails_root/app/helpers/application_helper.rb
+- test/rails_root/app/models/activity.rb
+- test/rails_root/app/models/comment.rb
+- test/rails_root/app/models/share.rb
+- test/rails_root/app/models/user.rb
+- test/rails_root/app/models/user_session.rb
+- test/rails_root/config/boot.rb
+- test/rails_root/config/environment.rb
+- test/rails_root/config/environments/cucumber.rb
+- test/rails_root/config/environments/development.rb
+- test/rails_root/config/environments/production.rb
+- test/rails_root/config/environments/test.rb
+- test/rails_root/config/initializers/inflections.rb
+- test/rails_root/config/initializers/mime_types.rb
+- test/rails_root/config/initializers/requires.rb
+- test/rails_root/config/initializers/session_store.rb
+- test/rails_root/config/routes.rb
+- test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
+- test/rails_root/db/migrate/20090327231918_create_users.rb
+- test/rails_root/db/migrate/20090402033319_add_muck_activities.rb
+- test/rails_root/db/migrate/20090402234137_create_languages.rb
+- test/rails_root/db/migrate/20090426041056_create_countries.rb
+- test/rails_root/db/migrate/20090426041103_create_states.rb
+- test/rails_root/db/migrate/20090602191243_create_muck_raker.rb
+- test/rails_root/db/migrate/20090613173314_create_comments.rb
+- test/rails_root/db/migrate/20090619211125_create_tag_clouds.rb
+- test/rails_root/db/migrate/20090623181458_add_grain_size_to_entries.rb
+- test/rails_root/db/migrate/20090623193525_add_grain_size_to_tag_clouds.rb
+- test/rails_root/db/migrate/20090703175825_denormalize_entries_subjects.rb
+- test/rails_root/db/migrate/20090704220055_create_slugs.rb
+- test/rails_root/db/migrate/20090716035935_change_tag_cloud_grain_sizes.rb
+- test/rails_root/db/migrate/20090717173900_add_contributor_to_feeds.rb
+- test/rails_root/db/migrate/20090717175825_normalize_entries_subjects.rb
+- test/rails_root/db/migrate/20090721043213_change_services_title_to_name.rb
+- test/rails_root/db/migrate/20090721054927_remove_services_not_null_from_feeds.rb
+- test/rails_root/db/migrate/20090723050510_create_feed_parents.rb
+- test/rails_root/db/migrate/20090728165716_add_etag_to_feeds.rb
+- test/rails_root/db/migrate/20090730044139_add_comment_cache.rb
+- test/rails_root/db/migrate/20090730045848_add_comment_cache_to_entries.rb
+- test/rails_root/db/migrate/20090730154102_allow_null_user.rb
+- test/rails_root/db/migrate/20090803185323_create_shares.rb
+- test/rails_root/db/migrate/20090804184247_add_comment_count_to_shares.rb
+- test/rails_root/db/migrate/20090804211240_add_entry_id_to_shares.rb
+- test/rails_root/db/migrate/20090804231857_add_shares_uri_index.rb
+- test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb
+- test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb
+- test/rails_root/db/migrate/20090826220530_change_services_sequence_to_sort.rb
+- test/rails_root/db/migrate/20090826225652_create_identity_feeds.rb
+- test/rails_root/db/migrate/20090827005105_add_identity_fields_to_services.rb
+- test/rails_root/db/migrate/20090827015308_create_service_categories.rb
+- test/rails_root/db/migrate/20090827221502_add_prompt_and_template_to_services.rb
+- test/rails_root/db/migrate/20090915041650_aggregations_to_polymorphic.rb
+- test/rails_root/db/migrate/20090922174200_update_oai_endpoints.rb
+- test/rails_root/db/migrate/20090922231552_add_dates_to_oai_endpoints.rb
+- test/rails_root/db/migrate/20090923150807_rename_name_in_aggregation.rb
+- test/rails_root/db/migrate/20090924200750_add_uri_data_template_to_services.rb
+- test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb
+- test/rails_root/db/migrate/20091022150615_add_uri_key_to_services.rb
+- test/rails_root/db/migrate/20091115011828_add_aggregations_for_personal_recs.rb
+- test/rails_root/db/migrate/20091116094447_rename_action_table.rb
+- test/rails_root/db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb
+- test/rails_root/db/migrate/20100123035450_create_access_codes.rb
+- test/rails_root/db/migrate/20100123233654_create_access_code_requests.rb
+- test/rails_root/db/schema.rb
+- test/rails_root/features/step_definitions/common_steps.rb
+- test/rails_root/features/step_definitions/visit_steps.rb
+- test/rails_root/features/step_definitions/webrat_steps.rb
+- test/rails_root/features/support/env.rb
+- test/rails_root/features/support/paths.rb
+- test/rails_root/public/dispatch.rb
+- test/rails_root/script/create_project.rb
+- test/rails_root/test/factories.rb
+- test/rails_root/test/functional/admin/feeds_controller_test.rb
+- test/rails_root/test/functional/admin/oai_endpoints_controller_test.rb
+- test/rails_root/test/functional/aggregation_feeds_controller_test.rb
+- test/rails_root/test/functional/aggregations_controller_test.rb
+- test/rails_root/test/functional/feed_previews_controller_test.rb
+- test/rails_root/test/functional/feeds_controller_test.rb
+- test/rails_root/test/functional/identity_feeds_controller_test.rb
+- test/rails_root/test/functional/oai_endpoints_controller_test.rb
+- test/rails_root/test/functional/topics_controller_test.rb
+- test/rails_root/test/functional/visits_controller_test.rb
+- test/rails_root/test/test_helper.rb
+- test/rails_root/test/unit/aggregation_feed_test.rb
+- test/rails_root/test/unit/aggregation_test.rb
+- test/rails_root/test/unit/comment_test.rb
+- test/rails_root/test/unit/entry_test.rb
+- test/rails_root/test/unit/feed_parent_test.rb
+- test/rails_root/test/unit/feed_test.rb
+- test/rails_root/test/unit/identity_feed_test.rb
+- test/rails_root/test/unit/oai_endpoint_test.rb
+- test/rails_root/test/unit/one_test.rb
+- test/rails_root/test/unit/personal_recommendation_test.rb
+- test/rails_root/test/unit/recommendation_test.rb
+- test/rails_root/test/unit/service_category_test.rb
+- test/rails_root/test/unit/service_test.rb
+- test/rails_root/test/unit/services_mailer_test.rb
+- test/rails_root/test/unit/share_test.rb
+- test/rails_root/test/unit/tag_cloud_test.rb
+- test/rails_root/test/unit/user_test.rb
+- test/rails_root/vendor/plugins/jrails/init.rb
+- test/rails_root/vendor/plugins/jrails/install.rb
+- test/rails_root/vendor/plugins/jrails/lib/jrails.rb
+- test/rails_root/vendor/plugins/jrails/rails/init.rb
+- test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
+- test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
 has_rdoc: true
 homepage: http://github.com/tatemae/muck-services
 licenses: []
@@ -564,21 +726,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: muck-services
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Feeds, aggregations and services for muck

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

@@ -1,45 +0,0 @@
-<%
-# TODO: Update this (see real_time.html.erb)
-@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.services.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.services.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="' + app + 'visits/' + r.id +'">' + r.title + ' (' + r.collection + ')</a>');
-	if (direct_link) document.write(' <a class="oer_recommender_direct_link" href="' + app + 'visits/' + 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.services.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('</p>');
-}
-document.write('</div>');	
-<% if params[:more_link] %>document.write('<div class="oer_recommender_more_link"><a href="' + app + 'documents/<%= @entry.id %>"><%= t('muck.services.gm_more_prompt') %></a></div>');<% end %>	
-document.write('</div>');	
-<% end %>

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

@@ -1,26 +0,0 @@
-# TODO: Update this (see real_time.html.erb)
-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.services.gm_title"), :more_prompt => t("muck.services.gm_more_prompt"), :direct_link_text => t("muck.services.direct_link")) do
-    @recommendations.results.each do |recommendation|
-      xml.recommendation do
-        xml.title recommendation["title"]
-        xml.collection recommendation["collection"]
-        xml.link "http://www.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