Skip to content

Commit

Permalink
Merge pull request #22 from emilmelnikov/feature-comments
Browse files Browse the repository at this point in the history
Feature comments
  • Loading branch information
fredwu committed Aug 2, 2012
2 parents e5816c7 + 1f1f4ac commit 9ba8cfe
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 0 deletions.
1 change: 1 addition & 0 deletions api_taster.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Gem::Specification.new do |s|
s.add_dependency 'jquery-rails'
s.add_dependency 'sass-rails'
s.add_dependency 'bootstrap-sass', '~> 2.0.3'
s.add_dependency 'redcarpet'

s.add_development_dependency 'rake'
s.add_development_dependency 'simplecov'
Expand Down
1 change: 1 addition & 0 deletions app/controllers/api_taster/routes_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ def index
def show
@route = Route.find(params[:id])
@params = Route.params_for(@route)
@comment = Route.comment_for(params[:id])
end

def missing_definitions
Expand Down
6 changes: 6 additions & 0 deletions app/helpers/api_taster/application_helper.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
require 'redcarpet'

module ApiTaster
module ApplicationHelper
def markdown(text)
markdown_renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML)
markdown_renderer.render(text).html_safe
end
end
end
7 changes: 7 additions & 0 deletions app/views/api_taster/routes/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
<% if @params.is_a?(Hash) && @params.has_key?(:undefined) %>
<%= render 'undefined_route', :route => @params[:undefined] %>
<% else %>

<% if @comment %>
<div class="well">
<%= markdown @comment %>
</div>
<% end %>

<% @params.each do |param| %>
<%= form_tag @route[:path], :method => @route[:verb], :class => 'well form-horizontal', :remote => true do %>

Expand Down
10 changes: 10 additions & 0 deletions lib/api_taster/mapper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module ApiTaster
class Mapper
cattr_accessor :last_desc

class << self
def get(path, params = {})
map_method(:get, path, params)
Expand All @@ -17,6 +19,10 @@ def delete(path, params = {})
map_method(:delete, path, params)
end

def desc(text)
self.last_desc = text
end

private

def map_method(method, path, params)
Expand All @@ -31,6 +37,10 @@ def map_method(method, path, params)
else
Route.supplied_params[route[:id]] ||= []
Route.supplied_params[route[:id]] << ApiTaster.global_params.merge(params)
unless last_desc.nil?
Route.comments[route[:id]] = last_desc
self.last_desc = nil
end
end
end
end
Expand Down
6 changes: 6 additions & 0 deletions lib/api_taster/route.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ class Route
cattr_accessor :mappings
cattr_accessor :supplied_params
cattr_accessor :obsolete_definitions
cattr_accessor :comments

class << self

def map_routes
self.route_set = Rails.application.routes
self.supplied_params = {}
self.obsolete_definitions = []
self.comments = []

normalise_routes!

Expand Down Expand Up @@ -72,6 +74,10 @@ def params_for(route)
supplied_params[route[:id]].collect { |input| split_input(input, route) }
end

def comment_for(id)
self.comments[id.to_i]
end

def defined_definitions
routes.reject { |route| undefined_route?(route) }
end
Expand Down
13 changes: 13 additions & 0 deletions spec/mapper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ module ApiTaster

before(:all) do
ApiTaster.routes do
desc "Dummy user ID"
get '/dummy_users/:id', :id => 1
post '/dummy_users'
post '/dummy_users', { :hello => 'world' }
Expand Down Expand Up @@ -79,5 +80,17 @@ module ApiTaster

Route.supplied_params[route[:id]].should == [{ :id => 3 }]
end

it "describes a route" do
route = Route.find_by_verb_and_path(:get, '/dummy_users/:id')

Route.comment_for(route[:id]).should == "Dummy user ID"
end

it "don't describe a route" do
route = Route.find_by_verb_and_path(:post, '/dummy_users')

Route.comment_for(route[:id]).should be_nil
end
end
end
6 changes: 6 additions & 0 deletions spec/route_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ module ApiTaster
end
end

it "#comment_for" do
markdown_comment = "Heading\n=======\n * List item 1\n * List item 2"
Route.comments[42] = markdown_comment
Route.comment_for(42).should eq(markdown)
end

it "#missing_definitions and #defined_definitions" do
routes = ActionDispatch::Routing::RouteSet.new
routes.draw do
Expand Down

0 comments on commit 9ba8cfe

Please sign in to comment.