muck-services 3.2.2 → 3.3.0

data/VERSION

@@ -1 +1 @@
-3.2.2
+3.3.0

data/app/controllers/muck/identity_feeds_controller.rb

@@ -37,7 +37,7 @@ class Muck::IdentityFeedsController < ApplicationController
     else
       uri = nil
     end 
-      
+  
     if uri
       @feed = Feed.new(:uri => uri, :login => params[:username])
       feeds = Service.create_tag_feeds_for_service(@service, uri, params[:username], params[:password], current_user.id)

data/app/models/feed.rb

@@ -38,8 +38,8 @@ class Feed < ActiveRecord::Base
   include HTTParty
   format :xml
 
-  validates_presence_of :uri
-  validates_uniqueness_of :uri
+  validates_presence_of :uri, :unless => :is_website?
+  validates_uniqueness_of :uri, :scope => [:contributor_id]
 
   has_many :feed_parents
   has_many :identity_feeds
@@ -59,6 +59,11 @@ class Feed < ActiveRecord::Base
   attr_protected :status, :last_requested_at, :last_harvested_at, :harvest_interval, :failed_requests,
                  :created_at, :updated_at, :entries_changed_at, :entries_count, :contributor_id
   
+  # let uri be blank if display_uri is not blank. In that case the 'feed' is really a site rather than a feed.
+  def is_website?
+    self.uri.blank? && !self.display_uri.blank?
+  end
+  
   def banned?
     self.status == MuckServices::Status::BANNED
   end
@@ -148,11 +153,11 @@ class Feed < ActiveRecord::Base
 
   # Gathers all available feed uris from the given uri and parses them into
   # feed objects
-  def self.feeds_from_uri(uri, user = nil)
+  def self.feeds_from_uri(uri, contributor = nil)
     feeds = []
     @available_feeds = discover_feeds(uri)
     @available_feeds.each do |feed|
-      feeds << create_from_feedzirra(fetch_feed(feed.url), user) unless feed.blank?
+      feeds << create_from_feedzirra(fetch_feed(feed.url), contributor) unless feed.blank?
     end
     feeds
   end
@@ -173,9 +178,9 @@ class Feed < ActiveRecord::Base
   end
 
   # Creates a feed from feedzirra into a muck feed
-  def self.create_from_feedzirra(feed, user)
+  def self.create_from_feedzirra(feed, contributor)
     return if feed.blank?
-    Feed.find_or_create(feed.feed_url, feed.title, '', '', Service.find_service_by_uri(feed.url), user, feed.url)
+    Feed.find_or_create(feed.feed_url, feed.title, '', '', Service.find_service_by_uri(feed.url), contributor, feed.url)
   end
   
   # Looks for feeds from a given url
@@ -188,8 +193,31 @@ class Feed < ActiveRecord::Base
     end
   end
   
+  # Attempts to build feeds from the provided uri. If that fails the uri is added as a website (a feed without a uri but with a display_uri)
+  def self.make_feeds_or_website(uri, contributor, service_name = nil)
+    return [] if uri.blank?
+    feeds = Feed.feeds_from_uri(uri, contributor)
+    if feeds.blank?
+      # Couldn't find a feed. Create it as a website
+      service = Service.find_by_name(service_name)
+      service ||= Service.find_service_by_uri(uri)
+      feeds = [Feed.find_or_create_as_website(uri, '', service, contributor)]
+    end
+    feeds
+  end
+  
   # Finds or creates a feed based on the url.  Any give feed uri should only exist once in the system
-  def self.find_or_create(uri, title, username, password, service_id, contributor_id, display_uri = nil)
+  def self.find_or_create(uri, title, username, password, service, contributor, display_uri = nil)
+    if service.is_a?(Service)
+      service_id = service.id
+    else
+      service_id = service
+    end
+    if contributor.is_a?(User)
+      contributor_id = contributor.id
+    else
+      contributor_id = contributor
+    end
     Feed.find_by_uri(uri) ||
       Feed.create(:uri => uri,
                  :harvest_interval => '01:00:00',
@@ -202,6 +230,11 @@ class Feed < ActiveRecord::Base
                  :display_uri => display_uri)
   end
   
+  # Finds or creates a feed based on the url.  Any give feed uri should only exist once in the system
+  def self.find_or_create_as_website(display_uri, title, service, contributor)
+    Feed.find_or_create(nil, title, nil, nil, service, contributor, display_uri)
+  end
+  
   # Create feeds for the given uris
   # user: User that will be set as the feed contributor
   # uris: An array of uris for which to create feeds
@@ -209,7 +242,7 @@ class Feed < ActiveRecord::Base
   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) }
+    uris.collect { |uri| Feed.find_or_create(uri, '', '', '', service, user, uri) }
   end
   
   # Combines entries in a collection of feeds together and sorts the entries by date

data/app/models/service.rb

@@ -428,7 +428,7 @@ class Service < ActiveRecord::Base
   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|
-      services.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, user, service.human_uri(tag)) }
     }.flatten!
   end
   

data/app/views/activity_templates/_entry_comment.erb

@@ -2,7 +2,7 @@
   <% if limited -%>
     <%= activity.item.body %>
   <% else -%>
-    <%= t('muck.services.entry_commment_contents', :resource => link_to(activity.item.commentable.title, visit_path(activity.item.commentable, :show_comments => true))) -%>
+    <%= t('muck.services.entry_commment_contents', :resource => link_to(activity.item.commentable.try(:title), visit_path(activity.item.commentable, :show_comments => true))) -%>
     <p class="entry-comment-contents"><%= activity.item.body %></p>
   <% end -%>
 <% end -%>

data/lib/muck-services/models/feed_owner.rb

@@ -10,6 +10,7 @@ module MuckServices
       extend ActiveSupport::Concern
       
       included do
+        has_many :contributed_feeds, :class_name => 'Feed'
         has_many :identity_feeds, :as => :ownable
         has_many :own_feeds, :through => :identity_feeds, :source => :feed, :order => 'created_at desc'
       end

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "3.2.2"
+  s.version = "3.3.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{2011-02-12}
+  s.date = %q{2011-03-02}
   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 = [
@@ -261,11 +261,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/tatemae/muck_services}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Feeds, aggregations and services for muck}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -2,12 +2,12 @@
 name: muck-services
 version: !ruby/object:Gem::Version 
   hash: 11
-  prerelease: false
+  prerelease: 
   segments: 
   - 3
-  - 2
-  - 2
-  version: 3.2.2
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Joel Duffin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 -07:00
+date: 2011-03-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -496,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Feeds, aggregations and services for muck