Fix #401 api collision

app/controllers/api/v1/activities_controller.rb

@@ -0,0 +1,14 @@
+class Api::V1::ActivitiesController < Api::BaseController
+  respond_to :json, :xml, :yaml, :on => [:latest, :just_updated]
+
+  def latest
+    @rubygems = Rubygem.latest(50)
+    respond_with(@rubygems, :yamlish => true)
+  end
+
+  def just_updated
+    @rubygems = Version.just_updated(50).map(&:rubygem)
+    respond_with(@rubygems, :yamlish => true)
+  end
+
+end

app/controllers/api/v1/rubygems_controller.rb

@@ -46,16 +46,6 @@ def unyank
     end
   end
 
-  def latest
-    @rubygems = Rubygem.latest(50)
-    respond_with(@rubygems, :yamlish => true)
-  end
-
-  def just_updated
-    @rubygems = Version.just_updated(50).map(&:rubygem)
-    respond_with(@rubygems, :yamlish => true)
-  end
-
   private
 
   def validate_gem_and_version

config/routes.rb

@@ -39,15 +39,20 @@
       resources :rubygems, :path => 'gems', :only => [:create, :show, :index], :id => Patterns::LAZY_ROUTE_PATTERN, :format => /json|xml|yaml/ do
         collection do
           delete :yank
-          put :unyank
-          get :latest
-          get :just_updated
+          put :unyank          
         end
         constraints :rubygem_id => Patterns::ROUTE_PATTERN do
           resource :owners, :only => [:show, :create, :destroy]
         end
       end
 
+      resource :activity, :only => [], :format => /json|xml|yaml/ do
+        collection do
+          get :latest
+          get :just_updated
+        end
+      end
+
       resource :search, :only => :show
 
       resources :web_hooks, :only => [:create, :index] do

test/functional/api/v1/activities_controller_test.rb

@@ -0,0 +1,86 @@
+require 'test_helper'
+
+class Api::V1::ActivitiesControllerTest < ActionController::TestCase
+
+  def should_return_latest_gems(gems)
+    assert_equal 2, gems.length
+    gems.each {|g| assert g.is_a?(Hash) }
+    assert_equal @rubygem_2.attributes['name'], gems[0]['name']
+    assert_equal @rubygem_3.attributes['name'], gems[1]['name']
+  end
+
+  def should_return_just_updated_gems(gems)
+    assert_equal 3, gems.length
+    gems.each {|g| assert g.is_a?(Hash) }
+    assert_equal @rubygem_1.attributes['name'], gems[0]['name']
+    assert_equal @rubygem_2.attributes['name'], gems[1]['name']
+    assert_equal @rubygem_3.attributes['name'], gems[2]['name']
+  end
+
+  context "No signed in-user" do
+    context "On GET to latest" do
+      setup do
+        @rubygem_1 = Factory(:rubygem)
+        @version_1 = Factory(:version, :rubygem => @rubygem_1)
+        @version_2 = Factory(:version, :rubygem => @rubygem_1)
+
+        @rubygem_2 = Factory(:rubygem)
+        @version_3 = Factory(:version, :rubygem => @rubygem_2)
+
+        @rubygem_3 = Factory(:rubygem)
+        @version_4 = Factory(:version, :rubygem => @rubygem_3)
+
+        stub(Rubygem).latest(50){ [@rubygem_2, @rubygem_3] }
+      end
+
+      should "return correct JSON for latest gems" do
+        get :latest, :format => :json
+        should_return_latest_gems MultiJson.decode(@response.body)
+      end
+
+      should "return correct YAML for latest gems" do
+        get :latest, :format => :yaml
+        should_return_latest_gems YAML.load(@response.body)
+      end
+
+      should "return correct XML for latest gems" do
+        get :latest, :format => :xml
+        gems = Hash.from_xml(Nokogiri.parse(@response.body).to_xml)['rubygems']
+        should_return_latest_gems(gems)
+      end
+    end
+
+    context "On GET to just_updated" do
+      setup do
+        @rubygem_1 = Factory(:rubygem)
+        @version_1 = Factory(:version, :rubygem => @rubygem_1)
+        @version_2 = Factory(:version, :rubygem => @rubygem_1)
+
+        @rubygem_2 = Factory(:rubygem)
+        @version_3 = Factory(:version, :rubygem => @rubygem_2)
+
+        @rubygem_3 = Factory(:rubygem)
+        @version_4 = Factory(:version, :rubygem => @rubygem_3)
+
+        stub(Version).just_updated(50){ [@version_2, @version_3, @version_4] }
+      end
+
+      should "return correct JSON for just_updated gems" do
+        get :just_updated, :format => :json
+        should_return_just_updated_gems MultiJson.decode(@response.body)
+      end
+
+      should "return correct YAML for just_updated gems" do
+        get :just_updated, :format => :yaml
+        should_return_just_updated_gems YAML.load(@response.body)
+      end
+
+      should "return correct XML for just_updated gems" do
+        get :just_updated, :format => :xml
+        gems = Hash.from_xml(Nokogiri.parse(@response.body).to_xml)['rubygems']
+        should_return_just_updated_gems(gems)
+      end
+    end
+
+  end
+end

test/functional/api/v1/rubygems_controller_test.rb

@@ -393,69 +393,5 @@ def should_return_just_updated_gems(gems)
       end
     end
 
-    context "On GET to latest" do
-      setup do
-        @rubygem_1 = Factory(:rubygem)
-        @version_1 = Factory(:version, :rubygem => @rubygem_1)
-        @version_2 = Factory(:version, :rubygem => @rubygem_1)
-
-        @rubygem_2 = Factory(:rubygem)
-        @version_3 = Factory(:version, :rubygem => @rubygem_2)
-
-        @rubygem_3 = Factory(:rubygem)
-        @version_4 = Factory(:version, :rubygem => @rubygem_3)
-
-        stub(Rubygem).latest(50){ [@rubygem_2, @rubygem_3] }
-      end
-
-      should "return correct JSON for latest gems" do
-        get :latest, :format => :json
-        should_return_latest_gems MultiJson.decode(@response.body)
-      end
-
-      should "return correct YAML for latest gems" do
-        get :latest, :format => :yaml
-        should_return_latest_gems YAML.load(@response.body)
-      end
-
-      should "return correct XML for latest gems" do
-        get :latest, :format => :xml
-        gems = Hash.from_xml(Nokogiri.parse(@response.body).to_xml)['rubygems']
-        should_return_latest_gems(gems)
-      end
-    end
-
-    context "On GET to just_updated" do
-      setup do
-        @rubygem_1 = Factory(:rubygem)
-        @version_1 = Factory(:version, :rubygem => @rubygem_1)
-        @version_2 = Factory(:version, :rubygem => @rubygem_1)
-
-        @rubygem_2 = Factory(:rubygem)
-        @version_3 = Factory(:version, :rubygem => @rubygem_2)
-
-        @rubygem_3 = Factory(:rubygem)
-        @version_4 = Factory(:version, :rubygem => @rubygem_3)
-
-        stub(Version).just_updated(50){ [@version_2, @version_3, @version_4] }
-      end
-
-      should "return correct JSON for just_updated gems" do
-        get :just_updated, :format => :json
-        should_return_just_updated_gems MultiJson.decode(@response.body)
-      end
-
-      should "return correct YAML for just_updated gems" do
-        get :just_updated, :format => :yaml
-        should_return_just_updated_gems YAML.load(@response.body)
-      end
-
-      should "return correct XML for just_updated gems" do
-        get :just_updated, :format => :xml
-        gems = Hash.from_xml(Nokogiri.parse(@response.body).to_xml)['rubygems']
-        should_return_just_updated_gems(gems)
-      end
-    end
-
   end
 end