RubyGems - trellis - Versions diffs - 0.0.6 → 0.0.7 - Mend

trellis 0.0.6 → 0.0.7

Files changed (27) hide show

data/History.txt +6 -0
data/examples/crud_components/html/address_view_edit.xhtml +3 -1
data/examples/crud_components/html/addresses.xhtml +3 -1
data/examples/flickr/source/flickr.rb +1 -1
data/examples/guest_book/source/guest_book.rb +2 -1
data/examples/hangman/html/game_over.xhtml +3 -1
data/examples/hangman/html/guess.xhtml +3 -1
data/examples/hangman/html/start.xhtml +3 -1
data/examples/hilo/html/game_over.xhtml +3 -1
data/examples/hilo/html/guess.xhtml +3 -1
data/examples/hilo/html/start.xhtml +3 -1
data/examples/routing/source/routing.rb +1 -1
data/examples/simplest/source/simplest.rb +1 -1
data/examples/stateful_counters/html/counters.xhtml +4 -2
data/lib/trellis/component_library/core_components.rb +19 -3
data/lib/trellis/trellis.rb +284 -48
data/lib/trellis/utils.rb +22 -0
data/lib/trellis/version.rb +1 -1
data/test/application_spec.rb +150 -41
data/test/component_spec.rb +4 -4
data/test/core_extensions_spec.rb +27 -5
data/test/fixtures/application_spec_applications.rb +220 -13
data/test/fixtures/component_spec_components.rb +4 -4
data/test/page_spec.rb +109 -36
data/test/renderer_spec.rb +3 -3
data/test/router_spec.rb +2 -0
metadata +2 -2

@@ -237,6 +237,28 @@ module Utils
     end
     result
   end
+end
+module Markaby
+  def self.build(*args, &block)
+    Markaby::Builder.new(*args, &block).to_s
+  end
+  class Builder
+    def thtml(&block)
+      tag!(:html,
+           :xmlns => "http://www.w3.org/1999/xhtml",
+           "xml:lang" => "en",
+           :lang => "en",
+           "xmlns:trellis" => "http://trellisframework.org/schema/trellis_1_0_0.xsd", &block)
+    end
+    def render_body
+      text %[@!{@body}@]
+    end
+  end
 end

data/lib/trellis/version.rb CHANGED

@@ -28,7 +28,7 @@ module Trellis
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 6
+    TINY  = 7
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/application_spec.rb CHANGED

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require "rack"
+require 'rack/test'
 require_fixtures 'application_spec_applications'
 describe Trellis::Application, " when declared" do
@@ -32,88 +33,196 @@ describe Trellis::Application, " when declared" do
 end
 describe Trellis::Application, " when requesting the root url with a GET" do
-  before(:each) do
-    application = TestApp::MyApp.new
-    request = Rack::MockRequest.new(application)
-    @response = request.get("/")
+  include Rack::Test::Methods
+  def app
+    TestApp::MyApp.new
   end
   it "should return an OK HTTP status" do
-    @response.status.should be(200)
+    get "/"
+    last_response.status.should be(200)
   end
   it "should reply with the home page" do
-    @response.body.should == "<html><body><h1>Hello World!</h1></body></html>"
+    get "/"
+    last_response.body.should == %[<?xml version=\"1.0\"?>\n<html>\n  <body>\n    <h1>Hello World!</h1>\n  </body>\n</html>\n]
   end
 end
 describe Trellis::Application, " requesting a route" do
-  before(:each) do
-    application = TestApp::MyApp.new
-    @request = Rack::MockRequest.new(application)
+  include Rack::Test::Methods
+  def app
+    TestApp::MyApp.new
   end
-  it "should return a 404 (not found)" do
-    response = @request.get("/blowup")
-    response.status.should be(404)
+  it "should return a 404 (not found) for an unmatch request" do
+    get "/blowup"
+    last_response.status.should be(404)
   end
   it "should return the page contents of the first page matching the route" do
-    response = @request.get("/whoa")
-    response.body.should == "<html><body>whoa!</body></html>"
+    get "/whoa"
+    last_response.body.should == "<?xml version=\"1.0\"?>\n<html>\n  <body>whoa!</body>\n</html>\n"
   end
   it "should support a single named parameter" do
-    response_brian = @request.get("/hello/brian")
-    response_anne = @request.get("/hello/anne")
-    response_brian.body.should == "<html><body><h2>Hello</h2>brian</body></html>"
-    response_anne.body.should == '<html><body><h2>Hello</h2>anne</body></html>'
+    get "/hello/brian"
+    last_response.body.should include("<body>\n    <h2>Hello</h2>\n    \n    brian\n  </body>")
+    get "/hello/anne"
+    last_response.body.should include("<body>\n    <h2>Hello</h2>\n    \n    anne\n  </body>")
   end
   it "should support multiple named parameters" do
-    response = @request.get('/report/2009/05/31')
-    response.body.should == "<html><body><h2>Report for</h2>05/31/2009</body></html>"
+    get '/report/2009/05/31'
+    last_response.body.should include("<body><h2>Report for</h2>05/31/2009</body>")
   end
   it "should support optional parameters" do
-    response_all_params = @request.get('/foobar/hello/world')
-    response_one_param = @request.get('/foobar/hello')
-    response_no_param = @request.get('/foobar')
-    response_all_params.body.should == "<html><body>hello-world</body></html>"
-    response_one_param.body.should == "<html><body>hello-</body></html>"
-    response_no_param.body.should == "<html><body>-</body></html>"
+    get '/foobar/hello/world'
+    last_response.body.should include("<body>hello-world</body>")
+    get '/foobar/hello'
+    last_response.body.should include("<body>hello-</body>")
+    get '/foobar'
+    last_response.body.should include("<body>-</body>")
   end
   it "should support a wildcard parameters" do
-    response = @request.get('/splat/goodbye/cruel/world')
-    response.body.should == '<html><body>goodbye/cruel/world</body></html>'
+    get '/splat/goodbye/cruel/world'
+    last_response.body.should include("goodbye/cruel/world")
   end
   it "should supports mixing multiple splats" do
-    response = @request.get('/splats/bar/foo/bling/baz/boom')
-    response.body.should == '<html><body>barblingbaz/boom</body></html>'
+    get '/splats/bar/foo/bling/baz/boom'
+    last_response.body.should include("barblingbaz/boom")
-    no_route_response = @request.get('/splats/bar/foo/baz')
-    no_route_response.status.should be(404)
+    get '/splats/bar/foo/baz'
+    last_response.status.should be(404)
   end
   it "should supports mixing named and wildcard params" do
-    response = @request.get('/mixed/afoo/bar/baz')
-    response.body.should == '<html><body>bar/baz-afoo</body></html>'
+    get '/mixed/afoo/bar/baz'
+    last_response.body.should include("bar/baz-afoo")
   end
   it "should merge named params and query string params" do
-    response_mr_bean = @request.get("/hello/Bean?salutation=Mr.%20")
-    response_mr_bean.body.should == "<html><body><h2>Hello</h2>Mr. Bean</body></html>"
+    get "/hello/Bean?salutation=Mr.%20"
+    last_response.body.should include("<h2>Hello</h2>\n    Mr. \n    Bean")
   end
   it "should match a dot ('.') as part of a named param" do
-    response = @request.get("/foobar/user@example.com/thebar")
-    response.body.should == "<html><body>user@example.com-thebar</body></html>"
+    get "/foobar/user@example.com/thebar"
+    last_response.body.should include("user@example.com-thebar")
   end
   it "should match a literal dot ('.') outside of named params" do
-    response = @request.get("/downloads/logo.gif")
-    response.body.should == "<html><body>logo-gif</body></html>"
+    get "/downloads/logo.gif"
+    last_response.body.should include("logo-gif")
+  end
+  it "should redirect to a custom route when handling an event returning a custom routed page" do
+    post "/admin/login/events/submit.login"
+    redirect = last_response.headers['Location']
+    redirect.should eql('/admin/result')
+    get redirect
+    last_response.body.should include('<h1>PostRedirectPage</h1>')
+  end
+end
+describe Trellis::Application do
+  include Rack::Test::Methods
+  def app
+    TestApp::MyApp.new
+  end
+  it "should have access to any persistent fields" do
+    get "/application_data_page"
+    last_response.body.should == "<?xml version=\"1.0\"?>\n<html>\n  <body>\n    <p></p>\n  </body>\n</html>\n"
+  end
+  it "should be able to modify any persistent fields" do
+    env = Hash.new
+    env["rack.session"] = Hash.new
+    get "/application_data_page/events/save", {}, env
+    redirect = last_response.headers['Location']
+    redirect.should eql('/application_data_page')
+    get redirect, {}, env
+    last_response.body.should == "<?xml version=\"1.0\"?>\n<html>\n  <body>\n    <p>here's a value</p>\n  </body>\n</html>\n"
+  end
+  it "should have access to any application public methods" do
+    get "/application_method_page"
+    last_response.body.should == "<?xml version=\"1.0\"?>\n<html>\n  <body>\n    <p>Zaphod Beeblebrox</p>\n  </body>\n</html>\n"
+  end
+end
+describe Trellis::Application, " with declared partial views" do
+  include Rack::Test::Methods
+  def app
+    TestApp::MyApp.new
+  end
+  it "should render a view defined in markaby" do
+    get "/partial_markaby"
+    last_response.body.should  include("<p>This content was generated by Markaby</p>")
+  end
+  it "should render a view defined in haml" do
+    get "/partial_haml"
+    last_response.body.should include("<p>This content was generated by HAML</p>")
+  end
+  it "should render a view defined in textile" do
+    get "/partial_textile"
+    last_response.body.should include("<p>This content was generated by <strong>Textile</strong></p>")
+  end
+  it "should render a view defined in markdown" do
+    get "/partial_markdown"
+    last_response.body.should include("<h1>This content was generated by Markdown</h1>")
+  end
+  it "should render a view defined in eruby" do
+    get "/partial_eruby"
+    last_response.body.should include("<p>This content was generated by The Amazing ERubis</p>")
+  end
+  it "should render a view defined in eruby and have access to the surrounding context" do
+    get "/partial_eruby_loop"
+    last_response.body.join.should include("<ul> <li>ichi</li> <li>ni</li> <li>san</li> <li>shi</li> <li>go</li> <li>rokku</li> <li>hichi</li> <li>hachi</li> <li>kyu</li> <li>jyu</li> </ul>")
   end
-end
+end
+describe Trellis::Application, " with declared layout" do
+  include Rack::Test::Methods
+  def app
+    TestApp::MyApp.new
+  end
+  it "should render a page with its corresponding layout" do
+    get "/with_layout_static"
+    last_response.body.should include("<p>\n<h3>Hello Arizona!</h3></p>")
+  end
+  it "should render a page with its corresponding layout" do
+    get "/with_layout_variable"
+    last_response.body.should include("p>\n<h3>Hello Arizona!</h3></p>")
+  end
+  it "should render any embedded trellis components" do
+    get "/markaby_template_with_components"
+    last_response.body.should include("<p>Vulgar Vogons</p>")
+  end
+  it "should render and eruby template and layout" do
+    get '/eruby_template_and_layout'
+    last_response.body.join.should include("<ul> <li>one</li> <li>two</li> <li>tres</li> <li>cuatro</li> </ul>")
+  end
+end

data/test/component_spec.rb CHANGED

@@ -13,7 +13,7 @@ describe Trellis::Component, " in an application" do
   it "should return its intended content" do
     get '/'
-    last_response.body.should eql('<html><body>hello from simple component</body></html>')
+    last_response.body.should include("hello from simple component")
   end
   it "should render each instance of a component in the template" do
@@ -65,17 +65,17 @@ describe Trellis::Component, " in an application" do
   it "should be able to provide a style link contribution to the page" do
     get '/page_with_contributions'
-    last_response.body.should include('<link href="/someplace/my_styles.css" rel="stylesheet" type="text/css" />')
+    last_response.body.should include(%[<link href=\"/someplace/my_styles.css\" rel=\"stylesheet\" type=\"text/css\"/>])
   end
   it "should be able to provide a script link contribution to the page" do
     get '/page_with_contributions'
-    last_response.body.should include('<script src="/someplace/my_script.js" type="text/javascript"></script>')
+    last_response.body.should include(%[<script src=\"/someplace/my_script.js\" type=\"text/javascript\"/>])
   end
   it "should be able to provide a style contribution to the page" do
     get '/page_with_contributions'
-    last_response.body.should include('<style type="text/css">html { color:#555555; background-color:#303030; }</style>')
+    last_response.body.should include(%[<style type="text/css">html { color:#555555; background-color:#303030; }</style>])
   end
   it "should be able to provide a style contribution to the page per instance" do

data/test/core_extensions_spec.rb CHANGED

@@ -123,32 +123,54 @@ end
 describe Class do
-  it "when calling class_attr_accessor should add class attribute accessors for each symbol passed" do
+  it "should add class attribute accessors for each symbol passed when calling class_attr_accessor" do
     class Foo; end
     Foo.class_attr_accessor(:bar)
     Foo.should respond_to(:bar)
     Foo.should respond_to(:bar=)
   end
-  it "when calling class_attr_reader should add class attribute readers for each symbol passed" do
+  it "should add class attribute readers for each symbol passed when calling class_attr_reader" do
     class Bar; end
     Bar.class_attr_reader(:foo)
     Bar.should respond_to(:foo)
     Bar.should_not respond_to(:foo=)
   end
-  it "when calling class_attr_writer should add class attribute readers for each symbol passed" do
+  it "should add class attribute readers for each symbol passed when calling class_attr_writer" do
     class FooBar; end
     FooBar.class_attr_writer(:bar)
     FooBar.should_not respond_to(:bar)
     FooBar.should respond_to(:bar=)
   end
-  it "when calling instance_attr_accessor should add instance attribute accessors for each symbol passed" do
+  it "should add instance attribute accessors for each symbol passed when calling instance_attr_accessor" do
     class Snafu; end
     Snafu.instance_attr_accessor(:bar)
     instance = Snafu.new
     instance.should respond_to(:bar)
     instance.should respond_to(:bar=)
   end
-end
+end
+describe Object do
+  before do
+    class Ini
+      def mini
+        "myni"
+      end
+    end
+    @instance = Ini.new
+  end
+  it "should invoke a method if available when calling call_if_provided" do
+    @instance.should respond_to(:call_if_provided)
+    @instance.call_if_provided(:mini).should eql("myni")
+  end
+  it "should not invoke a method if not available when calling call_if_provided" do
+    @instance.should respond_to(:call_if_provided)
+    @instance.call_if_provided(:moe).should be_nil
+  end
+end

data/test/fixtures/application_spec_applications.rb CHANGED

@@ -1,9 +1,26 @@
 module TestApp
   class MyApp < Trellis::Application
     home :home
+    persistent :my_field
     map_static ['/images', '/style', '/favicon.ico']
     map_static ['/jquery'], "./js"
+    MY_CONSTANT_1 = "it's just us, chickens!"
+    def application_method
+      "Zaphod Beeblebrox"
+    end
+    partial :partial_markaby do p "This content was generated by Markaby" end
+    partial :partial_haml, %[%p This content was generated by HAML], :format => :haml
+    partial :partial_textile, %[This content was generated by *Textile*], :format => :textile
+    partial :partial_markdown, %[# This content was generated by Markdown], :format => :markdown
+    partial :partial_eruby, %[<p>This content was generated by @{@my_variable}@</p>], :format => :eruby
+    partial :loop_body, %[<li>@{@i}@</li>], :format => :eruby
+    layout :main, %[<html><body><p>@!{@body}@</p></body></html>], :format => :eruby
+    layout(:other) { thtml { body { render_body }}}
   end
   class Home < Trellis::Page
@@ -28,6 +45,31 @@ module TestApp
     end
   end
+  class PageWithGetPlainText < Trellis::Page
+    pages :other
+    def get
+      "some content"
+    end
+  end
+  class PageWithGetRedirect < Trellis::Page
+    pages :other
+    def get
+      @other
+    end
+  end
+  class PageWithGetSame < Trellis::Page
+    def get
+      self
+    end
+    template do html { body { p "Vera, what has become of you?" }} end
+  end
   class Other < Trellis::Page
     template do html { body { p "Goodbye Cruel World " }} end
   end
@@ -39,7 +81,7 @@ module TestApp
       @some_value = "8675309"
     end
-    template do html { body { text %[<trellis:value name="some_value"/>] }} end
+    template do thtml { body { text %[<trellis:value name="some_value"/>] }} end
   end
   class AfterLoad < Trellis::Page
@@ -49,7 +91,26 @@ module TestApp
       @some_value = "chunky bacon!"
     end
-    template do html { body { text %[<trellis:value name="some_value"/>] }} end
+    template do thtml { body { text %[<trellis:value name="some_value"/>] }} end
+  end
+  class BeforeRender < Trellis::Page
+    attr_reader :some_value
+    def before_render
+      @some_value = "8675309"
+    end
+    template do thtml { body { text %[<trellis:value name="some_value"/>] }} end
+  end
+  class AfterRender < Trellis::Page
+    def after_render
+      @application.my_field = "changed in after_render method"
+    end
+    template do thtml { body { p { "hey!"} }} end
   end
   class RoutedDifferently < Trellis::Page
@@ -62,7 +123,7 @@ module TestApp
     route '/hello/:name'
     template do
-      html {
+      thtml {
         body {
           h2 "Hello"
           text %[<trellis:value name="salutation"/><trellis:value name="name"/>]
@@ -75,7 +136,7 @@ module TestApp
     route '/report/:year/:month/:day'
     template do
-      html {
+      thtml {
         body {
           h2 "Report for"
           text %[<trellis:value name="month"/>]
@@ -92,7 +153,7 @@ module TestApp
     route '/foobar/?:foo?/?:bar?'
     template do
-      html {
+      thtml {
         body {
           text %[<trellis:value name="foo"/>]
           text '-'
@@ -106,7 +167,7 @@ module TestApp
     route '/splat/*'
     template do
-      html {
+      thtml {
         body {
           text %[<trellis:value name="splat"/>]
         }
@@ -118,7 +179,7 @@ module TestApp
     route '/splats/*/foo/*/*'
     template do
-      html {
+      thtml {
         body {
           text %[<trellis:value name="splat"/>]
         }
@@ -130,7 +191,7 @@ module TestApp
     route '/mixed/:foo/*'
     template do
-      html {
+      thtml {
         body {
           text %[<trellis:value name="splat"/>]
           text '-'
@@ -144,7 +205,7 @@ module TestApp
     route '/foobar/:foo/:bar'
     template do
-      html {
+      thtml {
         body {
           text %[<trellis:value name="foo"/>]
           text '-'
@@ -158,7 +219,7 @@ module TestApp
     route '/downloads/:file.:ext'
     template do
-      html {
+      thtml {
         body {
           text %[<trellis:value name="file"/>]
           text '-'
@@ -170,11 +231,11 @@ module TestApp
   class SamplePage < Trellis::Page
     attr_accessor :value
-    template do html { body { text %[<trellis:value name="value"/>] }} end
+    template do thtml { body { text %[<trellis:value name="value"/>] }} end
   end
   class AnotherSamplePage < Trellis::Page
-    template do html { body { text %[<trellis:value name="page_name"/>] }} end
+    template do thtml { body { text %[<trellis:value name="page_name"/>] }} end
   end
   class HamlPage < Trellis::Page
@@ -197,7 +258,7 @@ module TestApp
   end
   class MarkDownPage < Trellis::Page
-    template "# This is the Title\n## This is the SubTitle\nThis is some text", :format => :markdown
+    template %[# This is the Title\n## This is the SubTitle\n**This is some text**], :format => :markdown
   end
   class HTMLPage < Trellis::Page
@@ -214,5 +275,151 @@ module TestApp
     template %[<html><body><ul><?rb for item in @list ?><li>@{item}@</li><?rb end ?></ul></body></html>], :format => :eruby
   end
+  class ConstantAccessPage < Trellis::Page
+    def greet
+      "helloooo, la la la"
+    end
+    template %[<html><body><p>@{TestApp::MyApp::MY_CONSTANT_1}@</p></body></html>], :format => :eruby
+  end
+  class MethodAccessPage < Trellis::Page
+    def greet
+      "helloooo, la la la"
+    end
+    template %[<html><body><p>@{greet}@</p></body></html>], :format => :eruby
+  end
+  class ApplicationDataPage < Trellis::Page
+    def on_save
+      @application.my_field = "here's a value"
+      self
+    end
+    template %[<html><body><p>@{@application.my_field}@</p></body></html>], :format => :eruby
+  end
+  class ApplicationMethodPage < Trellis::Page
+    template %[<html><body><p>@{application_method()}@</p></body></html>], :format => :eruby
+  end
+  class PageWithGetAndExplicitRedirect < Trellis::Page
+    route '/explicit_redirect'
+    def get
+      redirect "/hello/Ford%20Prefect"
+    end
+  end
+  class PartialMarkabyPage < Trellis::Page
+    route '/partial_markaby'
+    template %[<html><body>@!{render_partial(:partial_markaby)}@</body></html>], :format => :eruby
+  end
+  class PartialHamlPage < Trellis::Page
+    route '/partial_haml'
+    template %[<html><body>@!{render_partial(:partial_haml)}@</body></html>], :format => :eruby
+  end
+  class PartialTextilePage < Trellis::Page
+    route '/partial_textile'
+    template %[<html><body>@!{render_partial(:partial_textile)}@</body></html>], :format => :eruby
+  end
+  class PartialMarkdownPage < Trellis::Page
+    route '/partial_markdown'
+    template %[<html><body>@!{render_partial(:partial_markdown)}@</body></html>], :format => :eruby
+  end
+  class PartialErubyPage < Trellis::Page
+    route '/partial_eruby'
+    def get
+      @my_variable = 'The Amazing ERubis'
+      self
+    end
+    template %[<html><body>@!{render_partial(:partial_eruby)}@</body></html>], :format => :eruby
+  end
+  class PartialErubyLoopPage < Trellis::Page
+    route '/partial_eruby_loop'
+    def get
+      @elements = ['ichi', 'ni', 'san', 'shi', 'go', 'rokku', 'hichi', 'hachi', 'kyu', 'jyu']
+      self
+    end
+    template %[<html>
+                 <body>
+                   <ul>
+                     <?rb @elements.each do |element| ?>
+                       @!{ render_partial(:loop_body, {:i, element}) }@
+                    <?rb end ?>
+                  </ul>
+                </body>
+              </html>], :format => :eruby
+  end
+  class PageWithLayoutStatic < Trellis::Page
+    route '/with_layout_static'
+    template %[<h3>Hello Arizona!</h3>], :format => :eruby, :layout => :main
+  end
+  class PageWithLayoutDynamic < Trellis::Page
+    route '/with_layout_variable'
+    def get
+      @my_value = "Hello Arizona!"
+      self
+    end
+    template %[<h3>@{@my_value}@</h3>], :format => :eruby, :layout => :main
+  end
+  class MarkabyTemplateWithComponents < Trellis::Page
+    attr_reader :some_value
+    def get
+      @some_value = "Vulgar Vogons"
+      self
+    end
+    template(nil, :layout => :other) do p { text %[<trellis:value name="some_value"/>] } end
+  end
+  class ErubyTemplateAndLayout < Trellis::Page
+    def get
+      @elements = ['one', 'two', 'tres', 'cuatro']
+      self
+    end
+    template %[
+      <ul>
+        <?rb @elements.each do |element| ?>
+          @!{ render_partial(:loop_body, {:i, element}) }@
+        <?rb end ?>
+      </ul>
+    ], :format => :eruby, :layout => :main
+  end
+  class PostOriginPage < Trellis::Page
+    route '/admin/login'
+    pages :post_redirect_page
+    def on_submit_from_login
+      redirect '/admin/result'
+    end
+    template %[<html><body><h1>PostOriginPage</h1></body></html>]
+  end
+  class PostRedirectPage < Trellis::Page
+    route '/admin/result'
+    template %[<html><body><h1>PostRedirectPage</h1></body></html>]
+  end
 end