trellis 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.0.2 2009-09-19
+
+* 3 major enhancements:
+  * event subsystem revamped
+  * custom routing
+  * more tests!
+
 == 0.0.1 2009-08-29
 
 * 1 major enhancement:

data/Manifest.txt

@@ -1,180 +1,7 @@
-.git/COMMIT_EDITMSG
-.git/HEAD
-.git/config
-.git/description
-.git/hooks/applypatch-msg.sample
-.git/hooks/commit-msg.sample
-.git/hooks/post-commit.sample
-.git/hooks/post-receive.sample
-.git/hooks/post-update.sample
-.git/hooks/pre-applypatch.sample
-.git/hooks/pre-commit.sample
-.git/hooks/pre-rebase.sample
-.git/hooks/prepare-commit-msg.sample
-.git/hooks/update.sample
-.git/index
-.git/info/exclude
-.git/logs/HEAD
-.git/logs/refs/heads/master
-.git/logs/refs/remotes/origin/master
-.git/objects/01/2368d4dd3162ed570e6c1423ecb07a6a35f8c0
-.git/objects/02/238c88c522b88e71529495460cc5c2c8abe110
-.git/objects/07/03d3b123189f1da72d3889d9340e681841c96d
-.git/objects/0b/3935fdbf3ce8d37e6cb2a6ec94edaccb1c58dc
-.git/objects/0f/ecd1ad35f280c874ce070b7a97a4c1f86ace54
-.git/objects/12/61911b063b7e6883c5e9db7ab4396183f6f2b5
-.git/objects/13/0b7e2d214ec198d07aeed5b462597670ce85ad
-.git/objects/13/214d40f02b63f1233fd7881b1df9bb75d9c0a7
-.git/objects/14/7522bdc96af0b578935d81c1a7347b40573940
-.git/objects/16/a7fde706fe92b3548254d29722f5ca311ce63b
-.git/objects/16/fe580663cc29d141bf416dff5bf21bf4ea42a3
-.git/objects/17/2d55806918bafb4e701515edb27147a4ef6498
-.git/objects/17/686ef1882ed6c3c07b781fab18739b1c5e48bd
-.git/objects/17/824053c41a2cb523303e20cac42f66f9ca2134
-.git/objects/18/68448c5f88bc73b2fef6b8f3aa75b663013a3a
-.git/objects/1a/6d9051dc4c7db10bdcf5e17c5cb717b072d30a
-.git/objects/1a/8bdb445fb5668dcd1309cb9de5dedf846c822f
-.git/objects/1b/6fa67b70358fdb82eabcd7ef3bc46d518d0426
-.git/objects/1c/f6510ed08a274fb3292d40557cebb3e7090767
-.git/objects/1d/e661ce11d5335e5dd7968ef5698e2eb164eb52
-.git/objects/1e/301ee672d6040e734af6d0a5491185129d7b67
-.git/objects/21/2201d46200f13d23d8199bd4a7ecc9165205b3
-.git/objects/22/f687370babdf38d224d2a9ff039707e8d0aac1
-.git/objects/24/202d2de95dc31f5f1802e629a16ad45b723267
-.git/objects/25/4c5b6b8d211d8b9f07310fd342fd7b078a81af
-.git/objects/25/5832653fde9e9748855347fe7bce013aa0a6c7
-.git/objects/25/806945c89b4b5adb8c8676c308e4653361109c
-.git/objects/26/cb8deaca28bf275769cbb71b88e53a44adb9ca
-.git/objects/2e/1c13fb5f154f89cccd4c645540a2ec8ee0f57a
-.git/objects/2f/437425b2c085bb529379e409d6b4bc7f9f9fba
-.git/objects/2f/7cf4a25937b71f3de52e70c7a47cb2f7da07ea
-.git/objects/31/31bdbbac6e6e7e24fd6ea84332461f67e6e5b6
-.git/objects/32/02e02de478263912b729283eabc7cdab8a8037
-.git/objects/32/839ed9baa8c800d9033655d1ee995499825fb5
-.git/objects/34/2e479c61796125b0e025b483401ec12f3c5824
-.git/objects/36/7acb017aebab3f627a5208c25885c21fa7fdbb
-.git/objects/38/12910d2e2a8e6eeb79a399d20751675d3fbe77
-.git/objects/38/3fe1e1a07537db6e0f39c6005b7b4e40fa5ccd
-.git/objects/39/5ef328bc94df9191f4d80a77503a5be9f1f673
-.git/objects/39/dc76dc096fdf737e9f4f7062b78cbf4ab9628f
-.git/objects/3b/09eb196140b471556ed4c3987c0bc739733617
-.git/objects/3b/9f97f1bf55834832a92bab1ab900918dc49570
-.git/objects/40/5ffd3925b39dd905638ec24640dd8efa27cc1b
-.git/objects/42/4a5f37c6fe3a7cac54b0f85688c1cce7da9cdf
-.git/objects/44/9e23363d4e20da6a67be7ab78fc610b4e9852a
-.git/objects/48/90bb5d241cecaa30b28148c920b833056c7508
-.git/objects/4c/558c43676410a2c0a7d5c7b94fca18923a9af1
-.git/objects/4f/bf572175dd5245104679ff8f676f6a34466c29
-.git/objects/53/8583edf00c9f656b32149a0e69e030371737c5
-.git/objects/5b/8a2c4bf7bb56ae199414096dbda21fd4b8cd63
-.git/objects/5c/9fe8ff998d56dc076657ef88ee9f784ec160f9
-.git/objects/5f/8441f9d3507587940f31af04dd9fd5911d2812
-.git/objects/61/4f2752550e63b793e31dcf98b5ea26c32eb0be
-.git/objects/65/801b0fabdfd673861dbb2ac134d438ab2cc5e4
-.git/objects/66/2746dffaddbcd311f4ac070b5b9bddcd8894a7
-.git/objects/69/1ed3b65603a0d0dabfb66720e7163664be78f5
-.git/objects/69/3dc3b6037df8c1c8dfda916d649e7975481124
-.git/objects/69/67538427b3a371b33c01c72726ac7e67a04c39
-.git/objects/69/6cd6c3508e2adcc68829497884ff3d4b774dc2
-.git/objects/69/6ee93917040308ccd0bfc245d63c1cbeb23dae
-.git/objects/6a/3ac317746a8a2cfc88f3580bbd2b03dc0d50b5
-.git/objects/6d/6ba435839a65b96cb3f7584a40dd3767a0990f
-.git/objects/6f/32c190a651a82caeefeb55eb797fc5daf05426
-.git/objects/71/fecbce1bec36eaf4de655763d4bb7ceffc991d
-.git/objects/72/01d78a9e90347fd2f7790f9e8665587791d853
-.git/objects/73/6c97d6a551363ba4a4956408ba228fcab7f91f
-.git/objects/75/3264271e935e18f4eada49aa1818c6fb9e6abb
-.git/objects/75/cc7d390b4a565495cbdc5a08d4479e7e8dbfeb
-.git/objects/76/7c0c96f68b9ccec34ae538045a63bbe4f97d3e
-.git/objects/7b/47fe9b1ab9f2692b9706054de706430089ecd4
-.git/objects/7c/73144ef6847d1bc2315aee0925c0e5cf5c09d1
-.git/objects/7d/9c177c155386606aa1024d5cb020a097eea64a
-.git/objects/7d/e9a3296007c09ba9b7bc1802e1c5d9ad1d5dbb
-.git/objects/7e/b73d408147c8d84881109189a9724292abcb8d
-.git/objects/82/0e3bf5449a8f6b8eb637a653dcb2dc387b393c
-.git/objects/83/a10ce96763cb30d0b81425e9372f89c52f4c9f
-.git/objects/83/bdb801e78444d59225f83cf2f336f114cd23cf
-.git/objects/85/24e583e822abc18b1ffdd0aa356c9c079b5548
-.git/objects/88/b46cc8de5237897d4ba5023d3efdc83fec4f7c
-.git/objects/89/5eea66474f48a2cbf643ad0ef266fd26f9d2a3
-.git/objects/8a/539c5fc35d5b770d67241d2ccb6c6855df6a43
-.git/objects/8a/82cdbfb20cc58fdffe4e13b70b55977deb92c6
-.git/objects/8b/2b537442e4ac8719ffa71b3ae0c707133df06f
-.git/objects/8c/2a45f0c81284a081f8d7980e9a54210a9dd52c
-.git/objects/8e/10355b4ab312450031966107ef6a65b13833ee
-.git/objects/90/f6c76767ae725f15fa6790dcb6afd1719fa0e2
-.git/objects/92/92b696aba9840c089241c68d4c6ca14be38a64
-.git/objects/93/e03faa6906892434fa9f2ad230c4ececc64055
-.git/objects/93/eca2e28d80fda45d327fdfc6c39ae690af41cd
-.git/objects/95/92fe63bd5403654730cdec76cbf116ef83bbff
-.git/objects/96/bc6dd471c1c188a2eb4308bcc3ca4e6c8faac8
-.git/objects/96/d855221a9ff4fba57d2b70680b57bd5115cfde
-.git/objects/97/4ec92b2b9eb01a73fb57dc78d463cafdda69a7
-.git/objects/97/b7ec01ebe089832a0972d20b0a40d54456985c
-.git/objects/97/fa6aaae4cfc7654feb39971e7aee5c41ed1679
-.git/objects/98/18351c6685a1df5d23686e6346d11d261cc6f0
-.git/objects/98/3d3b7e55cbbce2f2a52c6e6d830a5dca7b4d42
-.git/objects/a2/e551049a5388112c21e7f3a4a720bf720601fa
-.git/objects/a3/7066bea4fae90d34761a3ebb3f8a348d94eba1
-.git/objects/a6/c99619145d1b9b75aa15ca04fbe4db0b2ee79b
-.git/objects/aa/e2234d0a8c1485096c7a7de039eceb4e019e13
-.git/objects/b0/3b52f4269c9719e02ecd6caabd8aff5adf3aac
-.git/objects/b1/50dbbd89f825302a9e82d8fdd66f238b8e6fc4
-.git/objects/b4/545fbe393aaa18f1c48de4d9f68f64ebf09ddc
-.git/objects/b6/8691404e088692929d40b988b993f815d76756
-.git/objects/b7/daa3d844ef5f5cd917084e48edd82e67f8f476
-.git/objects/bf/4232281dba5a0f17e8b5c16b9cbd0f52274fa8
-.git/objects/bf/9b84d10f19188beffe5ee99e6f5af035ba77d3
-.git/objects/c0/06e664b306145de804f74ab27550d62a92f58a
-.git/objects/c2/2806b16775f66453012d085d21fb8698521ea9
-.git/objects/c2/7f6559350f7adb19d43742b55b2f91d07b6550
-.git/objects/c3/833df21ed674a77374fd40ed931f900134d38b
-.git/objects/c3/b9da021eb76abad0b17ad6c4be75595e41a7e6
-.git/objects/c5/ca6b7e3561ea88aba1712aabb984d1167787f1
-.git/objects/c6/39f65e1f43c75b7f57c5ab28623d295dfb2afd
-.git/objects/c8/6f05fa5539f8e69e94850d1cd917919ff581be
-.git/objects/cb/5e499c8dcc6f2901014a08e74f04b7a4bd6596
-.git/objects/cc/1289d25eeee6ba31b4e406372cb9abf969fc6f
-.git/objects/cc/784e1b49111c42fa7eae10ad0e788186e672d1
-.git/objects/cc/bcae254dad515d7ef01a461980544e4483c41e
-.git/objects/ce/bfadad3a7c17148998e04275e6d0d1cf1b2e1e
-.git/objects/ce/f3335522abdc47a2c94be70455dcfaa9a51a27
-.git/objects/cf/6add7ea568d3d90d6a1f8afb0898b0119b14ff
-.git/objects/d0/719abd196033fec0e4cbe2af68a26ca435389c
-.git/objects/d1/ce63ff0eaec4dba419e5547f99195dfb9b5b20
-.git/objects/d2/c3feb3c74b892cca0049c0aced6ce786a784c8
-.git/objects/d7/8a91da13413419da71b539a3c6c7df4d8a2458
-.git/objects/d8/c7bed2b1357d54b6935536a8a51a3c73d535b4
-.git/objects/da/c3a1277ccb4806011e33eb32c5609cc45c46f2
-.git/objects/dc/3f920f4b937d0e2ac512f0bb31d477624c46d5
-.git/objects/dc/6c389abf5bd0d7b9be2a6bb6af90738a410e59
-.git/objects/df/07c423309f39c4d5570b0fad65dff23af654ae
-.git/objects/e2/93a5c9e2257b9f3fcb8fa5d5c8147a2f07ba1b
-.git/objects/e4/8464df56bf487e96e21ea99487330266dae3c9
-.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
-.git/objects/e8/0c13a1d1f62756fb9f1e4fb9f7512e5b8c5816
-.git/objects/e9/b8ade2125b2615ddc4c8043940c40ed36215c9
-.git/objects/ed/59a7599a81ef7ea7c230c3332345a3484febf8
-.git/objects/f0/d2a74226877e9a28af814d0d3727e4a3487439
-.git/objects/f0/f3ba7264f1d8e60eb93a907092af98fdc248e4
-.git/objects/f1/cdcc7ff2dc6298318523b2c4e425f515a58bf7
-.git/objects/f4/45c96f406f4d2f9839b3fe2fe8bc7f943ab469
-.git/objects/f7/eef7ce0a650d6f0c85dc4982f481da7bd44362
-.git/objects/f9/0abf96c5059ce1ba115f73bc9cf33e4663b3e1
-.git/objects/f9/cf7ae572eaebbd63f809f16a5ef14b9c679790
-.git/objects/fc/300df53fe2c9467210e2fd4c2f34e1c9c7c89a
-.git/objects/fc/45546596ab8debc4c9f49a7abc7fc14a7bcc7f
-.git/objects/fc/68d89167f69614eda17bd56dfccb4355d818e6
-.git/objects/fc/e4c02bb132e73b3cb957da182db7b75a47c242
-.git/objects/fe/be283da7f326344013f1fc847c12c8f29ab6ef
-.git/refs/heads/master
-.git/refs/remotes/origin/master
-.gitignore
 History.txt
 License.txt
 Manifest.txt
 README
-README.txt
 Rakefile
 config/hoe.rb
 config/requirements.rb
@@ -254,14 +81,16 @@ examples/hilo/html/game_over.xhtml
 examples/hilo/html/guess.xhtml
 examples/hilo/html/start.xhtml
 examples/hilo/source/hilo.rb
-examples/simplest/html/start.xhtml
+examples/routing/source/routing.rb
 examples/simplest/source/simplest.rb
 examples/stateful_counters/html/counters.xhtml
 examples/stateful_counters/html/style/main.css
 examples/stateful_counters/source/stateful_counters.rb
 lib/trellis.rb
-lib/trellis/core_components.rb
-lib/trellis/jquery.rb
+lib/trellis/component_library/core_components.rb
+lib/trellis/component_library/grid.rb
+lib/trellis/component_library/jquery.rb
+lib/trellis/component_library/object_editor.rb
 lib/trellis/logging.rb
 lib/trellis/trellis.rb
 lib/trellis/utils.rb
@@ -278,14 +107,10 @@ tasks/website.rake
 test/application_spec.rb
 test/component_spec.rb
 test/core_extensions_spec.rb
+test/default_router_spec.rb
 test/fixtures/application_spec_applications.rb
 test/page_spec.rb
 test/renderer_spec.rb
 test/router_spec.rb
 test/spec.opts
 test/spec_helper.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.html.erb

data/examples/crud_components/source/crud_components.rb

@@ -36,7 +36,6 @@ module ObjectEditor
   
   class CrudComponentsExample < Application
     home :addresses
-    pages :address_edit_view
     
     map_static ['/images', '/style', '/favicon.ico']
   end

data/examples/examples.txt

@@ -8,54 +8,56 @@ The simplest possible application to prove that Trellis is generating dynamic
 HTML. The date and time in the middle of the page changes with every page 
 refresh proving that this is a live application.
 
-guest_book
-==========
-see http://wicket.apache.org/exampleguestbook.html
+hilo
+====
+see http://tapestry.apache.org/tapestry5/tutorial1/hilo.html
 
-This application show the basic form handling and page persistent fields.
-The GuestBook application allows users to enter a comments. On submission the 
-page gets re-rendered showing the list of comments entered so far. The list of 
-comments is kept in the session.
+In the game, the computer selects a number between 1 and 10. You try and guess
+the number, clicking links. At the end, the computer tells you how many guesses
+you required.
 
 hangman
 =======
 see http://rifers.org/examples#D.10
 
-Hangman is a simple word game in which the system selects a secret target word; 
-the player attempts to guess the word and is only allow 5 incorrect guesses. The 
-game is over when the word is guessed or the user has exhausted the maximum 
+Hangman is a simple word game in which the system selects a secret target word;
+the player attempts to guess the word and is only allow 5 incorrect guesses. The
+game is over when the word is guessed or the user has exhausted the maximum
 number of incorrect guesses.
 
-hilo
-====
-see http://tapestry.apache.org/tapestry5/tutorial1/hilo.html
-
-In the game, the computer selects a number between 1 and 10. You try and guess 
-the number, clicking links. At the end, the computer tells you how many guesses 
-you required.
+guest_book
+==========
+see http://wicket.apache.org/exampleguestbook.html
 
-simple_blog (work in progress)
-===========
-see http://code.whytheluckystiff.net/camping/browser/trunk/examples/blog.rb
+This application show the basic form handling and page persistent fields.
+The GuestBook application allows users to enter a comment. On submission the 
+page gets re-rendered showing the list of comments entered so far. The list of 
+comments is kept in the session.
 
-A database-backed simple blog. It provides Articles and Comments. Articles 
-belong to User and a Category. The edit actions/page behavior are protected.
-Uses datamapped in standalone mode (no integration with the framework has been
-created)
+flickr
+======
+This application uses a custom stateless component that connects to the flickr
+image service api and retrieves several interesting pictures. Refresh the page
+to get more images
 
 stateful_counters
 =================
 see http://www.seaside.st/about/examples/multicounter
 see http://rifers.org/examples#D.9
 
-Example of a component (a simple counter) and how you can build and embed 
-multiple components in a page
+Example of a custom stateful component (a simple counter) and how you can build
+and embed multiple components in a page
+
+crud_components
+===============
+Shows the work in progress on a simple pageable/sortable data grid and an object
+editor
+
+routing
+=======
+Shows examples of custom page routing in Trellis
 
-triki (work in progress)
-=====
-see http://mongrel.rubyforge.org/browser/trunk/examples/camping/tepee.rb
 
-A Trellis little Wiki, supporting versioning and Textile/Markdown
 
 
 

data/examples/flickr/source/flickr.rb

@@ -73,10 +73,6 @@ module Flickr
           p {
             text "<trellis:flickr_interestingness/>"
           }
-          # h2 "and some more.."
-          # p { 
-          #   text "<trellis:flickr_interestingness per_page='2'/>"   
-          # }
         }
       }
     end

data/examples/hangman/source/hangman.rb

@@ -6,7 +6,6 @@ include Trellis
 module Hangman
   class HangmanGame < Application
     home :start
-    pages :guess, :game_over
     
     map_static ['/images', '/style', '/favicon.ico']
   end
@@ -63,7 +62,7 @@ module Hangman
   end
   
   class GameOver < Page
-    attr_accessor :target, :win, :guesses_left
+    persistent :target, :win, :guesses_left
   end
   
   web_app = HangmanGame.new

data/examples/hilo/html/guess.xhtml

@@ -11,8 +11,8 @@
   
         <trellis:loop source="1..10" value="guess">
             <trellis:action_link tid="link" context="guess">
-				<trellis:value name="guess">guess</trellis:value>
-			</trellis:action_link>
+                <trellis:value name="guess">guess</trellis:value>
+            </trellis:action_link>
         </trellis:loop>
     </body>
 </html>

data/examples/hilo/source/hilo.rb

@@ -7,15 +7,14 @@ module HiLo
   
   class HiLoGame < Application
     home :start
-    pages :guess, :game_over
+    logger.level = DEBUG
   end
   
   class Start < Page
     pages :guess
     
     def on_select
-      @guess.target = rand(10);
-      return @guess
+      @guess.initialize_target
     end
   end
   
@@ -37,13 +36,14 @@ module HiLo
       next_page
     end
     
-    def target=(value)
-      @target, @count, @message = value, 0, ''
+    def initialize_target
+      @target, @count, @message = rand(9) + 1, 0, ''
+      self
     end
   end
   
   class GameOver < Page
-    attr_accessor :count
+    persistent :count
   end
 
   web_app = HiLoGame.new

data/examples/routing/source/routing.rb

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'trellis'
+
+include Trellis
+
+module Routing
+
+  class Routing < Application
+    home :home
+    logger.level = DEBUG
+  end
+
+  class Home < Trellis::Page
+    template do html { body { text %[this is the home page] }} end
+  end
+
+  class RoutedDifferently < Trellis::Page
+    route '/whoa'
+
+    template do html { body { text %[whoa!] }} end
+  end
+
+  class RoutedDifferentlyWithParams < Trellis::Page
+    route '/day_of_the_year/:year/:month/:day'
+
+    def parse_date
+      Date.parse("#{@month}/#{@day}/#{@year}")
+    end
+
+    def on_select
+      self
+    end
+
+    template do
+      html {
+        body {
+          h2 {
+            text %[Date <trellis:value name="page.parse_date"/>]
+          }
+          text %[is the <trellis:eval expression="Date.parse(month + '/' + day + '/' + year).yday.to_s"/> day of the year]
+          br
+          text %[<trellis:action_link>Refresh</trellis:action_link>]
+        }
+      }
+    end
+  end
+
+  Routing.new.start if __FILE__ == $PROGRAM_NAME
+end
+

data/examples/stateful_counters/source/stateful_counters.rb

@@ -5,7 +5,7 @@ include Trellis
 
 # http://seaside.st/about/examples/multicounter
 # This example shows 
-# - a custom stateful component that can be use repeatedly in a page.
+# - a custom stateful component that can be use repeatedly in a page
 module StatefulCounters
 
   class Counter < Component
@@ -24,13 +24,18 @@ module StatefulCounters
       page = tag.globals.page
       counter = page.send("counter_#{tid}")
       value = counter.value
-      
+      href_add = DefaultRouter.to_uri(:page => page.class.name,
+                                      :event => 'add',
+                                      :source => "counter_#{tid}")
+      href_subtract = DefaultRouter.to_uri(:page => page.class.name,
+                                      :event => 'subtract',
+                                      :source => "counter_#{tid}")
       builder = Builder::XmlMarkup.new
       builder.div(:id => tid) {
         builder.h1(value)
-        builder.a("++", :href => "/#{page.class.name}.add_counter#{tid}")
+        builder.a("++", :href => href_add)
         builder.text(" ")      
-        builder.a("--", :href => "/#{page.class.name}.subtract_counter#{tid}")   
+        builder.a("--", :href => href_subtract)
       }
     end