muck-raker 0.1.36 → 0.1.37

data/VERSION

@@ -1 +1 @@
-0.1.36
+0.1.37

data/app/controllers/muck/feed_previews_controller.rb

@@ -15,7 +15,7 @@ class Muck::FeedPreviewsController < ApplicationController
 
   def select_feeds
     @feed = Feed.new(params[:feed])
-    @feeds = Feed.gather_information(@feed.uri)
+    @feeds = Feed.gather_information(@feed.uri).compact
     respond_to do |format|
       format.pjs do
         render_as_html do

data/app/controllers/muck/feeds_controller.rb

@@ -2,7 +2,8 @@ class Muck::FeedsController < ApplicationController
 
   unloadable
   
-  before_filter :get_owner
+  before_filter :login_required, :except => ['index', 'show']
+  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)
@@ -99,6 +100,9 @@ class Muck::FeedsController < ApplicationController
     end
   
     def has_permission_to_add_feed(user, parent)
+      return false if user.blank?
+      return true if user.admin?
+      return false if parent.blank?
       user == parent || parent.can_add_feed?(user)
     end
     

data/app/controllers/muck/opmls_controller.rb

@@ -1,5 +1,4 @@
 class Muck::OpmlsController < ApplicationController
-
   unloadable
   
   def index
@@ -13,7 +12,7 @@ class Muck::OpmlsController < ApplicationController
       @terms = params[:terms]
       respond_to do |format|
         format.html { render :template => 'opmls/index' }
-        format.opml { render(:layout => false) }
+        format.opml { render :template => 'opmls/index' }
       end
     end
   end

data/app/models/feed.rb

@@ -144,13 +144,14 @@ class Feed < ActiveRecord::Base
     feeds = []
     @available_feeds = discover_feeds(uri)
     @available_feeds.each do |feed|
-      feeds << from_feedzirra(Feedzirra::Feed.fetch_and_parse(feed.url))
+      feeds << from_feedzirra(Feedzirra::Feed.fetch_and_parse(feed.url)) unless feed.blank?
     end
     feeds
   end
 
   # Turns a feed from feedzirra into a muck feed
   def self.from_feedzirra(feed)
+    return if feed.blank?
     Feed.new(:short_title => feed.title,
              :title => feed.title,
              :display_uri => feed.url,

data/app/models/google_feed_request.rb

@@ -1,3 +1,9 @@
+# Google ajax feed api reference:
+# http://code.google.com/apis/ajaxfeeds/documentation/reference.html
+#
+# Google code playground:
+# http://code.google.com/apis/ajax/playground/?exp=search#load_feed
+#
 class GoogleFeedRequest
   include HTTParty
   format :json
@@ -9,6 +15,14 @@ class GoogleFeedRequest
     @api_key_id = api_key_id
   end
   
+  def self.lookup_feed(uri)
+    get('http://ajax.googleapis.com/ajax/services/feed/lookup', :query => build_google_query({:q => uri}))
+  end
+  
+  def self.load_feed(uri)
+    get('http://ajax.googleapis.com/ajax/services/feed/load', :query => build_google_query({:q => uri}))
+  end
+  
   # Search for feeds using google.  This will return 
   # a collection of 'Feed' objects
   def self.find_feeds(query)
@@ -18,9 +32,7 @@ class GoogleFeedRequest
   # Search for feeds using google.  This will return 
   # a hash with the results
   def self.find_google_feeds(query)
-    query_options = {:q => query, :v => '1.0'}
-    query_options[:key] = GlobalConfig.google_ajax_api_key if GlobalConfig.google_ajax_api_key
-    get('http://ajax.googleapis.com/ajax/services/feed/find', :query => query_options)
+    get('http://ajax.googleapis.com/ajax/services/feed/find', :query => build_google_query({:q => query}))
   end
   
   # convert the result of a google query to 'Feed' objects
@@ -33,4 +45,11 @@ class GoogleFeedRequest
     end
   end
 
+  # Add standard items to the google query
+  def self.build_google_query(query_options)
+    query_options[:v] = '1.0'
+    query_options[:key] = GlobalConfig.google_ajax_api_key if GlobalConfig.google_ajax_api_key
+    query_options
+  end
+  
 end

data/app/models/service.rb

@@ -142,7 +142,7 @@ class Service < ActiveRecord::Base
   # attempts to find a service using a uri
   def self.find_service_by_uri(uri)
     @services ||= Service.all
-    service = @services.detect { |service| service.uri && service.uri.length > 0 && uri.include?(service.uri) }
+    service = @services.detect { |service| service.uri && service.uri.length > 0 && (uri.include?(service.uri) || service.uri.include?(uri)) }
     service ||= Service.find_by_name('rss') # this will return the default rss service
     service
   end

data/muck-raker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.36"
+  s.version = "0.1.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin Justin Ball"]

data/test/rails_root/test/functional/feeds_controller_test.rb

@@ -25,42 +25,53 @@ class Muck::FeedsControllerTest < ActionController::TestCase
       should_render_template :show
     end
 
-    context "GET new" do
+    context "logged in" do
       setup do
-        get :new
+        @admin = Factory(:user)
+        @admin_role = Factory(:role, :rolename => 'administrator')
+        @admin.roles << @admin_role
+        activate_authlogic
+        login_as @admin
       end
-      should_not_set_the_flash
-      should_respond_with :success
-      should_render_template :new
-    end
-    
-    context "GET new_extended" do
-      setup do
-        get :new_extended
+      
+       context "GET new" do
+        setup do
+          get :new
+        end
+        should_not_set_the_flash
+        should_respond_with :success
+        should_render_template :new
+      end
+  
+      context "GET new_extended" do
+        setup do
+          get :new_extended
+        end
+        should_not_set_the_flash
+        should_respond_with :success
+        should_render_template :new_extended
       end
-      should_not_set_the_flash
-      should_respond_with :success
-      should_render_template :new_extended
-    end
 
-    context "POST create (simple)" do
-      setup do
-        post :create, :feed => { :uri => TEST_RSS_URI }
+      context "POST create (simple)" do
+        setup do
+          post :create, :feed => { :uri => TEST_RSS_URI }
+        end
+        should_set_the_flash_to(I18n.t('muck.raker.feed_successfully_created', :uri => TEST_RSS_URI))
       end
-      should_set_the_flash_to(I18n.t('muck.raker.feed_successfully_created', :uri => TEST_RSS_URI))
-    end
-        
-    context "POST create (advanced)" do
-      setup do
-        post :create, :feed => { :uri => TEST_RSS_URI, 
-                                 :display_uri => 'http://www.example.com',
-                                 :title => 'test feed long',
-                                 :short_title => 'test feed',
-                                 :description => 'foo bar'  }
+      
+      context "POST create (advanced)" do
+        setup do
+          post :create, :feed => { :uri => TEST_RSS_URI, 
+                                   :display_uri => 'http://www.example.com',
+                                   :title => 'test feed long',
+                                   :short_title => 'test feed',
+                                   :description => 'foo bar'  }
+        end
+        should_set_the_flash_to(I18n.t('muck.raker.feed_successfully_created', :uri => TEST_RSS_URI))
       end
-      should_set_the_flash_to(I18n.t('muck.raker.feed_successfully_created', :uri => TEST_RSS_URI))
-    end
 
+    end
+    
   end
 
 end

data/test/rails_root/test/functional/opmls_controller_test.rb

@@ -5,7 +5,7 @@ class Muck::OpmlsControllerTest < ActionController::TestCase
   tests Muck::OpmlsController
 
   context "opmls controller" do
-    
+
     context "GET new" do
       setup do
         get :new

data/test/rails_root/test/test_helper.rb

@@ -7,6 +7,7 @@ gem 'thoughtbot-factory_girl' # from github
 require 'factory_girl'
 require 'mocha'
 require 'authlogic/test_case'
+require 'active_record/fixtures'
 require 'redgreen' rescue LoadError
 require File.expand_path(File.dirname(__FILE__) + '/factories')
 require File.join(File.dirname(__FILE__), 'shoulda_macros', 'controller')
@@ -56,3 +57,20 @@ class ActsAsSolr::Post
     true
   end
 end
+
+
+# load in the default data required to run the app
+def bootstrap_services
+  ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+  
+  ServiceCategory.delete_all
+  yml = File.join(File.dirname(__FILE__), '..', '..', '..', 'db', 'bootstrap',"service_categories")
+  Fixtures.new(Service.connection,"service_categories",ServiceCategory,yml).insert_fixtures
+  
+  Service.delete_all
+  yml = File.join(File.dirname(__FILE__), '..', '..', '..', 'db', 'bootstrap',"services")
+  Fixtures.new(Service.connection,"services",Service,yml).insert_fixtures
+  
+end
+
+bootstrap_services

data/test/rails_root/test/unit/google_feed_request_test.rb

@@ -3,10 +3,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 class GoogleFeedRequestTest < ActiveSupport::TestCase
   
   context "google feed requests" do
-    setup do
-      Factory(:service)
-    end
-    context "find_feeds" do
+
+    context "find feeds" do
       setup do
         @feeds = GoogleFeedRequest.find_feeds('ruby')
       end
@@ -18,7 +16,7 @@ class GoogleFeedRequestTest < ActiveSupport::TestCase
       end
     end
   
-    context "find_google_feeds" do
+    context "find feeds (raw results)" do
       setup do
         @feeds = GoogleFeedRequest.find_google_feeds('ruby')
       end
@@ -27,6 +25,24 @@ class GoogleFeedRequestTest < ActiveSupport::TestCase
       end
     end
   
+    context "lookup feed" do
+      setup do
+        @result = GoogleFeedRequest.lookup_feed('http://www.justinball.com')
+      end
+      should "discover rss feed using uri" do
+        assert_equal 'http://www.justinball.com/feed/', @result['responseData']['url']
+      end
+    end
+    
+    context "load feed" do
+      setup do
+        @entries = GoogleFeedRequest.load_feed('http://www.justinball.com')
+      end
+      should "get entries from feed" do
+        assert @entries.length > 0
+      end      
+    end
+    
   end
   
 end

data/test/rails_root/test/unit/service_test.rb

@@ -84,10 +84,10 @@ class ServiceTest < ActiveSupport::TestCase
       feeds = Service.build_feeds(@user, tag)
       assert feeds.any?{|feed| feed.display_uri == (@uri_template.sub('{tag}', tag))}
     end
-    should "build a feed for every service" do
+    should "build a feed for every tag service" do
       tag = 'cycling'
       feeds = Service.build_feeds(@user, tag)
-      assert_equal Service.all.length, feeds.length
+      assert_equal Service.tag_services.length, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
     should "build a limited number of feeds for tag" do
@@ -96,10 +96,10 @@ class ServiceTest < ActiveSupport::TestCase
       assert_equal 1, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
-    should "create a feed for every service" do
+    should "create a feed for every tag service" do
       tag = 'physics'
       feeds = Service.create_feeds(@user, tag)
-      assert_equal Service.all.length, feeds.length
+      assert_equal Service.tag_services.length, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
     should "create a limited number of feeds for tag" do
@@ -138,12 +138,20 @@ class ServiceTest < ActiveSupport::TestCase
   
   context "Find service by uri" do
     setup do
+      Service.delete_all
       @service = Factory(:service, :uri => 'http://www.example.com')
     end
-    should "find service" do
+    after do
+      bootstrap_services
+    end
+    should "find service when uri is shorter" do
       service = Service.find_service_by_uri('example.com')
       assert_equal @service, service
     end
+    should "find service uri is longer" do
+      service = Service.find_service_by_uri('http://www.example.com/other_stuff')
+      assert_equal @service, service
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball