muck-raker 0.1.40 → 0.1.41

data/VERSION

@@ -1 +1 @@
-0.1.40
+0.1.41

data/app/controllers/muck/aggregations_controller.rb

@@ -60,7 +60,7 @@ class Muck::AggregationsController < ApplicationController
       terms = params[:terms]
       terms = terms.join(' ') if terms.is_a?(Array)
       
-      #@feeds = Service.build_feeds(terms, current_user, params[:service_ids])
+      #@feeds = Service.build_tag_feeds(terms, current_user, params[:service_ids])
       
       @photo_feeds = Service.build_photo_feeds(terms, current_user)
       @video_feeds = Service.build_video_feeds(terms, current_user)

data/app/controllers/muck/entries_controller.rb

@@ -86,6 +86,8 @@ class Muck::EntriesController < ApplicationController
       @paginated_results = @results.paginate(:page => @page, :per_page => @per_page, :total_entries => @hit_count)
       log_query(current_user.nil? ? request.remote_addr : current_user.id, Language.locale_id, @tag_filter.nil? ? 'search' : 'browse', @search, @grain_size, @hit_count)
     end
+  rescue MuckRaker::Exceptions::LanguageNotSupported => ex
+    flash[:error] = ex
   end
   
   def query_logger

data/app/controllers/muck/identity_feeds_controller.rb

@@ -29,7 +29,7 @@ class Muck::IdentityFeedsController < ApplicationController
   def create
     @service = Service.find(params[:service_id])
     @feed = Feed.new(:uri => params[:uri], :login => params[:username])
-    feeds = Service.create_feeds_for_service(@service, params[:uri], params[:username], params[:password], current_user.id)
+    feeds = Service.create_tag_feeds_for_service(@service, params[:uri], params[:username], params[:password], current_user.id)
     if feeds.blank?
       success = false
       if params[:username]

data/app/controllers/muck/topics_controller.rb

@@ -3,7 +3,7 @@ class Muck::TopicsController < ApplicationController
   
   before_filter :adjust_format_for_iphone
   before_filter :check_terms, :except => [:new]
-  before_filter :build_feeds, :only => [:show, :rss_discovery]
+  before_filter :build_tag_feeds, :only => [:show, :rss_discovery]
   
   def show
     respond_to do |format|
@@ -71,7 +71,7 @@ class Muck::TopicsController < ApplicationController
       end
     end
     
-    def build_feeds
+    def build_tag_feeds
       @terms = CGI.unescape(params[:id])
       @page_title = @title = @terms.titleize
     

data/app/models/aggregation.rb

@@ -29,12 +29,14 @@ class Aggregation < ActiveRecord::Base
   # 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.
-  def add_feeds(user = nil, service_ids = nil)
-    safe_add_feeds(Service.create_feeds(self.terms, user, service_ids))    
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def add_feeds(user = nil, service_ids = nil, refresh_services = false)
+    safe_add_feeds(Service.create_tag_feeds(self.terms, user, service_ids, refresh_services))
   end
   
   def add_feeds_by_uri(user = nil, uris = nil)
-    safe_add_feeds(Feed.create_feeds(user, uris))
+    safe_add_feeds(Feed.create_tag_feeds(user, uris))
   end
   
   # Only add feeds that aren't already part of the aggregation
@@ -50,28 +52,28 @@ class Aggregation < ActiveRecord::Base
   end
   
   # Get only photo feeds
-  def photo_feeds
-    all_feeds.find_all{ |feed| feed.service.photo? }
+  def photo_feeds(refresh_services = false)
+    all_feeds.find_all{ |feed| feed.service.photo?(refresh_services) rescue nil }
   end
   
   # Get only video feeds
-  def video_feeds
-    all_feeds.find_all{ |feed| feed.service.video? }
+  def video_feeds(refresh_services = false)
+    all_feeds.find_all{ |feed| feed.service.video?(refresh_services) rescue nil }
   end
   
   # Get only bookmark feeds
-  def bookmark_feeds
-    all_feeds.find_all{ |feed| feed.service.bookmark? }
+  def bookmark_feeds(refresh_services = false)
+    all_feeds.find_all{ |feed| feed.service.bookmark?(refresh_services) rescue nil }
   end
 
   # Get only music feeds
-  def music_feeds
-    all_feeds.find_all{ |feed| feed.service.music? }
+  def music_feeds(refresh_services = false)
+    all_feeds.find_all{ |feed| feed.service.music?(refresh_services) rescue nil}
   end
 
   # Get only general feeds (exclude all specific feeds such as photos, videos, etc)
-  def general_feeds
-    all_feeds.find_all{ |feed| feed.service.general? }
+  def general_feeds(refresh_services = false)
+    all_feeds.find_all{ |feed| feed.service.general?(refresh_services) rescue nil }
   end
   
   def all_feeds

data/app/models/entry.rb

@@ -60,6 +60,7 @@ class Entry < ActiveRecord::Base
   end
   
   def self.search(search_terms, grain_size = nil, language = "en", limit = 10, offset = 0, operator = :or)
+    raise MuckRaker::Exceptions::LanguageNotSupported, I18n.t('muck.raker.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
     return find_by_solr(query, :limit => limit, :offset => offset, :scores => true, :select => "entries.id, entries.title, entries.permalink, entries.direct_link, entries.published_at, entries.description, entries.feed_id, feeds.short_title AS collection", :joins => "INNER JOIN feeds ON feeds.id = entries.feed_id", :core => language, :operator => operator)
   end

data/app/models/feed.rb

@@ -198,7 +198,7 @@ class Feed < ActiveRecord::Base
   # user: User that will be set as the feed contributor
   # uris: An array of uris for which to create feeds
   # service: A default service to be associated with all the feeds.
-  def self.create_feeds(user = nil, uris = nil, service = nil)
+  def self.create_tag_feeds(user = nil, uris = nil, service = nil)
     return [] if uris.blank?
     service ||= Service.default_service
     uris.collect { |uri| Feed.find_or_create(uri, '', '', '', service.id, user, uri) }

data/app/models/service.rb

@@ -26,28 +26,39 @@ class Service < ActiveRecord::Base
   named_scope :tag_services, :conditions => ['use_for = ?', 'tags']
   named_scope :photo_services, :conditions => ["service_categories.id = services.service_category_id AND service_categories.name = 'Photos'"], :include => ['service_category']
   
-  # Indicates whether feed is primarily a photo feed ie from flick, picasa, etc
-  def photo?
-    Service.get_photo_services.include?(self)
+  # Indicates whether service is primarily a photo service ie from flick, picasa, etc
+  #
+  # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
+  def photo?(refresh_services = false)
+    Service.get_photo_services(refresh_services).include?(self)
   end
   
-  # Indicates whether feed is primarily a video feed ie from youtube, etc
-  def video?
-    Service.get_video_services.include?(self)
+  # Indicates whether service is primarily a video service ie from youtube, etc
+  #
+  # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
+  def video?(refresh_services = false)
+    Service.get_video_services(refresh_services).include?(self)
   end
   
-  # Indicates whether feed is primarily a bookmark feed ie from delicious, etc
-  def bookmark?
-    Service.get_bookmark_services.include?(self)
+  # Indicates whether service is primarily a bookmark service ie delicious, etc
+  #
+  # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
+  def bookmark?(refresh_services = false)
+    Service.get_bookmark_services(refresh_services).include?(self)
   end
   
-  # Indicates whether feed is primarily a music feed
-  def music?
-    Service.get_music_services.include?(self)
+  # Indicates whether service is primarily music
+  #
+  # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
+  def music?(refresh_services = false)
+    Service.get_music_services(refresh_services).include?(self)
   end
   
-  def general?
-    Service.get_general_services.include?(self)
+  # Indicates whether service is general (ie not video, photo, music or bookmark)
+  #
+  # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
+  def general?(refresh_services = false)
+    Service.get_general_services(refresh_services).include?(self)
   end
   
   def human_uri(tag)
@@ -100,95 +111,179 @@ class Service < ActiveRecord::Base
   # Generates uris for 'tag' using all services where 'use_for' is 'tags'
   def self.generate_tag_uris(terms, selected_service_ids = nil)
     split_terms(terms).collect { |tag|
-      get_services(selected_service_ids).collect { |service| service.generate_tag_uri(tag) }
+      get_tag_services(selected_service_ids).collect { |service| service.generate_tag_uri(tag) }
     }.flatten!
   end
 
   # creates a feed for a service with a username and optional password
-  def self.create_feeds_for_service(service, uri, username, password, contributor)
+  def self.create_tag_feeds_for_service(service, uri, username, password, contributor)
     uris = service.generate_uris(username, password, uri)
     uris.collect{ |u| Feed.find_or_create(u.url, u.title, username, password, service.id, contributor) } if uris
   end
   
-  def self.build_photo_feeds(terms, user, service_ids = nil)
+  def self.build_photo_feeds(terms, user, service_ids = nil, refresh_services = false)
     if service_ids.nil?
-      service_ids = get_photo_services.map(&:id)
+      service_ids = get_photo_tag_services(refresh_services).map(&:id)
     else
-      service_ids = make_int_array(service_ids) & get_photo_services.map(&:id)
+      service_ids = make_int_array(service_ids) & get_photo_tag_services(refresh_services).map(&:id)
     end
-    build_feeds(terms, user, service_ids)
+    build_tag_feeds(terms, user, service_ids, refresh_services)
   end
   
-  def self.build_video_feeds(terms, user, service_ids = nil)
+  def self.build_video_feeds(terms, user, service_ids = nil, refresh_services = false)
     if service_ids.nil?
-      service_ids = get_video_services.map(&:id)
+      service_ids = get_video_tag_services(refresh_services).map(&:id)
     else
-      service_ids = make_int_array(service_ids) & get_video_services.map(&:id)
+      service_ids = make_int_array(service_ids) & get_video_tag_services(refresh_services).map(&:id)
     end
-    build_feeds(terms, user, service_ids)
+    build_tag_feeds(terms, user, service_ids, refresh_services)
   end
   
-  def self.build_bookmark_feeds(terms, user, service_ids = nil)
+  def self.build_bookmark_feeds(terms, user, service_ids = nil, refresh_services = false)
     if service_ids.nil?
-      service_ids = get_bookmark_services.map(&:id)
+      service_ids = get_bookmark_tag_services(refresh_services).map(&:id)
     else
-      service_ids = make_int_array(service_ids) & get_bookmark_services.map(&:id)
+      service_ids = make_int_array(service_ids) & get_bookmark_tag_services(refresh_services).map(&:id)
     end
-    build_feeds(terms, user, service_ids)
+    build_tag_feeds(terms, user, service_ids, refresh_services)
   end
   
-  def self.build_music_feeds(terms, user, service_ids = nil)
+  def self.build_music_feeds(terms, user, service_ids = nil, refresh_services = false)
     if service_ids.nil?
-      service_ids = get_music_services.map(&:id)
+      service_ids = get_music_tag_services(refresh_services).map(&:id)
     else
-      service_ids = make_int_array(service_ids) & get_music_services.map(&:id)
+      service_ids = make_int_array(service_ids) & get_music_tag_services(refresh_services).map(&:id)
     end
-    build_feeds(terms, user, service_ids)
+    build_tag_feeds(terms, user, service_ids, refresh_services)
   end
   
-  def self.build_general_feeds(terms, user, service_ids = nil)
+  def self.build_general_feeds(terms, user, service_ids = nil, refresh_services = false)
     if service_ids.nil?
-      service_ids = get_general_services.map(&:id)
+      service_ids = get_general_tag_services(refresh_services).map(&:id)
     else
-      service_ids = make_int_array(service_ids) & get_general_services.map(&:id)
+      service_ids = make_int_array(service_ids) & get_general_tag_services(refresh_services).map(&:id)
     end
-    build_feeds(terms, user, service_ids)
+    build_tag_feeds(terms, user, service_ids, refresh_services)
   end
-    
-  def self.get_photo_services
-    @photo_services ||= get_services.find_all{|service| service.service_category.name == 'Photos' }
+  
+  # Get all photo services
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       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' }
   end
   
-  def self.get_video_services
-    @video_services ||= get_services.find_all{|service| service.service_category.name == 'Videos' }
+  # Get all video services
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       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' }
   end
   
-  def self.get_bookmark_services
-    @bookmark_services ||= get_services.find_all{|service| service.service_category.name == 'Bookmarks' }
+  # Get all bookmark services
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       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' }
+  end
+  
+  # Get all music services
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       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' }
+  end
+
+  # Get all general services. These are all services except photo, video, bookmark and music.
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database  
+  def self.get_general_services(refresh_services = false)
+    @general_services = nil if refresh_services
+    @general_services ||= get_services(refresh_services).find_all{|service| !['Photos', 'Videos', 'Bookmarks', 'Music'].include?(service.service_category.name) }
+  end
+    
+  # Get all photo services that are used to generate tag feeds
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       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' }
+  end
+
+  # Get all video services that are used to generate tag feeds
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       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' }
   end
   
-  def self.get_music_services
-    @music_services ||= get_services.find_all{|service| service.service_category.name == 'Music' }
+  # Get all bookmark services that are used to generate tag feeds
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       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' }
   end
   
-  def self.get_general_services
-    @general_services ||= get_services.find_all{|service| !['Photos', 'Videos', 'Bookmarks', 'Music'].include?(service.service_category.name) }
+  # Get all music services that are used to generate tag feeds
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       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' }
   end
   
-  # Builds feeds (does not save them to the db) for the given term
-  def self.build_feeds(terms, user, selected_service_ids = nil)
+  # Get all general services that are used to generate tag feeds
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_general_tag_services(refresh_services = false)
+    @general_services = nil if refresh_services
+    @general_services ||= get_tag_services(nil, refresh_services).find_all{|service| !['Photos', 'Videos', 'Bookmarks', 'Music'].include?(service.service_category.name) }
+  end
+  
+  # Builds tag based feeds for the given term.  Feeds are not saved to the database. 
+  #
+  # terms:                Terms for which to generate feeds.  This value can be an array, a single string, 
+  #                       or a list of items seperated by a comma.
+  # user:                 User to attach the feed to.  This is the feed 'contributor.
+  # selected_service_ids: ids for services to select.
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.build_tag_feeds(terms, user, selected_service_ids = nil, refresh_services = false)
+    services = get_tag_services(selected_service_ids, refresh_services)
     split_terms(terms).collect { |tag|
-      get_services(selected_service_ids).collect { |service| Feed.new(:uri => service.generate_tag_uri(tag),
-                                                                      :display_uri => service.human_uri(tag),
-                                                                      :title => I18n.t('muck.raker.service_feed_name', :term => CGI.unescape(tag).humanize, :service => service.name),
-                                                                      :service_id => service.id,
-                                                                      :contributor_id => user) }
+      services.collect { |service| Feed.new(:uri => service.generate_tag_uri(tag),
+                                            :display_uri => service.human_uri(tag),
+                                            :title => I18n.t('muck.raker.service_feed_name', :term => CGI.unescape(tag).humanize, :service => service.name),
+                                            :service_id => service.id,
+                                            :contributor_id => user) }
     }.flatten!
   end
   
   # Builds feeds (does not save them to the db) for the given term.  Note that this
-  # method calls each feed created and so it can take a while to run.
-  def self.build_live_feeds(terms, user, selected_service_ids = nil)
+  # method calls the url for each feed created to attempt auto discovery and so it 
+  # can take a while to run.
+  #
+  # terms:                Terms for which to generate feeds.  This value can be an array, a single string, 
+  #                       or a list of items seperated by a comma.
+  # user:                 User to attach the feed to.  This is the feed 'contributor.
+  # selected_service_ids: ids for services to select.
+  def self.build_live_tag_feeds(terms, user, selected_service_ids = nil)
     uris = generate_tag_uris(terms, selected_service_ids)
     feed_uris = uris.collect { |uri| Feed.discover_feeds(uri)}
     feed_uris.collect { |feed| Feed.new(:uri => feed.url,
@@ -197,46 +292,72 @@ class Service < ActiveRecord::Base
                                         :contributor_id => user) }
   end
   
-  # Create feeds for the given terms
-  def self.create_feeds(terms, user = nil, selected_service_ids = nil)
+  # Create feeds for the given terms and save them to the database.
+  # terms:                Terms for which to generate feeds.  This value can be an array, a single string,
+  #                       or a list of items seperated by a comma.
+  # user:                 User to attach the feed to.  This is the feed 'contributor.
+  # selected_service_ids: ids for services to select.
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.create_tag_feeds(terms, user = nil, selected_service_ids = nil, refresh_services = false)
+    services = get_tag_services(selected_service_ids, refresh_services)
     split_terms(terms).collect { |tag|
-      get_services(selected_service_ids).collect { |service| Feed.find_or_create(service.generate_tag_uri(tag), tag, '', '', service.id, user, service.human_uri(tag)) }
+      services.collect { |service| Feed.find_or_create(service.generate_tag_uri(tag), tag, '', '', service.id, user, service.human_uri(tag)) }
     }.flatten!
   end
   
+  # Splits terms using a comma.  This method also URI encodes all resulting terms
+  # terms:                A string, array or comma delimited string of terms (tags).
   def self.split_terms(terms)
     return '' if terms.blank?
     terms = terms.split(',') unless terms.is_a?(Array)
     terms.collect { |tag| CGI.escape(tag.strip) }
   end
   
-  def self.get_services(selected_service_ids = nil)
+  # Gets all services with the specified service ids.  If selected_service_ids is not 
+  # provided then this method will get all tag services 
+  #
+  # selected_service_ids: ids for services to select.
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_tag_services(selected_service_ids = nil, refresh_services = false)
     if selected_service_ids
       selected_service_ids.collect! { |service_id| service_id.to_i } # make sure the ids are ints
       Service.tag_services.find_all { |service| selected_service_ids.include?(service.id) }
     else
-      @services ||= Service.tag_services
+      if refresh_services
+        @tag_services = Service.tag_services
+      else
+        @tag_services ||= Service.tag_services
+      end
     end
   end
-
-  # attempts to find a service using a uri
+  
+  # Selects and caches all services from the database.
+  # 
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_services(refresh_services = false)
+    @all_services = nil if refresh_services
+    @all_services ||= Service.all
+  end
+  
+  # Attempts to find a service object using a uri
+  #
   # uri:              Uri to search for.  This method will attempt to all services for any part of the provided uri.
   # refresh_services: Forces a refresh of the services.  By default the services are cached for the duration of the request.
   def self.find_service_by_uri(uri, refresh_services = false)
-    if refresh_services
-      @services = Service.all
-    else
-      @services ||= Service.all
-    end
-    service = @services.detect { |service| service.uri && service.uri.length > 0 && (uri.include?(service.uri) || service.uri.include?(uri)) }
+    service = get_services(refresh_services).detect { |service| service.uri && service.uri.length > 0 && (uri.include?(service.uri) || service.uri.include?(uri)) }
     service ||= default_service
     service
   end
   
+  # Turns all items in an array into integers.
   def self.make_int_array(a)
     a.collect{|i| i.to_i}
   end
   
+  # Default service is RSS
   def self.default_service
     Service.find_by_name('rss') # this will return the default rss service
   end

data/app/views/entries/_result_status.html.erb

@@ -10,7 +10,7 @@
       <%= link_to('[' + t('muck.raker.show_tagged_courses') + ']',  @tag_filter.nil? ? {:q => @search, :grain_size => 'course'} : {:grain_size => 'course'}) %>
       <% end %>
       &nbsp;&nbsp;
-      <%= link_to('[' + t('muck.raker.explore', :topic => @search) + ']', topic_path(@search)) %>
+      <%= link_to('[' + t('muck.raker.explore', :topic => @search.titleize) + ']', topic_path(URI.escape(@search))) %>
     </span>
   </div>
 </div>

data/app/views/entries/browse_by_tags.html.erb

@@ -1,3 +1,4 @@
+<%= output_errors('', {:class => 'help-box'}) %>
 <div class="block">
   <% if @results.length > 0 %>
     <%= render(:partial => 'entries/result_status') %>

data/lib/muck_raker/exceptions.rb

@@ -0,0 +1,5 @@
+module MuckRaker
+  module Exceptions
+    class LanguageNotSupported < StandardError; end
+  end
+end

data/lib/muck_raker/languages.rb

@@ -49,5 +49,9 @@ module Recommender
                   CZECH, DANISH, DUTCH, ENGLISH, FILIPINO, FRENCH, GERMAN, GREEK, HEBREW,
                   ITALIAN, JAPANESE, KOREAN, LATVIAN, LITHUANIAN, NORWEGIAN, POLISH, PORTUGESE,
                   ROMANIAN, RUSSIAN, SERBIAN, SLOVAK, SLOVENIAN, SPANISH, SWEDISH, UKRANIAN, VIETNAMESE]
+  
+    def self.supported_languages
+      AVAILABLE_LOCALES.gsub('^', '').split('|')
+    end
   end
 end

data/lib/muck_raker.rb

@@ -1,5 +1,6 @@
 require 'muck_raker/muck_custom_form_builder'
 require 'muck_raker/services'
+require 'muck_raker/languages'
 
 ActionController::Base.send :helper, MuckRakerHelper
 ActionController::Base.send :helper, MuckRakerFeedsHelper
@@ -7,6 +8,7 @@ ActionController::Base.send :helper, MuckRakerServicesHelper
 ActionController::Base.send :helper, MuckRakerAggregationsHelper
 ActionController::Base.send :helper, MuckRakerGoogleHelper
 
+ActiveRecord::Base.class_eval { include MuckRaker::Exceptions }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckFeedParent }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckRakerComment }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckRakerShare }

data/locales/en.yml

@@ -204,6 +204,7 @@ en:
         videos: "Videos"
         back: "Back"
         explore: "Explore {{topic}}"
+        language_not_supported: "The requested language is not supported"
         comment_entries_count:
           one: "1 Comment"
           other: "{{count}} Comments"

data/muck-raker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.40"
+  s.version = "0.1.41"
 
   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-10-16}
+  s.date = %q{2009-10-19}
   s.description = %q{The aggregation and recommendation engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -416,6 +416,7 @@ Gem::Specification.new do |s|
      "lib/active_record/acts/muck_raker_comment.rb",
      "lib/active_record/acts/muck_raker_share.rb",
      "lib/muck_raker.rb",
+     "lib/muck_raker/exceptions.rb",
      "lib/muck_raker/initialize_routes.rb",
      "lib/muck_raker/languages.rb",
      "lib/muck_raker/muck_custom_form_builder.rb",

data/test/rails_root/test/factories.rb

@@ -143,6 +143,7 @@ end
 Factory.define :service do |f|
   f.uri { Factory.next(:uri) }
   f.name { Factory.next(:name) }
+  f.service_category { |a| a.association(:service_category) }
 end
 
 Factory.define :service_category do |f|

data/test/rails_root/test/functional/topics_controller_test.rb

@@ -35,7 +35,7 @@ class Muck::TopicsControllerTest < ActionController::TestCase
   
     context "GET show without terms" do
       setup do
-        get :show, :id => ''
+        get :show, :id => ' '
       end
       should_set_the_flash_to(I18n.t('muck.raker.no_terms_error'))
       should_redirect_to("new topic") { new_topic_path }

data/test/rails_root/test/test_helper.rb

@@ -59,6 +59,15 @@ class ActsAsSolr::Post
 end
 
 
+# Used to add in a music service since services.yml doesn't currently have any.
+def build_music_service
+  # We don't have any music services in the default services.yml so we build one here
+  template = "http://example.com/{tag}.rss"
+  uri_template = "http://example.com/{tag}"
+  service_category = Factory(:service_category, :name => 'Music')
+  Factory(:service, :uri_data_template => template, :uri_template => uri_template,  :use_for => 'tags', :service_category_id => service_category.id)
+end
+  
 # load in the default data required to run the app
 def bootstrap_services
   ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)

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

@@ -68,9 +68,10 @@ class AggregationTest < ActiveSupport::TestCase
   
     context "filter feed types" do
       setup do
+        build_music_service
         Aggregation.delete_all
         @aggregation = Factory(:aggregation, :terms => 'autumn')
-        @aggregation.add_feeds # Generate all feeds
+        @aggregation.add_feeds(nil, nil, true) # Generate all feeds
       end
       should "get all feeds" do
         assert @aggregation.all_feeds.length > 0
@@ -78,25 +79,25 @@ class AggregationTest < ActiveSupport::TestCase
         assert @aggregation.all_feeds.any?{ |feed| feed.service.video? }
         assert @aggregation.all_feeds.any?{ |feed| feed.service.bookmark? }
         assert @aggregation.all_feeds.any?{ |feed| feed.service.general? }
-      end      
+      end
       should "only get photo feeds" do
-        assert @aggregation.photo_feeds.length > 0
+        assert @aggregation.photo_feeds(true).length > 0
         assert @aggregation.photo_feeds.all?{ |feed| feed.service.photo? }
       end
       should "only get video feeds" do
-        assert @aggregation.video_feeds.length > 0
+        assert @aggregation.video_feeds(true).length > 0
         assert @aggregation.video_feeds.all?{ |feed| feed.service.video? }
       end
       should "only get bookmark feeds" do
-        assert @aggregation.bookmark_feeds.length > 0
+        assert @aggregation.bookmark_feeds(true).length > 0
         assert @aggregation.bookmark_feeds.all?{ |feed| feed.service.bookmark? }
       end
       should "only get music feeds" do
-        assert @aggregation.music_feeds.length > 0
+        assert @aggregation.music_feeds(true).length > 0
         assert @aggregation.music_feeds.all?{ |feed| feed.service.music? }
       end
       should "only get general feeds" do
-        assert @aggregation.general_feeds.length > 0
+        assert @aggregation.general_feeds(true).length > 0
         assert @aggregation.general_feeds.all?{ |feed| feed.service.general? }
       end
       
@@ -106,7 +107,7 @@ class AggregationTest < ActiveSupport::TestCase
       setup do
         @uris = ['http://www.example.com', 'http://www.justinball.com']
         @aggregation = Factory(:aggregation)
-        @aggregation.add_feeds_by_uri(nil, uris)
+        @aggregation.add_feeds_by_uri(nil, @uris)
         @aggregation.reload
       end
       should "add feeds" do

data/test/rails_root/test/unit/entry_test.rb

@@ -48,6 +48,18 @@ class EntryTest < ActiveSupport::TestCase
     subject { @entry }
     
     should_belong_to :feed
+    
+    context "search" do
+      # should "search indexes for ruby" do
+      #   Entry.search('ruby', 'all', 'en', 10, 0)
+      # end
+      should "raise invalid language error" do
+        assert_raise(MuckRaker::Exceptions::LanguageNotSupported) do
+          Entry.search('ruby', 'all', 'foo', 10, 0)
+        end
+      end
+    end
+    
   end
   
 end

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

@@ -22,6 +22,7 @@ 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
@@ -33,7 +34,7 @@ class ServiceTest < ActiveSupport::TestCase
         @service = Factory(:service, :service_category_id => service_category.id)
       end
       should "be a photo service" do
-        assert @service.photo?
+        assert @service.photo?(true)
       end
     end
     
@@ -43,7 +44,37 @@ class ServiceTest < ActiveSupport::TestCase
         @service = Factory(:service, :service_category_id => service_category.id)
       end
       should "be a video service" do
-        assert @service.video?
+        assert @service.video?(true)
+      end
+    end
+    
+    context "bookmarks" do
+      setup do
+        service_category = Factory(:service_category, :name => 'Bookmarks')
+        @service = Factory(:service, :service_category_id => service_category.id)
+      end
+      should "be a bookmark service" do
+        assert @service.bookmark?(true)
+      end
+    end
+    
+    context "music" do
+      setup do
+        service_category = Factory(:service_category, :name => 'Music')
+        @service = Factory(:service, :service_category_id => service_category.id)
+      end
+      should "be a music service" do
+        assert @service.music?(true)
+      end
+    end
+    
+    context "general" do
+      setup do
+        service_category = Factory(:service_category, :name => 'RSS')
+        @service = Factory(:service, :service_category_id => service_category.id)
+      end
+      should "be a general service" do
+        assert @service.general?(true)
       end
     end
     
@@ -81,30 +112,30 @@ class ServiceTest < ActiveSupport::TestCase
     end
     should "set display uri when building a feed" do
       tag = 'identity'
-      feeds = Service.build_feeds(tag, @user)
+      feeds = Service.build_tag_feeds(tag, @user, nil, true)
       assert feeds.any?{|feed| feed.display_uri == (@uri_template.sub('{tag}', tag))}
     end
     should "build a feed for every tag service" do
       tag = 'cycling'
-      feeds = Service.build_feeds(tag, @user)
+      feeds = Service.build_tag_feeds(tag, @user, nil, true)
       assert_equal Service.tag_services.length, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
     should "build a limited number of feeds for tag" do
       tag = 'ruby'
-      feeds = Service.build_feeds(tag, @user, [@service.id])
+      feeds = Service.build_tag_feeds(tag, @user, [@service.id], true)
       assert_equal 1, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
     should "create a feed for every tag service" do
       tag = 'physics'
-      feeds = Service.create_feeds(tag, @user)
+      feeds = Service.create_tag_feeds(tag, @user, nil, true)
       assert_equal Service.tag_services.length, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
     should "create a limited number of feeds for tag" do
       tag = 'math'
-      feeds = Service.create_feeds(tag, @user, [@service.id])
+      feeds = Service.create_tag_feeds(tag, @user, [@service.id], true)
       assert_equal 1, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
@@ -119,7 +150,7 @@ class ServiceTest < ActiveSupport::TestCase
       @user = Factory(:user)
     end
     should "create feed from service" do
-      feeds = Service.create_feeds_for_service(@service, '', @login, @password, @user.id)
+      feeds = Service.create_tag_feeds_for_service(@service, '', @login, @password, @user.id)
       feed = feeds[0]
       assert_equal @uri_data_template.sub("{username}", @login), feed.uri
       assert_equal @login, feed.login
@@ -127,7 +158,7 @@ class ServiceTest < ActiveSupport::TestCase
       assert_equal @service.id, feed.service_id
     end
     should "create feed from service even with nil template" do
-      feeds = Service.create_feeds_for_service(@service, '', @login, @password, @user.id)
+      feeds = Service.create_tag_feeds_for_service(@service, '', @login, @password, @user.id)
       feed = feeds[0]
       assert_equal @uri_data_template.sub("{username}", @login), feed.uri
       assert_equal @login, feed.login
@@ -189,7 +220,8 @@ class ServiceTest < ActiveSupport::TestCase
     end
     context "music feeds" do
       setup do
-        @feeds = Service.build_music_feeds(@terms, @user.id)
+        build_music_service
+        @feeds = Service.build_music_feeds(@terms, @user.id, nil, true) # We build the music service above so we have to force a cache refresh
       end
       should "only create music feeds" do
         assert @feeds.length > 0
@@ -199,29 +231,32 @@ class ServiceTest < ActiveSupport::TestCase
   end
   
   context "service types" do
+    setup do
+      build_music_service
+    end
     should "get photo services" do
-      assert Service.get_photo_services.length > 0
-      assert Service.get_photo_services.all? { |service| service.service_category.name == "Photo" }
+      assert Service.get_photo_tag_services(true).length > 0
+      assert Service.get_photo_tag_services.all? { |service| service.service_category.name == "Photos" }
     end
     should "get video services" do
-      assert Service.get_video_services.length > 0
-      assert Service.get_video_services.all? { |service| service.service_category.name == "Video" }
+      assert Service.get_video_tag_services(true).length > 0
+      assert Service.get_video_tag_services.all? { |service| service.service_category.name == "Videos" }
     end
     should "get bookmark services" do
-      assert Service.get_bookmark_services.length > 0
-      assert Service.get_bookmark_services.all? { |service| service.service_category.name == "Bookmark" }
+      assert Service.get_bookmark_tag_services(true).length > 0
+      assert Service.get_bookmark_tag_services.all? { |service| service.service_category.name == "Bookmarks" }
     end
     should "get music services" do
-      assert Service.get_music_services.length > 0
-      assert Service.get_music_services.all? { |service| service.service_category.name == "Music" }
+      assert Service.get_music_tag_services(true).length > 0
+      assert Service.get_music_tag_services.all? { |service| service.service_category.name == "Music" }
     end
     should "get general services" do
-      assert Service.get_general_services.length > 0
-      assert !Service.get_general_services.any? { |service| service.service_category.name == "Photo" }
-      assert !Service.get_general_services.any? { |service| service.service_category.name == "Video" }
-      assert !Service.get_general_services.any? { |service| service.service_category.name == "Bookmark" }
-      assert !Service.get_general_services.any? { |service| service.service_category.name == "Music" }
+      assert Service.get_general_tag_services(true).length > 0
+      assert !Service.get_general_tag_services.any? { |service| service.service_category.name == "Photos" }
+      assert !Service.get_general_tag_services.any? { |service| service.service_category.name == "Videos" }
+      assert !Service.get_general_tag_services.any? { |service| service.service_category.name == "Bookmarks" }
+      assert !Service.get_general_tag_services.any? { |service| service.service_category.name == "Music" }
     end
   end
-     
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.40
+  version: 0.1.41
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -06:00
+date: 2009-10-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -511,6 +511,7 @@ files:
 - lib/active_record/acts/muck_raker_comment.rb
 - lib/active_record/acts/muck_raker_share.rb
 - lib/muck_raker.rb
+- lib/muck_raker/exceptions.rb
 - lib/muck_raker/initialize_routes.rb
 - lib/muck_raker/languages.rb
 - lib/muck_raker/muck_custom_form_builder.rb