hobo 0.7.1 → 0.7.2

data/hobo_files/plugin/CHANGES.txt

@@ -1,3 +1,87 @@
+=== Release 0.7.2 ===
+
+Migration generator
+
+  Fixed "no such method table_name" bug
+
+  Fixed various problems with specific column types, in particular
+  decimal colums were problematic.
+
+
+Model and controller generators:
+
+  Brought test related files up to date with latest Rails
+
+
+Model controller
+
+  Fix: now correctly renders pages with validation errors for tag
+  pages (pages with no dryml file)
+
+  index_action and show_action can now be passed options for Hobo's
+  default actions rather than giving a block. e.g.
+
+    index_action :foo
+      hobo_index :page_size => 10
+    end
+
+    Can now be written
+
+    index_action :foo, :page_size => 10
+
+
+Hobo user model generator
+
+  Added :default => false to administrator field
+
+
+DRYML
+
+  Polymorphic tags -- looking up the polymorphic tag for an array will
+  now use the 'member_class' of the array if available.
+
+
+Rapid
+
+  New generic tag <collection>. Used to create type-specific
+  renderings of collections. E.g. you can 
+
+    <def tag="collection" for="Comment">
+
+    To customise how an array of comments are displayed. This will get
+    picked up by the default pages.
+
+
+Rapid pages
+
+  Removed <default-layout/> -- dryml has built in facilities for
+  setting and overriding defaults so this was not needed.
+
+  Login and signup pages now specify "simple" layout, so e.g. if you
+  redefine <page> to use "aside" layout, then login and signup will
+  still use the simple layout.
+
+  Various improvements to the default pages
+
+  <index-page> new params
+
+
+Plugins
+
+  Changing from hobo_* naming convention to rapid_* 
+
+
+
+Clean theme
+
+  Many small style improvements
+
+  Support for aside layout
+
+
+
+
+
 === Release 0.7.1 ===
 
 Hobo 0.7 is tested against Rails 2.0.1

data/hobo_files/plugin/generators/hobo_migration/hobo_migration_generator.rb

@@ -71,8 +71,8 @@ class HoboMigrationGenerator < Rails::Generator::Base
       end
     end
     
-    up = [renames, drops, creates, changes].flatten.select{|s|!s.blank?} * "\n\n"
-    down = [undo_changes, undo_renames, undo_drops, undo_creates].flatten.select{|s|!s.blank?} * "\n\n"
+    up   = [renames, drops, creates, changes].flatten.reject(&:blank?) * "\n\n"
+    down = [undo_changes, undo_renames, undo_drops, undo_creates].flatten.reject(&:blank?) * "\n\n"
 
     if up.blank?
       puts "Database and models match -- nothing to change"
@@ -188,7 +188,7 @@ class HoboMigrationGenerator < Rails::Generator::Base
       "remove_column :#{new_table_name}, :#{c}"
     end
     undo_removes = to_remove.map do |c|
-      revert_column(table_name, c)
+      revert_column(new_table_name, c)
     end
     
     old_names = to_rename.invert
@@ -200,15 +200,15 @@ class HoboMigrationGenerator < Rails::Generator::Base
       spec = model.field_specs[c]
       if spec.different_to?(col)
         change_spec = {}
-        change_spec[:limit]     = spec.limit if !spec.limit.nil?
-        change_spec[:precision] = spec.precision if !spec.precision.nil?
-        change_spec[:scale]     = spec.scale if !spec.scale.nil?
-        change_spec[:null]      = false unless spec.null
-        change_spec[:default]   = spec.default
+        change_spec[:limit]     = spec.limit     unless spec.limit.nil?
+        change_spec[:precision] = spec.precision unless spec.precision.nil?
+        change_spec[:scale]     = spec.scale     unless spec.scale.nil?
+        change_spec[:null]      = false          unless spec.null
+        change_spec[:default]   = spec.default   unless spec.default.nil? && col.default.nil?
         
-        changes << "change_column :#{table_name}, :#{c}, " + 
+        changes << "change_column :#{new_table_name}, :#{c}, " + 
           ([":#{spec.sql_type}"] + format_options(change_spec, spec.sql_type)).join(", ")
-        back = change_column_back(table_name, c)
+        back = change_column_back(new_table_name, c)
         undo_changes << back unless back.blank?
       else
         nil

data/hobo_files/plugin/generators/hobo_model/templates/unit_test.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 
-class <%= class_name %>Test < Test::Unit::TestCase
-  fixtures :<%= table_name %>
-
+class <%= class_name %>Test < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/hobo_files/plugin/generators/hobo_model_controller/templates/functional_test.rb

@@ -1,16 +1,6 @@
 require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
-require '<%= file_path %>_controller'
-
-# Re-raise errors caught by the controller.
-class <%= class_name %>Controller; def rescue_action(e) raise e end; end
-
-class <%= class_name %>ControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = <%= class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
 
+class <%= class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/hobo_files/plugin/generators/hobo_rapid/templates/hobo-rapid.js

@@ -523,5 +523,9 @@ HasManyThroughInput = Behavior.create({
 })
 
 Event.addBehavior({
-    'div.has-many-through.input' : HasManyThroughInput()
+    'div.has-many-through.input' : HasManyThroughInput(),
+		'.dependent-collection-count:click' : function(e) {
+			new Effect.ScrollTo('dependent-collection', {duration: 1.0, offset: -10, transition: Effect.Transitions.sinoidal});
+			Event.stop(e);
+		}
 });

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/stylesheets/application.css

@@ -1,13 +1,13 @@
 html {background: #666;}
 body {
-	width: 800px; margin: 0 auto; background: white; color: #222;
+	width: 760px; margin: 0 auto; background: white; color: #222;
 	font: 12px "Lucida Grande", Arial, sans-serif;
-	line-height: 18px; padding-bottom: 10px; margin-bottom: 20px;
+	line-height: 18px; margin-bottom: 20px;
 }
-h1, h2, h3 {font-family: "Rockwell", "Trebuchet MS", "Arial", sans-serif;}
-h1 {font-size: 32px; line-height: 32px; margin: 20px 0 10px;}
-h2 {font-size: 24px; line-height: 24px; margin: 15px 0 10px;}
-h3 {font-size: 18px; line-height: 18px; margin: 10px 0 5px;}
+h1, h2, h3 {font-family: "Lucida Grande", "Trebuchet MS", "Arial", sans-serif; font-weight: normal;}
+h1 {font-size: 22px; line-height: 22px; margin: 20px 0 10px;}
+h2 {font-size: 18px; line-height: 18px; margin: 15px 0 10px;}
+h3 {font-size: 16px; line-height: 16px; margin: 10px 0 5px;}
 h4 {font-size: 14px; line-height: 14px; margin: 10px 0 5px;}
 h5 {font-size: 12px; line-height: 12px; margin: 10px 0 5px;}
 h6 {font-size: 10px; line-height: 10px; margin: 10px 0 5px;}
@@ -17,17 +17,14 @@ li {margin-left: 20px;}
 a {
 	text-decoration: none; color: #222;
 	border-bottom: 1px dotted #ccc;
-	background: #f8f8f8;
+	background: #fafafa;
 }
 a:hover {
-	border-bottom: 1px dotted #aaa; background: #f0f0f0; color: black;
+	border-bottom: 1px dotted #aaa; background: #f2f2f2; color: black;
 }
 h1 a, h2 a, h3 a {background: none; border: none;}
 
-/*input.text, input.string, input.email_address, input.password, textarea {
-	border: 2px solid #444; padding: 1px;
-}*/
-input.text, input.string, input.email_address, input.password, input.search, textarea {
+input.text, input.string, input.email_address, input.password, input.search, input.integer, input.float, textarea {
 	font-size:1.1em;
 	line-height:1.3em;
 	border-top:1px solid #7c7c7c;
@@ -43,7 +40,6 @@ input.file_upload {
 
 .button {
 	padding: 6px 10px;
-/*	color: white; background: black; border: 1px solid #666;*/
 	font: bold 11px "Lucida Grande", Arial, sans-serif;
 	border-top:1px solid #ddd;
 	border-left:1px solid #c3c3c3;
@@ -67,24 +63,46 @@ input.file_upload {
 	padding: 0 20px 20px; background: #f2f2f2; border: 1px solid #ddd; color: black;
 }
 #search-results-panel .card.linkable a {
-/*	background: #333; border-color: #444;*/ color: black;
+	color: black;
 }
 
-.content-header, .content-body, .content-footer {margin: 10px 60px; padding: 0 0 10px;}
-.flash {margin-left: 60px; margin-right: 60px; text-shadow: #728852 2px 2px 0;}
+.content-header, .content-body, .content-footer {margin: 10px 45px 15px; padding: 0;}
+
+.flash {
+	margin: 20px 40px; padding: 10px 30px;
+	border-width: 2px 0;
+	color: white;
+}
+.flash.notice {background: #92ab6e; border: 1px solid #829862; text-shadow: #728852 2px 2px 0;}
+.flash.error {background: #BC1C3D; border: 1px solid #900024; text-shadow: #900024 2px 2px 0;}
 .article { margin: 20px 0; border-top: 1px dotted #ccc;}
 
+.content-header, .content-body {padding-bottom: 15px;}
+.content-footer {padding-bottom: 20px;}
+
+
+/* aside layout */
+body.aside-layout {width: 960px;}
+.aside-layout .page-content {overflow: hidden; height: 100%;}
+.main-content {float: left; width: 670px;}
+.aside {float: right; width: 220px; padding: 20px 30px; background: #E5E5E5;}
+.aside-content {
+	font-size: 11px; color: #444;
+}
+/* trick to produce equal height columns */
+.aside, .main-content {padding-bottom: 10000px; margin-bottom: -10000px;}
+
+
 /***********/
 
-.page-header {color: white; background: black; padding: 20px 0 0; position: relative;}
-.page-header h1 {margin: 0; padding: 0 40px 30px; font-family: "Trebuchet MS", Tahoma, Arial, sans-serif; font-size: 48px; letter-spacing: -2.5pt;}
-.page-header .nav {margin: 0 30px; overflow: hidden; height: 100%;}
+.page-header {color: white; background: black; margin-top: 20px; padding: 20px 0 0; position: relative;}
+.page-header h1 {margin: 0; padding: 0 30px 30px; font-family: "Arial Black", Tahoma, Arial, sans-serif; font-size: 36px; letter-spacing: -1.5pt;}
+.page-header .nav {margin: 0 20px; overflow: hidden; height: 100%;}
 .page-header .nav li {float: left; list-style: none; margin-left: 0;}
-.page-header a {color: white; border: none; background: none;}
+.page-header a, .page-header a:hover {color: white; border: none; background: none;}
 
 .page-header div.search {
-	position: absolute; top: 0; right: 25px; padding: 6px 30px 8px 15px; 
-	background: #282828; border: 1px solid #313131; border-width: 0 1px 1px;
+	position: absolute; top: 10px; right: 5px; padding: 6px 30px 8px 15px; 
 }
 .page-header div.search label {
 	padding-right: 10px; 
@@ -96,37 +114,47 @@ input.file_upload {
 #search-spinner {position: absolute; top: 6px; right: 7px;}
 
 .account-nav {
-	position: absolute; top: 38px; right: 40px;
-/*	font: normal 12px Arial, sans-serif;*/
-	font-size: 11px;
+	position: absolute; top: -20px; right: 35px; font-size: 11px; 
 }
 
 ul.main-nav {float: left; margin: 0 10px;}
 .main-nav li {background: black; margin-right: 10px;}
 .main-nav a {
 	background: #282828;
-	display: block; padding: 7px 15px; border: 1px solid #313131; border-width: 1px 1px 0;
-	font: bold 16px "Myriad Pro", Arial, sans-serif; text-shadow: black 2px 2px 2px;
+	display: block; padding: 5px 15px 7px; border: 1px solid #313131; border-width: 1px 1px 0;
+	font: bold 13px "Lucida Grande", Arial, sans-serif; text-shadow: black 2px 2px 2px;
 }
 .main-nav a:hover {background: #444; border: 1px solid #555; border-width: 1px 1px 0;}
-.account-nav li {padding-left: 20px;}
-.account-nav a {border-bottom: 1px solid black; font-weight: bold;}
+.account-nav li {
+	padding-left: 20px; float: left; list-style: none; margin-left: 0; color: #ddd; text-shadow: #444 2px 2px 0;}
+.account-nav a {font-weight: bold;}
 .account-nav a:hover {border-bottom: 1px dotted #ddd;}
 
 
-.page-content {padding-top: 10px;}
+/* pagination nav, needs a more specific class on the wrapper */
+.content-body .nav {font-size: 11px; margin-bottom: 10px;}
+.content-body .nav a {margin-right: 5px;}
+
+.field-list th {width: 120px;}
+.field-list td {width: auto;}
 
 .login-page, .signup-page {width: 50%; margin-top: 40px;}
+.login-page .content-header, .signup-page .content-header {padding-bottom: 0;}
 .login-page .field-list, .signup-page .field-list {width: 300px;}
 .login-page .field-list td, .signup-page .field-list td {width: auto;}
 .login-page .field-list th, .signup-page .field-list th {width: 120px;}
-.login-page .submit-button, .signup-page .submit-button {margin: 10px 130px;}
+.login-page .actions, .signup-page .actions {text-align: left; margin-left: 128px; margin-top: 20px;}
+/*.login-page .submit-button, .signup-page .submit-button {margin: 10px 130px;}*/
 
 .edit-page .delete-button {margin-top: 25px;}
 
-.show-page .content-header {position: relative; border-bottom: 1px dotted #ddd;}
-.show-page .content-header h1, .new-in-collection-page .content-header h1 {margin-bottom: 4px; margin-right: 70px;}
+.show-page .content-header {position: relative; border-bottom: 1px dotted black;}
+.show-page .content-header h1, .new-in-collection-page .content-header h1 {margin-bottom: 2px; margin-right: 70px;}
 .show-page .content-header a.edit {position: absolute; top: 0; right: 0;}
+.content-header .creation-details, .content-header .dependent-collection-count {font-size: 11px; line-height: 11px;}
+.content-header .creator {margin-right: 5px;}
+.content-header .created-at {color: #444;}
+.content-header .dependent-collection-count {font-weight: bold; margin-left: 15px;}
 
 .new-in-collection-page .content-header h2 {margin-top: 6px; font: bold 16px "Lucida Grande", Arial, sans-serif;}
 .new-in-collection-page .content-header h2, .new-in-collection-page .content-header h2 a {color: #222;}
@@ -135,14 +163,19 @@ ul.main-nav {float: left; margin: 0 10px;}
 	padding: 0 30px;
 	border-top: 1px dotted #ddd; margin-top: 20px; background: #f5f5f5;
 }
-.show-page .create-new form .submit-button {margin: 20px 155px;}
+.show-page .create-new form .submit-button {margin: 20px 130px;}
+.show-page .create-new h2 {margin: 20px 0; padding: 0; border-bottom: none;}
 
+/* styling of generic elements */
+.creator {font-weight: bold;}
 .card {
 	background: #f5f5f5;
 	border: 1px solid #e8e8e8;
 	padding:10px 20px;
 	margin-bottom: 5px;
+	height: 100%; overflow: hidden; clear: both;
 }
+.card a {background: #f5f5f5;}
 .card .creation-details {
 	font-size: 11px; color: #333; display: block;
 }
@@ -150,8 +183,16 @@ ul.main-nav {float: left; margin: 0 10px;}
 
 .card.content {
 	font-size: 11px;
-	border: none; background: none; padding: 0; margin: 10px 0;
+	border: none; background: none; padding: 0; margin: 10px 0 30px;
 }
+.card.content .creation-details {
+	float: left; width: 155px; line-height: 14px;
+}
+.card.content .creation-details .created-at {display: block;}
+.card.content .content {
+	float: right; width: 420px;
+}
+ul.collection li {list-style: none; margin-left: 0;}
 
 .new-links {margin-top: 20px;}
 .new-links ul li {list-style: none; margin-left: 0;}
@@ -159,6 +200,10 @@ ul.main-nav {float: left; margin: 0 10px;}
 .dependent-collection ul li {
 	list-style: none; margin-left: 0;
 }
+.dependent-collection h2 {
+	padding: 15px 0; margin-bottom: 20px;
+	border-bottom: 1px dotted black;
+}
 
 /*******************************************************/
 /* these styles are for the generated front index page */

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/stylesheets/rapid-ui.css

@@ -1,13 +1,5 @@
 .hidden {display: none;}
 
-.flash {
-	background: #92ab6e;
-	padding: 10px 30px; margin-top: 5px;
-	border: 1px solid #829862;
-/*	border-width: 2px 0;*/
-	color: white;
-}
-
 .in-place-textfield-bhv, .in-place-textarea-bhv, .in-place-html-textarea-bhv {
 	border: 1px dotted #666;
 	padding: 0 3px; padding-right: 20px;
@@ -125,7 +117,7 @@ div.completions-popup ul li {
 
 
 .field-list   {width:100%;}
-.field-list td {vertical-align: middle; width: 75%;}
+.field-list td {vertical-align: middle;}
 .field-list th {font-weight: bold;}
 .field-list th, .field-list td {padding: 5px 0;}
 .field-list th {padding-right: 10px;}

data/hobo_files/plugin/generators/hobo_user_controller/templates/functional_test.rb

@@ -1,16 +1,6 @@
 require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
-require '<%= file_path %>_controller'
-
-# Re-raise errors caught by the controller.
-class <%= class_name %>Controller; def rescue_action(e) raise e end; end
-
-class <%= class_name %>ControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = <%= class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
 
+class <%= class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/hobo_files/plugin/generators/hobo_user_model/templates/fixtures.yml

@@ -1,5 +1,19 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+<% unless attributes.empty? -%>
 one:
-  id: 1
+<% for attribute in attributes -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>
+
 two:
-  id: 2
+<% for attribute in attributes -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>
+<% else -%>
+# one:
+#   column: value
+#
+# two:
+#   column: value
+<% end -%>

data/hobo_files/plugin/generators/hobo_user_model/templates/model.rb

@@ -4,7 +4,7 @@ class <%= class_name %> < ActiveRecord::Base
 
   fields do
     username :string, :login => true, :name => true
-    administrator :boolean
+    administrator :boolean, :default => false
     timestamps
   end
 

data/hobo_files/plugin/generators/hobo_user_model/templates/unit_test.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 
-class <%= class_name %>Test < Test::Unit::TestCase
-  fixtures :<%= table_name %>
-
+class <%= class_name %>Test < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/hobo_files/plugin/lib/hobo/dryml.rb

@@ -71,16 +71,17 @@ module Hobo
           @tag_page_renderer_classes[controller_class.name].new(page, view)
         else
           template_path = "app/views/" + page + ".dryml"
-          src_file = File.new(File.join(RAILS_ROOT, template_path))
+          src_file = File.join(RAILS_ROOT, template_path)
+          mtime = File.mtime(src_file)
           renderer_class = @renderer_classes[page]
 
           # do we need to recompile?
           if (!renderer_class or                                          # nothing cached?
               (local_names - renderer_class.compiled_local_names).any? or # any new local names?
-              renderer_class.load_time < src_file.mtime)                  # cache out of date?
-            renderer_class = make_renderer_class(src_file.read, template_path, local_names,
+              renderer_class.load_time < mtime)                           # cache out of date?
+            renderer_class = make_renderer_class(File.read(src_file), template_path, local_names,
                                                  DEFAULT_IMPORTS, included_taglibs)
-            renderer_class.load_time = src_file.mtime
+            renderer_class.load_time = mtime
             @renderer_classes[page] = renderer_class
           end
           renderer_class.new(page, view)

data/hobo_files/plugin/lib/hobo/dryml/dryml_builder.rb

@@ -17,7 +17,7 @@ module Hobo::Dryml
 
 
     def ready?(mtime)
-      !(@build_instructions.empty? || @last_build_time.nil? || mtime > @last_build_time)
+      !@build_instructions.empty? && @last_build_mtime && @last_build_mtime >= mtime
     end
 
 
@@ -62,7 +62,7 @@ module Hobo::Dryml
     end
 
 
-    def build(local_names, auto_taglibs)
+    def build(local_names, auto_taglibs, src_mtime)
 
       auto_taglibs.each { |t| import_taglib(t) }
     
@@ -98,7 +98,7 @@ module Hobo::Dryml
                                  "building #{template_path}")
         end
       end
-      @last_build_time = Time.now
+      @last_build_mtime = src_mtime
     end
     
 

data/hobo_files/plugin/lib/hobo/dryml/taglib.rb

@@ -9,16 +9,15 @@ module Hobo
       class << self
      
         def get(options)
-          file = taglib_file(options)
-     
           taglib = @cache[options]
           if taglib
             taglib.reload
           else
+            src_file = taglib_filename(options)
             renames = (bundle = options[:bundle] and
                        Bundle.bundles[bundle]._?.renames)
      
-            taglib = Taglib.new(file, renames)
+            taglib = Taglib.new(src_file, renames)
             @cache[options] = taglib
           end
           taglib
@@ -30,7 +29,7 @@ module Hobo
         
         private
         
-        def taglib_file(options)
+        def taglib_filename(options)
           base = if (plugin = options[:plugin])
                    "vendor/plugins/#{plugin}/taglibs"
                  elsif (bundle_name = options[:bundle])
@@ -44,19 +43,19 @@ module Hobo
           
           filename = "#{RAILS_ROOT}/#{base}/#{options[:src]}.dryml"
           raise DrymlException, "No such taglib: #{options.inspect} #{filename}" unless File.exists?(filename)
-          File.new(filename)
+          filename
         end
      
       end
      
-      def initialize(file, renames)
-        @file = file
+      def initialize(src_file, renames)
+        @src_file = src_file
         @renames = renames
         load
       end
      
       def reload
-        load if @file.mtime > @last_load_time
+        load if File.mtime(@src_file) > @last_load_time
       end
      
       def load
@@ -85,10 +84,9 @@ module Hobo
           end
           
         end
-        @file.rewind
-        template = Template.new(@file.read, @module, @file.path, @renames)
+        template = Template.new(File.read(@src_file), @module, @src_file, @renames)
         template.compile([], [])
-        @last_load_time = @file.mtime
+        @last_load_time = File.mtime(@src_file)
       end
      
       def import_into(class_or_module, as)

data/hobo_files/plugin/lib/hobo/dryml/template.rb

@@ -65,7 +65,7 @@ module Hobo::Dryml
       end
 
       # compile the build instructions
-      @builder.build(local_names, auto_taglibs)
+      @builder.build(local_names, auto_taglibs, mtime)
 
       from_cache = (parsed ? '' : ' (from cache)')
       logger.info("  DRYML: Compiled#{from_cache} #{template_path} in %.2fs" % (Time.now - now))

data/hobo_files/plugin/lib/hobo/dryml/template_environment.rb

@@ -133,13 +133,13 @@ module Hobo::Dryml
       res
     end
     
-    def call_polymorphic_tag(*args, &b)
-      attributes = extract_options_from_args!(args)
-      name, type = args
+    def call_polymorphic_tag(name, *args)
+      type = args.first.is_a?(Class) ? args.shift : nil
+      attributes, parameters = args
       
       tag = find_polymorphic_tag(name, type)
       if tag != name
-        send(tag, attributes, &b)
+        send(tag, attributes, parameters || {})
       else
         nil
       end
@@ -147,8 +147,17 @@ module Hobo::Dryml
 
     
     def find_polymorphic_tag(name, call_type=nil)
-      call_type ||= this_type
-      return name if call_type.is_a?(ActiveRecord::Reflection::AssociationReflection)
+      call_type ||= case this_type
+                    when ActiveRecord::Reflection::AssociationReflection
+                      # Don't blow up with non-existent polymorphic types
+                      return name if this_type.options[:polymorphic] && !Object.const_defined?(this_type.class_name)
+                      this_type.klass
+                    when Array
+                      this.member_class
+                    else
+                      this_type
+                    end
+      
       call_type = TrueClass if call_type == FalseClass
 
       while true
@@ -186,8 +195,7 @@ module Hobo::Dryml
               @_form_field_path]
       @_erb_output = ""
       res = yield
-      @_erb_output, @_this, @_this_parent, @_this_field, @_this_type,
-          @_form_field_path = ctx
+      @_erb_output, @_this, @_this_parent, @_this_field, @_this_type, @_form_field_path = ctx
       res.to_s
     end
 
@@ -210,13 +218,13 @@ module Hobo::Dryml
 
     def new_field_context(field_path, tag_this=nil)
       new_context do
-      path = if field_path.is_a? Array
-               field_path
-             elsif field_path.is_a? String
-               field_path.split('.')
-             else
-               [field_path]
-             end
+        path = if field_path.is_a? Array
+                 field_path
+               elsif field_path.is_a? String
+                 field_path.split('.')
+               else
+                 [field_path]
+               end
         parent, field, obj = Hobo.get_field_path(tag_this || this, path)
 
         type = if parent.class.respond_to?(:field_type) && field_type = parent.class.field_type(field)

data/hobo_files/plugin/lib/hobo/field_spec.rb

@@ -48,9 +48,13 @@ module Hobo
     end
     
     def different_to?(col_spec)
-      [:limit, :precision, :scale, :null, :default].any? do |k|
-        col_spec.send(k) != self.send(k)
-      end || sql_type != col_spec.type
+      sql_type != col_spec.type ||
+        begin
+          check_cols = [:null, :default]
+          check_cols += [:precision, :scale] if sql_type == :decimal
+          check_cols << :limit if sql_type.in?([:string, :text, :binary, :integer])
+          check_cols.any? { |k| col_spec.send(k) != self.send(k) }
+        end
     end
     
     private

data/hobo_files/plugin/lib/hobo/model.rb

@@ -354,6 +354,7 @@ module Hobo
       
       
       class ScopedProxy
+        
         def initialize(klass, scope)
           @klass = klass
           

data/hobo_files/plugin/lib/hobo/model_controller.rb

@@ -140,23 +140,25 @@ module Hobo
       
       
       def show_action(*names, &block)
+        options = names.extract_options!
         show_actions.concat(names)
         for name in names
           if block
             define_method(name, &block)
           else
-            define_method(name) { hobo_show }
+            define_method(name) { hobo_show options }
           end
         end
       end
       
       def index_action(*names, &block)
+        options = names.extract_options!
         index_actions.concat(names)
         for name in names
           if block
             define_method(name, &block)
           else
-            define_method(name) { hobo_index }
+            define_method(name) { hobo_index options }
           end
         end
       end
@@ -358,6 +360,7 @@ module Hobo
     def re_render_form(default_action)
       if params[:page_path]
         controller, view = Controller.controller_and_view_for(params[:page_path])
+        view = default_action if view == Dryml::EMPTY_PAGE
         hobo_render(view, model_for(controller))
       else
         hobo_render(default_action)
@@ -531,7 +534,7 @@ module Hobo
           end
         elsif invalid?
           respond_to do |wants|
-          wants.html { re_render_form(:edit) }
+            wants.html { re_render_form(:edit) }
             wants.js { render(:status => 500,
                               :text => ("There was a problem with that change.\n" + 
                                         @this.errors.full_messages.join("\n"))) }

data/hobo_files/plugin/lib/hobo/user_controller.rb

@@ -29,7 +29,7 @@ module Hobo
       if request.post?
         user = model.authenticate(params[:login], params[:password])
         if user.nil?
-          flash[:notice] = options[:failure_notice]
+          flash[:error] = options[:failure_notice]
         else
           old_user = current_user
           self.current_user = user

data/hobo_files/plugin/taglibs/rapid.dryml

@@ -104,7 +104,7 @@
 
 <def tag="card">
   <if test="&can_view?">
-    <%= poly = call_polymorphic_tag('card', attributes) %>
+    <%= poly = call_polymorphic_tag('card', attributes, parameters) %>
     <div class="card #{linkable? ? 'linkable' : 'content'} #{type_name :dasherize => true}" unless="&poly">
       <a if="&linkable?"/>
       <div class="content" param="content">
@@ -117,6 +117,17 @@
 </def>
   
 
+<def tag="collection">
+  <%= poly = call_polymorphic_tag('collection', attributes, parameters) %>
+  <ul class="collection" merge-attrs unless="&poly">
+    <li:><card param/></li:>
+  </ul>
+  <p class="empty-collection-message" if="&this.empty?" param="empty-message">
+    There are no <type-name plural/>
+  </p>
+</def>
+
+
 <def tag="hobo-rapid-javascripts" attrs="tiny-mce"><%=
    res = '<script type="text/javascript">var hoboParts = {};'
    unless Hobo.all_models.empty?
@@ -464,10 +475,10 @@ in the future - use at your own risk. -->
 
 
 <def tag="a-or-an" attrs="word"><%=
-  (word =~ /^[aeiouh]/ ? "an " : "a ") + word
+  (word =~ /^[aeiouh]/i ? "an " : "a ") + word
 %></def>
 
 
 <def tag="A-or-An" attrs="word"><%=
-  (word =~ /^[aeiouh]/ ? "An " : "A ") + word
+  (word =~ /^[aeiouh]/i ? "An " : "A ") + word
 %></def>

data/hobo_files/plugin/taglibs/rapid_forms.dryml

@@ -308,7 +308,7 @@
       
 <def tag="error-messages">
   <section class="error-messages" merge-attrs if="&this.errors.length > 0">
-    <h2 param="heading">In order to proceed please correct the following:</h2>
+    <h2 param="heading">To proceed please correct the following:</h2>
     <ul:errors.full_messages param>
       <li: param><%= this %></li:>
     </ul>

data/hobo_files/plugin/taglibs/rapid_pages.dryml

@@ -20,21 +20,23 @@
 </html>
 </def>
 
+
 <def tag="simple-layout">
   <base-page merge>
     <body: param>
       <ajax-progress/>
       <header class="page-header" param>
         <heading param="app-name"><a href="/#{base_url}"><app-name/></a></heading>
-        <live-search param/>
+        <live-search param if="&defined_route? :search"/>
         <nav param>
           <account-nav if="&Hobo::UserController.user_models.first" param/>
           <magic-nav class="main-nav" param="main-nav"/>
         </nav>
       </header>
       <section class="page-content" param="content">
-        <header class="content-header" param="content-header"/>
         <flash-message param/>
+        <flash-message type="error" param/>
+        <header class="content-header" param="content-header"/>
         <section class="content-body" param="content-body"/>
         <footer class="content-footer" param="content-footer"/>
       </section>
@@ -57,15 +59,12 @@
 </def>
       
 
-<def tag="default-layout" alias-of="simple-layout"/>
+<def tag="page" attrs="layout"><call-tag tag="#{layout || 'simple'}-layout" merge/></def>
 
 
-<def tag="page" attrs="layout"><% layout ||= "default" %><call-tag tag="#{layout}-layout" merge/></def>
-
-
-<def tag="index-page" attrs="layout">
+<def tag="index-page">
   <% model_name = @model.name.titleize %>
-  <page layout="&layout" title="All #{model_name.pluralize}" merge>
+  <page title="All #{model_name.pluralize}" merge>
     <body: class="index-page #{@model.name.underscore}" param/>
     <content-header: param>
       <heading param><%= model_name.pluralize %></heading>
@@ -75,7 +74,7 @@
     <content-body: param>
       <nav param="top-pagination-nav"><page-nav/></nav>
       
-      <card repeat/>
+      <collection param/>
       
       <nav param="bottom-pagination-nav"><page-nav/></nav>
     </content-body>
@@ -95,8 +94,8 @@
 </def>
 
 
-<def tag="new-page" attrs="layout">
-  <page layout="&layout" title="New #{type_name}" merge>
+<def tag="new-page">
+  <page title="New #{type_name}" merge>
     <body: class="new-page #{type_name.underscore}" param/>
     <content-header: param>
       <heading param>New <type-name title/></heading>
@@ -116,13 +115,13 @@
 </def>
 
 
-<def tag="show-page" attrs="layout">
+<def tag="show-page">
   <% has_many_assocs = this.class.reflections.values.map do |refl|
        this.send(refl.name) if Hobo.simple_has_many_association?(refl)
      end.compact
-     show_all_cards = this.class.dependent_collections.first if this.class.dependent_collections.length == 1 
+     dependent_collection = this.class.dependent_collections.first if this.class.dependent_collections.length == 1 
   %>
-  <page layout="&layout" merge title="#{name :no_wrapper => true}">
+  <page merge title="#{name :no_wrapper => true}">
     <body: class="show-page #{type_name.underscore}" param/>
     <content-header: param>
       <if with="&this.dependent_on.reject{|x| x.is_a?(Hobo::User)}.first">
@@ -130,8 +129,8 @@
       </if>
 
       <heading param><%= this %></heading>
-      <creation-details/>
-      <a class="dependent-collection-count" href="##{show_all_cards.to_s.underscore}" if="&show_all_cards"><count-dependents/></a>
+      <creation-details param/>
+      <do param="dependent-collection-count"><a class="dependent-collection-count" href="##{dependent_collection.to_s.underscore}" part="dependent-collection-count" part-locals="dependent_collection" if="&dependent_collection"><count-dependents/></a></do>
       <a action="edit" if="&can_edit?" class="edit">Edit <type-name/></a>
     </content-header>
     
@@ -141,22 +140,24 @@
       <field-list skip="&[this.class.name_attribute, this.class.primary_content_attribute, this.class.creator_attribute, this.class.dependent_on.first].compact "
                   skip-associations="has_many" param/>
 
-      <if test="&show_all_cards">
-        <section class="dependent-collection" field="&show_all_cards">
-          <a name="#{show_all_cards.to_s.underscore}"/>
-          <h2><%= show_all_cards.to_s.titleize %></h2>
-          <do part="dependent-collection" part-locals="show_all_cards">
-            <ul><li:><card/></li:></ul>
-            <else>No <%= show_all_cards.to_s %> have been added yet.</else>
+      <if test="&dependent_collection">
+        <section class="dependent-collection" field="&dependent_collection">
+          <a name="#{dependent_collection.to_s.underscore}"/>
+          <h2 param="dependent-collection-title"><%= dependent_collection.to_s.titleize %></h2>
+
+          <do param="collection">
+            <collection part="dependent-collection" part-locals="dependent_collection">
+              <empty-message:>No <%= dependent_collection.to_s %> have been added yet.</empty-message>
+            </collection>
           </do>
         
           <do with="&new_for_current_user">
             <section class="create-new" if="&!linkable?(:new) && can_create?">
-              <h2>Add <A-or-An word="&show_all_cards.to_s.singularize.titleize"/></h2>
-              <form update="dependent-collection" message="Adding #{show_all_cards.to_s.singularize.titleize}..." reset-form>
-                <field-list skip="#{@this.class.reverse_reflection(@this.send(show_all_cards).proxy_reflection.name).name}"
-                            skip-associations="has_many" param/>
-                <submit label="Create #{show_all_cards.to_s.singularize.titleize}"/>
+              <h2>Add <A-or-An word="&dependent_collection.to_s.singularize.titleize"/></h2>
+              <form update="dependent-collection, dependent-collection-count" message="Adding #{dependent_collection.to_s.singularize.titleize}..." reset-form>
+                <field-list skip="#{@this.class.reverse_reflection(@this.send(dependent_collection).proxy_reflection.name).name}"
+                            skip-associations="has_many" param="dependent-collection-field-list"/>
+                <submit label="Create #{dependent_collection.to_s.singularize.titleize}"/>
               </form>
             </section>
           </do>
@@ -167,7 +168,7 @@
           <with-fields associations="has_many">
             <section class="#{this_field.dasherize}">
               <h2>Recent <this-field.titleize/></h2>
-              <card repeat="&this.recent.all"/>
+              <collection with="&this.recent"/>
               <a class="more">More... (<count/>)</a>
             </section>
           </with-fields>
@@ -185,8 +186,8 @@
 </def>
 
 
-<def tag="edit-page" attrs="layout">
-  <page layout="&layout" merge>    
+<def tag="edit-page">
+  <page merge>    
     <body: class="edit-page #{this.class.name.underscore}" param/>
     <content-header: param>
       <heading><if test="&this.respond_to? :name"><name/></if><else><type-name/></else></heading>
@@ -207,9 +208,9 @@
 </def>
 
 
-<def tag="new-in-collection-page" attrs="layout">
+<def tag="new-in-collection-page">
   <set association-name="&@association.proxy_reflection.name.to_s.singularize.titleize"/>
-  <page layout="&layout" title="New #{type_name}" merge>
+  <page title="New #{type_name}" merge>
     <body: class="new-in-collection-page #{type_name(:with => @owner)} #{type_name}" param/>
     <content-header: param>
       <heading param>New <association-name/></heading>
@@ -231,9 +232,9 @@
 </def>
 
 
-<def tag="show-collection-page" attrs="layout">
+<def tag="show-collection-page">
   <% title = "#{@reflection.name.to_s.titleize} for #{name(:with => @owner)}" %>
-  <page layout="&layout" title="&title" merge>
+  <page title="&title" merge>
     <body: class="show-collection-page #{type_name(:with => @owner)} #{type_name(:pluralize => true)}"
           param/>
     <content-header: param>
@@ -257,8 +258,8 @@
 </def>
 
 
-<def tag="signup-page" attrs="layout">
-  <page layout="&layout" title="Sign up to #{app_name}" merge>
+<def tag="signup-page">
+  <page layout="simple" title="Sign up to #{app_name}" merge>
     <body: class="signup-page" param/>
 
     <live-search: replace/>
@@ -275,7 +276,9 @@
           <password-confirmation-label:>Confirm Password</password-confirmation-label>
         </field-list>
 
-        <submit label='Sign Up'/>
+        <div class="actions" param="actions">
+          <submit label='Sign Up'/>
+        </div>
       </form>
     </content-body>
 
@@ -283,8 +286,8 @@
 </def>
 
 
-<def tag="login-page" attrs="remember-me, layout">
-  <page layout="&layout" title="Log in to #{app_name}" merge>
+<def tag="login-page" attrs="remember-me">
+  <page layout="simple" title="Log in to #{app_name}" merge>
    
     <body: class="login-page" param/>
  
@@ -313,20 +316,23 @@
             <item-value><input type="checkbox" name="remember_me" id="remember-me" param="remember-me-input"/></item-value>
           </labelled-item>
         </labelled-item-list>
-        <submit label='Log in' param/>
+        <set user="&Hobo::UserController.user_models.first"/>
+        <div class="actions" param="actions">
+          <submit label='Log in' param/><if test="&signup_url(user)" class='nav-item'> or <a href="&signup_url(user)">Sign up</a></if>
+        </div>
       </form>
     </content-body>
   </page>
 </def>
 
 
-<def tag="account-disabled-page" attrs="layout">
+<def tag="account-disabled-page">
 
-  <page layout="&layout" title="#{app_name} - account not available" merge>
+  <page layout="simple" title="#{app_name} - account not available" merge>
        
     <body: class="account-disabled-page" param/>
 
-    <content-header: param><heading param>Account is not availble</heading></content>
+    <content-header: param><heading param>Account is not available</heading></content>
 
     <content-body: param>
       <p>Your account is not available at this time.</p>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2007-12-23 00:00:00 +00:00
+  version: 0.7.2
+date: 2008-01-04 00:00:00 +00:00
 summary: The web app builder for Rails
 require_paths: 
 - lib
@@ -63,7 +63,6 @@ files:
 - hobo_files/plugin/generators/hobo_model_controller/templates/controller.rb
 - hobo_files/plugin/generators/hobo_model_controller/templates/functional_test.rb
 - hobo_files/plugin/generators/hobo_model_controller/templates/helper.rb
-- hobo_files/plugin/generators/hobo_model_controller/templates/view.rhtml
 - hobo_files/plugin/generators/hobo_model_controller/USAGE
 - hobo_files/plugin/generators/hobo_rapid
 - hobo_files/plugin/generators/hobo_rapid/hobo_rapid_generator.rb
@@ -128,7 +127,6 @@ files:
 - hobo_files/plugin/generators/hobo_user_controller/templates/controller.rb
 - hobo_files/plugin/generators/hobo_user_controller/templates/functional_test.rb
 - hobo_files/plugin/generators/hobo_user_controller/templates/helper.rb
-- hobo_files/plugin/generators/hobo_user_controller/templates/view.rhtml
 - hobo_files/plugin/generators/hobo_user_controller/USAGE
 - hobo_files/plugin/generators/hobo_user_model
 - hobo_files/plugin/generators/hobo_user_model/hobo_user_model_generator.rb

data/hobo_files/plugin/generators/hobo_model_controller/templates/view.rhtml

@@ -1,2 +0,0 @@
-<h1><%= class_name %>#<%= action %></h1>
-<p>Find me in <%= path %></p>

data/hobo_files/plugin/generators/hobo_user_controller/templates/view.rhtml

@@ -1,2 +0,0 @@
-<h1><%= class_name %>#<%= action %></h1>
-<p>Find me in <%= path %></p>