muck-services 0.1.27 → 0.1.28

data/VERSION

@@ -1 +1 @@
-0.1.27
+0.1.28

data/app/models/service.rb

@@ -111,15 +111,24 @@ class Service < ActiveRecord::Base
     if self.name == 'Facebook'
       # Facebook can't just use feeds like everyone else.
       params = {}
-      pairs = uri.split('?')[1].split('&')
-      pairs.each do |pair|
-        p = pair.split('=')
-        params[p[0].to_sym] = p[1]
-      end
       uris = []
-      uris << OpenStruct.new(:url => "http://www.facebook.com/feeds/notifications.php?id=#{params[:id]}&viewer=#{params[:id]}&key=#{params[:key]}&format=rss20", :title => I18n.t('muck.services.facebook_notifications'))
-      uris << OpenStruct.new(:url => "http://www.facebook.com/feeds/share_posts.php?id=#{params[:id]}&viewer=#{params[:id]}&key=#{params[:key]}&format=rss20", :title => I18n.t('muck.services.facebook_shares'))
-      uris << OpenStruct.new(:url => "http://www.facebook.com/feeds/notes.php?id=#{params[:id]}&viewer=#{params[:id]}&key=#{params[:key]}&format=rss20", :title => I18n.t('muck.services.facebook_notes'))
+      uri = "http://#{uri}" unless uri.starts_with?("http://")
+      parsed_uri = URI.parse(uri)
+      if parsed_uri.host == 'facebook.com' # check to make sure that the url provided really comes from Facebook
+        if parsed_uri.query.blank?
+          # Assume that they provided their Facebook Identity Uri (no feeds)
+            uris << OpenStruct.new(:url => uri, :display_uri => uri, :title => I18n.t('muck.services.facebook'))
+        else
+          pairs = uri.split('?')[1].split('&')
+          pairs.each do |pair|
+            p = pair.split('=')
+            params[p[0].to_sym] = p[1]
+          end
+          uris << OpenStruct.new(:url => "http://www.facebook.com/feeds/notifications.php?id=#{params[:id]}&viewer=#{params[:id]}&key=#{params[:key]}&format=rss20", :title => I18n.t('muck.services.facebook_notifications'))
+          uris << OpenStruct.new(:url => "http://www.facebook.com/feeds/share_posts.php?id=#{params[:id]}&viewer=#{params[:id]}&key=#{params[:key]}&format=rss20", :title => I18n.t('muck.services.facebook_shares'))
+          uris << OpenStruct.new(:url => "http://www.facebook.com/feeds/notes.php?id=#{params[:id]}&viewer=#{params[:id]}&key=#{params[:key]}&format=rss20", :title => I18n.t('muck.services.facebook_notes'))
+        end
+      end
       uris
     elsif self.name == 'Amazon'
       return [] if username.blank?

data/locales/en.yml

@@ -63,6 +63,7 @@ en:
       polyvore_prompt: Polyvore profile URL
       login_or_signup_prompt: "{{signup}} or {{login}} to discuss and share resources."
       facebook_shares: Facebook Shared Links
+      facebook: Facebook
       for: for
       zotero_group_prompt: Zotero group URL
       download_opml: Download OPML file for {{terms}}

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "0.1.27"
+  s.version = "0.1.28"
 
   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-01-06}
+  s.date = %q{2010-01-11}
   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 = [

data/test/rails_root/config/environments/development.rb

@@ -18,19 +18,20 @@ config.action_mailer.raise_delivery_errors = false
 
 HOST = "localhost"
 
-config.gem 'flyerhzm-bullet', :lib => 'bullet', :source => 'http://gems.github.com'
-
-config.after_initialize do
-  Bullet.enable = true 
-  Bullet.alert = true
-  Bullet.bullet_logger = true  
-  Bullet.console = true
-  Bullet.rails_logger = true
-  Bullet.disable_browser_cache = true
-  begin
-    require 'ruby-growl'
-    Bullet.growl = true
-  rescue MissingSourceFile
-  end
-end
-
+# Enable bullet to get an understanding of which sql queries are causing problems.
+# config.gem 'bullet'
+# 
+# config.after_initialize do
+#   Bullet.enable = true 
+#   Bullet.alert = true
+#   Bullet.bullet_logger = true  
+#   Bullet.console = true
+#   Bullet.rails_logger = true
+#   Bullet.disable_browser_cache = true
+#   begin
+#     require 'ruby-growl'
+#     Bullet.growl = true
+#   rescue MissingSourceFile
+#   end
+# end
+# 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors: 
 - Joel Duffin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -07:00
+date: 2010-01-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency