sinatra-rabbit 1.0.2 → 1.0.3

data/lib/sinatra/rabbit/base.rb

@@ -218,7 +218,9 @@ module Sinatra
         end
 
         # Define Sinatra::Base route
-        base_class.send(operation.http_method || http_method_for(operation_name), operation.full_path, opts, &operation.control)
+        route_options = opts.clone
+        route_options.delete :with_capability
+        base_class.send(operation.http_method || http_method_for(operation_name), operation.full_path, route_options, &operation.control)
 
         # Generate OPTIONS routes
         unless Rabbit.disabled? :options_routes
@@ -230,7 +232,7 @@ module Sinatra
       end
 
       def self.action(action_name, opts={}, &block)
-        opts.merge!(:http_method => :post)
+        opts.merge!(:http_method => :post) unless opts[:http_method]
         operation(action_name, opts, &block)
       end
 
@@ -249,6 +251,7 @@ module Sinatra
         def self.generate(collection, name, opts={}, &block)
           @name, @params, @collection = name, [], collection
           @options = opts
+          http_method(@options.delete(:http_method)) if @options.has_key? :http_method
           @collection.features.select { |f| f.operations.map { |o| o.name}.include?(@name) }.each do |feature|
             if Sinatra::Rabbit.configuration[:check_features]
               next unless Sinatra::Rabbit.configuration[:check_features].call(collection.collection_name, feature.name)
@@ -271,6 +274,15 @@ module Sinatra
         def self.full_path; @operation_path; end
         def self.operation_name; @name; end
 
+        def self.has_capability?
+          @capability ||= Sinatra::Rabbit.configuration[:check_capability]
+          if @capability and @options.has_key?(:with_capability)
+            @capability.call(@options[:with_capability])
+          else
+            true
+          end
+        end
+
         def self.description(text=nil)
           return @description if text.nil?
           @description = text
@@ -278,22 +290,21 @@ module Sinatra
 
         def self.control(&block)
           params_def = @params
-          if Sinatra::Rabbit.configuration[:check_capability] and @options.has_key?(:with_capability)
-            unless Sinatra::Rabbit.configuration[:check_capability].call(@options.delete(:with_capability))
-              @control = Proc.new { [412, {}, "Required capability is missing for current resource and configuration"] }
-            end
-          end
-          @control ||= Proc.new do
-            begin
-              Rabbit::Validator.validate!(params, params_def)
-            rescue => e
-              if e.kind_of? Rabbit::Validator::ValidationError
-                halt e.http_status_code, e.message
-              else
-                raise e
+          if not has_capability?
+            @control = Proc.new { [412, {}, "The required capability to execute this operation is missing"] }
+          else
+            @control ||= Proc.new do
+              begin
+                Rabbit::Validator.validate!(params, params_def)
+              rescue => e
+                if e.kind_of? Rabbit::Validator::ValidationError
+                  halt e.http_status_code, e.message
+                else
+                  raise e
+                end
               end
+              instance_eval(&block)
             end
-            instance_eval(&block)
           end
         end
 

data/lib/sinatra/rabbit/features.rb

@@ -60,8 +60,9 @@ module Sinatra
     module Features
 
       def features(&block)
+        return @features || [] unless block_given?
         @features ||= []
-        instance_eval(&block) if block_given?
+        instance_eval(&block)
         @features
       end
 

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.0.2'
+  s.version = '1.0.3'
   s.date = Time.now
   s.summary = %q{Sinatra REST API DSL}
   s.files = FileList[

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rabbit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70094500372800 !ruby/object:Gem::Requirement
+  requirement: &70288446299200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70094500372800
+  version_requirements: *70288446299200
 description: ! "    Rabbit is a Sinatra extension which can help you writing\n    a
   simple REST API using easy to undestand DSL.\n"
 email: dev@deltacloud.apache.org