sinatra-rabbit 1.1.2 → 1.1.3

data/lib/sinatra/docs/collection.haml

@@ -20,10 +20,10 @@
               %th Name
               %th Constraints
               %th Description
-          %tbody
+          %tbody.features
             - collection.features.each do |f|
               %tr
-                %td
+                %td.feature
                   %em=f.name
                 %td
                   - f.constraints.each do |c, v|
@@ -50,7 +50,7 @@
             %th HTTP method
             %th URL
             %th Description
-        %tbody
+        %tbody.operations
           - collection.operations.each do |o|
             %tr
               %td

data/lib/sinatra/rabbit/base.rb

@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+require 'haml'
 require_relative './dsl'
 require_relative './param'
 require_relative './base_collection'
@@ -94,7 +95,7 @@ module Sinatra
       base.get '/docs' do
         css_file = File.read(File.join(File.dirname(__FILE__), '..', 'docs', 'bootstrap.min.css'))
         index_file = File.read(File.join(File.dirname(__FILE__), '..', 'docs', 'api.haml'))
-        haml index_file, :locals => { :base => base.documentation_class, :css => css_file }
+        haml index_file, :locals => { :base => base.respond_to?(:documentation_class) ? base.documentation_class : base, :css => css_file }
       end
     end
 
@@ -107,14 +108,15 @@ module Sinatra
         @parent_collection = parent_collection
         class_eval(&block)
         generate_head_route unless Rabbit.disabled? :head_routes
-        generate_option_route unless Rabbit.disabled? :options_routes
+        generate_options_route unless Rabbit.disabled? :options_routes
         generate_docs_route unless Rabbit.disabled? :docs
         self
       end
 
-      def self.generate_option_route
-        base_class.options '/docs' + full_path do
-          header 'Allow' => operations.map { |o| o.operation_name }.join(',')
+      def self.generate_options_route
+        methods = (['OPTIONS'] + operations.map { |o| o.http_method.to_s.upcase }).uniq.join(',')
+        base_class.options full_path do
+          headers 'Allow' => methods
           status 200
         end
       end
@@ -257,7 +259,7 @@ module Sinatra
         # Define Sinatra route and generate OPTIONS route if enabled
         base_class.send(new_operation.http_method || http_method_for(operation_name), new_operation.full_path, route_options, &new_operation.control)
 
-        new_operation.generate_option_route(root_path + route_for(path, operation_name, :no_id_and_member)) unless Rabbit.disabled?(:options_routes)
+        new_operation.generate_options_route(root_path + route_for(path, operation_name, :no_id_and_member)) unless Rabbit.disabled?(:options_routes)
         new_operation.generate_head_route(root_path + route_for(path, operation_name, :member)) unless Rabbit.disabled?(:head_routes)
         new_operation.generate_docs_route(new_operation.docs_url) unless Rabbit.disabled?(:doc_routes)
         self
@@ -314,7 +316,7 @@ module Sinatra
           end
         end
 
-        def self.generate_option_route(path)
+        def self.generate_options_route(path)
           operation_params = params.map { |p| p.to_s }.join(',')
           @collection.base_class.options path do
             headers 'Allow' => operation_params

data/sinatra-rabbit.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     a simple REST API using easy to undestand DSL.
   EOF
 
-  s.version = '1.1.2'
+  s.version = '1.1.3'
   s.date = Time.now
   s.summary = %q{Sinatra REST API DSL}
   s.files = FileList[

data/tests/app_test.rb

@@ -27,6 +27,19 @@ describe Sample do
     status.must_equal 200
   end
 
+  it "should respond to OPTIONS request for sample collection" do
+    options '/sample'
+    status.must_equal 200
+    allow_header = last_response.headers['Allow'].split(',')
+    allow_header.wont_be_empty
+    allow_header.must_include 'OPTIONS'
+    allow_header.must_include 'GET'
+    allow_header.must_include 'POST'
+    allow_header.must_include 'DELETE'
+    last_response.headers['Content-Length'].must_equal '0'
+    last_response.body.must_be_empty
+  end
+
   it "should respond 200 to HEAD request for index operation in sample collection" do
     head '/sample/index'
     status.must_equal 200

data/tests/docs_test.rb

@@ -24,34 +24,29 @@ describe 'Documentation' do
 
   it "should return list of collections in entrypoint" do
     get '/docs'
-    html.css('html body > h1').text.must_equal 'Sample'
+    html.css('html body h1').text.must_equal 'Sample'
     html.css('html body ul li').wont_be_empty
     html.css('html body ul li a').wont_be_empty
   end
 
   it "should return valid collection name when query collection documentation" do
     get '/docs/sample'
-    html.css('html body > h1').text.must_equal 'SampleCollection'
+    html.css('html body h1').text.must_equal 'Sample'
   end
 
   it "should return valid collection description when query collection documentation" do
     get '/docs/sample'
-    html.css('html body > blockquote').text.must_equal 'Test'
-  end
-
-  it "should return valid collection url when query collection documentation" do
-    get '/docs/sample'
-    html.css('html body > .url').text.must_equal '/sample'
+    html.css('html body blockquote p').text.strip.must_equal 'Test'
   end
 
   it "should return list of features when query collection documentation" do
     get '/docs/sample'
-    html.css('html body .features .feature').map { |f| f.text}.must_include 'user_data', 'user_name'
+    html.css('html body .features .feature').map { |f| f.text.strip}.must_include 'user_data', 'user_name'
   end
 
   it "should return complete list of operations when query collection documentation" do
     get '/docs/sample'
-    html.css('html body .operations tr').size.must_equal 7
+    html.css('html body .operations tr').size.must_equal 6
   end
 
   it "should provide valid links from entrypoint to collection" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rabbit
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -37,20 +37,20 @@ extra_rdoc_files:
 files:
 - lib/sinatra/rabbit.rb
 - lib/sinatra/docs/api.haml
-- lib/sinatra/docs/collection.haml
 - lib/sinatra/docs/operation.haml
+- lib/sinatra/docs/collection.haml
 - lib/sinatra/docs/bootstrap.min.css
 - lib/sinatra/rabbit/base.rb
-- lib/sinatra/rabbit/base_collection.rb
-- lib/sinatra/rabbit/dsl.rb
 - lib/sinatra/rabbit/features.rb
-- lib/sinatra/rabbit/param.rb
 - lib/sinatra/rabbit/validator.rb
+- lib/sinatra/rabbit/dsl.rb
+- lib/sinatra/rabbit/param.rb
+- lib/sinatra/rabbit/base_collection.rb
 - tests/app_test.rb
+- tests/params_test.rb
+- tests/fixtures.rb
 - tests/docs_test.rb
 - tests/dsl_test.rb
-- tests/fixtures.rb
-- tests/params_test.rb
 - LICENSE
 - README.md
 - sinatra-rabbit.gemspec