roda 0.9.0 → 1.0.0

data/spec/plugin/per_thread_caching_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "per_thread_caching plugin" do 
+  it "should use a per thread cache instead of a shared cache" do
+    app(:bare) do
+      plugin :per_thread_caching
+      @c = thread_safe_cache
+      def self.c; @c end
+      route do |r|
+        r.on :id do |i|
+          ((self.class.c[i] ||= []) << 2).join
+        end
+      end
+    end
+
+    (0..10).map do |n|
+      Thread.new do
+        Thread.current[:n] = n
+        body('/a').should == '2'
+        body('/a').should == '22'
+        body('/a').should == '222'
+        body('/b').should == '2'
+        body('/b').should == '22'
+        body('/b').should == '222'
+      end
+    end.map{|t| t.join}
+  end
+end

data/spec/plugin/render_each_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "render_each plugin" do 
+  it "calls render with each argument, returning joined string with all results" do
+    app(:bare) do
+      plugin :render_each
+      def render(t, opts)
+        "r#{t}#{opts[:locals][:foo] if opts[:locals]}#{opts[:bar]} "
+      end 
+
+      route do |r|
+        r.root do
+          render_each([1,2,3], :foo)
+        end
+
+        r.is 'a' do
+          render_each([1,2,3], :bar, :local=>:foo, :bar=>4)
+        end
+
+        r.is 'b' do
+          render_each([1,2,3], :bar, :local=>nil)
+        end
+      end
+    end
+
+    body.should == 'rfoo1 rfoo2 rfoo3 '
+    body("/a").should == 'rbar14 rbar24 rbar34 '
+    body("/b").should == 'rbar rbar rbar '
+  end
+end

data/spec/plugin/render_spec.rb

@@ -1,7 +1,8 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
 begin
-  require 'tilt'
+  require 'tilt/erb'
+  require 'tilt/string'
 rescue LoadError
   warn "tilt not installed, skipping render plugin test"  
 else
@@ -27,6 +28,10 @@ describe "render plugin" do
         r.on "path" do
           render(:path=>"./spec/views/about.erb", :locals=>{:title => "Path"}, :layout_opts=>{:locals=>{:title=>"Home"}})
         end
+
+        r.on "content" do
+          view(:content=>'bar', :layout_opts=>{:locals=>{:title=>"Home"}})
+        end
       end
     end
   end
@@ -36,6 +41,7 @@ describe "render plugin" do
     body("/home").strip.should == "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
     body("/inline").strip.should == "Hello Agent Smith"
     body("/path").strip.should == "<h1>Path</h1>"
+    body("/content").strip.should == "<title>Roda: Home</title>\nbar"
   end
 
   it "with str as engine" do

data/spec/plugin/symbol_matchers_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "symbol_matchers plugin" do 
+  it "allows symbol specific regexps" do
+    app(:bare) do
+      plugin :symbol_matchers
+      symbol_matcher(:f, /(f+)/)
+
+      route do |r|
+        r.is :d do |d|
+          "d#{d}"
+        end
+
+        r.is "foo:optd" do |o|
+          "foo#{o.inspect}"
+        end
+
+        r.is "bar:opt" do |o|
+          "bar#{o.inspect}"
+        end
+
+        r.is "format:format" do |f|
+          "format#{f.inspect}"
+        end
+
+        r.is :f do |f|
+          "f#{f}"
+        end
+
+        r.is 'q:rest' do |r|
+          "rest#{r}"
+        end
+
+        r.is :w do |w|
+          "w#{w}"
+        end
+
+        r.is ':d/:w/:f' do |d, w, f|
+          "dwf#{d}#{w}#{f}"
+        end
+      end
+    end
+
+    status.should == 404
+    body("/1").should == 'd1'
+    body("/11232135").should == 'd11232135'
+    body("/a").should == 'wa'
+    body("/1az0").should == 'w1az0'
+    body("/f").should == 'ff'
+    body("/foo").should == 'foonil'
+    body("/foo/123").should == 'foo"123"'
+    status("/foo/bar").should == 404
+    status("/foo/123/a").should == 404
+    body("/bar").should == 'barnil'
+    body("/bar/foo").should == 'bar"foo"'
+    status("/bar/foo/baz").should == 404
+    body("/format").should == 'formatnil'
+    body("/format.json").should == 'format"json"'
+    status("/format.").should == 404
+    body("/ffffffffffffffff").should == 'fffffffffffffffff'
+    status("/-").should == 404
+    body("/1/1a/f").should == 'dwf11af'
+    body("/12/1azy/fffff").should == 'dwf121azyfffff'
+    status("/1/f/a").should == 404
+    body("/qa/b/c/d//f/g").should == 'resta/b/c/d//f/g'
+    body('/q').should == 'rest'
+  end
+end

data/spec/plugin/symbol_views_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "symbol_views plugin" do
+  before do
+    app(:bare) do
+      plugin :symbol_views
+
+      def view(s)
+        "v#{s}"
+      end
+
+      route do |r|
+        r.root do
+          :sym
+        end
+
+        r.is "string" do
+          'string'
+        end
+      end
+    end
+  end
+
+  it "should call view with the symbol" do
+    body.should == "vsym"
+  end
+
+  it "should not affect other return types" do
+    body("/string").should == 'string'
+    body("/foo").should == ''
+  end
+end

data/spec/plugin/view_subdirs_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+begin
+  require 'tilt/erb'
+rescue LoadError
+  warn "tilt not installed, skipping view_subdirs plugin test"  
+else
+describe "view_subdirs plugin" do
+  before do
+    app(:bare) do
+      plugin :render
+      render_opts[:views] = "./spec"
+      plugin :view_subdirs
+
+      route do |r|
+        r.on "home" do
+          set_view_subdir 'views'
+          view("home", :locals=>{:name => "Agent Smith", :title => "Home"}, :layout_opts=>{:locals=>{:title=>"Home"}})
+        end
+
+        r.on "about" do
+          set_view_subdir 'views'
+          render("views/about", :locals=>{:title => "About Roda"})
+        end
+
+        r.on "path" do
+          render('views/about', :locals=>{:title => "Path"}, :layout_opts=>{:locals=>{:title=>"Home"}})
+        end
+      end
+    end
+  end
+
+  it "should use set subdir if template name does not contain a slash" do
+    body("/home").strip.should == "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
+  end
+
+  it "should not use set subdir if template name contains a slash" do
+    body("/about").strip.should == "<h1>About Roda</h1>"
+  end
+
+  it "should not change behavior when subdir is not set" do
+    body("/path").strip.should == "<h1>Path</h1>"
+  end
+end
+end

data/spec/plugin_spec.rb

@@ -15,10 +15,20 @@ describe "plugins" do
       end
       self::RequestMethods = Module.new do
         def hello(&block)
-          on 'hello', &block
+          on self.class.hello, &block
+        end
+      end
+      self::RequestClassMethods = Module.new do
+        def hello(&block)
+          'hello'
         end
       end
       self::ResponseMethods = Module.new do
+        def foobar
+          self.class.foobar
+        end
+      end
+      self::ResponseClassMethods = Module.new do
         def foobar
           "Default   "
         end

data/spec/redirect_spec.rb

@@ -3,14 +3,25 @@ require File.expand_path("spec_helper", File.dirname(__FILE__))
 describe "redirects" do
   it "should be immediately processed" do
     app do |r|
-      r.on "about" do
-        r.redirect "/hello", 301
+      r.root do
+        r.redirect "/hello"
         "Foo"
       end
-      r.on do
-        r.redirect "/hello"
+
+      r.is "about" do
+        r.redirect "/hello", 301
         "Foo"
       end
+
+      r.is 'foo' do
+        r.get do
+          r.redirect
+        end
+
+        r.post do
+          r.redirect
+        end
+      end
     end
 
     status.should == 302
@@ -20,5 +31,11 @@ describe "redirects" do
     status("/about").should == 301
     header('Location', "/about").should == '/hello'
     body("/about").should == ''
+
+    status("/foo", 'REQUEST_METHOD'=>'POST').should == 302
+    header('Location', "/foo", 'REQUEST_METHOD'=>'POST').should == '/foo'
+    body("/foo", 'REQUEST_METHOD'=>'POST').should == ''
+
+    proc{req('/foo')}.should raise_error(Roda::RodaError)
   end
 end

data/spec/request_spec.rb

@@ -20,6 +20,15 @@ describe "request.halt" do
 
     body.should ==  "foo"
   end
+
+  it "should use current response if no argument is given" do
+    app do |r|
+      response.write('foo')
+      r.halt
+    end
+
+    body.should ==  "foo"
+  end
 end
 
 describe "request.scope" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-flash
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -71,49 +85,79 @@ email:
 - code@jeremyevans.net
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.rdoc
+- MIT-LICENSE
+- CHANGELOG
+- doc/release_notes/1.0.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- doc/release_notes/1.0.0.txt
 - lib/roda.rb
+- lib/roda/plugins/_erubis_escaping.rb
 - lib/roda/plugins/all_verbs.rb
+- lib/roda/plugins/backtracking_array.rb
+- lib/roda/plugins/content_for.rb
+- lib/roda/plugins/csrf.rb
 - lib/roda/plugins/default_headers.rb
 - lib/roda/plugins/error_handler.rb
 - lib/roda/plugins/flash.rb
 - lib/roda/plugins/h.rb
 - lib/roda/plugins/halt.rb
+- lib/roda/plugins/head.rb
 - lib/roda/plugins/header_matchers.rb
 - lib/roda/plugins/hooks.rb
 - lib/roda/plugins/indifferent_params.rb
+- lib/roda/plugins/json.rb
 - lib/roda/plugins/middleware.rb
 - lib/roda/plugins/multi_route.rb
+- lib/roda/plugins/not_allowed.rb
 - lib/roda/plugins/not_found.rb
 - lib/roda/plugins/pass.rb
+- lib/roda/plugins/per_thread_caching.rb
 - lib/roda/plugins/render.rb
+- lib/roda/plugins/render_each.rb
 - lib/roda/plugins/streaming.rb
+- lib/roda/plugins/symbol_matchers.rb
+- lib/roda/plugins/symbol_views.rb
+- lib/roda/plugins/view_subdirs.rb
+- lib/roda/version.rb
 - spec/composition_spec.rb
 - spec/env_spec.rb
 - spec/integration_spec.rb
 - spec/matchers_spec.rb
 - spec/module_spec.rb
 - spec/opts_spec.rb
+- spec/plugin/_erubis_escaping_spec.rb
 - spec/plugin/all_verbs_spec.rb
+- spec/plugin/backtracking_array_spec.rb
+- spec/plugin/content_for_spec.rb
+- spec/plugin/csrf_spec.rb
 - spec/plugin/default_headers_spec.rb
 - spec/plugin/error_handler_spec.rb
 - spec/plugin/flash_spec.rb
 - spec/plugin/h_spec.rb
 - spec/plugin/halt_spec.rb
+- spec/plugin/head_spec.rb
 - spec/plugin/header_matchers_spec.rb
 - spec/plugin/hooks_spec.rb
 - spec/plugin/indifferent_params_spec.rb
+- spec/plugin/json_spec.rb
 - spec/plugin/middleware_spec.rb
 - spec/plugin/multi_route_spec.rb
+- spec/plugin/not_allowed_spec.rb
 - spec/plugin/not_found_spec.rb
 - spec/plugin/pass_spec.rb
+- spec/plugin/per_thread_caching_spec.rb
+- spec/plugin/render_each_spec.rb
 - spec/plugin/render_spec.rb
 - spec/plugin/streaming_spec.rb
+- spec/plugin/symbol_matchers_spec.rb
+- spec/plugin/symbol_views_spec.rb
+- spec/plugin/view_subdirs_spec.rb
 - spec/plugin_spec.rb
 - spec/redirect_spec.rb
 - spec/request_spec.rb