hobo 0.9.103 → 0.9.104

data/CHANGES.txt

@@ -14,8 +14,45 @@ likely to cause conflicts, so it is highly recommended that you have
 your code backed up and in a change control system such as git or
 subversion.
 
-=== Hobo 0.9.103 (AKA 1.0.RC2) ===
+=== Hobo 0.9.104 (AKA 1.0RC3) ===
+
+[#604](https://hobo.lighthouseapp.com/projects/8324/tickets/604):
+
+The new input-many introduced in 0.9.103 had issues with >10 elements,
+several issues running with IE7 and an issue with its javascript
+callbacks.
+
+[#537](https://hobo.lighthouseapp.com/projects/8324/tickets/537):
+
+`x._?.to_s` now returns nil rather than a blank string
+
+[#592](https://hobo.lighthouseapp.com/projects/8324/tickets/592): 
+
+If you previously had a snippet such as this:
+
+    <table fields="this, date, account.login">
+      <login-view:>
+        ...
+      </login-view:>
+    </table>
 
+You now have to use:
+
+    <table fields="this, date, account.login">
+      <account-login-view:>
+        ...
+      </account-login-view:>
+    </table>
+
+The same change has been applied to `<field-list>`
+
+[#568](https://hobo.lighthouseapp.com/projects/8324/tickets/568):
+
+`hobo_index` now supports the `:scope` option
+
+See also the [git log](http://github.com/tablatom/hobo/commits/v0.9.104)
+
+=== Hobo 0.9.103 (AKA 1.0.RC2) ===
 
 ### Warning
 
@@ -24,6 +61,8 @@ please check out bug
 [#574](https://hobo.lighthouseapp.com/projects/8324/tickets/574-rails-235-b0rks-our-rake-tasks-running-on-edge-hobo)
 for a workaround you need to apply to your Rakefile.
 
+NOTE: fixed in 0.9.104
+
 ### Bugs
 
 This release fixes a couple of serious bugs:

data/Rakefile

@@ -10,7 +10,7 @@ $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobosupport/
 require 'hobo'
 
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
-RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} `which rubydoctest`"
+RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 
 desc "Default Task"
 task :default => [ :test ]
@@ -28,8 +28,9 @@ Rake::TestTask.new(:test) { |t|
 namespace "test" do
   desc "Run the doctests"
   task :doctest do |t|
+    files=Dir['doctest/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
     # note, tests in doctest/hobo/ are out of date
-    exit(1) if !system("#{RUBYDOCTEST} doctest/*.rdoctest")
+    exit(1) if !system("#{RUBYDOCTEST} #{files}")
   end
 end
 
@@ -61,7 +62,8 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.add_dependency("rails", [">= 2.2.2"])
   gemspec.add_dependency("will_paginate", [">= 2.3.11"])
   gemspec.add_dependency("hobosupport", ["= #{Hobo::VERSION}"])
-  gemspec.add_dependency("hobofields", ["= #{Hobo::VERSION}"])    
+  gemspec.add_dependency("hobofields", ["= #{Hobo::VERSION}"])
+  gemspec.files.include %w(tasks/environments.rake tasks/hobo_tasks.rake)
 end
 Jeweler::GemcutterTasks.new
 Jeweler::RubyforgeTasks.new do |rubyforge|

data/doctest/model.rdoctest

@@ -0,0 +1,332 @@
+Hobo's Miscellaneous Model Extensions
+{.document-title}
+
+This chapter of the Hobo Manual describes Hobo's model extensions,
+with the exception of [HoboFields](../hobofields) and
+[Permissions](../permissions), 
+[Accessible Associations](../multi_model_forms) and [Scopes](../scopes) each of
+which have their own chapters in this manual.  This chapter should
+describe everything else that Hobo provides to your models.
+
+Contents
+{.contents-heading}
+
+- contents
+{:toc}
+
+    >> require 'rubygems'
+    >> require 'active_support'
+    >> require 'active_record'
+    >> require 'action_pack'
+    >> require 'action_view'
+    >> require 'action_controller'
+    >> mysql_adapter = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'
+    >> mysql_user = 'root'; mysql_password = ''
+    >> mysql_login = "-u #{mysql_user} --password='#{mysql_password}'"
+    >> mysql_database = "hobofields_doctest"
+    >> system "mysqladmin #{mysql_login} --force drop #{mysql_database} 2> /dev/null"
+    >> system("mysqladmin #{mysql_login} create #{mysql_database}") or raise "could not create database"
+    >> ActiveRecord::Base.establish_connection(:adapter => mysql_adapter,
+                                               :database => mysql_database,
+                                               :host => "localhost", 
+                                               :username => mysql_user, 
+                                               :password => mysql_password)
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobofields/lib')
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobosupport/lib')
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobo/lib')
+    >> require 'will_paginate'
+    >> require 'will_paginate/finder'
+    >> require 'hobosupport'
+    >> require 'hobofields'
+    >> require 'hobo'
+    >> Hobo::Model.enable
+    >> HoboFields.enable
+    >>
+     def migrate(renames={})
+       up, down = HoboFields::MigrationGenerator.run(renames)
+       puts up
+       ActiveRecord::Migration.class_eval(up)
+       ActiveRecord::Base.send(:subclasses).each { |model| model.reset_column_information }
+       [up, down]
+     end
+{.hidden}
+
+# Special Attributes
+
+Rails provides one "special" attribute to your model: `primary_key`
+
+    >> class Foo < ActiveRecord::Base; end
+    >> Foo.primary_key
+    => "id"
+
+`primary_key` references one of the columns in your table.  Rails
+provides a default, but you can change it.
+
+In the same fashion, Hobo provides several special attributes that
+generally correspond to columns in your database table.
+
+In Hobo, these attributes are specified by passing options to their
+declaration:
+
+    >> class User < ActiveRecord::Base; end
+    >>
+     class Post < ActiveRecord::Base
+       hobo_model
+
+       fields do
+         title :string, :name => true, :index => true
+         content :text, :primary_content => true
+       end
+
+       belongs_to :poster, :class_name => "User", :creator => true
+
+       set_search_columns :title, :content
+       never_show :poster
+
+     end
+    >> migrate
+
+In the above example, `name`, `creator` and `primary_content` specify
+attributes that have meaning to Hobo.  `set_search_columns` and
+`never_show` also allow you to tag columns for Hobo.
+
+## name
+
+Many models have a column in their table that names the object.  A
+good example would be the title column in a blog object.
+
+    fields do
+      title :string, :name => true, :index => true
+    end
+
+    >> Post.name_attribute
+    => :title
+
+
+Rapid makes extensive use of this column, both directly and
+indirectly.   The `<name>` tag uses it, `<table-plus>` uses it as the
+default sort column, to give two examples of direct uses.
+
+Indirectly it is used much more often via the default `to_s` function
+that Hobo::Model provides.
+
+    >> post = Post.new(:title => "Hello")
+    >> post.to_s
+    => "Hello"
+
+Hobo::Model also provides a default `to_param` function to provide
+human readable URL's:
+
+    >> post.id = 17
+    >> post.to_param
+    => "17-hello"
+
+You are of course welcome to provide your own `to_s` and `to_param`
+functions, but in most cases the Hobo::Model definitions do well.
+
+Hobo::Model also provides a default finder, `named`:
+
+    >> post.save!
+    >> Post.named("Hello").title
+    => "Hello"
+
+If you are going to be using this finder, it is recommended that you
+also provide an index for your name column:
+
+    fields do
+      title :string, :name => true, :index => true
+    end
+
+Sometimes a single column does not do a good job of naming the
+object.  In this case, you can provide your own name method instead:
+
+    >>
+     class Person < ActiveRecord::Base
+       hobo_model
+       fields do
+         first_name :string
+         last_name :string
+       end
+
+       def name
+         first_name + ' ' + last_name
+       end
+     end
+    >> migrate
+    >> person = Person.new(:first_name => "John", :last_name => "Brown")
+    >> person.to_s
+    => "John Brown"
+
+If you use a composite name, you do lose a couple of features that
+require direct database access: the `named` finder, and the ability to
+use it as a sort column without loading the entire table.
+
+## primary\_content
+
+`primary_content` works very similarly to `name`, except that it
+provides the "description" of the row.   This is not used in very many
+places.  Currently it is only used in the generated `<card>` and
+`<show-page>` for your views, but it may be used in more places in the
+future.
+
+    fields do
+      content :text, :primary_content => true
+    end
+
+If you do not explicitly set `primary_content`, Hobo::Model will look
+for a method or attribute named `description`, `body`, `content`,
+or `profile` and use that.
+
+    >>
+     class Person < ActiveRecord::Base
+       def profile
+         "Boring"
+       end
+     end
+
+    >> Person.primary_content_attribute
+    => "profile"
+
+## login
+
+This field is only used in User models.  This attribute specifies
+the field that uniquely identifies a user.   Unsurprisingly, it's
+primary use is for the `login` field on the signup form, but it is
+used elsewhere.
+
+    >>
+     class User < ActiveRecord::Base
+       hobo_user_model
+       fields do
+         email_address :string, :login => true, :unique => true
+       end
+     end
+
+    >> User.login_attribute
+    => :email_address
+
+## creator
+
+If you specify the `creator` option on one of your fields, Hobo will
+set it to contain the current user when creating the object.
+
+Normally this is specified on a belongs\_to:
+
+    >>
+     class Post < ActiveRecord::Base
+       belongs_to :poster, :class_name => "User", :creator => true
+     end
+
+    >> Post.creator_attribute
+    => :poster
+
+However, it may also be added as an option to a string field, in which
+case the `login_attribute` is saved to the field:
+
+    >>
+     class Foo2 < ActiveRecord::Base
+        hobo_model
+        fields do
+          creator_login :string, :creator => true
+        end
+     end
+
+    >> Foo2.creator_attribute
+    => :creator_login
+
+Creator may also be specified via `attr_accessor` if you wish it to
+be set without being saved to the database:
+
+    >>
+     class Foo3 < ActiveRecord::Base
+       hobo_model
+       attr_accessor :created_by, :creator => true
+     end
+
+    >> Foo3.creator_attribute
+    => :created_by
+
+## set\_search\_columns
+
+Using the `set_search_columns` class function, you may specify which
+columns are searched by the rapid tags that provide searching
+capabilities.
+
+    >>
+     class Post < ActiveRecord::Base
+       set_search_columns :title, :content
+     end
+
+    >> Post.search_columns
+    => ["title", "content"]
+
+If you do not provide the search columns, Hobo defaults to `%w(name
+title body description content profile)`.
+
+## never\_show
+
+`never_show` columns are not displayed in any views that Rapid
+creates.
+
+    >>
+     class Post < ActiveRecord::Base
+       never_show :poster
+     end
+
+    >> Post.never_show?(:poster)
+    => true
+
+# typed\_id
+
+    >> post.typed_id
+    => "post:17"
+
+`typed_id` is a method added to Hobo models that uniquely identifies
+the model in your database.  This is very useful when coupled with
+`Hobo::Model.find_by_typed_id`:
+
+    >> Hobo::Model.find_by_typed_id("post:17")
+    => #<Post id: 17, title: "Hello", content: nil, poster_id: nil>
+
+This is the mechanism that is used to store the current user in the
+session.   It is also used throughout Rapid.
+
+# set\_default\_order
+
+    set_default_order :name
+    set_default_order "name DESC"
+
+This sets the :order option on the finder for the class.
+
+Note that Rails 2.3 has
+[default\_scope](http://ryandaigle.com/articles/2008/11/18/what-s-new-in-edge-rails-default-scoping).
+This may be used instead of `set_default_order`, although currently
+there are many bugs open against `default_scope` in Rails.  See [ticket #395](
+https://hobo.lighthouseapp.com/projects/8324/tickets/395-remove-default_order-once-were-on-rails-23)
+for more information on this issue.
+
+# reverse\_reflection
+
+This is the mechanism that Hobo uses to find a matching association on
+the other model.
+
+    >>
+     class Post < ActiveRecord::Base
+       belongs_to :poster, :class_name => "User", :creator => true
+     end
+    >>
+     class User < ActiveRecord::Base
+       has_many :posts, :foreign_key => "poster_id"
+     end
+    >> migrate
+
+    >> Post.reverse_reflection(:poster).name
+    => :posts
+
+# view\_hints
+
+This provides a shortcut to the corresponding
+[ViewHints](../viewhints) object.
+
+    >> Post.view_hints
+    => PostHints

data/doctest/multi_model_forms.rdoctest

@@ -0,0 +1,273 @@
+Accessible Associations
+{.document-title}
+
+This chapter describes Hobo's support for nested models in forms.
+This is mostly technical background -- beginners should not have to
+read more than the introduction.
+
+Contents
+{.contents-heading}
+
+- contents
+{:toc}
+
+    >> require 'rubygems'
+    >> require 'active_support'
+    >> require 'active_record'
+    >> require 'action_pack'
+    >> require 'action_view'
+    >> require 'action_controller'
+    >> mysql_adapter = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'
+    >> mysql_user = 'root'; mysql_password = ''
+    >> mysql_login = "-u #{mysql_user} --password='#{mysql_password}'"
+    >> mysql_database = "hobofields_doctest"
+    >> system "mysqladmin #{mysql_login} --force drop #{mysql_database} 2> /dev/null"
+    >> system("mysqladmin #{mysql_login} create #{mysql_database}") or raise "could not create database"
+    >> ActiveRecord::Base.establish_connection(:adapter => mysql_adapter,
+                                               :database => mysql_database,
+                                               :host => "localhost", 
+                                               :username => mysql_user, 
+                                               :password => mysql_password)
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobofields/lib')
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobosupport/lib')
+    >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobo/lib')
+    >> require 'will_paginate'
+    >> require 'will_paginate/finder'
+    >> require 'hobosupport'
+    >> require 'hobofields'
+    >> require 'hobo'
+    >> Hobo::Model.enable
+    >> HoboFields.enable
+    >> ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(STDOUT)
+    >>
+     def migrate(renames={})
+       up, down = HoboFields::MigrationGenerator.run(renames)
+       puts up
+       ActiveRecord::Migration.class_eval(up)
+       ActiveRecord::Base.send(:subclasses).each { |model| model.reset_column_information }
+       [up, down]
+     end
+{.hidden}
+
+# Introduction
+
+Using multi-model forms in Hobo is very straightforward:
+
+      has_many :posts, :accessible => true
+
+Once you've done that, the default forms that Hobo builds will use the
+[input-many](/api_tag_defs/input-many) tag.
+
+`:accessible => true` works for `has_many`, `has_many :through` and
+`belongs_to`, but does not work for `has_one` or
+`has_and_belongs_to_many`.
+
+It's quite common to also add the `:dependent => :destroy` flag to
+accessible associations.  This also used to trigger magic in Hobo, but
+this additional magic has been removed and replaced with [View
+Hints](/manual/viewhints).  See the [Rails
+rdoc](http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html)
+for more information on `:dependent => :destroy`.
+
+# Model Support
+
+We'll use rubydoctest to provide our examples for this section.  Here
+are the models:
+
+    >> 
+     class Foo < ActiveRecord::Base
+       hobo_model
+       fields { name :string }
+       has_many :bars, :accessible => true
+     end
+    >> 
+     class Bar < ActiveRecord::Base
+       hobo_model
+       fields { name :string }
+       belongs_to :foo
+     end
+    >> migrate
+
+The `:accessible => true` option patches in
+`Hobo::AccessibleAssociations` to your ActiveRecord model.  It
+modifies the `bars=` writer function to support assigning an array of
+records, an array of hashes, an array of ids, or an empty string.
+
+## Assigning an array of records
+
+The whole array must be assigned -- any records that are not assigned
+are deleted from your association.
+
+    >> bar1 = Bar.new(:name => "bar1")
+    >> bar2 = Bar.new(:name => "bar2")
+    >> foo = Foo.new(:name => "foo1")
+    >> foo.bars = [bar1, bar2]
+    >> foo.bars.*.name
+    => ["bar1", "bar2"]
+    >> foo.save!
+
+    >> foo.bars = [bar2]
+    >> foo.bars.*.name
+    => ["bar2"]
+    >> foo.save!
+
+    >> bar2.foo.name
+    => "foo1"
+    >> bar1.reload
+    >> bar1.foo
+    => nil    
+
+If `:dependent => :destroy` had been set on `has_many :bars`, bar1
+would now be deleted from the database.   Since it hasn't, it still
+exists in the database but has become orphaned.
+
+## Assigning an array of hashes
+
+Assigning an array of hashes maps nicely with how Rails deconstructs
+your URI encoded query string.  For example, your form can return
+
+    foo[bars][0][name]=bar1&foo[bars][0][name]=bar2
+
+which Rails will decode into your params hash as
+
+    >> params = {"foo" => {"bars" => [ {"name" => "bar3"}, {"name" => "bar4"}]}}
+
+With Hobo's accessible associations, the params hash may be directly
+assigned.
+
+    >> foo.attributes = params["foo"]
+    >> foo.bars.*.name
+    => ["bar3", "bar4"]
+    >> foo.save!
+
+Because these parameters did not include an ID, Hobo created new bar
+models.   If you include an ID, Hobo looks up the existing record in
+the database and modifies it with the parameters assigned.
+
+    >> params = {"foo" => {"bars" => [ {:name => "bar3_mod", :id => "#{foo.bars[0].id}"}]}}
+
+    >> old_bar3_id = foo.bars[0].id
+    >> foo.attributes = params["foo"]
+    >> foo.save!
+    >> foo.bars.*.name
+    => ["bar3_mod"]
+    >> foo.bars[0].id == old_bar3_id
+    => true
+
+## Assigning an array of IDs
+
+While [input-many](/api_tag_defs/input-many) returns an array of
+hashes, [select-many](/api_tag_defs/select-many) returns an array of
+ids.  These ids must have an "@" prepended.
+
+    >> params = {"foo" => {"bars" => ["@#{bar1.id}", "@#{bar2.id}"]}}
+    >> foo.attributes = params["foo"]
+    >> foo.save!
+    >> foo.bars.*.name
+    => ["bar1", "bar2"]
+
+## Assigning an empty string
+
+You can remove all elements from the association by assigning an empty
+array:
+
+    >> foo.bars = []
+    >> foo.bars
+    => []
+
+However, there is no way to format a URI query string to make Rails
+construct an empty array in its params hash, so Hobo adds a useful
+shortcut to it's accessible associations:
+
+    >> foo.bars = ""
+    >> foo.bars
+    => []
+
+# View Support
+
+The Rapid tags [input-many](/api_tag_defs/input-many),
+[input-all](/api_tag_defs/input-all),
+[select-many](/api_tag_defs/select-many) and
+[check-many](/api_tag_defs/check-many) all require accessible
+associations.
+
+`input-many` may even be used in a nested fashion:
+
+    <form>
+      <field-list:>
+        <foos-view:>
+          <input-many>
+            <field-list:>
+              <bars-view:>
+                <input-many>
+                </input-many>
+              </bars-view:>
+            </field-list:>
+          </input-many>
+        </foos-view:>
+      </field-list:>
+    </form>
+
+You do not need to use the accessible association tags -- standard
+inputs acquire the correct `name` for use with accessible associations
+when called from the appropriate context.  Here's an example form that
+will work with the example given above in *Model Support*
+
+    <form>
+      <field-list:>
+        <bars-view:>
+          <repeat>
+            <input:name/>
+          </repeat>
+        </bars-view:>
+      <field-list:>
+    </form>
+
+# Controller Support
+
+No special code is required in your controllers to support accessible
+associations, even if you aren't using a Hobo controller.
+
+# Validations
+
+Validations simply work as you'd expect.  The only thing to note is
+that validation errors in a child object will cause the parent
+object to receive an error message of "..." on the association.
+
+# Transactions
+
+Hobo's accessible associations do not do any explicit saves so any new
+child objects are not saved until the parent object is saved.   Rails
+wraps this save in a transaction, so any save is an all or nothing
+deal even though parents and children are saved via different SQL
+statements.
+
+# Rails 2.3 nested models
+
+Rails 2.3 includes a functionality similar to Hobo's accessible
+associations.  The Hobo version is based on an early version of the
+Rails functionality, but unfortunately the Rails version changed
+significantly between the time that the Hobo version was released and
+when Rails 2.3 was released.
+
+For more information on Rails 2.3's `accept_nested_attributes_for`,
+see [the Ruby on Rails
+blog](http://weblog.rubyonrails.org/2009/1/26/nested-model-forms) or
+[Ryan Daigle's blog](http://ryandaigle.com/articles/2009/2/1/what-s-new-in-edge-rails-nested-attributes).
+
+The two versions use a different model:  in Hobo the whole array is
+assigned, allowing add, delete or update via a single mechanism.   In
+rails, there's a different mechanism for adding or deleting objects
+from the association, and there's no method for update.
+
+Each version have their pluses and minuses.  The Hobo version is
+conceptually simpler, but it starts to get unwieldy if there are a
+large number of elements in the association.
+
+Both mechanisms are compatible and may be enabled simultaneously.
+
+It's certainly possible that Rapid >=1.1 will acquire tags that will
+require `accept_nested_attributes_for`.   However, it's unlikely that
+Hobo will drop support for accessible associations unless ActiveRecord
+itself changes significantly.
+

data/doctest/scopes.rdoctest

@@ -80,6 +80,7 @@ And we'll require hobo:
     >> require 'hobofields'
     >> require 'hobo'
     >> Hobo::Model.enable
+    >> HoboFields.enable
 {.hidden}
 
 Let's set up a few models for our testing:

data/dryml_generators/rapid/cards.dryml.erb

@@ -22,7 +22,7 @@ show_title = !show_link && (name_attribute || !has_body)
 model_key = model.name.pluralize.underscore
 -%>
 <def tag="card" for="<%= model.name %>">
-  <card class="<%= model_name :dashed %>" param="default" merge>
+  <card class="<%= model_class %>" param="default" merge>
 <% if name_attribute || show_link || has_actions || !has_body -%>
     <header: param>
 <% if show_link || show_title -%>

data/dryml_generators/rapid/pages.dryml.erb

@@ -21,7 +21,7 @@ model_key = model.name.tableize
 -%>
 
 <def tag="index-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.index.title', :default=>['<%= model_name :plural %>'] }">
+  <page merge title="#{ht '<%= model_key %>.index.title', :default=>['<%= sq_escape(model_name :plural) %>'] }">
     <body: class="index-page <%= model_class %>" param/>
 
     <content: param>
@@ -77,7 +77,7 @@ model_key = model.name.tableize
 
 
 <def tag="new-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.new.title', :default=>['New <%=model_name %>'] }">
+  <page merge title="#{ht '<%= model_key %>.new.title', :default=>[' New <%= sq_escape(model_name) %>'] }">
     <body: class="new-page <%= model_class %>" param/>
 
     <content: param>
@@ -91,7 +91,7 @@ model_key = model.name.tableize
 
       <section param="content-body">
         <form param>
-          <submit: label="#{ht '<%= model_key %>.actions.create', :default=>['Create <%= model_name %>']}"/>
+          <submit: label="#{ht '<%= model_key %>.actions.create', :default=>['Create <%= sq_escape(model_name) %>']}"/>
         </form>
       </section>
     </content:>
@@ -126,7 +126,7 @@ unless model.view_hints.secondary_children.empty?
 end
 -%>
 <def tag="show-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=model_name %>'] }">
+  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=sq_escape model_name %>'] }">
 
     <body: class="show-page <%= model_class %>" param/>
 
@@ -202,7 +202,7 @@ end
                 </h3>
                 <form with="&@<%= collection_class.name.underscore %> || new_for_current_user(@<%= model.name.underscore %>.<%= collection %>)" owner="<%= owner %>" without-cancel param>
                   <field-list: skip="<%= owner %>"/>
-                  <submit: label="#{ht '<%= collection.to_s.pluralize %>.actions.add', :default=>['Add'] }"/>
+                  <submit: label="#{ht '<%= sq_escape collection.to_s.pluralize %>.actions.add', :default=>['Add'] }"/>
                 </form>
               </section>
 <%   end -%>
@@ -251,7 +251,7 @@ end
 name_attribute = model.name_attribute
 -%>
 <def tag="edit-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.edit.title', :default=>['Edit <%=model_name %>'] }">
+  <page merge title="#{ht '<%= model_key %>.edit.title', :default=>['Edit <%= sq_escape model_name %>'] }">
 
     <body: class="edit-page <%= model_class %>" param/>
 
@@ -262,7 +262,7 @@ name_attribute = model.name_attribute
             Edit <type-name/>
           </ht>
         </h2>
-        <delete-button label="#{ht '<%= model_key %>.actions.delete', :default=>['Remove This <%= model_name %>']}" param/>
+        <delete-button label="#{ht '<%= model_key %>.actions.delete', :default=>['Remove This <%= sq_escape model_name %>']}" param/>
       </section>
 
       <section param="content-body">
@@ -290,7 +290,7 @@ new_link = :new.in?(actions)
 -%>
 <def tag="index-for-<%= owner.dasherize %>-page" polymorphic/>
 <def tag="index-for-<%= owner.dasherize %>-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.index_for_owner.title', :default=>['<%=model_name :plural %> for']} #{name :with => @<%= owner %>, :no_wrapper => true}">    
+  <page merge title="#{ht '<%= model_key %>.index_for_owner.title', :default=>['<%= sq_escape(model_name :plural) %> for']} #{name :with => @<%= owner %>, :no_wrapper => true}">    
     <body: class="index-for-owner-page <%= owner.dasherize %> <%= model_class %>" param/>
     <content: param>
       <header param="content-header">
@@ -348,7 +348,7 @@ new_link = :new.in?(actions)
 <% if :new.in? actions -%>
 <def tag="new-for-<%= owner.dasherize %>-page" polymorphic/>
 <def tag="new-for-<%= owner.dasherize %>-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%=model_key %>.new_for_owner.title', :default=>['New <%=model_name %> for']} #{name :with => @<%= owner %>}">
+  <page merge title="#{ht '<%=model_key %>.new_for_owner.title', :default=>['New <%= sq_escape model_name %> for']} #{name :with => @<%= owner %>}">
     <body: class="new-for-owner-page <% owner.dasherize %> <%= model_class %>" param/>
 
     <content: param>
@@ -369,7 +369,7 @@ new_link = :new.in?(actions)
       <section param="content-body">
         <form owner="<%= owner %>" method="post" param>
           <field-list: skip="<%= owner %>"/>
-          <submit: label="#{ht '<%=model_key %>.actions.create', :default=>['Create <%= model_name %>']}"/>
+          <submit: label="#{ht '<%=model_key %>.actions.create', :default=>['Create <%= sq_escape model_name %>']}"/>
         </form>
       </section>
     </content:>
@@ -383,7 +383,7 @@ new_link = :new.in?(actions)
 <def tag="<%= creator.dasherize %>-page" polymorphic/>
 <def tag="<%= creator.dasherize %>-page" for="<%= model.name %>">
   
-  <page title="#{ht '<%=model_key %>.<%= creator.underscore %>.title', :default=>['<%= creator.titleize %>']}" merge>  
+  <page title="#{ht '<%=model_key %>.<%= creator.underscore %>.title', :default=>['<%= sq_escape creator.titleize %>']}" merge>  
 
     <body: class="lifecycle-start-page <%= creator.dasherize %>-page" param/>
 

data/lib/active_record/association_collection.rb

@@ -25,6 +25,16 @@ module ActiveRecord
         record
       end
 
+      # DO NOT call super here - AssociationProxy's version loads the collection, and that's bad.
+      # TODO: this really belongs in Rails; migrate it there ASAP
+      def respond_to?(*args)
+        proxy_respond_to?(*args) || Array.new.respond_to?(*args)
+      end
+
+      # TODO: send this patch into Rails. There's no reason to load the collection just to find out it acts like an array.
+      def is_a?(klass)
+        Array.is_a?(klass)
+      end
 
       def member_class
         proxy_reflection.klass

data/lib/hobo.rb

@@ -16,7 +16,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "0.9.103"
+  VERSION = "0.9.104"
   
   class PermissionDeniedError < RuntimeError; end
 
@@ -220,4 +220,3 @@ module ::Enumerable
   alias_method_chain :group_by, :metadata
 end
 
-Hobo.enable if defined?(Rails)

data/lib/hobo/dryml/dryml_generator.rb

@@ -161,14 +161,19 @@ module Hobo
       def model_name(*options)
         name = :plural.in?(options) ? model.view_hints.model_name_plural : model.view_hints.model_name
         name = name.titleize.downcase                         if :lowercase.in?(options)
-        name = name.underscore.gsub('_', '-').gsub('/', '--') if :dashed.in?(options)
         name = name.camelize                                  if :camel.in?(options)
         name
       end
+
+      # escape single quotes and backslashes for use in a single
+      # quoted string
+      def sq_escape(s)
+        s.gsub(/[\\]/, "\\\\\\\\").gsub(/'/, "\\\\'")
+      end
       
       
       def model_class
-        model_name(:dashed)
+        model.name.underscore.gsub('_', '-').gsub('/', '--')
       end
       
       

data/lib/hobo/dryml/template_environment.rb

@@ -397,7 +397,7 @@ module Hobo::Dryml
                              end
       end
 
-      if param_name == :default && overriding_proc
+      if param_name == :default && overriding_proc && overriding_proc.arity>0
         # :default content is handled specially
 
         call_tag_parameter_with_default_content(the_tag, attributes, parameters[:default], overriding_proc)

data/lib/hobo/model_controller.rb

@@ -449,6 +449,8 @@ module Hobo
     def find_or_paginate(finder, options)
       options = options.reverse_merge(:paginate => request_requires_pagination?)
       do_pagination = options.delete(:paginate) && finder.respond_to?(:paginate)
+      finder = Array.wrap(options.delete(:scope)).inject(finder) { |a, v| a.send(*Array.wrap(v).flatten) }
+
       options[:order] = :default unless options[:order] || finder.send(:scope, :find)._?[:order]
 
       if do_pagination

data/lib/hobo/user.rb

@@ -43,6 +43,7 @@ module Hobo
         attr_accessor :current_password, :password, :password_confirmation, :type => :password
 
         before_save :encrypt_password
+        after_save :stash_current_password
 
         never_show *AUTHENTICATION_FIELDS
 
@@ -148,6 +149,13 @@ module Hobo
       self.crypted_password = encrypt(password)
     end
 
+    # after filter that sets current_password so we can pass
+    # validate_current_password_when_changing_password if you save
+    # again.  See
+    # https://hobo.lighthouseapp.com/projects/8324-hobo/tickets/590
+    def stash_current_password
+      @current_password ||= password
+    end
 
     def changing_password?
       !new_record? && !lifecycle_changing_password? &&

data/rails/init.rb

@@ -0,0 +1,10 @@
+module ::Hobo
+  class << self
+    attr_accessor :rails_initializer
+  end
+end
+::Hobo.rails_initializer = initializer
+
+require File.dirname(__FILE__) + "/../lib/hobo"
+require 'rails_generator'
+Hobo.enable

data/rails_generators/hobo/templates/initializer.rb

@@ -1 +1,2 @@
 Hobo::ModelRouter.reload_routes_on_every_request = true
+# Hobo::Dryml.precompile_taglibs if File.basename($0) != "rake" && Rails.env.production? 

data/rails_generators/hobo_rapid/templates/hobo-rapid.js

@@ -481,9 +481,9 @@ Element.findContaining = function(el, tag) {
     return null;
 }
 
-Element.prototype.childWithClass = function(klass) {
+Element.Methods.childWithClass = function(el, klass) {
     var ret=null;
-    this.childElements().each(function(el2) {
+    el.childElements().each(function(el2) {
         if(ret==null && el2.hasClassName(klass)) ret=el2;
     });
     return ret;
@@ -570,6 +570,14 @@ new HoboBehavior("ul.input-many", {
   },
 
   initialize: function(ul) {
+      /* the second clause should be sufficient, but it isn't in IE7.  See bug 603  */
+      $$(".input-many-template input:hidden, .input-many-template select:hidden, .input-many-template textarea:hidden, .input-many-template button:hidden").each(function(input) {
+          if(!input.disabled) {
+              input.disabled = true;
+              input.addClassName("input_many_template_input");
+          }
+      });
+
       // disable all elements inside our template, and mark them so we can find them later.
       $$(".input-many-template input:enabled, .input-many-template select:enabled, .input-many-template textarea:enabled, .input-many-template button:enabled").each(function(input) {
           input.disabled = true;
@@ -611,7 +619,7 @@ new HoboBehavior("ul.input-many", {
 
   // given this==an input-many item, get the submit index
   getIndex: function() {
-      return Number(this.id.match(/\[([0-9])+\]$/)[1]);
+      return Number(this.id.match(/\[([-0-9]+)\]$/)[1]);
   },
 
   /* For some reason, select() and down() and all those useful functions aren't working for us.  Roll our own replacement. */
@@ -627,6 +635,11 @@ new HoboBehavior("ul.input-many", {
       Event.stop(ev);
       var ul = el.up('ul.input-many'), li = el.up('li.input-many-li');
 
+      if(li.id.search(/\[-1\]/)>=0) {
+          /* if(console) console.log("IE7 messed up again (bug 605)"); */
+          return;
+      }
+
       var template = ul.down("li.input-many-template");
       var clone = $(template.cloneNode(true));
       clone.removeClassName("input-many-template");
@@ -652,7 +665,12 @@ new HoboBehavior("ul.input-many", {
       // do the add with anim
       clone.setStyle("display", "none")
       li.insert({after: clone});
-      new Effect.BlindDown(clone, {duration: 0.3})
+      new Effect.BlindDown(clone, {duration: 0.3, afterFinish: function(ef) {
+          Event.addBehavior.reload();
+
+          ul.fire("rapid:add", { element: clone });
+          ul.fire("rapid:change", { element: clone });
+      }});
 
       // visibility
       if(li.hasClassName("empty")) {
@@ -664,11 +682,6 @@ new HoboBehavior("ul.input-many", {
           li.childWithClass("buttons").childWithClass("add-item").addClassName("hidden");
       }
       
-      Event.addBehavior.reload();
-
-      ul.fire("rapid:add", { element: clone })
-      ul.fire("rapid:change", { element: clone })
-
       return;
   },
 
@@ -678,7 +691,12 @@ new HoboBehavior("ul.input-many", {
       var ul = el.up('ul.input-many'), li = el.up('li.input-many-li')
       var minimum = parseInt(Hobo.getClassData(ul, 'minimum'));
 
-      ul.fire("rapid:remove", { element: li })
+      if(li.id.search(/\[-1\]/)>=0) {
+          /* if(console) console.log("IE7 messed up again (bug 605)"); */
+          return;
+      }
+
+      if(ul.fire("rapid:remove", { element: li }).stopped) return;
 
       // rename everybody from me onwards
       var i=this.getIndex.call(li)
@@ -708,11 +726,11 @@ new HoboBehavior("ul.input-many", {
       }
 
       new Effect.BlindUp(li, { duration: 0.3, afterFinish: function (ef) {
+          ul.fire("rapid:change")
           li.remove() 
       } });
 
-      ul.fire("rapid:change")
-  },
+  }
 
 
 

data/taglibs/rapid_core.dryml

@@ -36,11 +36,11 @@
        input_attrs = {:no_edit => no_edit} if tag == "input"
     -%>
       <labelled-item unless="&tag == 'input' && no_edit == 'skip' && !can_edit?">
-        <item-label param="#{this_field.to_s.sub('?', '')}-label" unless="&field_name.blank?">
+        <item-label param="#{scope.field_name.to_s.sub('?', '').sub('.', '-')}-label" unless="&field_name.blank?">
           <do param="label"><%= field_name %></do>
         </item-label>
-        <item-value param="#{this_field.to_s.sub('?', '')}-view" colspan="&2 if field_name.blank?">
-          <do param="view"><call-tag tag="&tag" param="#{this_field.to_s.sub('?', '')}-tag" merge-attrs="&input_attrs"/></do>
+        <item-value param="#{scope.field_name.to_s.sub('?', '').sub('.', '-')}-view" colspan="&2 if field_name.blank?">
+          <do param="view"><call-tag tag="&tag" param="#{scope.field_name.to_s.sub('?', '').sub('.', '-')}-tag" merge-attrs="&input_attrs"/></do>
           <div param="input-help" if="&tag.to_sym == :input && !this_field_help.blank?"><%= this_field_help %></div>
         </item-value>
       </labelled-item>
@@ -119,7 +119,7 @@ This will use `<input/>` as the tag in each table cell instead of `<view/>`
               class="#{scope.even_odd} #{this_type.name.underscore} #{model_id_class}">
             <if test="&fields">
               <with-fields merge-attrs="&all_attributes & attrs_for(:with_fields)" force-all>
-                <td param="#{this_field.to_s.sub('?', '').gsub('.', '-')}-view"><call-tag tag="&field_tag"/></td>
+                <td param="#{scope.field_name.to_s.sub('?', '').gsub('.', '-')}-view"><call-tag tag="&field_tag"/></td>
               </with-fields>
               <td class="controls" param="controls" if="&all_parameters[:controls]">
                 <a param="edit-link" action="edit" if="&can_edit?"><ht key="hobo.action.edit">Edit</ht></a>
@@ -616,5 +616,6 @@ The context should be a user object. If `this == current_user` the "you" form is
                first-option="Guest" options="&user.all(:limit => 30).*.login"
                onchange="location.href = '#{dev_support_path}/set_current_user?login=' + this.options[this.selectedIndex].value"
                selected="#{current_user.login}"
-               class="dev-user-changer"/>
+               class="dev-user-changer"
+               merge-attrs/>
 </def>

data/taglibs/rapid_forms.dryml

@@ -118,7 +118,21 @@ AJAX based submission can be enabled by simply adding an `update` attribute. e.g
  - reset-form: Clear the form after submission (only makes sense for ajax forms)
  
  - refocus-form: Refocus the first form-field after submission (only makes sense for ajax forms)
-   
+
+### Parameters
+
+The standard form tag does not have any parameters, nor does it have any default content.   However, Hobo does autogenerate polymorphic form tags for each of your models into `app/views/taglibs/auto/rapid/forms.dryml`.  These forms have the following parameters:
+
+ - error-messages
+
+ - field-list
+ 
+ - actions
+
+ - submit
+
+ - cancel
+
 -->
 <def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner, multipart"><%= 
   ajax_attrs, html_attrs = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
@@ -436,7 +450,7 @@ procedure call.
 The URL that the call is POSTed to is the `object_url` of `this`, plus the method name
 
 `<remote-method-button>` supports all of the standard ajax attributes (see the main taglib documention for Rapid
-Forms). If any ajax attributes are given, the button becomes an ajax button, if not,
+Forms). If any ajax attributes are given, the button becomes an ajax button, if not, Rails' `button_to` is used, which behaves similarly to a standard link.
 
 ### Attributes 
 
@@ -910,8 +924,33 @@ A fully worked up example of nested hjq-input-many's may be found in [agility/jq
 
  - `template`: the default values for new items.  Normally this functionality is better provided by Model.new, but it's here if you need it.
 
+### Events
+
+ - `rapid:add`: fired after the element is inserted.  `memo.element`
+ is set to the new element inserted.
+
+ - `rapid:remove`: fired before the element is
+ inserted. `memo.element` is set to the element to be deleted.  The
+ removal may be cancelled by stopping the event.
+
+ - `rapid:change`: fired after an element has been removed or
+ inserted.  `memo.element` set as above.
+
+Example javascript:
+
+      var last_added;
+      var last_removed;
+      Event.addBehavior({
+        '.stories:rapid:add' : function(ev) {
+          last_added = ev.memo.element;
+        },
+        '.stories:rapid:remove' : function(ev) {
+          if(!confirm("really?")) ev.stop();
+        }
+      });
+
   -->
-<def tag="input-many" attrs="minimum, fields, skip, template, add-hook, remove-hook" polymorphic >
+<def tag="input-many" attrs="minimum, fields, skip, template" polymorphic >
 <%
 # helper function to create id's on buttons to facilitate testing
 def underize(s)
@@ -922,7 +961,7 @@ end
   <% template ||= this.try.new_candidate || this.member_class.new %>
   <% minimum ||= 0 ; minimum = minimum.to_i %>
   <% skip ||= this.proxy_reflection.klass.reflect_on_all_associations.detect {|p| p.primary_key_name==this.proxy_reflection.primary_key_name}.try.name.to_s if this.respond_to? :proxy_reflection %>           
-  <ul class="input-many #{this_field.dasherize} #{css_data :input_many_prefix, param_name_for_this} #{css_data(:minimum, minimum)} #{css_data(:add_hook, add_hook) if add_hook} #{css_data(:remove_hook, remove_hook) if remove_hook}">
+  <ul class="input-many #{this_field.dasherize} #{css_data :input_many_prefix, param_name_for_this} #{css_data(:minimum, minimum)}">
     <fake-field-context fake-field="-1" context="&template">
       <li class="input-many-li input-many-template" id="#{param_name_for_this}">
         <div class="input-many-item" param="default">

data/taglibs/rapid_summary.dryml

@@ -129,8 +129,7 @@
 
 <!-- repeats on the plugins used by the application -->
 <def tag="with-plugins">
-  <%  fi = Hobo::FakeInitializer.new(Rails.configuration)
-      plugins = Rails.configuration.plugin_loader.new(fi).plugins %>
+  <% plugins = Rails.configuration.plugin_loader.new(Hobo.rails_initializer).plugins %>
   <repeat with="&plugins">
     <do param="default" />
   </repeat>

data/taglibs/rapid_support.dryml

@@ -44,11 +44,13 @@ This tag is in need of a review - it's a bit funky.
   field_names -= comma_split(skip) if skip
   field_names = field_names.select {|f| can_view?(this, f)} unless force_all
   field_names.each do |field| 
+    %><set-scoped field-name="&field"><%
     if field == "this"
       %><do param="default"/><%
     else
       %><with field="&field"><do param="default"/></with><%
     end
+    %></set-scoped><%
   end
 %></def>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.9.103
+  version: 0.9.104
 platform: ruby
 authors: 
 - Tom Locke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -05:00
+date: 2010-01-21 00:00:00 -05:00
 default_executable: hobo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.103
+        version: 0.9.104
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobofields
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.103
+        version: 0.9.104
     version: 
 description: 
 email: tom@tomlocke.com
@@ -68,11 +68,12 @@ files:
 - bin/hobo
 - doctest/hobo/hobo_helper.rdoctest
 - doctest/hobo/lifecycles.rdoctest
+- doctest/model.rdoctest
+- doctest/multi_model_forms.rdoctest
 - doctest/scopes.rdoctest
 - dryml_generators/rapid/cards.dryml.erb
 - dryml_generators/rapid/forms.dryml.erb
 - dryml_generators/rapid/pages.dryml.erb
-- init.rb
 - lib/action_view_extensions/helpers/tag_helper.rb
 - lib/active_record/association_collection.rb
 - lib/active_record/association_proxy.rb
@@ -104,7 +105,6 @@ files:
 - lib/hobo/dryml/template.rb
 - lib/hobo/dryml/template_environment.rb
 - lib/hobo/dryml/template_handler.rb
-- lib/hobo/fake_initializer.rb
 - lib/hobo/find_for.rb
 - lib/hobo/generator.rb
 - lib/hobo/guest.rb
@@ -135,6 +135,7 @@ files:
 - lib/hobo/user.rb
 - lib/hobo/user_controller.rb
 - lib/hobo/view_hints.rb
+- rails/init.rb
 - rails_generators/hobo/USAGE
 - rails_generators/hobo/hobo_generator.rb
 - rails_generators/hobo/templates/application.css

data/init.rb

@@ -1,2 +0,0 @@
-require File.dirname(__FILE__) + "/lib/hobo"
-require 'rails_generator'

data/lib/hobo/fake_initializer.rb

@@ -1,14 +0,0 @@
-# really what we want is a reference to the Initializer used in
-# config/boot.rb.  But since we can't monkey patch that file, we'll
-# use a fake instead.
-
-# this is used by the rapid_summary tag with_plugins
-module Hobo
-  class FakeInitializer
-    attr_reader :configuration
-    
-    def initialize(config = Rails.configuration)
-      @configuration = config
-    end
-  end
-end