muck-services 0.1.47 → 3.0.0

data/test/{rails_root/test/functional/identity_feeds_controller_test.rb → rails_test/spec/controllers/identity_feeds_controller_spec.rb}

@@ -1,108 +1,108 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
-class Muck::IdentityFeedsControllerTest < ActionController::TestCase
+describe Muck::IdentityFeedsController do
 
-  tests Muck::IdentityFeedsController
-
-  context "identity feeds controller" do
+  render_views
+  
+  describe "identity feeds controller" do
     
-    setup do
+    before do
       @user = Factory(:user)
       @service = Factory(:service)
       activate_authlogic
       login_as @user
     end
     
-    context "GET index" do
-      setup do
+    describe "GET index" do
+      before do
         get :index, :user_id => @user.to_param
       end
-      should_not_set_the_flash
-      should_respond_with :success
-      should_render_template :index
+      it { should_not set_the_flash }
+      it { should respond_with :success }
+      it { should render_template :index }
     end
 
-    context "GET new" do
-      setup do
+    describe "GET new" do
+      before do
         get :new, :user_id => @user.to_param, :service_id => @service.to_param
       end
-      should_not_set_the_flash
-      should_respond_with :success
-      should_render_template :new
+      it { should_not set_the_flash }
+      it { should respond_with :success }
+      it { should render_template :new }
     end
     
-    context "POST create using bogus service and bogus uri" do
-      setup do
+    describe "POST create using bogus service and bogus uri" do
+      before do
         @service = Factory(:service)
         @uri = 'http://www.example.com'
         post :create, :service_id => @service.to_param, :uri => @uri, :user_id => @user
       end
-      should_set_the_flash_to(I18n.t('muck.services.no_feeds_at_uri'))
-      should_redirect_to("parent") { user_identity_feeds_url(@user.id) }
+      it { should set_the_flash.to(I18n.t('muck.services.no_feeds_at_uri')) }
+      it { should redirect_to( user_identity_feeds_url(@user.id) ) }
     end
 
-    context "POST create using bogus service and username" do
-      setup do
+    describe "POST create using bogus service and username" do
+      before do
         @service = Factory(:service)
         post :create, :service_id => @service.to_param, :username => 'test', :user_id => @user, :uri => 'http://www.example.com'
       end
-      should_set_the_flash_to(I18n.t('muck.services.no_feeds_from_username'))
-      should_redirect_to("parent") { user_identity_feeds_url(@user.id) }
+      it { should set_the_flash.to(I18n.t('muck.services.no_feeds_from_username')) }
+      it { should redirect_to( user_identity_feeds_url(@user.id) ) }
     end
     
-    context "POST create using uri" do
-      setup do
+    describe "POST create using uri" do
+      before do
         @service = Factory(:service)
         @uri = TEST_URI
         post :create, :service_id => @service.to_param, :uri => @uri, :user_id => @user
       end
-      should "set success in the flash" do
+      it "should set success in the flash" do
         ensure_flash_contains(I18n.t('muck.services.successfully_added_uri_feed'))
       end
     end
     
-    context "POST create using valid service username" do
-      setup do
+    describe "POST create using valid service username" do
+      before do
         @service = Factory(:service, :uri_data_template => TEST_USERNAME_TEMPLATE)
         @username = 'jbasdf'
       end
-      context "html" do
-        setup do
+      describe "html" do
+        before do
           post :create, :service_id => @service.to_param, :username => @username, :user_id => @user, :uri => 'http://www.example.com'
         end
-        should_set_the_flash_to(I18n.t('muck.services.successfully_added_username_feed', :service => ''))
-        should_redirect_to("parent") { user_identity_feeds_url(@user.id) }
+        it { should set_the_flash.to(I18n.t('muck.services.successfully_added_username_feed', :service => '')) }
+        it { should redirect_to( user_identity_feeds_url(@user.id) ) }
       end
-      context "json" do
-        setup do
+      describe "json" do
+        before do
           post :create, :service_id => @service.to_param, :username => @username, :user_id => @user, :format => 'json'
         end
-        should_respond_with :success
+        it { should respond_with :success }
       end
     end
     
-    context "POST create using valid service username - duplicate" do
-      setup do
+    describe "POST create using valid service username - duplicate" do
+      before do
         @service = Factory(:service, :uri_data_template => TEST_USERNAME_TEMPLATE)
         @username = 'jbasdf'
         post :create, :service_id => @service.to_param, :username => @username, :user_id => @user, :uri => 'http://www.example.com'
         post :create, :service_id => @service.to_param, :username => @username, :user_id => @user, :uri => 'http://www.example.com'
       end
-      should_set_the_flash_to(I18n.t('muck.services.already_added_username_feed', :service => '', :username => 'jbasdf')) # really do have to hard code the string here.  @username is nil
-      should_redirect_to("parent") { user_identity_feeds_url(@user.id) } 
+      it { should set_the_flash.to(I18n.t('muck.services.already_added_username_feed', :service => '', :username => 'jbasdf')) } # really do have to hard code the string here.  @username is nil
+      it { should redirect_to( user_identity_feeds_url(@user.id) ) } 
     end
     
-    context "POST create using uri - duplicate" do
-      setup do
+    describe "POST create using uri - duplicate" do
+      before do
         @service = Factory(:service)
         @uri = TEST_URI
         post :create, :service_id => @service.to_param, :uri => @uri, :user_id => @user
         post :create, :service_id => @service.to_param, :uri => @uri, :user_id => @user
       end
-      should "set already added in the flash" do
+      it "should set already added in the flash" do
         ensure_flash_contains(I18n.t('muck.services.already_added_uri_feed', :uri => @uri))
       end
-      should_redirect_to("parent") { user_identity_feeds_url(@user.id) } 
+      it { should redirect_to( user_identity_feeds_url(@user.id) ) } 
     end
     
   end

data/test/rails_test/spec/controllers/oai_endpoints_controller_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Muck::OaiEndpointsController do
+
+  render_views
+  
+  describe "oai endpoints controller" do
+    
+    describe "logged in as admin" do
+      before do
+        @user = Factory(:user)
+        activate_authlogic
+        login_as @user
+      end
+      describe "GET new" do
+        before do
+          get :new
+        end
+        it { should_not set_the_flash }
+        it { should respond_with :success }
+        it { should render_template :new }
+      end
+      describe "POST create" do
+        before do
+          post :create, :oai_endpoint => { :uri => 'http://www.example.com', :title => 'example' }
+        end
+        it { should set_the_flash.to(I18n.t('muck.services.oai_endpoint_successfully_created')) }
+        it { should redirect_to( oai_endpoint_url(assigns(:oai_endpoint)) ) }
+      end
+      describe "GET show" do
+        before do
+          @oai_endpoint = Factory(:oai_endpoint)
+          get :show, :id => @oai_endpoint.to_param
+        end
+        it { should_not set_the_flash }
+        it { should respond_with :success }
+        it { should render_template :show }
+      end
+    end
+  end
+
+end

data/test/rails_test/spec/controllers/topics_controller_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Muck::TopicsController do
+
+  render_views
+  
+  describe "topics controller" do
+
+    before do
+      bootstrap_services
+    end
+    
+    describe "GET new" do
+      before do
+        get :new
+      end
+      it { should_not set_the_flash }
+      it { should respond_with :success }
+      it { should render_template :new }
+    end
+
+    describe "GET rss_discovery with term defined" do
+      before do
+        get :rss_discovery, :id => 'ruby,rails'
+      end
+      it { should_not set_the_flash }
+      it { should respond_with :success }
+      it { should render_template :rss_discovery }
+    end
+    
+    describe "GET show with term defined" do
+      before do
+        get :show, :id => 'ruby,rails'
+      end
+      it { should_not set_the_flash }
+      it { should respond_with :success }
+      it { should render_template :show }
+    end
+  
+    describe "GET show without terms" do
+      before do
+        get :show, :id => ' '
+      end
+      it { should set_the_flash.to(I18n.t('muck.services.no_terms_error')) }
+      it { should redirect_to( new_topic_path ) }
+    end
+    
+  end
+  
+end

data/test/rails_test/spec/controllers/visits_controller_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Muck::VisitsController do
+  
+  render_views
+
+  describe "visits controller" do
+
+    describe "GET show" do
+      before do
+        @entry = Factory(:entry)
+        get :show, :id => @entry.to_param, :format => 'html'
+      end
+      it { should_not set_the_flash }
+      it { should respond_with :success }
+      it { should render_template :show }
+    end
+
+  end
+
+end

data/test/{rails_root/test → rails_test/spec}/factories.rb

@@ -1,10 +1,15 @@
-Factory.define :share do |f|
+Factory.define :service_share, :class => 'share' do |f|
   f.uri { Factory.next(:uri) }
   f.title { Factory.next(:title) }
   f.shared_by {|a| a.association(:user)}
   f.entry {|a| a.association(:entry)}
 end
 
+Factory.define :personal_recommendation do |r|
+  r.personal_recommendable {|a| a.association(:user)}
+  r.destination {|a| a.association(:entry)}
+end
+
 Factory.define :recommendation do |r|
   r.entry {|a| a.association(:entry)}
   r.dest_entry {|a| a.association(:entry)}

data/test/rails_test/spec/mailers/services_mailer_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'services_mailer'
+
+describe ServicesMailer do
+
+  describe "deliver emails" do
+
+    before do
+      ActionMailer::Base.delivery_method = :test
+      ActionMailer::Base.perform_deliveries = true
+      ActionMailer::Base.deliveries = []
+    end
+
+    it "should send notification feed added email" do
+      feed = Factory(:feed)
+      email = ServicesMailer.notification_feed_added(feed).deliver
+      ActionMailer::Base.deliveries.should_not be_empty
+      [MuckEngine.configuration.admin_email].should == email.to
+      [MuckEngine.configuration.from_email].should == email.from
+    end
+
+    it "should send notification oai endpoint added email" do
+      oai_endpoint = Factory(:oai_endpoint)
+      email = ServicesMailer.notification_oai_endpoint_added(oai_endpoint).deliver
+      ActionMailer::Base.deliveries.should_not be_empty
+      [MuckEngine.configuration.admin_email].should == email.to
+      [MuckEngine.configuration.from_email].should == email.from
+    end
+    
+  end
+end

data/test/{rails_root/test/unit/aggregation_feed_test.rb → rails_test/spec/models/aggregation_feed_spec.rb}

@@ -8,19 +8,16 @@
 #  feed_type      :string(255)     default("Feed")
 #
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
-class AggregationFeedTest < ActiveSupport::TestCase
+describe AggregationFeed do
   
-  context "aggregation feed" do
-    setup do
+  describe "aggregation feed" do
+    before do
       @aggregation_feed = Factory(:aggregation_feed)
     end
-    
-    subject { @aggregation_feed }
-    
-    should_belong_to :aggregation
-    should_belong_to :feed
+    it { should belong_to :aggregation }
+    it { should belong_to :feed }
   end
   
 end

data/test/{rails_root/test/unit/aggregation_test.rb → rails_test/spec/models/aggregation_spec.rb}

@@ -14,71 +14,71 @@
 #  feed_count   :integer(4)      default(0)
 #
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
-class AggregationTest < ActiveSupport::TestCase
+describe Aggregation do
   
-  context "aggregation" do
-    setup do
+  describe "aggregation" do
+    before do
       @aggregation = Factory(:aggregation)
     end
     
-    subject { @aggregation }
     
-    should_belong_to :ownable
-    should_have_many :aggregation_feeds
-    should_have_many :feeds
+    
+    it { should belong_to :ownable }
+    it { should have_many :aggregation_feeds }
+    it { should have_many :feeds }
 
-    should_scope_by_title
-    should_scope_recent
-    should_scope_newest
+    it { should scope_by_title }
+    it { should scope_newer_than }
+    it { should scope_by_newest }
 
-    context "filter feed types" do
-      setup do
+    describe "filter feed types" do
+      before do
         build_music_service
         Aggregation.delete_all
         @aggregation = Factory(:aggregation, :terms => 'autumn')
         @aggregation.add_feeds(nil, nil, true) # Generate all feeds
       end
-      should "get all feeds" do
+      it "should get all feeds" do
         assert @aggregation.all_feeds.length > 0
         assert @aggregation.all_feeds.any?{ |feed| feed.service.photo? }
         assert @aggregation.all_feeds.any?{ |feed| feed.service.video? }
         assert @aggregation.all_feeds.any?{ |feed| feed.service.bookmark? }
         assert @aggregation.all_feeds.any?{ |feed| feed.service.general? }
       end
-      should "only get photo feeds" do
+      it "should only get photo feeds" do
         assert @aggregation.photo_feeds(true).length > 0
         assert @aggregation.photo_feeds.all?{ |feed| feed.service.photo? }
       end
-      should "only get video feeds" do
+      it "should only get video feeds" do
         assert @aggregation.video_feeds(true).length > 0
         assert @aggregation.video_feeds.all?{ |feed| feed.service.video? }
       end
-      should "only get bookmark feeds" do
+      it "should only get bookmark feeds" do
         assert @aggregation.bookmark_feeds(true).length > 0
         assert @aggregation.bookmark_feeds.all?{ |feed| feed.service.bookmark? }
       end
-      should "only get music feeds" do
+      it "should only get music feeds" do
         assert @aggregation.music_feeds(true).length > 0
         assert @aggregation.music_feeds.all?{ |feed| feed.service.music? }
       end
-      should "only get general feeds" do
+      it "should only get general feeds" do
         assert @aggregation.general_feeds(true).length > 0
         assert @aggregation.general_feeds.all?{ |feed| feed.service.general? }
       end
       
     end
     
-    context "add_feeds_by_uri" do
-      setup do
+    describe "add_feeds_by_uri" do
+      before do
         @uris = ['http://www.example.com', 'http://www.justinball.com']
         @aggregation = Factory(:aggregation)
         @aggregation.add_feeds_by_uri(nil, @uris)
         @aggregation.reload
       end
-      should "add feeds" do
-        assert_equal @uris.length, @aggregation.feeds.length
+      it "should add feeds" do
+        @aggregation.feeds.length.should == @uris.length
       end
     end
     

data/test/{rails_root/test/unit/entry_test.rb → rails_test/spec/models/entry_spec.rb}

@@ -25,120 +25,116 @@
 #  comment_count           :integer(4)      default(0)
 #
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
-class EntryTest < ActiveSupport::TestCase
+describe Entry do
 
-  context "entry instance" do
-    setup do
+  describe "entry instance" do
+    before do
       @entry = Factory(:entry)
     end
     
-    subject { @entry }
-    
-    should_belong_to :feed
-
+    it { should belong_to :feed }
 
-    context "recommender_entry" do
-      should "return an entry if the direct_link matches the specified uri" do
+    describe "recommender_entry" do
+      it "should return an entry if the direct_link matches the specified uri" do
         uri = Factory.next(:uri)
         e = Factory.create(:entry, :direct_link => uri)
-        assert_equal e.id, Entry.recommender_entry(uri).id
+        Entry.recommender_entry(uri).id.should == e.id
       end
 
-      should "return an entry if the permalink matches the specified uri" do
+      it "should return an entry if the permalink matches the specified uri" do
         uri = Factory.next(:uri)
         e = Factory.create(:entry, :permalink => uri)
-        assert_equal e.id, Entry.recommender_entry(uri).id
+        Entry.recommender_entry(uri).id.should == e.id
       end
 
-      should "return an empty entry with the specified uri if the specified uri doesn't match" do
+      it "should return an empty entry with the specified uri if the specified uri doesn't match" do
         uri = Factory.next(:uri)
         e = Factory.create(:entry, :permalink => uri)
-        assert_not_nil Entry.recommender_entry(uri)
-        assert_equal uri, Entry.recommender_entry(uri).permalink
+        Entry.recommender_entry(uri).should_not be_nil
+        Entry.recommender_entry(uri).permalink.should == uri
       end
     end
 
-    context "resource_uri" do
-      should "return the permalink when no direct_link is specified" do
+    describe "resource_uri" do
+      it "should return the permalink when no direct_link is specified" do
         @entry.direct_link = nil
-        assert_equal @entry.permalink, @entry.resource_uri
+        @entry.resource_uri.should == @entry.permalink
       end
 
-      should "return the direct_link when a direct_link is specified" do
+      it "should return the direct_link when a direct_link is specified" do
         @entry.direct_link = Factory.next(:uri)
-        assert_equal @entry.direct_link, @entry.resource_uri
+        @entry.resource_uri.should == @entry.direct_link
       end
     end
     
-    context "search" do
-      # should "search indexes for ruby" do
+    describe "search" do
+      # it "should search indexes for ruby" do
       #   Entry.search('ruby', 'all', 'en', 10, 0)
       # end
-      should "raise invalid language error" do
-        assert_raise(MuckServices::Exceptions::LanguageNotSupported) do
-          Entry.search('ruby', 'all', 'foo', 10, 0)
-        end
+      it "should raise invalid language error" do
+        lambda{
+          Entry.search('ruby', 'all', 'foo', 10, 0)          
+        }.should raise_error(MuckServices::Exceptions::LanguageNotSupported)
       end
     end
 
-    context "normalized_uri" do
-      should "remove the trailing file name from any url that ends in index.*" do
+    describe "normalized_uri" do
+      it "should remove the trailing file name from any url that ends in index.*" do
         index_uri = 'http://example.com/some_dir/'
         ['html','aspx','shtm','htm','asp','php','cfm','jsp','shtml','jhtml'].each { |ext|
-          assert_equal index_uri, Entry.normalized_uri(index_uri + 'index.' + ext)
+          Entry.normalized_uri(index_uri + 'index.' + ext).should == index_uri
         }
       end
     end
 
-    context "recommendation requested omitting certain feeds" do
-      should "not contain entries from those feeds" do
+    describe "recommendation requested omitting certain feeds" do
+      it "should not contain entries from those feeds" do
         feed1_id = Factory(:feed).id
         feed2_id = Factory(:feed).id
-        assert_not_equal feed1_id, feed2_id
+        feed1_id.should_not == feed2_id
         Recommendation.create(:entry_id => @entry.id, :dest_entry_id => Factory.create(:entry, :feed_id => feed1_id).id)
         Recommendation.create(:entry_id => @entry.id, :dest_entry_id => Factory.create(:entry, :feed_id => feed2_id).id)
         r = @entry.related_entries.top(false, 5, feed2_id.to_s)
-        assert_equal 1, r.length
+        r.length.should == 1
         r.each { |e| assert_not_equal feed2_id, e.feed_id}
       end
     end
 
-    context "with 3 recommendations" do
-
-      setup do
+    describe "with 3 recommendations" do
+      before do
         3.times { |n| Recommendation.create(:entry_id => @entry.id,
                       :dest_entry_id => Factory(:entry).id, :relevance => n.to_f/10.0) }
       end
 
-      should "have 3 related_entries" do
-        assert_equal 3, @entry.related_entries.top.length
+      it "should have 3 related_entries" do
+        @entry.related_entries.top.length.should == 3
       end
 
-      should "return only 2 if specified" do
-        assert_equal 2, @entry.related_entries.top(true,2).length
+      it "should return only 2 if specified" do
+        @entry.related_entries.top(true,2).length.should == 2
       end
 
-      should "return results in order of relevance by default" do
+      it "should return results in order of relevance by default" do
         related_entries = @entry.related_entries.top
-        assert related_entries[1].relevance < related_entries[0].relevance
-        assert related_entries[2].relevance < related_entries[1].relevance
+        related_entries[1].relevance.should < related_entries[0].relevance
+        related_entries[2].relevance.should < related_entries[1].relevance
       end
 
     end
     
-    context "recommendation requested without details" do
-      should "not have an author" do
+    describe "recommendation requested without details" do
+      it "should not have an author" do
         Recommendation.create(:entry_id => @entry.id,
                               :dest_entry_id => Factory.create(:entry, :author => Factory.next(:name)).id,
                               :relevance => '.3')
-        assert_raise ActiveRecord::MissingAttributeError do
-          @entry.related_entries.top.first.author
-        end
+        lambda{
+          @entry.related_entries.top.first.author          
+        }.should raise_error
       end
 
-      should "have basic fields" do
+      it "should have basic fields" do
         title = Factory.next(:name)
         collection = Factory.next(:name)
         feed_id = Factory(:feed, :short_title => collection).id
@@ -147,18 +143,18 @@ class EntryTest < ActiveSupport::TestCase
         recommendation_id = Recommendation.create(:entry_id => @entry.id, :relevance => relevance,
                :dest_entry_id => dest_entry_id).id.to_s
         r = @entry.related_entries.top(true).first
-        assert_nothing_raised do
-          assert_equal recommendation_id, r.recommendation_id
-          assert_equal relevance.to_f, r.relevance.to_f
-          assert_equal title, r.title
-          assert_equal collection, r.collection
-          assert_not_nil r.dest_entry_id
-        end
+        lambda do
+          r.recommendation_id.should == recommendation_id
+          r.relevance.to_f.should == relevance.to_f
+          r.title.should == title
+          r.collection.should == collection
+          r.dest_entry_id.should_not be_nil
+        end.should_not raise_error
       end
     end
 
-    context "recommendation requested with details" do
-      should "have basic and detailed fields" do
+    describe "recommendation requested with details" do
+      it "should have basic and detailed fields" do
         title = Factory.next(:name)
         collection = Factory.next(:name)
         author = Factory.next(:name)
@@ -176,21 +172,21 @@ class EntryTest < ActiveSupport::TestCase
         recommendation_id = Recommendation.create(:entry_id => @entry.id, :relevance => relevance,
                :avg_time_at_dest => average_time_at_dest, :clicks => clicks, :dest_entry_id => dest_entry_id).id.to_s
         r = @entry.related_entries.top(true).first
-        assert_nothing_raised do
-          assert_equal recommendation_id, r.recommendation_id
-          assert_equal relevance.to_f, r.relevance.to_f
-          assert_equal title, r.title
-          assert_equal collection, r.collection
-          assert_not_nil r.dest_entry_id
-
-          assert_equal author, r.author
-#          assert_equal published_at, r.published_at
-          assert_equal clicks, r.clicks.to_i
-          assert_equal permalink, r.permalink
-          assert_equal direct_uri, r.direct_uri
-          assert_equal average_time_at_dest, r.average_time_at_dest.to_i
-          assert_equal description, r.description
-        end
+        lambda do
+          r.recommendation_id.should == recommendation_id
+          r.relevance.to_f.should == relevance.to_f
+          r.title.should == title
+          r.collection.should == collection
+          r.dest_entry_id.should_not be_nil
+
+          r.author.should == author
+#          r.published_at.should == published_at
+          r.clicks.to_i.should == clicks
+          r.permalink.should == permalink
+          r.direct_uri.should == direct_uri
+          r.average_time_at_dest.to_i.should == average_time_at_dest
+          r.description.should == description
+        end.should_not raise_error
       end
     end