sinatra-rabbit 1.1.4 → 1.1.5

data/lib/sinatra/rabbit/base.rb

@@ -89,9 +89,13 @@ module Sinatra
     #       include Sinatra::Rabbit
     #     end
     #
+
     def self.included(base)
       configuration[:root_path] ||= '/'
-      base.register(DSL) if base.respond_to? :register
+      base.register(Rabbit::DSL) if base.respond_to? :register
+      if configuration[:use_namespace]
+        configuration[:base_module] = const_get(base.name.split('::').first)
+      end
       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'))
@@ -101,7 +105,7 @@ module Sinatra
 
     class Collection < BaseCollection
 
-      include DSL
+      include Rabbit::DSL
 
       def self.generate(name, parent_collection=nil, &block)
         @collection_name = name.to_sym

data/lib/sinatra/rabbit/base_collection.rb

@@ -49,7 +49,16 @@ module Sinatra
       end
 
       def self.collection_class(name, parent_class=nil)
-        klass = parent_class || Sinatra::Rabbit
+        if base_module = Rabbit::configuration[:base_module]
+          if base_module.const_defined? 'Rabbit'
+            base_module = base_module::Rabbit
+          else
+            base_module = base_module.const_set('Rabbit', Module.new)
+          end
+        else
+          base_module = Sinatra::Rabbit
+        end
+        klass = parent_class || base_module
         begin
           yield k = klass.const_get(name.to_s.camelize + 'Collection')
         rescue NameError

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

metadata

@@ -1,102 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-rabbit
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.1.5
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 4
-  version: 1.1.4
 platform: ruby
-authors: 
+authors:
 - The Apache Software Foundation
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-15 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id001
-description: "    Rabbit is a Sinatra extension which can help you writing\n    a simple REST API using easy to undestand DSL.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+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
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-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
-has_rdoc: true
 homepage: http://github.com/mifo/sinatra-rabbit
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 8
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sinatra REST API DSL
 test_files: []
-
+has_rdoc: