muck-services 0.1.24 → 0.1.25

data/VERSION

@@ -1 +1 @@
-0.1.24
+0.1.25

data/app/helpers/muck_services_service_helper.rb

@@ -37,23 +37,12 @@ module MuckServicesServiceHelper
   def services_for_user_edit(identity_feeds, title = nil, css = '')
     render :partial => 'identity_feeds/services_for_user', :locals => { :identity_feeds => identity_feeds, :css => css, :title => title, :edit => true }
   end
-  
-  # Renders an icon for the given service
-  # Name is the name of the image file associated with the service
-  # Size can be one of 16, 24, 48 or 60.
-  def service_icon(name, size = 24)
-    %Q{<img src="/images/service_icons/#{size}/#{name}" />}
-  end
-  
-  def service_image(name, size = 24)
-    %Q{/images/service_icons/#{size}/#{name}}
-  end
-  
+
   # Renders name and icon for the service
   def service_title(service)
     %Q{<div class="identity-service-title" #{service_icon_background(service)}>#{service_prompt(service)}</div>}
   end
-  
+    
   # By default renders Service username e.g. Flickr username
   # If the service has a 'prompt' set it will look for a value in the localization
   # files.  For example, setting service.prompt to 'blog_url' will cause this method
@@ -107,10 +96,6 @@ module MuckServicesServiceHelper
     end
   end
   
-  def service_icon_background(service)
-    %Q{style="background: transparent url('#{service_image(service.icon, 24)}') no-repeat scroll left top;"}
-  end
-  
   def url_by_identity_feed(owner, identity_feed, service)
     if identity_feed
       polymorphic_url([owner, identity_feed], :service_id => service.to_param)

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/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

@@ -25,7 +25,6 @@ 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,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
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# 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.24"
+  s.version = "0.1.25"
 
   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-19}
+  s.date = %q{2009-12-21}
   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,6 +140,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",
@@ -428,269 +429,6 @@ Gem::Specification.new do |s|
      "locales/zh-TW.yml",
      "locales/zh.yml",
      "muck-services.gemspec",
-     "public/images/folksemantic/logo-folksemantic-gm.gif",
-     "public/images/service_icons/16/amazon.png",
-     "public/images/service_icons/16/ask.png",
-     "public/images/service_icons/16/bibsonomy.png",
-     "public/images/service_icons/16/bing.png",
-     "public/images/service_icons/16/blogger.png",
-     "public/images/service_icons/16/bloglines.png",
-     "public/images/service_icons/16/citeulike.png",
-     "public/images/service_icons/16/clipmarks.png",
-     "public/images/service_icons/16/connotea.png",
-     "public/images/service_icons/16/dailymotion.png",
-     "public/images/service_icons/16/delicious.png",
-     "public/images/service_icons/16/digg.png",
-     "public/images/service_icons/16/diigo.png",
-     "public/images/service_icons/16/facebook.png",
-     "public/images/service_icons/16/feed.png",
-     "public/images/service_icons/16/flickr.png",
-     "public/images/service_icons/16/fotolog.png",
-     "public/images/service_icons/16/friendfeed.png",
-     "public/images/service_icons/16/friendster.png",
-     "public/images/service_icons/16/furl.png",
-     "public/images/service_icons/16/goodreads.png",
-     "public/images/service_icons/16/google.png",
-     "public/images/service_icons/16/googleblog.png",
-     "public/images/service_icons/16/googlenews.png",
-     "public/images/service_icons/16/icerocket.png",
-     "public/images/service_icons/16/identica.png",
-     "public/images/service_icons/16/joost.png",
-     "public/images/service_icons/16/lastfm.png",
-     "public/images/service_icons/16/librarything.png",
-     "public/images/service_icons/16/linkedin.png",
-     "public/images/service_icons/16/livejournal.png",
-     "public/images/service_icons/16/magnolia.png",
-     "public/images/service_icons/16/mendeley.png",
-     "public/images/service_icons/16/metacafe.png",
-     "public/images/service_icons/16/mixx.png",
-     "public/images/service_icons/16/myspace.png",
-     "public/images/service_icons/16/netflix.png",
-     "public/images/service_icons/16/netvibes.png",
-     "public/images/service_icons/16/newsvine.png",
-     "public/images/service_icons/16/oai.png",
-     "public/images/service_icons/16/odeo.png",
-     "public/images/service_icons/16/opml.png",
-     "public/images/service_icons/16/pandora.png",
-     "public/images/service_icons/16/photobucket.png",
-     "public/images/service_icons/16/picasa.png",
-     "public/images/service_icons/16/polyvore.png",
-     "public/images/service_icons/16/pownce.png",
-     "public/images/service_icons/16/reddit.png",
-     "public/images/service_icons/16/simpy.png",
-     "public/images/service_icons/16/smugmug.png",
-     "public/images/service_icons/16/stumbleupon.png",
-     "public/images/service_icons/16/tag.png",
-     "public/images/service_icons/16/technorati.png",
-     "public/images/service_icons/16/tumblr.png",
-     "public/images/service_icons/16/twine.png",
-     "public/images/service_icons/16/twitter.png",
-     "public/images/service_icons/16/vimeo.png",
-     "public/images/service_icons/16/webshots.png",
-     "public/images/service_icons/16/wordpress.png",
-     "public/images/service_icons/16/xanga.png",
-     "public/images/service_icons/16/yahoo.png",
-     "public/images/service_icons/16/yelp.png",
-     "public/images/service_icons/16/youtube.png",
-     "public/images/service_icons/16/zooomr.png",
-     "public/images/service_icons/16/zotero.png",
-     "public/images/service_icons/24/amazon.png",
-     "public/images/service_icons/24/ask.png",
-     "public/images/service_icons/24/bibsonomy.png",
-     "public/images/service_icons/24/bing.png",
-     "public/images/service_icons/24/blogger.png",
-     "public/images/service_icons/24/bloglines.png",
-     "public/images/service_icons/24/citeulike.png",
-     "public/images/service_icons/24/clipmarks.png",
-     "public/images/service_icons/24/connotea.png",
-     "public/images/service_icons/24/dailymotion.png",
-     "public/images/service_icons/24/delicious.png",
-     "public/images/service_icons/24/digg.png",
-     "public/images/service_icons/24/diigo.png",
-     "public/images/service_icons/24/facebook.png",
-     "public/images/service_icons/24/feed.png",
-     "public/images/service_icons/24/flickr.png",
-     "public/images/service_icons/24/fotolog.png",
-     "public/images/service_icons/24/friendfeed.png",
-     "public/images/service_icons/24/friendster.png",
-     "public/images/service_icons/24/furl.png",
-     "public/images/service_icons/24/goodreads.png",
-     "public/images/service_icons/24/google.png",
-     "public/images/service_icons/24/googleblog.png",
-     "public/images/service_icons/24/googlenews.png",
-     "public/images/service_icons/24/icerocket.png",
-     "public/images/service_icons/24/identica.png",
-     "public/images/service_icons/24/joost.png",
-     "public/images/service_icons/24/lastfm.png",
-     "public/images/service_icons/24/librarything.png",
-     "public/images/service_icons/24/linkedin.png",
-     "public/images/service_icons/24/livejournal.png",
-     "public/images/service_icons/24/magnolia.png",
-     "public/images/service_icons/24/mendeley.png",
-     "public/images/service_icons/24/metacafe.png",
-     "public/images/service_icons/24/mixx.png",
-     "public/images/service_icons/24/myspace.png",
-     "public/images/service_icons/24/netflix.png",
-     "public/images/service_icons/24/netvibes.png",
-     "public/images/service_icons/24/newsvine.png",
-     "public/images/service_icons/24/oai.png",
-     "public/images/service_icons/24/odeo.png",
-     "public/images/service_icons/24/opml.png",
-     "public/images/service_icons/24/pandora.png",
-     "public/images/service_icons/24/photobucket.png",
-     "public/images/service_icons/24/picasa.png",
-     "public/images/service_icons/24/polyvore.png",
-     "public/images/service_icons/24/pownce.png",
-     "public/images/service_icons/24/reddit.png",
-     "public/images/service_icons/24/simpy.png",
-     "public/images/service_icons/24/smugmug.png",
-     "public/images/service_icons/24/stumbleupon.png",
-     "public/images/service_icons/24/tag.png",
-     "public/images/service_icons/24/technorati.png",
-     "public/images/service_icons/24/tumblr.png",
-     "public/images/service_icons/24/twine.png",
-     "public/images/service_icons/24/twitter.png",
-     "public/images/service_icons/24/vimeo.png",
-     "public/images/service_icons/24/webshots.png",
-     "public/images/service_icons/24/wordpress.png",
-     "public/images/service_icons/24/xanga.png",
-     "public/images/service_icons/24/yahoo.png",
-     "public/images/service_icons/24/yelp.png",
-     "public/images/service_icons/24/youtube.png",
-     "public/images/service_icons/24/zooomr.png",
-     "public/images/service_icons/24/zotero.png",
-     "public/images/service_icons/48/amazon.png",
-     "public/images/service_icons/48/ask.png",
-     "public/images/service_icons/48/bibsonomy.png",
-     "public/images/service_icons/48/bing.png",
-     "public/images/service_icons/48/blogger.png",
-     "public/images/service_icons/48/bloglines.png",
-     "public/images/service_icons/48/citeulike.png",
-     "public/images/service_icons/48/clipmarks.png",
-     "public/images/service_icons/48/connotea.png",
-     "public/images/service_icons/48/dailymotion.png",
-     "public/images/service_icons/48/delicious.png",
-     "public/images/service_icons/48/digg.png",
-     "public/images/service_icons/48/diigo.png",
-     "public/images/service_icons/48/facebook.png",
-     "public/images/service_icons/48/feed.png",
-     "public/images/service_icons/48/flickr.png",
-     "public/images/service_icons/48/fotolog.png",
-     "public/images/service_icons/48/friendfeed.png",
-     "public/images/service_icons/48/friendster.png",
-     "public/images/service_icons/48/furl.png",
-     "public/images/service_icons/48/goodreads.png",
-     "public/images/service_icons/48/google.png",
-     "public/images/service_icons/48/googleblog.png",
-     "public/images/service_icons/48/googlenews.png",
-     "public/images/service_icons/48/icerocket.png",
-     "public/images/service_icons/48/identica.png",
-     "public/images/service_icons/48/joost.png",
-     "public/images/service_icons/48/lastfm.png",
-     "public/images/service_icons/48/librarything.png",
-     "public/images/service_icons/48/linkedin.png",
-     "public/images/service_icons/48/livejournal.png",
-     "public/images/service_icons/48/magnolia.png",
-     "public/images/service_icons/48/mendeley.png",
-     "public/images/service_icons/48/metacafe.png",
-     "public/images/service_icons/48/mixx.png",
-     "public/images/service_icons/48/myspace.png",
-     "public/images/service_icons/48/netflix.png",
-     "public/images/service_icons/48/netvibes.png",
-     "public/images/service_icons/48/newsvine.png",
-     "public/images/service_icons/48/oai.png",
-     "public/images/service_icons/48/odeo.png",
-     "public/images/service_icons/48/opml.png",
-     "public/images/service_icons/48/pandora.png",
-     "public/images/service_icons/48/photobucket.png",
-     "public/images/service_icons/48/picasa.png",
-     "public/images/service_icons/48/polyvore.png",
-     "public/images/service_icons/48/pownce.png",
-     "public/images/service_icons/48/reddit.png",
-     "public/images/service_icons/48/simpy.png",
-     "public/images/service_icons/48/smugmug.png",
-     "public/images/service_icons/48/stumbleupon.png",
-     "public/images/service_icons/48/tag.png",
-     "public/images/service_icons/48/technorati.png",
-     "public/images/service_icons/48/tumblr.png",
-     "public/images/service_icons/48/twine.png",
-     "public/images/service_icons/48/twitter.png",
-     "public/images/service_icons/48/vimeo.png",
-     "public/images/service_icons/48/webshots.png",
-     "public/images/service_icons/48/wordpress.png",
-     "public/images/service_icons/48/xanga.png",
-     "public/images/service_icons/48/yahoo.png",
-     "public/images/service_icons/48/yelp.png",
-     "public/images/service_icons/48/youtube.png",
-     "public/images/service_icons/48/zooomr.png",
-     "public/images/service_icons/48/zotero.png",
-     "public/images/service_icons/60/amazon.png",
-     "public/images/service_icons/60/ask.png",
-     "public/images/service_icons/60/bibsonomy.png",
-     "public/images/service_icons/60/bing.png",
-     "public/images/service_icons/60/blogger.png",
-     "public/images/service_icons/60/bloglines.png",
-     "public/images/service_icons/60/citeulike.png",
-     "public/images/service_icons/60/clipmarks.png",
-     "public/images/service_icons/60/connotea.png",
-     "public/images/service_icons/60/dailymotion.png",
-     "public/images/service_icons/60/delicious.png",
-     "public/images/service_icons/60/digg.png",
-     "public/images/service_icons/60/diigo.png",
-     "public/images/service_icons/60/facebook.png",
-     "public/images/service_icons/60/feed.png",
-     "public/images/service_icons/60/flickr.png",
-     "public/images/service_icons/60/fotolog.png",
-     "public/images/service_icons/60/friendfeed.png",
-     "public/images/service_icons/60/friendster.png",
-     "public/images/service_icons/60/furl.png",
-     "public/images/service_icons/60/goodreads.png",
-     "public/images/service_icons/60/google.png",
-     "public/images/service_icons/60/googleblog.png",
-     "public/images/service_icons/60/googlenews.png",
-     "public/images/service_icons/60/icerocket.png",
-     "public/images/service_icons/60/identica.png",
-     "public/images/service_icons/60/joost.png",
-     "public/images/service_icons/60/lastfm.png",
-     "public/images/service_icons/60/librarything.png",
-     "public/images/service_icons/60/linkedin.png",
-     "public/images/service_icons/60/livejournal.png",
-     "public/images/service_icons/60/magnolia.png",
-     "public/images/service_icons/60/mendeley.png",
-     "public/images/service_icons/60/metacafe.png",
-     "public/images/service_icons/60/mixx.png",
-     "public/images/service_icons/60/myspace.png",
-     "public/images/service_icons/60/netflix.png",
-     "public/images/service_icons/60/netvibes.png",
-     "public/images/service_icons/60/newsvine.png",
-     "public/images/service_icons/60/oai.png",
-     "public/images/service_icons/60/odeo.png",
-     "public/images/service_icons/60/opml.png",
-     "public/images/service_icons/60/pandora.png",
-     "public/images/service_icons/60/photobucket.png",
-     "public/images/service_icons/60/picasa.png",
-     "public/images/service_icons/60/polyvore.png",
-     "public/images/service_icons/60/pownce.png",
-     "public/images/service_icons/60/reddit.png",
-     "public/images/service_icons/60/simpy.png",
-     "public/images/service_icons/60/smugmug.png",
-     "public/images/service_icons/60/stumbleupon.png",
-     "public/images/service_icons/60/tag.png",
-     "public/images/service_icons/60/technorati.png",
-     "public/images/service_icons/60/tumblr.png",
-     "public/images/service_icons/60/twine.png",
-     "public/images/service_icons/60/twitter.png",
-     "public/images/service_icons/60/vimeo.png",
-     "public/images/service_icons/60/webshots.png",
-     "public/images/service_icons/60/wordpress.png",
-     "public/images/service_icons/60/xanga.png",
-     "public/images/service_icons/60/yahoo.png",
-     "public/images/service_icons/60/yelp.png",
-     "public/images/service_icons/60/youtube.png",
-     "public/images/service_icons/60/zooomr.png",
-     "public/images/service_icons/60/zotero.png",
-     "public/images/service_icons/facebook_friend_links.jpg",
-     "public/images/service_icons/facebook_my_links.jpg",
      "public/javascripts/muck_services.js",
      "public/javascripts/recommenderextension.user.js",
      "public/stylesheets/frame.css",
@@ -856,3 +594,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end
+