sinatra-controllers 0.2.1 → 0.2.3

data/CHANGELOG

@@ -1 +1,9 @@
+
+* 0.2.2
+	- fix bug with class with scope '/'.
+	- adding of Sinatra::Controllers.routes and Sinatra::Controllers.show_routes.
+	- adding example application.
+* 0.2.1
+	- fix bug where omittance of leading slash and no defined scope leads to
+	TypeError
 * 0.2.0 add scoping

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-controllers (0.2.1)
+    sinatra-controllers (0.2.2)
       sinatra (>= 1.0.0)
 
 GEM

data/README.rdoc

@@ -3,7 +3,8 @@
 Sinatra routing done differently.  Allows for clean organization across
 multiple sinatra routes files.
 
-NOTE: this has only been tested with ruby 1.9.2
+* this has only been tested with ruby 1.9.2
+* redirect doesn't work.. yet
 
 
 == Examples

data/lib/sinatra-controllers.rb

@@ -18,20 +18,26 @@ module Sinatra
   end
   module Controllers
     class Mapping
+      @@routes = []
       attr_accessor :klass, :opts
-
       def initialize(klass,opts={})
         @klass = klass
         @opts  = opts
       end
 
+      def self.routes
+        @@routes
+      end
+
       def route(verb, path, action)
         aklass = klass # need this so it will stay in scope for closure
         block = proc { aklass.new(params, request).send action }
         if path[0] != '/'
           path = '/' + File.join(opts[:scope] || '', path)
         end
-        Sinatra::Application.send verb, path, &block
+        @@routes.push [verb.to_sym, path, "#{aklass}\##{action}"]
+        path.gsub!(%r{^/+},'/')
+        Sinatra::Base.send verb, path, &block
       end
 
       def parse
@@ -62,6 +68,16 @@ module Sinatra
         map.instance_eval(&block) if block
         map.parse
       end
+      def routes
+        Sinatra::Controllers::Mapping.routes
+      end
+      def show_routes
+        routes.each do |verb, path, action|
+          puts
+          puts "#{verb.to_s.ljust(8)}#{path.ljust(35)}#{action.ljust(25)}"
+          puts
+        end
+      end
     end
   end
 end

data/lib/sinatra-controllers/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Controllers
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   end
 end

data/test/{path_defined_test.rb → scope_defined_test.rb}

@@ -22,6 +22,13 @@ class Leader < Sinatra::Controller
   end
 end
 
+class Sliders < Sinatra::Controller
+  def get_quinn
+    'mallory'
+  end
+end
+Sinatra::Controllers.register(Sliders, :scope => '/')
+
 Sinatra::Controllers.register(Show70, :scope => '/70s_show')
 # make sure we don't need leading slash
 Sinatra::Controllers.register(Seinfeld, :scope => 'seinfeld') do
@@ -42,6 +49,12 @@ describe  "with defined scope" do
     end
   end
 
+  it "should get a scope of slash correctly for a class" do
+    get '/quinn'
+    last_response.status.must_equal 200
+    last_response.body.must_equal 'mallory'
+  end
+
   it "should use correct scope" do
     get '/70s_show/kelso'
     last_response.status.must_equal 200

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Daniel Bretoi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -07:00
+date: 2011-04-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,7 @@ files:
 - test/controller_test.rb
 - test/helper.rb
 - test/no_block_test.rb
-- test/path_defined_test.rb
+- test/scope_defined_test.rb
 - test/views/foo.haml
 - test/views/fringe.haml
 - test/watchr.rb
@@ -180,7 +180,7 @@ test_files:
 - test/controller_test.rb
 - test/helper.rb
 - test/no_block_test.rb
-- test/path_defined_test.rb
+- test/scope_defined_test.rb
 - test/views/foo.haml
 - test/views/fringe.haml
 - test/watchr.rb