sinatra-advanced-routes 0.5.1 → 0.5.2

data/NEWS.md

@@ -0,0 +1,6 @@
+# News
+
+## v0.5.2
+
+    * Added bundle default require file (#5)
+    * Fixed tests with updated depenencies (#4)

data/README.md

@@ -1,75 +1,79 @@
-Sinatra::AdvancedRoutes
-=======================
+# Sinatra::AdvancedRoutes
 
-Makes routes first class objects in [Sinatra](http://sinatrarb.com).
+> Makes routes first class objects in [Sinatra](http://sinatrarb.com).
 
-BigBand
--------
+[![Build Status](https://travis-ci.org/rkh/sinatra-advanced-routes.png)](https://travis-ci.org/rkh/sinatra-advanced-routes)
 
-Sinatra::AdvancedRoutes is part of the [BigBand](http://github.com/rkh/big_band) stack.
-Check it out if you are looking for other fancy Sinatra extensions.
+Check out [sinatra-contrib](https://github.com/sinatra/sinatra-contrib) you are looking for other fancy Sinatra extensions.
 
-Installation
-------------
+## Installation
 
-    gem install sinatra-advanced-routes
+Add to your `Gemfile` :
 
-Example
--------
+```ruby
+gem 'sinatra-advanced-routes'
+```
 
-Route manipulation:
+If you are extending Sinatra::Base, register the extension manually :
 
-    require "sinatra"
-    require "sinatra/advanced_routes"
+```ruby
+require "sinatra/base"
+require "sinatra/advanced_routes"
 
-    admin_route = get "/admin" do
-      administrate_stuff
-    end
+class Foo < Sinatra::Base
+  register Sinatra::AdvancedRoutes
+end
+```
 
-    before do
-      # Let's deactivate the route if we have no password file.
-      if File.exists? "admin_password" then admin_route.activate
-      else admin_route.deactivate 
-      end
-    end
+## Examples
 
-    first_route = get "/:name" do
-      # stuff
-    end
+### Route manipulation
 
-    other_route = get "/foo_:name" do
-      # other stuff
-    end
+```ruby
+require "sinatra"
+require "sinatra/advanced_routes"
 
-    # Unfortunatly first_route will catch all the requests other_route would
-    # have gotten, since it has been defined first. But wait, we can fix this!
-    other_route.promote
+admin_route = get "/admin" do
+  administrate_stuff
+end
 
-Route inspection:
+before do
+  # Let's deactivate the route if we have no password file.
+  if File.exists? "admin_password" then admin_route.activate
+  else admin_route.deactivate 
+  end
+end
 
-    require "some_sinatra_app"
-    
-    SomeSinatraApp.each_route do |route|
-      puts "-"*20
-      puts route.app.name   # "SomeSinatraApp"
-      puts route.path       # that's the path given as argument to get and akin
-      puts route.verb       # get / head / post / put / delete
-      puts route.file       # "some_sinatra_app.rb" or something
-      puts route.line       # the line number of the get/post/... statement
-      puts route.pattern    # that's the pattern internally used by sinatra
-      puts route.keys       # keys given when route was defined
-      puts route.conditions # conditions given when route was defined
-      puts route.block      # the route's closure
-    end
+first_route = get "/:name" do
+  # stuff
+end
 
-Some of that fields (like conditions or pattern) can be changed, which will take immediate effect on the routing.
+other_route = get "/foo_:name" do
+  # other stuff
+end
+
+# Unfortunatly first_route will catch all the requests other_route would
+# have gotten, since it has been defined first. But wait, we can fix this!
+other_route.promote
+```
+
+### Route inspection
 
-Usage with Sinatra::Base
-------------------------
+```ruby
+require "some_sinatra_app"
 
-    require "sinatra/base"
-    require "sinatra/advanced_routes"
-    
-    class Foo < Sinatra::Base
-      register Sinatra::AdvancedRoutes
-    end
+SomeSinatraApp.each_route do |route|
+  puts "-" * 20
+  puts route.app.name   # "SomeSinatraApp"
+  puts route.path       # that's the path given as argument to get and akin
+  puts route.verb       # get / head / post / put / delete
+  puts route.file       # "some_sinatra_app.rb" or something
+  puts route.line       # the line number of the get/post/... statement
+  puts route.pattern    # that's the pattern internally used by sinatra
+  puts route.keys       # keys given when route was defined
+  puts route.conditions # conditions given when route was defined
+  puts route.block      # the route's closure
+end
+```
+
+Some of that fields (like conditions or pattern) can be changed, which will take immediate effect on the routing.

data/lib/sinatra/advanced/routes.rb

@@ -0,0 +1 @@
+require 'sinatra/advanced_routes'

data/spec/sinatra/advanced_routes_spec.rb

@@ -1,10 +1,16 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
+set :environment, :test
+
 describe Sinatra::AdvancedRoutes do
-  before { app :AdvancedRoutes }
-  it_should_behave_like 'sinatra'
 
-  [:get, :head, :post, :put, :delete].each do |verb|
+  def app
+    Sinatra::Application
+  end
+
+  before { mock_app { register Sinatra::AdvancedRoutes }}
+
+  [:head, :get, :post, :put, :delete].each do |verb|
     describe "HTTP #{verb.to_s.upcase}" do
 
       describe "activation" do
@@ -18,7 +24,7 @@ describe Sinatra::AdvancedRoutes do
           browse_route(verb, "/foo").should_not be_ok
         end
 
-        it "is able to deacitvate routes from a before filter" do
+        it "is able to deactivate routes from a before filter" do
           route = define_route(verb, "/foo") { "bar" }
           app.before { route.deactivate }
           route.should be_active
@@ -91,4 +97,13 @@ describe Sinatra::AdvancedRoutes do
 
     end
   end
+
+  def define_route(verb, *args, &block)
+    app.send(verb, *args, &block)
+  end
+
+  def browse_route(verb, *args, &block)
+    send(verb, *args, &block)
+    last_response
+  end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,10 @@
-require "sinatra/rspec/shared"
-require "sinatra/advanced_routes"
+require 'sinatra'
+require 'sinatra/test_helpers'
+require 'sinatra/advanced_routes'
+require 'rspec'
+require 'rack/test'
+
+RSpec.configure do |config|
+  config.include Rack::Test::Methods
+  config.include Sinatra::TestHelpers
+end

metadata

@@ -1,149 +1,164 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-advanced-routes
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
+version: !ruby/object:Gem::Version
+  version: 0.5.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-16 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: monkey-lib
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.5.0
+    none: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    none: false
+- !ruby/object:Gem::Dependency
   name: sinatra-sugar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.5.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra-test-helper
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements: 
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.5.0
+    none: false
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
+  name: rake
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+- !ruby/object:Gem::Dependency
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
+    none: false
   type: :development
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    none: false
 description: Make Sinatra routes first class objects (part of BigBand).
 email: konstantin.mailinglists@googlemail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/sinatra/advanced/routes.rb
 - lib/sinatra/advanced_routes.rb
 - spec/sinatra/advanced_routes_spec.rb
 - spec/spec_helper.rb
+- NEWS.md
 - README.md
 - LICENSE
-has_rdoc: yard
 homepage: http://github.com/rkh/sinatra-advanced-routes
 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
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Make Sinatra routes first class objects (part of BigBand).
 test_files: []
-
+has_rdoc: yard