muck-services 0.1.46 → 0.1.47

data/VERSION

@@ -1 +1 @@
-0.1.46
+0.1.47

data/app/controllers/admin/muck/feeds_controller.rb

@@ -3,7 +3,7 @@ class Admin::Muck::FeedsController < Admin::Muck::BaseController
   unloadable
 
   def index
-    @feeds = Feed.find(:all, :order => (params[:order] || 'created_at') + (params[:asc] == 'false' ? ' DESC' : ' ASC') + ', title', :include => [:default_language]).paginate(:page => @page, :per_page => @per_page)
+    @feeds = Aggregation.global_feeds(params[:order], params[:asc]).paginate(:page => @page, :per_page => @per_page)
     respond_to do |format|
       format.html { render :template => 'admin/feeds/index' }
       format.xml  { render :xml => @feeds.to_xml }

data/app/controllers/muck/feeds_controller.rb

@@ -6,7 +6,7 @@ class Muck::FeedsController < ApplicationController
   before_filter :get_owner, :except => ['index', 'show']
   
   def index
-    @feeds = Feed.find(:all, :conditions => 'status >= 0', :order => (params[:order] || 'title') + (params[:asc] == 'false' ? ' DESC' : ' ASC') + ', title', :include => [:default_language]).paginate(:page => @page, :per_page => @per_page)
+    @feeds = Aggregation.global_feeds(params[:order], params[:asc]).paginate(:page => @page, :per_page => @per_page)
     respond_to do |format|
       format.html { render :template => 'feeds/index' }
       format.xml  { render :xml => @feeds.to_xml }

data/app/helpers/muck_services_feeds_helper.rb

@@ -14,18 +14,18 @@ module MuckServicesFeedsHelper
 
   def feed_contributor_link(feed)
     if feed.contributor_id.nil?
-      admin = Feed.find_by_login('admin')
+#      admin = Feed.find_by_login('admin')
       'unknown'
     else
       link_to feed.contributor.display_name, profile_path(feed.contributor)
     end
   end
 
-  def sort_feeds_link(current_order, current_asc, new_order, admin = false)
+  def sort_feeds_url(current_order, current_asc, new_order, admin = false)
     if admin == true
       admin_feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'true' || current_asc == nil)) ? 'false' : 'true')
     else
-      feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'true' || current_asc == nil)) ? 'false' : 'true')
+      feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'false' || current_asc == nil)) ? 'true' : 'false')
     end
   end
 

data/app/models/aggregation.rb

@@ -30,7 +30,21 @@ class Aggregation < ActiveRecord::Base
   named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
   named_scope :newest, :order => "created_at DESC"
 
-    
+
+  def self.global_feeds(order_field = 'title', ascending = 'true')
+    allowed_fields = ['languages.english_name','status','entries_count','harvested_from_title','last_harvested_at','created_at','feed_contributor']
+    order_direction = (ascending == 'false' ? ' DESC' : ' ASC')
+    order_by = allowed_fields.include?(order_field) ? (order_field  + order_direction + ', title') : ('title ' + order_direction)
+
+    Feed.find_by_sql("SELECT users.id feed_contributor_id, users.login feed_contributor, languages.english_name default_language_name, feeds.*, aggregation_id <=> 1 FROM aggregations " +
+            "INNER JOIN aggregation_feeds ON aggregations.id = aggregation_feeds.aggregation_id " +
+            "RIGHT OUTER JOIN feeds ON aggregation_feeds.feed_id = feeds.id " +
+            "INNER JOIN languages ON feeds.default_language_id = languages.id " +
+            "LEFT OUTER JOIN users ON feeds.contributor_id = users.id " +
+#            "WHERE aggregations.title = 'global_feeds' AND feeds.status >= 0 " +
+          "ORDER BY #{order_by}")
+  end
+
   # 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.

data/app/views/admin/feeds/index.html.erb

@@ -7,14 +7,15 @@
   </p>
   <table class="feeds">
     <tr>
-      <th><%= link_to t('muck.services.approval_status'), sort_feeds_link(params[:order], params[:asc], 'status', true) %></th>
-      <th><%= link_to t('muck.services.status'), sort_feeds_link(params[:order], params[:asc], 'status', true) %></th>
-      <th><%= link_to t('muck.services.default_language'), sort_feeds_link(params[:order], params[:asc], 'languages.english_name', true) %></th>
-      <th><%= link_to t('muck.services.entries_count'), sort_feeds_link(params[:order], params[:asc], 'entries_count', true) %></th>
-      <th><%= link_to t('muck.services.repository'), sort_feeds_link(params[:order], params[:asc], 'harvested_from_title', true)  %></th>
-      <th><%= link_to t('muck.services.title'), sort_feeds_link(params[:order], params[:asc], 'title', true)  %></th>
-      <th><%= link_to t('muck.services.harvested_at'), sort_feeds_link(params[:order], params[:asc], 'last_harvested_at', true) %></th>
-      <th><%= link_to t('muck.services.added_date'), sort_feeds_link(params[:order], params[:asc], 'created_at', true) %></th>
+      <th><%= link_to t('muck.services.approval_status'), sort_feeds_url(params[:order], params[:asc], 'status', true) %></th>
+      <th><%= link_to t('muck.services.entries_count'), sort_feeds_url(params[:order], params[:asc], 'entries_count', true) %></th>
+      <th><%= link_to t('muck.services.title'), sort_feeds_url(params[:order], params[:asc], 'title', true)  %></th>
+      <th><%= link_to t('muck.services.contributor'), sort_feeds_url(params[:order], params[:asc], 'feed_contributor', true) %></th>
+      <th width="70px"><%= link_to t('muck.services.added_date'), sort_feeds_url(params[:order], params[:asc], 'created_at', true) %></th>
+      <th width="120px"><%= link_to t('muck.services.harvested_at'), sort_feeds_url(params[:order], params[:asc], 'last_harvested_at', true) %></th>
+      <th><%= link_to t('muck.services.default_language'), sort_feeds_url(params[:order], params[:asc], 'languages.english_name', true) %></th>
+      <th><%= link_to t('muck.services.repository'), sort_feeds_url(params[:order], params[:asc], 'harvested_from_title', true)  %></th>
+      <th><%= link_to t('muck.services.status'), sort_feeds_url(params[:order], params[:asc], 'status') %></th>
     </tr>
     <%= render :partial => 'feeds/feed_row', :collection => @feeds, :locals => { :show_admin => true } %>
   </table>

data/app/views/admin/oai_endpoints/index.html.erb

@@ -7,10 +7,10 @@
   </p>
   <table class="feeds">
     <tr>
-      <th><%= link_to t('muck.services.status'), sort_feeds_link(params[:order], params[:asc], 'status', true) %></th>
-      <th><%= link_to t('muck.services.default_language'), sort_feeds_link(params[:order], params[:asc], 'languages.english_name', true) %></th>
-      <th><%= link_to t('muck.services.title'), sort_feeds_link(params[:order], params[:asc], 'title', true)  %></th>
-      <th><%= link_to t('muck.services.added_date'), sort_feeds_link(params[:order], params[:asc], 'created_at', true) %></th>
+      <th><%= link_to t('muck.services.status'), sort_feeds_url(params[:order], params[:asc], 'status', true) %></th>
+      <th><%= link_to t('muck.services.default_language'), sort_feeds_url(params[:order], params[:asc], 'languages.english_name', true) %></th>
+      <th><%= link_to t('muck.services.title'), sort_feeds_url(params[:order], params[:asc], 'title', true)  %></th>
+      <th><%= link_to t('muck.services.added_date'), sort_feeds_url(params[:order], params[:asc], 'created_at', true) %></th>
     </tr>
     <%= render :partial => 'oai_endpoints/oai_endpoint_row', :collection => @oai_endpoints, :locals => { :show_admin => true } %>
   </table>

data/app/views/feeds/index.html.erb

@@ -7,13 +7,14 @@
   </p>
   <table class="feeds">
     <tr>
-      <th><%= link_to t('muck.services.status'), sort_feeds_link(params[:order], params[:asc], 'status') %></th>
-      <th><%= link_to t('muck.services.default_language'), sort_feeds_link(params[:order], params[:asc], 'languages.english_name') %></th>
-      <th><%= link_to t('muck.services.entries_count'), sort_feeds_link(params[:order], params[:asc], 'entries_count') %></th>
-      <th><%= link_to t('muck.services.repository'), sort_feeds_link(params[:order], params[:asc], 'harvested_from_title')  %></th>
-      <th><%= link_to t('muck.services.title'), sort_feeds_link(params[:order], params[:asc], 'title')  %></th>
-      <th><%= link_to t('muck.services.harvested_at'), sort_feeds_link(params[:order], params[:asc], 'last_harvested_at') %></th>
-      <th><%= link_to t('muck.services.added_date'), sort_feeds_link(params[:order], params[:asc], 'created_at') %></th>
+      <th><%= link_to t('muck.services.entries_count'), sort_feeds_url(params[:order], params[:asc], 'entries_count') %></th>
+      <th><%= link_to t('muck.services.title'), sort_feeds_url(params[:order], params[:asc], 'title')  %></th>
+      <th><%= link_to t('muck.services.contributor'), sort_feeds_url(params[:order], params[:asc], 'feed_contributor') %></th>
+      <th width="70px"><%= link_to t('muck.services.added_date'), sort_feeds_url(params[:order], params[:asc], 'created_at') %></th>
+      <th width="120px"><%= link_to t('muck.services.harvested_at'), sort_feeds_url(params[:order], params[:asc], 'last_harvested_at') %></th>
+      <th><%= link_to t('muck.services.default_language'), sort_feeds_url(params[:order], params[:asc], 'languages.english_name') %></th>
+      <th><%= link_to t('muck.services.repository'), sort_feeds_url(params[:order], params[:asc], 'harvested_from_title')  %></th>
+      <th><%= link_to t('muck.services.status'), sort_feeds_url(params[:order], params[:asc], 'status') %></th>
     </tr>
     <%= render :partial => 'feeds/feed_row', :collection => @feeds %>
   </table>

data/lib/muck_services.rb

@@ -20,3 +20,4 @@ ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckAggregationOwner
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckRecommendations }
 
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]
+MuckEngine.add_muck_admin_nav_item('Feeds', '/admin/feeds')

data/locales/en.yml

@@ -1,6 +1,8 @@
 --- 
 en: 
   muck: 
+    admin:
+      feeds: Feeds
     services: 
       get_recommendations: Get Recommendations
       generate_new_topic: Generate a new topic

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "0.1.46"
+  s.version = "0.1.47"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2010-09-13}
+  s.date = %q{2010-10-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 = [
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "VERSION.orig",
     "app/controllers/admin/muck/feeds_controller.rb",
     "app/controllers/admin/muck/oai_endpoints_controller.rb",
     "app/controllers/muck/aggregation_feeds_controller.rb",
@@ -529,7 +528,6 @@ Gem::Specification.new do |s|
     "test/rails_root/test/unit/feed_test.rb",
     "test/rails_root/test/unit/identity_feed_test.rb",
     "test/rails_root/test/unit/oai_endpoint_test.rb",
-    "test/rails_root/test/unit/one_test.rb",
     "test/rails_root/test/unit/personal_recommendation_test.rb",
     "test/rails_root/test/unit/recommendation_test.rb",
     "test/rails_root/test/unit/service_category_test.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 1
-  - 46
-  version: 0.1.46
+  - 47
+  version: 0.1.47
 platform: ruby
 authors: 
 - Joel Duffin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -06:00
+date: 2010-10-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -203,7 +203,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- VERSION.orig
 - app/controllers/admin/muck/feeds_controller.rb
 - app/controllers/admin/muck/oai_endpoints_controller.rb
 - app/controllers/muck/aggregation_feeds_controller.rb
@@ -701,7 +700,6 @@ files:
 - test/rails_root/test/unit/feed_test.rb
 - test/rails_root/test/unit/identity_feed_test.rb
 - test/rails_root/test/unit/oai_endpoint_test.rb
-- test/rails_root/test/unit/one_test.rb
 - test/rails_root/test/unit/personal_recommendation_test.rb
 - test/rails_root/test/unit/recommendation_test.rb
 - test/rails_root/test/unit/service_category_test.rb
@@ -844,7 +842,6 @@ test_files:
 - test/rails_root/test/unit/feed_test.rb
 - test/rails_root/test/unit/identity_feed_test.rb
 - test/rails_root/test/unit/oai_endpoint_test.rb
-- test/rails_root/test/unit/one_test.rb
 - test/rails_root/test/unit/personal_recommendation_test.rb
 - test/rails_root/test/unit/recommendation_test.rb
 - test/rails_root/test/unit/service_category_test.rb

data/VERSION.orig

@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-0.1.40
-=======
-0.1.42
->>>>>>> 97d29b7a4de0792aa8744d745f5f6774266b01c8

data/test/rails_root/test/unit/one_test.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class OneTest < ActiveSupport::TestCase
-  context "entry instance" do
-    setup do
-      @entry = Factory(:entry)
-    end
-
-    subject { @entry }
-
-
-  end
-end