bebop 0.1.1 → 0.1.2

data/bebop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bebop'
-  s.version = '0.1.1'
+  s.version = '0.1.2'
   s.date = '2010-1-10'
  
   s.summary = s.description = "A small Sinatra/Monk extension for resource routing"

data/lib/bebop.rb

@@ -1,4 +1,6 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
+require 'logger'
+require 'active_support'
 require 'bebop/ext'

data/lib/bebop/ext.rb

@@ -1,8 +1,7 @@
-require 'active_support'
-
 module Bebop
   class InvalidPathArgumentError < ArgumentError; end
   PARAM_REGEX = /:[a-zA-Z0-9_]+/
+  
 
   def resource(name, &block)
     resource = ResourceRouter.new
@@ -28,10 +27,30 @@ module Bebop
     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 
-    
+
+    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
@@ -51,7 +70,7 @@ module Bebop
     end
 
     def delete(route, options={}, &block)
-      add_route(:delete, route, options,  block)
+      add_route(:delete, route, options, block)
     end
 
     def head(route, options={}, &block)
@@ -106,11 +125,10 @@ module Bebop
     def print
       #TODO 6! 6! Block parameters, Ah Ah Ah! -> probably need route objects
       @routes.each do |method, route, options, block, helper, identifier|
-        puts "#{route}"
-        puts "  method:     #{method.to_s.upcase}"
-        puts "  helper:     #{helper}" if helper
-        puts "  identifier: #{identifier}" if identifier
-        puts
+        logger.info "#{route}"
+        logger.info "  method:     #{method.to_s.upcase}"
+        logger.info "  helper:     #{helper}" if helper
+        logger.info "  identifier: #{identifier} " if identifier
       end
     end
     
@@ -131,7 +149,7 @@ module Bebop
     end
     
     def add_route(method, route, options, block) 
-      identifier =options[:identifier]
+      identifier = options[:identifier]
       route = append_to_path(route)
       block = add_filters_to_block(block, identifier, method)
       helper = route_helper(identifier)

data/spec/bebop_spec.rb

@@ -147,7 +147,10 @@ describe Bebop do
     last_response.body.should == 'success'
   end
 
-  it "should produce correct routes for more than 2 levels of nesting"
+  it "should produce correct routes for more than 2 levels of nesting" do
+    get '/foos/1/bars/2/bazs' 
+    last_response.body.should match(/#{BEFORE_ALL_2}/)
+  end
   
   BEFORE_BARS = '__before_bars__'
   BEFORE_UPDATE = '__before_update__'
@@ -193,6 +196,10 @@ describe Bebop do
         bar.destroy { "#{@all2}#{@all}#{@update}#{@bars}" }
 
         bar.show { "show #{params[:foo_id]} #{params[:bar_id]}" }
+
+        bar.resource :bazs do |baz|
+          baz.index { @all2 }
+        end
       end
 
       foo.get('/do/something') { 'success' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bebop
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - John Bender