sinatra-rabbit 1.0.1 → 1.0.2

data/lib/sinatra/rabbit/base.rb

@@ -64,27 +64,27 @@ module Sinatra
     end
 
     def self.configuration
-      @configuration || {}
+      Thread.current[:rabbit_configuration] ||= {}
     end
 
     def self.enable(property)
-      @configuration[property] = true
+      configuration[property] = true
     end
 
     def self.enabled?(property)
-      !@configuration[property].nil? and @configuration[property] == true
+      !configuration[property].nil? and configuration[property] == true
     end
 
     def self.disabled?(property)
-      !@configuration[property].nil? and @configuration[property] == false
+      !configuration[property].nil? and configuration[property] == false
     end
 
     def self.disable(property)
-      @configuration[property] = false
+      configuration[property] = false
     end
 
     def self.set(property, value)
-      @configuration[property] = value
+      configuration[property] = value
     end
 
     # Automatically register the DSL to Sinatra::Base if this
@@ -97,9 +97,7 @@ module Sinatra
     #     end
     #
     def self.included(base)
-      @configuration ||= {
-        :root_path => '/'
-      }
+      configuration[:root_path] = '/'
       base.register(DSL)
     end
 
@@ -153,6 +151,10 @@ module Sinatra
         base_class.features.select { |f| f.collection == collection_name }
       end
 
+      def self.feature(name)
+        features.find { |f| f.name == name }
+      end
+
       def self.with_id!(id)
         @with_id = ":#{id}"
       end
@@ -189,7 +191,7 @@ module Sinatra
         end
 
         # Create operation class
-        operation = operation_class(self, operation_name).generate(self, operation_name, &block)
+        operation = operation_class(self, operation_name).generate(self, operation_name, opts, &block)
         @operations << operation
 
         # Generate HEAD routes
@@ -244,9 +246,13 @@ module Sinatra
           @method ||= method || BaseCollection.http_method_for(@name)
         end
 
-        def self.generate(collection, name, &block)
+        def self.generate(collection, name, opts={}, &block)
           @name, @params, @collection = name, [], collection
+          @options = opts
           @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)
+            end
             feature.operations.each do |o|
               instance_eval(&o.params)
             end
@@ -272,6 +278,11 @@ 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)

data/lib/sinatra/rabbit/features.rb

@@ -18,13 +18,16 @@ module Sinatra
   module Rabbit
     class Feature
       attr_reader :name
+      attr_reader :description
       attr_reader :collection
       attr_reader :operations
+      attr_reader :constraints
 
       def initialize(name, opts={}, &block)
         @name = name
         @operations = []
         @collection = opts[:for]
+        @constraints = {}
         raise "Each feature must define collection for which it will be valid using :for parameter" unless @collection
         instance_eval(&block) if block_given?
       end
@@ -34,6 +37,14 @@ module Sinatra
         @operations.find { |o| o.name == name }
       end
 
+      def description(s=nil)
+        @description ||= s
+      end
+
+      def constraint(name, value)
+        @constraints[name] = value
+      end
+
       class Operation
         attr_reader :name
         attr_reader :params
@@ -49,14 +60,20 @@ module Sinatra
     module Features
 
       def features(&block)
-        @@features ||= []
+        @features ||= []
         instance_eval(&block) if block_given?
-        @@features
+        @features
       end
 
       def feature(name, opts={}, &block)
-        @@features << Feature.new(name, opts, &block) if block_given?
-        @@features.find { |f| f.name == name }
+        feature = @features.find { |f| f.name == name }
+        return feature unless block_given?
+        if feature
+          feature.class_eval(&block)
+        else
+          @features << Feature.new(name, opts, &block) if block_given?
+        end
+        @features.find { |f| f.name == name }
       end
 
       def self.included(base)

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.1'
+  s.version = '1.0.2'
   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.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70156043073960 !ruby/object:Gem::Requirement
+  requirement: &70094500372800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70156043073960
+  version_requirements: *70094500372800
 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