bebop 0.1.2 → 0.1.3

data/bebop.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = 'bebop'
-  s.version = '0.1.2'
+  s.version = '0.1.3'
   s.date = '2010-1-10'
- 
+
   s.summary = s.description = "A small Sinatra/Monk extension for resource routing"
- 
+
   s.authors = ["John Bender"]
   s.homepage = 'http://github.com/johnbender/bebop'
   s.email = 'john.m.bender@gmail.com'
- 
+
   # = MANIFEST =
-  s.files = %w[ 
+  s.files = %w[
 README.markdown
 Rakefile
 bebop.gemspec
@@ -20,12 +20,12 @@ lib/bebop/ext.rb
 lib/bebop.rb
 spec/bebop_spec.rb
 ]
-  # = MANIFEST = 
+  # = MANIFEST =
   s.add_dependency 'sinatra', '>= 0.9.4'
   s.add_dependency 'activesupport', '>= 2.3.5'
 
   s.add_development_dependency 'rspec', '>=1.2.9'
-  
+
   s.has_rdoc = false
   s.require_paths = %w[lib]
   s.rubyforge_project = 'bebop'

data/examples/filters.rb

@@ -1,19 +1,19 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'bebop')
-require 'sinatra'
+require 'sinatra/base'
 
 class MyApp < Sinatra::Base
   register Bebop
 
   resource :foos do |foos|
-    # Bebop provides some simple targeting for before and after filters, with the 
-    # caveat that they must be defined before the routes they target within the resource block    
+    # Bebop provides some simple targeting for before and after filters, with the
+    # caveat that they must be defined before the routes they target within the resource block
     # To have your filter run before all routes under a given resource and its child resources
     # pass :all as the first parameter
-    # 
+    #
     foos.before :all do
       @all = 'all'
     end
-    
+
     # To have your filter run before a specific route, the route must be one of the seven helper
     # routes (see example/routes.rb) or specify the :identifier parameter
     #
@@ -24,7 +24,7 @@ class MyApp < Sinatra::Base
     foos.new do
       "#{@all} #{@new}" # => 'all new'
     end
-   
+
     # You can target the vanila methods by providing the :identifier hash option
     #
     # GET /foos/baz
@@ -33,11 +33,11 @@ class MyApp < Sinatra::Base
     end
 
     # You can also specify a before filter for nested routes by using the child resource name
-    # 
+    #
     foos.before :bars do
       @bars = 'some bars'
     end
-    
+
     foos.resource :bars do |bars|
       bars.get '/some_bars' do
         @bars # => 'some bars'
@@ -49,12 +49,14 @@ class MyApp < Sinatra::Base
     end
 
     # Finally you can specify many different methods in your filters by passing many identifiers
-    # 
+    #
     foos.before :bak, :baz do
       @bak_baz = "bak 'n' baz"
     end
 
     foos.get('/something', :identifier => :bak) { @bak_baz }
-    foos.get('/anything', :identifier => :baz) { @bak_baz }    
+    foos.get('/anything', :identifier => :baz) { @bak_baz }
   end
 end
+
+MyApp.run!

data/examples/routes.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'bebop')
-require 'sinatra'
+require 'sinatra/base'
 
 class MyApp < Sinatra::Base
   register Bebop
@@ -14,7 +14,7 @@ class MyApp < Sinatra::Base
     foos.get '/baz' do
       'baz'
     end
-    
+
     # There are 7 helper methods for the traditional resource actions. They
     # are index, new, create, update, edit, destroy, and show. Each is a wrapper
     # for the corresponding Sinatra method
@@ -36,7 +36,7 @@ class MyApp < Sinatra::Base
 
     # PUT /foos/:foo_id
     foos.update {}
-    
+
     # GET /foos/:foo_id/edit
     foos.edit {}
 
@@ -46,30 +46,30 @@ class MyApp < Sinatra::Base
     # For each of the helper methods, and any generic method (eg foos.get) that specifies the :identifier
     # option, bebop will define a relative path helper. See the nested resource below for the nameing of those
     # methods
-    # 
-    # POST /foos/do/redirect
+    #
+    # GET /foos/do/redirect
     foos.get 'do/redirect' do
       # Redirects to /foos/1
       redirect foos_show_path(1)
     end
 
     # If you want to represent the relationship of your models through nested resources use
-    # the resource method with the block parameter and all new routes will be nested and 
+    # the resource method with the block parameter and all new routes will be nested and
     # parameterized properly
     #
     # Prefix all with /foos/:foo_id
     foos.resource :bars do |bars|
-      
+
       # GET /foos/:foo_id/bars/:bar_id/edit
       bars.edit do
         "foo: #{params[:foo_id]} bar: #{params[:bar_id]}"
-      end 
-      
+      end
+
       bars.get '/redirect' do
-     
+
         # The route helper method naming convention is simple and easy to remember as it follows
         # the order of nesting for the given route starting with the original parent resource and
-        # ending with the method identifier. 
+        # ending with the method identifier.
         #
         # Redirects to /foos/1/bars/2/edit
         redirect foos_bars_edit_path(1, 2)
@@ -77,3 +77,5 @@ class MyApp < Sinatra::Base
     end
   end
 end
+
+MyApp.run!

data/lib/bebop/ext.rb

@@ -1,7 +1,6 @@
 module Bebop
   class InvalidPathArgumentError < ArgumentError; end
   PARAM_REGEX = /:[a-zA-Z0-9_]+/
-  
 
   def resource(name, &block)
     resource = ResourceRouter.new
@@ -18,45 +17,32 @@ module Bebop
       unless route.scan(PARAM_REGEX).length == args.length
         raise InvalidPathArgumentError.new("invalid number of parameters #{args.length} for: #{route}")
       end
-      
+
       args.inject(route.dup) do |acc, arg|
         #handle fixnums and ar objects
-        arg = (arg.kind_of?(Fixnum) ? arg : arg.id)
-        acc.sub!(PARAM_REGEX, arg.to_s) 
+        final_argument = arg.respond_to?(:to_param) ? arg.to_param : arg
+        acc.sub!(PARAM_REGEX, final_argument.to_s)
       end
     end
   end
-  
-  class Action
-    attr_accessor :route, :options, :block
-    def initialize(route, options, block)
-      @route, @options, @block = route, options, block
-    end
 
-    def method
-      self.class.to_s.downcase.to_sym
-    end
-  end
-
-  class Get < Action; end
-  
   class ResourceRouter
-    attr_accessor :routes 
+    attr_accessor :routes
 
     def logger
       @@logger ||= Logger.new(STDOUT)
     end
- 
+
     def logger=(val)
       @@logger = val
     end
-   
+
     def initialize(parent_resources=[], before_all=[], after_all=[])
       @current_resource = parent_resources.pop
       @parent_resources = parent_resources
       @before, @after, @routes = before_all, after_all, []
     end
-    
+
     def get(route, options={}, &block)
       add_route(:get, route, options, block)
     end
@@ -64,7 +50,7 @@ module Bebop
     def put(route, options={}, &block)
       add_route(:put, route, options, block)
     end
-    
+
     def post(route, options={}, &block)
       add_route(:post, route, options, block)
     end
@@ -80,7 +66,7 @@ module Bebop
     def new(options={}, &block)
       get 'new', options.merge(:identifier => :new), &block
     end
-    
+
     def create(options={}, &block)
       post '' , options.merge(:identifier => :create), &block
     end
@@ -116,7 +102,7 @@ module Bebop
     def resource(name, &block)
       before_filters = filters(@before, :all, name)
       after_filters = filters(@after, :all, name)
-      
+
       router = self.class.new(all_resources + [name], before_filters, after_filters)
       yield(router)
       @routes += router.routes
@@ -131,11 +117,11 @@ module Bebop
         logger.info "  identifier: #{identifier} " if identifier
       end
     end
-    
+
     private
-    
+
     def all_resources
-      #in the initial call to resource there is current_resource
+      #in the initial call to resource there isn't a current_resource
       @current_resource ? @parent_resources + [@current_resource] : @parent_resources
     end
 
@@ -147,8 +133,8 @@ module Bebop
       params = [:all] if params.empty?
       type << {:routes => params, :block => block}
     end
-    
-    def add_route(method, route, options, block) 
+
+    def add_route(method, route, options, block)
       identifier = options[:identifier]
       route = append_to_path(route)
       block = add_filters_to_block(block, identifier, method)
@@ -178,7 +164,7 @@ module Bebop
 
     def route_helper(identifier)
       helper_tokens = (@parent_resources.dup << @current_resource) << identifier
-      "#{helper_tokens.join('_')}_path".to_sym
+      "#{helper_tokens.compact.join('_')}_path".to_sym
     end
 
     def add_filters_to_block(block, identifier, method)

data/spec/bebop_spec.rb

@@ -1,9 +1,12 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'bebop')
 require 'rack/test'
-require 'sinatra'
+require 'sinatra/base'
+require 'ruby-debug'
 
 class TestClass < Sinatra::Base
   register Bebop
+  set :show_exceptions, true
+
   def self.global
     @@global
   end
@@ -14,34 +17,31 @@ end
 
 describe Bebop do
   include Rack::Test::Methods
-  
+
   def app
-    @test_app ||= TestClass.new 
+    @test_app ||= TestClass.new
     @test_app
   end
 
   before :all do
     app
     @class = TestClass
-    use_bebop 
+    use_bebop
   end
 
   before :each do
     TestClass.global = nil
   end
 
-  it "should define route helpers properly for routes specifying an identifier" do
-    @class.instance_methods.should include('foos_bars_index_path')
-    @class.instance_methods.should include('foos_create_path')
-  end  
-
   it "should provide the correct relative url from the route helpers" do
-    @test_app.foos_bars_index_path(1).should == '/foos/1/bars'
-    @test_app.foos_bars_update_path(1,2).should == '/foos/1/bars/2'
+    get '/foos/route_helper_test'
+    last_response.body.should include('/foos/1/bars')
+    last_response.body.should include('/foos/1/bars/2')
   end
 
   it "should raise an error when the wrong number of paramters are passed to a route helper" do
-    lambda {@test_app.foos_bars_update_path(1)}.should raise_error(Bebop::InvalidPathArgumentError)
+    get '/foos/exception'
+    last_response.body.should include('Bebop::InvalidPathArgumentError')
   end
 
   it "should define a route with new for the new method" do
@@ -91,24 +91,24 @@ describe Bebop do
 
     get '/foos/1/bars'
     last_response.body.should match(/#{BEFORE_ALL}/)
-    
+
     delete '/foos/1/bars/1'
-    last_response.body.should match(/#{BEFORE_ALL}/)    
+    last_response.body.should match(/#{BEFORE_ALL}/)
 
     put '/foos/1/bars/1'
     last_response.body.should match(/#{BEFORE_ALL}/)
   end
-  
+
   it "should call before and after resource blocks only on the nested resource routes" do
     get '/foos/1/bars'
     last_response.body.should match(/#{BEFORE_BARS}/)
-    
+
     delete '/foos/1/bars/1'
     last_response.body.should match(/#{BEFORE_BARS}/)
   end
-  
+
   it "should not call before and after resource blocks on non nested resource blocks" do
-    post '/foos' 
+    post '/foos'
     last_response.body.should_not match(/#{BEFORE_BARS}/)
   end
 
@@ -121,14 +121,14 @@ describe Bebop do
 
     get '/foos/1/bars'
     last_response.body.should match(/#{BEFORE_ALL_2}/)
-    
+
     delete '/foos/1/bars/1'
-    last_response.body.should match(/#{BEFORE_ALL_2}/)    
+    last_response.body.should match(/#{BEFORE_ALL_2}/)
 
     put '/foos/1/bars/1'
     last_response.body.should match(/#{BEFORE_ALL_2}/)
   end
-  
+
   it "should call before and after filters that specify multiple identifiers before the proper routes" do
     post '/foos'
     TestClass.global.should == AFTER_VALUE
@@ -136,8 +136,8 @@ describe Bebop do
     put '/foos/1'
     TestClass.global.should == AFTER_VALUE
   end
-  
-  it "should not call before and after filters that specify multiple parameters on anyting else" do
+
+  it "should not call before and after filters that specify multiple parameters on anything else" do
     get '/foos/new'
     TestClass.global = nil
   end
@@ -148,10 +148,10 @@ describe Bebop do
   end
 
   it "should produce correct routes for more than 2 levels of nesting" do
-    get '/foos/1/bars/2/bazs' 
+    get '/foos/1/bars/2/bazs'
     last_response.body.should match(/#{BEFORE_ALL_2}/)
   end
-  
+
   BEFORE_BARS = '__before_bars__'
   BEFORE_UPDATE = '__before_update__'
   BEFORE_ALL = '__all__'
@@ -159,9 +159,8 @@ describe Bebop do
   AFTER_VALUE = '__after__'
 
   def use_bebop
-    # ENV['PROUTES']='t'
     @class.resource :foos do |foo|
-      
+
       foo.before :all do
         @all = BEFORE_ALL
       end
@@ -173,7 +172,7 @@ describe Bebop do
       foo.before :update do
         @update = BEFORE_UPDATE
       end
-      
+
       foo.before :bars do
         @bars = BEFORE_BARS
       end
@@ -182,7 +181,7 @@ describe Bebop do
         TestClass.global = AFTER_VALUE
       end
 
-      foo.get(:arbitrary) { 'baz' }        
+      foo.get(:arbitrary) { 'baz' }
 
       foo.create { "#{@all2}#{@all}#{@update}#{@bars}" }
       foo.update { "#{@all2}#{@all}#{@update}#{@bars}" }
@@ -203,6 +202,14 @@ describe Bebop do
       end
 
       foo.get('/do/something') { 'success' }
-    end    
+
+      foo.get '/route_helper_test' do
+        foos_bars_update_path(1,2) + foos_bars_path(1)
+      end
+
+      foo.get '/exception' do
+        foos_bars_update_path(1)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bebop
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - John Bender
@@ -14,34 +19,46 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id003
 description: A small Sinatra/Monk extension for resource routing
 email: john.m.bender@gmail.com
 executables: []
@@ -59,7 +76,7 @@ files:
 - lib/bebop/ext.rb
 - lib/bebop.rb
 - spec/bebop_spec.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/johnbender/bebop
 licenses: []
 
@@ -72,18 +89,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: bebop
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A small Sinatra/Monk extension for resource routing