Merge 1c89749 into 514633b

app/controllers/api/v1/api_controller.rb

@@ -0,0 +1,19 @@
+class API::V1::ApiController < ApplicationController
+  respond_to :json, :xml
+
+  # The stats API only requires an api_key for the given app.
+  skip_before_filter :authenticate_user!
+  before_filter :require_api_key_or_authenticate_user!
+
+  protected
+
+  def require_api_key_or_authenticate_user!
+    if params[:api_key].present?
+      if @app = App.where(:api_key => params[:api_key]).first
+        return true
+      end
+    end
+
+    authenticate_user!
+  end
+end

app/controllers/api/v1/apps_controller.rb

@@ -0,0 +1,9 @@
+class API::V1::AppsController < API::V1::ApiController
+  def index
+    @apps = App.all
+  end
+
+  def show
+    @app = App.find(params[:id])
+  end
+end

app/controllers/api/v1/stats_controller.rb

@@ -1,10 +1,4 @@
-class Api::V1::StatsController < ApplicationController
-  respond_to :json, :xml
-
-  # The stats API only requires an api_key for the given app.
-  skip_before_filter :authenticate_user!
-  before_filter :require_api_key_or_authenticate_user!
-
+class API::V1::StatsController < API::V1::ApiController
   def app
     if problem = @app.problems.order_by(:last_notice_at.desc).first
       @last_error_time = problem.last_notice_at
@@ -22,18 +16,4 @@ def app
       format.xml  { render :xml  => stats }
     end
   end
-
-
-  protected
-
-  def require_api_key_or_authenticate_user!
-    if params[:api_key].present?
-      if @app = App.where(:api_key => params[:api_key]).first
-        return true
-      end
-    end
-
-    authenticate_user!
-  end
-
 end

app/views/api/v1/apps/index.json.jbuilder

@@ -0,0 +1 @@
+json.apps @apps, :id, :name, :github_repo

app/views/api/v1/apps/show.json.jbuilder

@@ -0,0 +1,4 @@
+json.(@app, :id, :name)
+json.errors @app.problems do |json, problem|
+  json.(problem, :message, :last_noticed_at, :notices_count)
+end

config/initializers/inflections.rb

@@ -1,11 +1,4 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.acronym 'API'
+end
 

config/routes.rb

@@ -52,6 +52,7 @@
     namespace :v1 do
       resources :problems, :only => [:index, :show], :defaults => { :format => 'json' }
       resources :notices,  :only => [:index], :defaults => { :format => 'json' }
+      resources :apps,  :only => [:index, :show], :defaults => { :format => 'json' }
       resources :stats, :only => [], :defaults => { :format => 'json' } do
         collection do
           get :app