muck-services 0.1.23 → 0.1.24

data/README.rdoc

@@ -78,8 +78,10 @@ muck-services uses muck-comments and muck-activities to add comments to entries
 muck-services also uses muck-shares and muck-activities to share entries with other users.  Again you can omit these gems if you don't desire the share capability.
 
 To turn on this functionality add these lines to your global_config.yml file:
-  enable_raker_comments: true
-  enable_raker_shares: true
+  inform_admin_of_global_feed: true   # If true then the 'admin_email' will recieve an email anytime a global feed (one that is not 
+                                      # attached to any object) is added.
+  enable_services_comments: true      # Enables or disables comments in the frame that wraps content as a user browses recommendation results
+  enable_services_shares: true        # Enables or disables sharing in the frame that wraps content as a user browses recommendation results
 
 To install these gems:
   sudo gem install muck-comments

data/Rakefile

@@ -3,6 +3,9 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+desc 'Default: run unit tests.'
+task :default => :test
+
 desc 'Translate this gem'
 task :translate do
   file = File.join(File.dirname(__FILE__), 'locales', 'en.yml')
@@ -35,9 +38,6 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-task :test => :check_dependencies
-task :default => :test
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-0.1.23
+0.1.24

data/app/models/entry.rb

@@ -46,10 +46,6 @@ class Entry < ActiveRecord::Base
     self.direct_link.nil? ? self.permalink : self.direct_link
   end
   
-  def self.top_tags(tags = nil)
-    
-  end
-  
   def self.search(search_terms, grain_size = nil, language = "en", limit = 10, offset = 0, operator = :or)
     raise MuckServices::Exceptions::LanguageNotSupported, I18n.t('muck.services.language_not_supported') unless Recommender::Languages.supported_languages.include?(language)
     query = ((!grain_size.nil? && grain_size != 'all') ? (search_terms + ") AND (grain_size:#{grain_size}") : search_terms) + ") AND (aggregation:#{Aggregation.global_feeds_id}"
@@ -63,8 +59,8 @@ class Entry < ActiveRecord::Base
     Entry.find(:first, :conditions => ['permalink = ? OR direct_link = ?', uri, uri], :order => 'direct_link IS NULL DESC') || Entry.new(:permalink => uri)
   end
   
-  def recommendations(limit = 20, order = "relevance", details = false, omit_feeds = nil)
-    sql = "SELECT recommendations.id, dest_entry_id, entries.permalink, entries.title, entries.description, entries.direct_link, feeds.short_title AS collection "
+  def recommendation_entries(limit = 20, order = "relevance", details = false, omit_feeds = nil)
+    sql = "SELECT recommendations.dest_entry_id AS id, entries.permalink, entries.title, entries.description, entries.direct_link, feeds.short_title AS collection "
     sql << ", relevance_calculated_at, relevance, clicks, avg_time_at_dest AS avg_time_on_target, author, published_at " if details == true
     sql << "FROM recommendations "
     sql << "INNER JOIN entries ON recommendations.dest_entry_id = entries.id "
@@ -76,8 +72,8 @@ class Entry < ActiveRecord::Base
     Entry.find_by_sql([sql,self.id])
   end
 
-  def recommendation_entries(limit = 20, order = "relevance", details = false, omit_feeds = nil)
-    sql = "SELECT recommendations.dest_entry_id AS id, entries.permalink, entries.title, entries.description, entries.direct_link, feeds.short_title AS collection "
+  def recommendations(limit = 20, order = "relevance", details = false, omit_feeds = nil)
+    sql = "SELECT recommendations.id, dest_entry_id, entries.permalink, entries.title, entries.description, entries.direct_link, feeds.short_title AS collection "
     sql << ", relevance_calculated_at, relevance, clicks, avg_time_at_dest AS avg_time_on_target, author, published_at " if details == true
     sql << "FROM recommendations "
     sql << "INNER JOIN entries ON recommendations.dest_entry_id = entries.id "
@@ -89,90 +85,13 @@ class Entry < ActiveRecord::Base
     Entry.find_by_sql([sql,self.id])
   end
 
-  def self.track_time_on_page(session, uri)
-    recommendation_id = session[:last_clicked_recommendation]
-    if !recommendation_id.nil?
-      time_on_page = (Time.now - session[:last_clicked_recommendation_time].to_f).to_i
-      
-      # if they spend longer than two minutes on a page, we don't infer anything
-      if time_on_page > 5 and time_on_page < 120
-        if normalized_uri(uri) != session[:last_clicked_recommendation_uri] 
-          recommendation = Recommendation.find(recommendation_id)
-          entry = Entry.find(recommendation.entry_id)
-          new_avg = (recommendation.avg_time_at_dest*recommendation.clicks - @@default_time_on_page + time_on_page)/recommendation.clicks
-          recommendation.avg_time_at_dest = new_avg
-          recommendation.save!
-          entry.rank_recommendations
-          session[:last_clicked_recommendation] = nil
-        end
-      else
-        session[:last_clicked_recommendation] = nil if time_on_page > 5
-      end
-    end
-  end
-  
-  def self.avg_time(clicks, old_avg, time_on_page)
-    return (old_avg*(clicks-1) + time_on_page)/clicks
-  end
-
-  def self.track_click(session, recommendation_id, referrer, redirect_type = "direct_link", requester = "unknown", user_agent = "unknown")
-    # look up the recommendation
-    recommendation = Recommendation.find(recommendation_id)
-    return "" if !recommendation
-    
-    # get the entries being linked from and to
-    entry = Entry.find(recommendation.entry_id)
-    target = Entry.find(recommendation.dest_entry_id)
-    
-    # get the list of recommendations that have been clicked during this session
-    clicks = session[:rids] || Array.new
-    
-    # redirect to our frame page
-    redirect = "/visits/#{recommendation.dest_entry_id}"
-    
-    # track the time on the last page
-    track_time_on_page(session, redirect)
-    
-    # if this is first time the user clicked on this recommendation during this session 
-    if !clicks.include?(recommendation_id)
-      
-      # add this recommendation to the end of the list 
-      clicks << recommendation_id
-      session[:rids] = clicks
-      
-      # update the click time
-      recommendation.avg_time_at_dest = ((recommendation.avg_time_at_dest*recommendation.clicks) + @@default_time_on_page)/(recommendation.clicks + 1) 
-      recommendation.clicks += 1 
-      recommendation.save!
-      
-      # store info about this click in the session
-      now = Time.now
-      session[:last_clicked_recommendation] = recommendation_id
-      session[:last_clicked_recommendation_time] = now
-      session[:last_clicked_recommendation_uri] = redirect
-
-      # update the recommendation cache for the entry
-      entry.rank_recommendations if entry
-      
-      # track the click in the db
-      Click.create(:recommendation_id => recommendation_id, :when => now, :referrer => referrer, :requester => requester, :user_agent => user_agent)
-    end
-    
-    return redirect   
-  end
-
   def relevant_recommendations(limit = 5, order = "relevance", details = false, omit_feeds = nil)
     return self.recommendations(limit, order, details, omit_feeds)
   end
 
-  def self.truncate_words(text, length = 30, end_string = ' ...')
-    words = text.split()
-    words[0..(length-1)].join(' ') + (words.length > length ? end_string : '')
-  end
-
   def ranked_recommendations(limit = 5, order = "mixed", details = false, omit_feeds = nil)
-    return relevant_recommendations(limit, "clicks DESC, relevance", details, omit_feeds) if order == "clicks"
-    return relevant_recommendations(limit, "relevance", details, omit_feeds) if (order == "relevance" || details == true)
+    return self.recommendations(limit, "clicks DESC, relevance", details, omit_feeds) if order == "clicks"
+    return self.recommendations(limit, "relevance", details, omit_feeds) if (order == "relevance" || details == true)
     return relevant_recommendations_filtered(limit, details, omit_feeds) if omit_feeds != nil
 
     recs = []
@@ -190,6 +109,11 @@ class Entry < ActiveRecord::Base
     return recs
   end
   
+  def json_recommendations(limit = 5, order = "mixed", details = false, omit_feeds = nil)
+    recs = ranked_recommendations(limit, order, details, omit_feeds)
+    (recs.nil? || recs.empty?) ? "" : ActiveSupport::JSON.encode(recs)
+  end
+
   def relevant_recommendations_filtered(limit, details, omit_feeds)
     # get recommendations for the entry from the recommendations table
     recs = self.recommendations(limit, "mixed", details, omit_feeds)
@@ -222,10 +146,6 @@ class Entry < ActiveRecord::Base
     return (popular_recs + relevant_recs + other_recs)[0..limit]
   end
 
-  def json_recommendations(limit = 5, order = "mixed", details = false, omit_feeds = nil)
-    ActiveSupport::JSON.encode(ranked_recommendations(limit, order, details, omit_feeds))
-  end
-  
   def rank_recommendations
     return
     # get recommendations for the entry from the recommendations table
@@ -304,6 +224,83 @@ class Entry < ActiveRecord::Base
     return threshold > 5 ? threshold : 5
   end
   
+  def self.avg_time(clicks, old_avg, time_on_page)
+    return (old_avg*(clicks-1) + time_on_page)/clicks
+  end
+
+  def self.track_time_on_page(session, uri)
+    recommendation_id = session[:last_clicked_recommendation]
+    if !recommendation_id.nil?
+      time_on_page = (Time.now - session[:last_clicked_recommendation_time].to_f).to_i
+
+      # if they spend longer than two minutes on a page, we don't infer anything
+      if time_on_page > 5 and time_on_page < 120
+        if normalized_uri(uri) != session[:last_clicked_recommendation_uri]
+          recommendation = Recommendation.find(recommendation_id)
+          entry = Entry.find(recommendation.entry_id)
+          new_avg = (recommendation.avg_time_at_dest*recommendation.clicks - @@default_time_on_page + time_on_page)/recommendation.clicks
+          recommendation.avg_time_at_dest = new_avg
+          recommendation.save!
+          entry.rank_recommendations
+          session[:last_clicked_recommendation] = nil
+        end
+      else
+        session[:last_clicked_recommendation] = nil if time_on_page > 5
+      end
+    end
+  end
+
+  def self.track_click(session, recommendation_id, referrer, redirect_type = "direct_link", requester = "unknown", user_agent = "unknown")
+    # look up the recommendation
+    recommendation = Recommendation.find(recommendation_id)
+    return "" if !recommendation
+
+    # get the entries being linked from and to
+    entry = Entry.find(recommendation.entry_id)
+    target = Entry.find(recommendation.dest_entry_id)
+
+    # get the list of recommendations that have been clicked during this session
+    clicks = session[:rids] || Array.new
+
+    # redirect to our frame page
+    redirect = "/visits/#{recommendation.dest_entry_id}"
+
+    # track the time on the last page
+    track_time_on_page(session, redirect)
+
+    # if this is first time the user clicked on this recommendation during this session
+    if !clicks.include?(recommendation_id)
+
+      # add this recommendation to the end of the list
+      clicks << recommendation_id
+      session[:rids] = clicks
+
+      # update the click time
+      recommendation.avg_time_at_dest = ((recommendation.avg_time_at_dest*recommendation.clicks) + @@default_time_on_page)/(recommendation.clicks + 1)
+      recommendation.clicks += 1
+      recommendation.save!
+
+      # store info about this click in the session
+      now = Time.now
+      session[:last_clicked_recommendation] = recommendation_id
+      session[:last_clicked_recommendation_time] = now
+      session[:last_clicked_recommendation_uri] = redirect
+
+      # update the recommendation cache for the entry
+      entry.rank_recommendations if entry
+
+      # track the click in the db
+      Click.create(:recommendation_id => recommendation_id, :when => now, :referrer => referrer, :requester => requester, :user_agent => user_agent)
+    end
+
+    return redirect
+  end
+
+  def self.truncate_words(text, length = 30, end_string = ' ...')
+    words = text.split()
+    words[0..(length-1)].join(' ') + (words.length > length ? end_string : '')
+  end
+
   protected
   
 #  def self.redirect_uri(target, referrer, redirect_type)

data/app/models/oai_endpoint.rb

@@ -14,18 +14,6 @@
 #  created_at          :datetime
 #  updated_at          :datetime
 #
-
-# == Schema Information
-#
-# Table name: oai_endpoints
-#
-#  id              :integer(4)      not null, primary key
-#  uri             :string(2083)
-#  display_uri     :string(2083)
-#  metadata_prefix :string(255)
-#  title           :string(1000)
-#  short_title     :string(100)
-#
 class OaiEndpoint < ActiveRecord::Base
   
   belongs_to :contributor, :class_name => 'User', :foreign_key => 'contributor_id'
@@ -33,7 +21,7 @@ class OaiEndpoint < ActiveRecord::Base
   
   validates_presence_of :uri
   
-  named_scope :banned, :conditions => "status < 0"
+  named_scope :banned, :conditions => ["status = ?", MuckServices::Status::BANNED]
   named_scope :valid, :conditions => "status >= 0"
   named_scope :by_title, :order => "title ASC"
   named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }

data/app/models/personal_recommendation.rb

@@ -13,10 +13,14 @@
 #
 
 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/models/service.rb

@@ -230,7 +230,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database  
   def self.get_photo_services(refresh_services = false)
     @photo_services = nil if refresh_services
-    @photo_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Photos' }
+    @photo_services ||= get_services(refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Photos' }
   end
   
   # Get all video services
@@ -239,7 +239,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_video_services(refresh_services = false)
     @video_services = nil if refresh_services
-    @video_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Videos' }
+    @video_services ||= get_services(refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Videos' }
   end
   
   # Get all bookmark services
@@ -248,7 +248,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_bookmark_services(refresh_services = false)
     @bookmark_services = nil if refresh_services
-    @bookmark_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Bookmarks' }
+    @bookmark_services ||= get_services(refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Bookmarks' }
   end
   
   # Get all music services
@@ -257,7 +257,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_music_services(refresh_services = false)
     @music_services = nil if refresh_services
-    @music_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Music' }
+    @music_services ||= get_services(refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Music' }
   end
 
   # Get all news services
@@ -266,7 +266,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_news_services(refresh_services = false)
     @news_services = nil if refresh_services
-    @news_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'News' }
+    @news_services ||= get_services(refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'News' }
   end
   
   # Get all blog services
@@ -275,7 +275,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_blog_services(refresh_services = false)
     @blog_services = nil if refresh_services
-    @blog_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Blogging' }
+    @blog_services ||= get_services(refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Blogging' }
   end
   
   # Get all search services
@@ -284,7 +284,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_search_services(refresh_services = false)
     @search_services = nil if refresh_services
-    @search_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Search' }
+    @search_services ||= get_services(refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Search' }
   end
   
   # Get all general services. These are all services except photo, video, bookmark and music.
@@ -304,7 +304,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_photo_tag_services(refresh_services = false)
     @photo_services = nil if refresh_services
-    @photo_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Photos' }
+    @photo_services ||= get_tag_services(nil, refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Photos' }
   end
 
   # Get all video services that are used to generate tag feeds
@@ -313,7 +313,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database  
   def self.get_video_tag_services(refresh_services = false)
     @video_services = nil if refresh_services
-    @video_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Videos' }
+    @video_services ||= get_tag_services(nil, refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Videos' }
   end
   
   # Get all bookmark services that are used to generate tag feeds
@@ -322,7 +322,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_bookmark_tag_services(refresh_services = false)
     @bookmark_services = nil if refresh_services
-    @bookmark_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Bookmarks' }
+    @bookmark_services ||= get_tag_services(nil, refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Bookmarks' }
   end
   
   # Get all music services that are used to generate tag feeds
@@ -331,7 +331,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_music_tag_services(refresh_services = false)
     @music_services = nil if refresh_services
-    @music_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Music' }
+    @music_services ||= get_tag_services(nil, refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Music' }
   end
   
   # Get all news services that are used to generate tag feeds
@@ -340,7 +340,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_news_tag_services(refresh_services = false)
     @news_services = nil if refresh_services
-    @news_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'News' }
+    @news_services ||= get_tag_services(nil, refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'News' }
   end
   
   # Get all blog services that are used to generate tag feeds
@@ -349,7 +349,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_blog_tag_services(refresh_services = false)
     @blog_services = nil if refresh_services
-    @blog_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Blogging' }
+    @blog_services ||= get_tag_services(nil, refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Blogging' }
   end
   
   # Get all search services that are used to generate tag feeds
@@ -358,7 +358,7 @@ class Service < ActiveRecord::Base
   #                       will result in the values being repopulated from the database
   def self.get_search_tag_services(refresh_services = false)
     @search_services = nil if refresh_services
-    @search_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Search' }
+    @search_services ||= get_tag_services(nil, refresh_services).find_all{|service| !service.service_category.blank? && service.service_category.name == 'Search' }
   end
   
   # Get all general services that are used to generate tag feeds

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

@@ -1,6 +1,6 @@
 <%
 @json_recommendations = @entry.json_recommendations(@limit, params[:order] || "mixed", true, params[:omit_feeds] || nil) 
-if !@json_recommendations.nil? 
+if !@json_recommendations.empty? 
 @direct_link_text = params[:direct_link_text] || t('muck.services.direct_link')
 %>
 var catalog_page = <%= !@entry.direct_link.nil? and @uri == @entry.permalink %>;
@@ -26,6 +26,7 @@ document.write('<div class="oer_recommender_list">');
 for(nRec = 0; nRec < recs.length; nRec++) {
 	r = recs[nRec].entry;
     if (r == null) r = recs[nRec].attributes;
+    if (r == null) r = recs[nRec];
 	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">');
@@ -35,11 +36,11 @@ for(nRec = 0; nRec < recs.length; nRec++) {
 	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>');
+	document.write('<br/><span class="oer_recommender_uri">' + r.permalink + '</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.services.gm_more_prompt') %></a></div>');<% end %>	
+<% if params[:more_link] %>document.write('<div class="oer_recommender_more_link"><a href="' + app + 'resources/<%= @entry.id %>"><%= t('muck.services.gm_more_prompt') %></a></div>');<% end %>
 document.write('</div>');	
 <% end %>

data/config/muck_services_routes.rb

@@ -25,6 +25,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :oai_endpoints, :controller => 'muck/oai_endpoints', :has_many => :feeds
     
   map.resources :feeds, :controller => 'muck/feeds', :collection => { :new_extended => :get, :new_oai_rss => :get }, :has_many => :entries
+  map.connection 'users/:login/recommendations', :controller => 'muck/personal_recommendations', :action => 'index'
 
   map.connect 'recommendations/real_time', :controller => 'muck/recommendations', :action => 'real_time'
   map.connect 'recommendations/get_button', :controller => 'muck/recommendations', :action => 'get_button'

data/lib/active_record/acts/muck_recommendations.rb

@@ -11,6 +11,8 @@ 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
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "0.1.23"
+  s.version = "0.1.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2009-12-11}
+  s.date = %q{2009-12-19}
   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 = [
@@ -140,7 +140,6 @@ 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",
@@ -857,4 +856,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end
-

data/public/stylesheets/muck-services.css

@@ -98,7 +98,7 @@ ul#add_oai_rss_feed_menu li{display:inline;margin:0 5px;}
 #recs_header{color:#777;background-color:white;font-weight:bold;font-size:16px;font-family:Arial,Helvetica,sans-serif;margin: 2px 3px 0 3px; padding: 2px;}
 #recs_list{margin: 1px; padding: 1px; list-style-type: none;}
 #recs_list li{margin-left: 0px; padding: 3px; list-style-type: none; font-size: 12px;}
-.even{background-color:#E6E6E6;}
+.even{background-color:#DDD;}
 #more_recs{margin:4px 0 6px;padding:0;text-align:center;}
 #recs_panel a{color:#3987DC;text-decoration:none;}
 #recs_panel a:hover{text-decoration:underline;}

data/test/rails_root/config/environment.rb

@@ -31,6 +31,7 @@ Rails::Initializer.run do |config|
   config.gem "geokit"
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'
+  config.gem 'muck-profiles', :lib => 'muck_profiles'
   config.gem 'muck-comments', :lib => 'muck_comments'
   config.gem 'muck-activities', :lib => 'muck_activities'
   config.gem 'muck-shares', :lib => 'muck_shares'

data/test/rails_root/test/unit/aggregation_test.rb

@@ -29,44 +29,10 @@ class AggregationTest < ActiveSupport::TestCase
     should_have_many :aggregation_feeds
     should_have_many :feeds
 
-    context "named scope" do
-      context "by_title" do
-        setup do
-          Aggregation.delete_all
-          @first = Factory(:aggregation, :title => 'a')
-          @second = Factory(:aggregation, :title => 'b')
-        end
-        should "sort by title" do
-          assert_equal @first, Aggregation.by_title[0]
-          assert_equal @second, Aggregation.by_title[1]
-        end    
-      end
-      context "recent" do
-        setup do
-          Aggregation.delete_all
-          @recent = Factory(:aggregation)
-          @not_recent = Factory(:aggregation, :created_at => 10.weeks.ago)
-        end
-        should "get recent aggregations" do
-          assert Aggregation.recent.include?(@recent)
-        end
-        should "not get recent aggregations" do
-          assert !Aggregation.recent.include?(@not_recent)
-        end
-      end
-      context "newest" do
-        setup do
-          Aggregation.delete_all
-          @first = Factory(:aggregation, :created_at => 1.day.ago)
-          @second = Factory(:aggregation, :created_at => 1.week.ago)
-        end
-        should "sort by created_at" do
-          assert_equal @first, Aggregation.newest[0]
-          assert_equal @second, Aggregation.newest[1]
-        end
-      end
-    end
-  
+    should_scope_by_title
+    should_scope_recent
+    should_scope_newest
+
     context "filter feed types" do
       setup do
         build_music_service

data/test/rails_root/test/unit/feed_test.rb

@@ -53,11 +53,9 @@ class FeedTest < ActiveSupport::TestCase
     
     should_validate_presence_of :uri
     
-    should_have_named_scope :by_newest
-    should_have_named_scope :banned
-    should_have_named_scope :valid
-    should_have_named_scope :by_title
-    should_have_named_scope :recent
+    should_scope_by_title
+    should_scope_recent
+    should_scope_by_newest
     
     should "set 24 hours as default interval" do
       assert_equal @feed.harvest_interval_hours, 24
@@ -68,6 +66,35 @@ class FeedTest < ActiveSupport::TestCase
       assert_equal @feed.harvest_interval, 10 * 3600
     end
     
+    context "named scope" do
+      context "banned" do
+        # named_scope :banned, :conditions => ["status = ?", MuckServices::Status::BANNED]
+        setup do
+          @feed = Factory(:feed, :status => MuckServices::Status::BANNED)
+          @feed_not = Factory(:feed)
+        end
+        should "find feeds that are banned" do
+          assert Feed.banned.include?(@feed)
+        end
+        should "not find feeds that are not banned" do
+          assert !Feed.banned.include?(@feed_not)
+        end
+      end
+      context "valid" do
+        # named_scope :valid, :conditions => "status >= 0", :include => [:default_language]
+        setup do
+          @feed = Factory(:feed, :status => 0)
+          @feed_not = Factory(:feed, :status => MuckServices::Status::BANNED)
+        end
+        should "find valid feeds" do
+          assert Feed.valid.include?(@feed)
+        end
+        should "not find invalid feeds" do
+          assert !Feed.valid.include?(@feed_not)
+        end
+      end
+    end
+    
   end
   
   context "Feed status" do

data/test/rails_root/test/unit/oai_endpoint_test.rb

@@ -32,25 +32,52 @@ class OaiEndpointTest < ActiveSupport::TestCase
     
     should_validate_presence_of :uri
     
-    should_have_named_scope :by_newest
-    should_have_named_scope :banned
-    should_have_named_scope :valid
-    should_have_named_scope :by_title
-    should_have_named_scope :recent
+    should_scope_by_title
+    should_scope_recent
+    should_scope_by_newest
+
+    context "named scope" do
+      context "banned" do
+        # named_scope :banned, :conditions => ["status = ?", MuckServices::Status::BANNED]
+        setup do
+          @oai_endpoint = Factory(:oai_endpoint, :status => MuckServices::Status::BANNED)
+          @oai_endpoint_not = Factory(:oai_endpoint)
+        end
+        should "find oai_endpoints that are banned" do
+          assert OaiEndpoint.banned.include?(@oai_endpoint)
+        end
+        should "not find oai_endpoints that are not banned" do
+          assert !OaiEndpoint.banned.include?(@oai_endpoint_not)
+        end
+      end
+      context "valid" do
+        # named_scope :valid, :conditions => "status >= 0", :include => [:default_language]
+        setup do
+          @oai_endpoint = Factory(:oai_endpoint, :status => 0)
+          @oai_endpoint_not = Factory(:oai_endpoint, :status => MuckServices::Status::BANNED)
+        end
+        should "find valid oai_endpoints" do
+          assert OaiEndpoint.valid.include?(@oai_endpoint)
+        end
+        should "not find invalid oai_endpoints" do
+          assert !OaiEndpoint.valid.include?(@oai_endpoint_not)
+        end
+      end
+    end
     
   end
   
   context "banned/unbanned" do
     setup do
-      @feed = Factory(:feed)
+      @oai_endpoint = Factory(:oai_endpoint)
     end
     should "be banned" do
-      @feed.status = -1
-      assert @feed.banned?
+      @oai_endpoint.status = -1
+      assert @oai_endpoint.banned?
     end
     should "not be banned" do
-      @feed.status = 0
-      assert !@feed.banned?
+      @oai_endpoint.status = 0
+      assert !@oai_endpoint.banned?
     end
   end
   

data/test/rails_root/test/unit/service_category_test.rb

@@ -13,7 +13,7 @@ class ServiceCategoryTest < ActiveSupport::TestCase
 
   context "service category instance" do
     should_have_many :services
-    should_have_named_scope :sorted
+    should_scope_sorted
   end
   
 end

data/test/rails_root/test/unit/service_test.rb

@@ -24,11 +24,64 @@ require File.dirname(__FILE__) + '/../test_helper'
 class ServiceTest < ActiveSupport::TestCase
 
   context "service instance" do
-    
+
     should_belong_to :service_category
-    should_have_named_scope :sorted
-    should_have_named_scope :identity_services
-    should_have_named_scope :tag_services
+    should_scope_sorted
+    
+    context "named scope" do
+      context "identity_services" do
+        # named_scope :identity_services, :conditions => ['use_for = ?', 'identity']
+        setup do
+          @service = Factory(:service, :use_for => 'identity')
+          @service_not = Factory(:service, :use_for => 'not')
+        end
+        should "find services that have use_for=='identity_services'" do
+          assert Service.identity_services.include?(@service)
+        end
+        should "not find services that where use_for!='identity_services'" do
+          assert !Service.identity_services.include?(@service_not)
+        end
+      end
+      context "tag_services" do
+        # named_scope :tag_services, :conditions => ['use_for = ?', 'tags']
+        setup do
+          @service = Factory(:service, :use_for => 'tags')
+          @service_not = Factory(:service, :use_for => 'not')
+        end
+        should "find services that have use_for=='tags'" do
+          assert Service.tag_services.include?(@service)
+        end
+        should "not find services that where use_for!='tags'" do
+          assert !Service.tag_services.include?(@service_not)
+        end
+      end
+      context "sorted_id" do
+        # named_scope :sorted_id, :order => "id ASC"
+        setup do
+          Service.delete_all
+          @first = Factory(:service)
+          @second = Factory(:service)
+        end
+        should "sort by 'sort' field" do
+          assert_equal @first, Service.sorted_id[0]
+          assert_equal @second, Service.sorted_id[1]
+        end
+      end
+      context "photo_services" do
+        # named_scope :photo_services, :conditions => ["service_categories.id = services.service_category_id AND service_categories.name = 'Photos'"], :include => ['service_category']
+        setup do
+          @service_category = Factory(:service_category, :name => 'Photos')
+          @service = Factory(:service, :service_category => @service_category)
+          @service_not = Factory(:service)
+        end
+        should "find services that have 'Photos' for a service category" do
+          assert Service.photo_services.include?(@service)
+        end
+        should "not find services that don't have 'Photos' for a service category" do
+          assert !Service.photo_services.include?(@service_not)
+        end
+      end
+    end
     
     context "photos" do
       setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors: 
 - Joel Duffin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -07:00
+date: 2009-12-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -266,7 +266,6 @@ 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

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

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