sinatra-controllers 0.1.2 → 0.2.0

data/CHANGELOG

@@ -0,0 +1 @@
+* 0.2.0 add scoping

data/Gemfile.lock

@@ -1,14 +1,18 @@
 PATH
   remote: .
   specs:
-    sinatra-controllers (0.1.2)
+    sinatra-controllers (0.2.0)
       sinatra (>= 1.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    awesome_print (0.3.1)
+    haml (3.0.25)
     minitest (2.0.2)
     rack (1.2.2)
+    rack-test (0.5.7)
+      rack (>= 1.0)
     sinatra (1.2.1)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
@@ -19,8 +23,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   bundler (>= 1.0.0)
+  haml
   minitest (~> 2.0.0)
+  rack-test (~> 0.5.7)
   sinatra (>= 1.0.0)
   sinatra-controllers!
   watchr

data/README.rdoc

@@ -57,4 +57,28 @@ register is optional here.
     end
   end
 
+You can also use scopes for your own defined path, either because you're
+unhappy with your classname, or because you just want to:
 
+  class Fringe < Sinatra::Controller
+    def get_walternet
+      'scopes'
+    end
+    def peter
+      'more scopes'
+    end
+    def index
+      'index still if you want'
+    end
+  end
+
+  Sinatra::Controllers.register(Fringe, :scope => 'fringe') do
+    get 'peter', :peter
+    get '/', :index
+  end
+
+this enables the following routes
+
+  get '/fringe/walternet'
+  get '/fringe/peter'
+  get '/'

data/lib/sinatra-controllers.rb

@@ -25,16 +25,22 @@ module Sinatra
         @opts  = opts
       end
 
-      def route(verb, path, action, opts={})
+      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
       end
 
       def parse
         klass.instance_methods.each do |meth|
-          next unless meth =~ /^(get|post|delete|put)_(.*)$/
-          route $1,"/#{klass.to_s.downcase}/#{$2.downcase}", meth
+          verb,name = meth.to_s.scan(/^(get|post|delete|put)_(.*)$/).flatten
+          next unless verb
+          scope = '/' + (opts[:scope] || klass.to_s.downcase)
+          scope.gsub!(%r{^/+},'/')
+          route verb,"#{scope}/#{name.downcase}", meth
         end
       end
 

data/lib/sinatra-controllers/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Controllers
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/sinatra-controllers.gemspec

@@ -18,6 +18,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "minitest", "~> 2.0.0"
   s.add_development_dependency "watchr"
+  s.add_development_dependency "rack-test", "~> 0.5.7"
+  s.add_development_dependency "awesome_print"
+  s.add_development_dependency "haml"
+
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/test/controller_test.rb

@@ -1,28 +1,68 @@
-require 'rack/test'
-require 'test/unit'
-require 'minitest/autorun'
-require 'ap'
-require './test/fixtures/sinatra_application'
-
-class Pride
-  def print o
-    case o
-    when /0 errors/i
-      Kernel.print o.green
-    when /(e|f)/i
-      Kernel.print o.red
-    else
-      Kernel.print o.green
-    end
-  end
-  def puts o = ''
-    if o=~ /([1-9]+ failures)/
-      o.sub!(/([1-9]+ failures)/, '\1'.red)
-    end
-    Kernel.puts o
+require './test/helper'
+
+class Blah < Sinatra::Controller
+  def help
+    @blah = 'message' + params.inspect
+    haml :foo
+  end
+  def test
+    params.inspect
+  end
+
+  def flames
+    'heat'
+  end
+
+  def requested
+    request.inspect
+  end
+
+  def racket
+    'posted'
+  end
+
+  def everything
+    'wiped'
+  end
+  def fringe
+    @fringe = "Anna Torv"
+    haml :fringe
+  end
+  def take
+    params[:arg]
+  end
+end
+
+class Help < Sinatra::Controller
+  def help
+    'another help'
+  end
+  def get_index
+    'help found'
   end
 end
-MiniTest::Unit.output = Pride.new
+
+Sinatra::Controllers.register(Help) do
+  get '/help', :help
+end
+
+Sinatra::Controllers.register(Blah) do
+  get '/request', :requested
+  get '/', :help
+  get '/test/:id', :test
+  post '/racket', :racket
+  put '/flame', :flames
+  delete '/all', :everything
+  get '/fringe', :fringe
+  get '/take/:arg', :take
+end
+
+
+
+# regular path should work too
+get '/regular' do
+  'flames'
+end
 
 class ClassicMappingTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
@@ -97,33 +137,3 @@ class ClassicMappingTest < MiniTest::Unit::TestCase
     assert_equal true, (last_response.body =~ /123/) != nil
   end
 end
-
-require 'minitest/spec'
-describe  "without defined route block" do
-  include Rack::Test::Methods
-  def app
-    @app = Sinatra::Application
-    @app.set :environment, :test
-    @app
-  end
-  it "should respond to get" do
-    get '/welcome/index'
-    last_response.status.must_equal 200
-    last_response.body.must_match /route test/
-  end
-  it "should respond to put" do
-    put '/welcome/update'
-    last_response.status.must_equal 200
-    last_response.body.must_match /walternet/
-  end
-  it "should respond to post" do
-    post '/welcome/peter'
-    last_response.status.must_equal 200
-    last_response.body.must_match /amber/
-  end
-  it "should respond to delete" do
-    delete '/welcome/universe'
-    last_response.status.must_equal 200
-    last_response.body.must_match /destroy/
-  end
-end

data/test/helper.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rack/test'
+require 'test/unit'
+require 'minitest/autorun'
+require 'awesome_print'
+require 'sinatra'
+require 'sinatra-controllers'
+
+class Pride
+  def print o
+    case o
+    when /0 errors/i
+      Kernel.print o.green
+    when /(e|f)/i
+      Kernel.print o.red
+    else
+      Kernel.print o.green
+    end
+  end
+  def puts o = ''
+    if o=~ /([1-9]+ failures)/
+      o.sub!(/([1-9]+ failures)/, '\1'.red)
+    end
+    Kernel.puts o
+  end
+end
+MiniTest::Unit.output = Pride.new
+

data/test/no_block_test.rb

@@ -0,0 +1,47 @@
+require './test/helper'
+require 'minitest/spec'
+
+class Welcome < Sinatra::Controller
+  def get_index
+    'route test'
+  end
+  def put_update
+    'walternet'
+  end
+  def post_peter
+    'amber'
+  end
+  def delete_universe
+    'destroy'
+  end
+end
+Sinatra::Controllers.register(Welcome)
+
+describe  "without defined route block" do
+  include Rack::Test::Methods
+  def app
+    @app = Sinatra::Application
+    @app.set :environment, :test
+    @app
+  end
+  it "should respond to get" do
+    get '/welcome/index'
+    last_response.status.must_equal 200
+    last_response.body.must_match /route test/
+  end
+  it "should respond to put" do
+    put '/welcome/update'
+    last_response.status.must_equal 200
+    last_response.body.must_match /walternet/
+  end
+  it "should respond to post" do
+    post '/welcome/peter'
+    last_response.status.must_equal 200
+    last_response.body.must_match /amber/
+  end
+  it "should respond to delete" do
+    delete '/welcome/universe'
+    last_response.status.must_equal 200
+    last_response.body.must_match /destroy/
+  end
+end

data/test/path_defined_test.rb

@@ -0,0 +1,47 @@
+require './test/helper'
+require 'minitest/spec'
+
+class Show70 < Sinatra::Controller
+  def get_kelso
+    'michael'
+  end
+end
+
+class Seinfeld < Sinatra::Controller
+  def get_cosmo
+    'kramer'
+  end
+  def george
+    'bald'
+  end
+end
+
+Sinatra::Controllers.register(Show70, :scope => '/70s_show')
+# make sure we don't need leading slash
+Sinatra::Controllers.register(Seinfeld, :scope => 'seinfeld') do
+  get 'costanza', :george
+end
+
+describe  "with defined scope" do
+  include Rack::Test::Methods
+  def app
+    @app = Sinatra::Application
+    @app.set :environment, :test
+    @app
+  end
+  it "should use correct scope" do
+    get '/70s_show/kelso'
+    last_response.status.must_equal 200
+    last_response.body.must_equal 'michael'
+  end
+  it "should use correct scope without leading slash using no block" do
+    get '/seinfeld/cosmo'
+    last_response.status.must_equal 200
+    last_response.body.must_equal 'kramer'
+  end
+  it "should use correct scope without leading slash for block" do
+    get '/seinfeld/costanza'
+    last_response.status.must_equal 200
+    last_response.body.must_equal 'bald'
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Bretoi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -07:00
+date: 2011-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,47 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 7
+        version: 0.5.7
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: awesome_print
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Adds controllers to Sinatra
 email: []
 
@@ -86,6 +127,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -94,9 +136,11 @@ files:
 - lib/sinatra-controllers/version.rb
 - sinatra-controllers.gemspec
 - test/controller_test.rb
-- test/fixtures/sinatra_application.rb
-- test/fixtures/views/foo.haml
-- test/fixtures/views/fringe.haml
+- test/helper.rb
+- test/no_block_test.rb
+- test/path_defined_test.rb
+- test/views/foo.haml
+- test/views/fringe.haml
 - test/watchr.rb
 has_rdoc: true
 homepage: https://github.com/danielb2/sinatra-controllers
@@ -134,7 +178,9 @@ specification_version: 3
 summary: Adds controllers to Sinatra
 test_files: 
 - test/controller_test.rb
-- test/fixtures/sinatra_application.rb
-- test/fixtures/views/foo.haml
-- test/fixtures/views/fringe.haml
+- test/helper.rb
+- test/no_block_test.rb
+- test/path_defined_test.rb
+- test/views/foo.haml
+- test/views/fringe.haml
 - test/watchr.rb

data/test/fixtures/sinatra_application.rb

@@ -1,86 +0,0 @@
-require 'sinatra'
-class Sinatra::Application
-  def env
-    @env.update('SCRIPT_NAME' => '/test')
-  end
-end
-require 'sinatra-controllers'
-
-class Blah < Sinatra::Controller
-  def help
-    @blah = 'message' + params.inspect
-    haml :foo
-  end
-  def test
-    params.inspect
-  end
-
-  def flames
-    'heat'
-  end
-
-  def requested
-    request.inspect
-  end
-
-  def racket
-    'posted'
-  end
-
-  def everything
-    'wiped'
-  end
-  def fringe
-    @fringe = "Anna Torv"
-    haml :fringe
-  end
-  def take
-    params[:arg]
-  end
-end
-
-class Help < Sinatra::Controller
-  def help
-    'another help'
-  end
-  def get_index
-    'help found'
-  end
-end
-
-class Welcome < Sinatra::Controller
-  def get_index
-    'route test'
-  end
-  def put_update
-    'walternet'
-  end
-  def post_peter
-    'amber'
-  end
-  def delete_universe
-    'destroy'
-  end
-end
-
-Sinatra::Controllers.register(Welcome)
-
-Sinatra::Controllers.register(Help) do
-  get '/help', :help
-end
-
-Sinatra::Controllers.register(Blah) do
-  get '/request', :requested
-  get '/', :help
-  get '/test/:id', :test
-  post '/racket', :racket
-  put '/flame', :flames
-  delete '/all', :everything
-  get '/fringe', :fringe
-  get '/take/:arg', :take
-end
-
-# regular paths should work too
-get '/regular' do
-  'flames'
-end