muck-raker 0.1.48 → 0.1.49

data/VERSION

@@ -1 +1 @@
-0.1.48
+0.1.49

data/app/controllers/muck/topics_controller.rb

@@ -98,14 +98,14 @@ class Muck::TopicsController < ApplicationController
     
     def load_feeds
       if @load_feeds_on_server
-        @server_loaded_general_feeds = GoogleFeedRequest.load_feeds(@general_feeds + @discovered_feeds)
-        @server_loaded_photo_feeds = GoogleFeedRequest.load_feeds(@photo_feeds)
-        @server_loaded_video_feeds = GoogleFeedRequest.load_feeds(@video_feeds)
-        @server_loaded_bookmark_feeds = GoogleFeedRequest.load_feeds(@bookmark_feeds)
-        @server_loaded_music_feeds = GoogleFeedRequest.load_feeds(@music_feeds)
-        @server_loaded_news_feeds = GoogleFeedRequest.load_feeds(@news_feeds)
-        @server_loaded_blog_feeds = GoogleFeedRequest.load_feeds(@blog_feeds)
-        @server_loaded_search_feeds = GoogleFeedRequest.load_feeds(@search_feeds)
+        @server_loaded_general_feeds = GoogleFeedRequest.load_feeds(@general_feeds + @discovered_feeds, @number_of_items)
+        @server_loaded_photo_feeds = GoogleFeedRequest.load_feeds(@photo_feeds, @number_of_images)
+        @server_loaded_video_feeds = GoogleFeedRequest.load_feeds(@video_feeds, @number_of_videos)
+        @server_loaded_bookmark_feeds = GoogleFeedRequest.load_feeds(@bookmark_feeds, @number_of_items)
+        @server_loaded_music_feeds = GoogleFeedRequest.load_feeds(@music_feeds, @number_of_items)
+        @server_loaded_news_feeds = GoogleFeedRequest.load_feeds(@news_feeds, @number_of_items)
+        @server_loaded_blog_feeds = GoogleFeedRequest.load_feeds(@blog_feeds, @number_of_items)
+        @server_loaded_search_feeds = GoogleFeedRequest.load_feeds(@search_feeds, @number_of_items)
         if @show_combined
           @server_combined_general_feeds = Feed.combine_sort(@server_loaded_general_feeds)
           @server_combined_photo_feeds = Feed.combine_sort(@server_loaded_photo_feeds)
@@ -135,8 +135,8 @@ class Muck::TopicsController < ApplicationController
       @number_of_videos = 6
       
       @show_google_search = true
-      @show_combined = false
-      @load_feeds_on_server = false
+      @show_combined = true
+      @load_feeds_on_server = true
     end
     
 end

data/app/models/google_feed_request.rb

@@ -15,21 +15,25 @@ class GoogleFeedRequest
     @api_key_id = api_key_id
   end
   
+  # Lookup a given feed.  
   def self.lookup_feed(uri)
     get('http://ajax.googleapis.com/ajax/services/feed/lookup', :query => build_google_query({:q => uri}))
   end
   
   # Requests entries for a single feed
-  def self.load_feed(uri)
-    get('http://ajax.googleapis.com/ajax/services/feed/load', :query => build_google_query({:q => uri}))
+  #
+  # uri:             Uri of the feed to load
+  # number_of_items: Number of items to load from the feed
+  def self.load_feed(uri, number_of_items = 5)
+    get('http://ajax.googleapis.com/ajax/services/feed/load', :query => build_google_query({:q => uri, :num => number_of_items}))
   end
   
   # Requests a set of feeds from Google
   #
   # feeds:  An array of objects with the attributes 'uri' and 'service_id' defined
-  def self.load_feeds(feeds)
+  def self.load_feeds(feeds, number_of_items = 5)
     feeds = feeds.collect do |feed|
-      json = load_feed(feed.uri)
+      json = load_feed(feed.uri, number_of_items)
       new_feed = convert_google_feed_json_to_feed(feed, json)
       new_feed.entries << convert_google_feed_json_to_entries(new_feed, json).compact if new_feed
       new_feed
@@ -86,7 +90,7 @@ class GoogleFeedRequest
   
   # Search for feeds using google.  This will return 
   # a hash with the results
-  def self.find_google_feeds(query)
+  def self.find_google_feeds(query, number_of_items = 5)
     get('http://ajax.googleapis.com/ajax/services/feed/find', :query => build_google_query({:q => query}))
   end
   

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

@@ -49,8 +49,19 @@
 </div>
 
 <div class="span-10 column datafeeds">
-  <%= google_feeds(@photo_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
-  <%= google_feeds(@video_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
+  
+  <% if @load_feeds_on_server -%>
+    <div id="photos">
+      <%= render :partial => 'topics/feed', :collection => @server_loaded_photo_feeds %>
+    </div>
+    <div id="videos">
+      <%= render :partial => 'topics/feed', :collection => @server_loaded_video_feeds %>
+    </div>
+  <% else -%>
+    <%= google_feeds(@photo_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
+    <%= google_feeds(@video_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
+  <% end -%>
+  
   <%= google_feeds(@music_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
   <%= google_feeds(@bookmark_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
 </div>

data/muck-raker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.48"
+  s.version = "0.1.49"
 
   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-23}
+  s.date = %q{2009-10-24}
   s.description = %q{The aggregation and recommendation engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.48
+  version: 0.1.49
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 -06:00
+date: 2009-10-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency