muck-raker 0.1.47 → 0.1.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/app/controllers/muck/topics_controller.rb +19 -18
- data/app/views/topics/show.html.erb +1 -1
- data/muck-raker.gemspec +1 -1
- metadata +1 -1
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.1.
|
|
1
|
+
0.1.48
|
|
@@ -4,7 +4,7 @@ class Muck::TopicsController < ApplicationController
|
|
|
4
4
|
before_filter :adjust_format_for_iphone
|
|
5
5
|
before_filter :check_terms, :except => [:new]
|
|
6
6
|
before_filter :build_tag_feeds, :only => [:show, :rss_discovery]
|
|
7
|
-
before_filter :configure_feed_loading, :only => [:show]
|
|
7
|
+
before_filter :configure_feed_loading, :only => [:show, :rss_discovery]
|
|
8
8
|
|
|
9
9
|
def show
|
|
10
10
|
|
|
@@ -94,9 +94,6 @@ class Muck::TopicsController < ApplicationController
|
|
|
94
94
|
|
|
95
95
|
@feeds = @photo_feeds + @video_feeds + @bookmark_feeds + @music_feeds + @news_feeds + @blog_feeds + @search_feeds + @general_feeds + @discovered_feeds
|
|
96
96
|
|
|
97
|
-
@number_of_items = 6
|
|
98
|
-
@number_of_images = 12
|
|
99
|
-
@number_of_videos = 6
|
|
100
97
|
end
|
|
101
98
|
|
|
102
99
|
def load_feeds
|
|
@@ -110,29 +107,33 @@ class Muck::TopicsController < ApplicationController
|
|
|
110
107
|
@server_loaded_blog_feeds = GoogleFeedRequest.load_feeds(@blog_feeds)
|
|
111
108
|
@server_loaded_search_feeds = GoogleFeedRequest.load_feeds(@search_feeds)
|
|
112
109
|
if @show_combined
|
|
113
|
-
@
|
|
114
|
-
@
|
|
115
|
-
@
|
|
116
|
-
@
|
|
117
|
-
@
|
|
118
|
-
@
|
|
119
|
-
@
|
|
120
|
-
@
|
|
110
|
+
@server_combined_general_feeds = Feed.combine_sort(@server_loaded_general_feeds)
|
|
111
|
+
@server_combined_photo_feeds = Feed.combine_sort(@server_loaded_photo_feeds)
|
|
112
|
+
@server_combined_video_feeds = Feed.combine_sort(@server_loaded_video_feeds)
|
|
113
|
+
@server_combined_bookmark_feeds = Feed.combine_sort(@server_loaded_bookmark_feeds)
|
|
114
|
+
@server_combined_music_feeds = Feed.combine_sort(@server_loaded_music_feeds)
|
|
115
|
+
@server_combined_news_feeds = Feed.combine_sort(@server_loaded_news_feeds)
|
|
116
|
+
@server_combined_blog_feeds = Feed.combine_sort(@server_loaded_blog_feeds)
|
|
117
|
+
@server_combined_search_feeds = Feed.combine_sort(@server_loaded_search_feeds)
|
|
121
118
|
end
|
|
122
119
|
end
|
|
123
120
|
end
|
|
124
121
|
|
|
125
122
|
def load_combined_feeds
|
|
126
123
|
return unless @load_feeds_on_server && @show_combined
|
|
127
|
-
@
|
|
128
|
-
@
|
|
129
|
-
@
|
|
130
|
-
@
|
|
131
|
-
@
|
|
132
|
-
@
|
|
124
|
+
@server_combined_feeds = Feed.sort_entries(@server_combined_general_feeds + @server_combined_news_feeds +
|
|
125
|
+
@server_combined_blog_feeds + @server_combined_search_feeds +
|
|
126
|
+
@server_combined_photo_feeds + @server_combined_video_feeds +
|
|
127
|
+
@server_combined_bookmark_feeds + @server_combined_music_feeds)
|
|
128
|
+
@server_combined_data_feeds = Feed.sort_entries(@server_combined_general_feeds + @server_combined_news_feeds + @server_combined_blog_feeds + @server_combined_search_feeds)
|
|
129
|
+
@server_combined_extended_data_feeds = Feed.sort_entries(@server_combined_data_feeds + @server_combined_bookmark_feeds)
|
|
133
130
|
end
|
|
134
131
|
|
|
135
132
|
def configure_feed_loading
|
|
133
|
+
@number_of_items = 6
|
|
134
|
+
@number_of_images = 12
|
|
135
|
+
@number_of_videos = 6
|
|
136
|
+
|
|
136
137
|
@show_google_search = true
|
|
137
138
|
@show_combined = false
|
|
138
139
|
@load_feeds_on_server = false
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
<% if @load_feeds_on_server -%>
|
|
26
26
|
<% if @show_combined -%>
|
|
27
27
|
<ul class="combined-feed-list">
|
|
28
|
-
<%= render :partial => 'topics/simple_entry', :collection => @
|
|
28
|
+
<%= render :partial => 'topics/simple_entry', :collection => @server_combined_data_feeds %>
|
|
29
29
|
</ul>
|
|
30
30
|
<script type="text/javascript">
|
|
31
31
|
jQuery(document).ready(function() {
|
data/muck-raker.gemspec
CHANGED