muck-raker 0.1.49 → 0.2.0

data/Rakefile

@@ -73,6 +73,7 @@ begin
   Jeweler::RubyforgeTasks.new do |rubyforge|
     rubyforge.doc_task = "rdoc"
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.49
+0.2.0

data/app/controllers/muck/topics_controller.rb

@@ -120,13 +120,33 @@ class Muck::TopicsController < ApplicationController
     end
     
     def load_combined_feeds
-      return unless @load_feeds_on_server && @show_combined
-      @server_combined_feeds = Feed.sort_entries(@server_combined_general_feeds + @server_combined_news_feeds + 
-                                               @server_combined_blog_feeds + @server_combined_search_feeds + 
-                                               @server_combined_photo_feeds + @server_combined_video_feeds + 
-                                               @server_combined_bookmark_feeds + @server_combined_music_feeds)
-      @server_combined_data_feeds = Feed.sort_entries(@server_combined_general_feeds + @server_combined_news_feeds + @server_combined_blog_feeds + @server_combined_search_feeds)
-      @server_combined_extended_data_feeds = Feed.sort_entries(@server_combined_data_feeds + @server_combined_bookmark_feeds)
+      return unless @load_feeds_on_server
+      @server_loaded_feeds = []
+      @server_loaded_feeds += @server_loaded_general_feeds if @server_loaded_general_feeds 
+      @server_loaded_feeds += @server_loaded_news_feeds if @server_loaded_news_feeds 
+      @server_loaded_feeds += @server_loaded_blog_feeds if @server_loaded_blog_feeds 
+      @server_loaded_feeds += @server_loaded_search_feeds if @server_loaded_search_feeds 
+      @server_loaded_feeds += @server_loaded_photo_feeds if @server_loaded_photo_feeds 
+      @server_loaded_feeds += @server_loaded_video_feeds if @server_loaded_video_feeds 
+      @server_loaded_feeds += @server_loaded_bookmark_feeds if @server_loaded_bookmark_feeds 
+      @server_loaded_feeds += @server_loaded_music_feeds if @server_loaded_music_feeds
+      
+      @server_loaded_data_feeds = []
+      @server_loaded_data_feeds += @server_loaded_general_feeds if @server_loaded_general_feeds 
+      @server_loaded_data_feeds += @server_loaded_news_feeds if @server_loaded_news_feeds 
+      @server_loaded_data_feeds += @server_loaded_blog_feeds if @server_loaded_blog_feeds 
+      @server_loaded_data_feeds += @server_loaded_search_feeds if @server_loaded_search_feeds
+      
+      @server_loaded_extended_data_feeds = []
+      @server_loaded_extended_data_feeds += @server_loaded_data_feeds if @server_loaded_data_feeds
+      @server_loaded_extended_data_feeds += @server_loaded_bookmark_feeds if @server_loaded_bookmark_feeds
+      
+      if @show_combined
+        @server_combined_feeds = Feed.combine_sort(@server_loaded_feeds)
+        @server_combined_data_feeds = Feed.combine_sort(@server_loaded_data_feeds)
+        @server_combined_extended_data_feeds = Feed.combine_sort(@server_loaded_extended_data_feeds)
+      end
+      
     end
     
     def configure_feed_loading

data/app/views/google/_combined_feed.html.erb

@@ -27,7 +27,7 @@
         html += '</li>';
         jQuery('#<%= content_id %> ul').append(html);
       }
-      apply_show_content();
+      apply_show_entry_content();
       <%= "#{javascript_callback}('#{content_id}');" if javascript_callback -%>
     }
   }

data/app/views/google/_feeds_scripts.html.erb

@@ -30,6 +30,7 @@ function setup_delete_links() {
   });
 }
 jQuery(document).ready(function() {
-  setup_delete_links();
+  google_load_complete('','');
+  setup_delete_links();  
 });
 <% end -%>

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

@@ -33,7 +33,7 @@
         });
       </script>
     <% else -%>
-      <%= render :partial => 'topics/feed', :collection => @server_loaded_general_feeds %>
+      <%= render :partial => 'topics/feed', :collection => @server_loaded_data_feeds %>
     <% end -%>
   <% elsif @show_combined -%>
     <%= google_combined_feeds(@general_feeds + @discovered_feeds) %>

data/muck-raker.gemspec

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

data/test/rails_root/test/unit/amazon_request_test.rb

@@ -7,7 +7,8 @@ class AmazonRequestTest < ActiveSupport::TestCase
       @email = 'justinball@gmail.com'
     end
     should "get wishlist" do
-      #AmazonRequest.get_amazon_feeds(@email)
+      # result = AmazonRequest.get_amazon_feeds(@email)
+      #       assert result.length > 0
     end
   end
   

metadata

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