hobo 0.8.2 → 0.8.3

data/CHANGES.txt

@@ -1,3 +1,134 @@
+=== Hobo 0.8.3 ===
+
+Hobo models -- improvements to logic for validating passwords. Closes #281
+
+Hobo users -- simpler definition of account_active?
+
+    This assumes the user has the default lifecycle or similar. If the lifecycle is cusomtised this method can be overridden
+
+Lifecycles -- Make current creator/transition available as lifecycle.active_step
+
+Lifecycles -- user a safer name for methods to test if the lifecycle is in a given state
+
+  Now record.lifecycle.is_active? instead of record.lifecycle.active?
+
+Lifecycles -- become method should not polute AR namespace (use lifecycle.become)
+
+Models -- to_param should always return a string. Closes #280
+
+Rapid -- <login-page> -- "remember me" is now on by default
+
+Fixed typo in <forgot-password-page>. Thanks to Jakub Suder
+
+Fixes and Clean theme improvements for site-wide live-search. Closes #290
+
+Removing hobo_spec - test will live in hobo/test, hobofields/test as is normal
+
+Adding close button (also, keyboard = ESC) to live-search popup
+
+Models -- classes for polymorphic assciations (e.g. Tagging::ble) are now automatically created instead of blowing up when
+calling reflection.klass. Closes #83
+
+Removed nicedit - we've moved to a plugin based system for rich editors now (see github.com/tablatom/hoboyui)
+
+Rapid -- the select menus in <select-many> now observe conditions applied to the has_many :through
+
+Rapid -- fix to double-escaping of names in <select-one>
+
+merge-attrs on <section-group>
+
+Rapid -- added if-present attribute to <name> to supress the nil-view if there is no name
+
+  Used in <name-one> to ensure the input box is blank
+
+Improved support for validation in multi-model-forms
+
+Added support for owner actions where the owner is a has_many :through (was only for :belongs_to owners)
+
+Rapid -- improvements to index-for-owner page
+
+Rapid -- renamed <card> parameter from 'description' to 'content'
+
+Rapid -- adding multipart attribute to <form>. Usage: <form multipart>
+
+Model Controller -- fix to :redirect option for hobo actions
+
+DRYML -- fix to dom_id helper when this_parent is a collection
+
+Model Controller -- improved remember_page_path to also remember the query string
+
+Rapid - fix to <remote-method-button> -- the confirm attribute was incorrectly changing the button into an ajax button
+
+Rapid -- <select-menu> now supports an array of label/value pairs, like the options_for_select helper
+
+Model Controller -- Now remembers the previous page path in the session and uses this to fix a problem with 
+<after-submit stay-here/> (occured after a validation error)
+
+New tag <input-all> for situations where you want input for every item in an existing collection (without the +/- buttons that
+<input-many> has)
+
+HoboSupport -- enum.rest now returns [] for an empty enumerable (was nil)
+
+Rapid + DRYML -- recfactoring the way DRYML keep track of which form field names.
+
+  It's now possible to track these for a sub-object by setting a new scoped variable form_field_names
+
+Rapid -- enhancements to <name-one>:
+
+ - sensible defaults for complete-target and completer
+   (you can now use <name-one> as a drop-in replacement for <select-one>
+
+ - The <name> of the referenced object is included in the input box if there is one
+
+Rapid -- improved grammar (use of 'a' or 'an') in <select-many>
+
+Model controller autocompleter enhancement -- you can ommit the name of the autocompleter, in which case it defaults to the
+model's name_attribute
+
+Hobo Model -- more robust handling of date hashes
+
+Support in Rapid and javascript for <input-many>
+
+  It's now very easy to embed form fields for items in a has_many collection.
+  These use javascript + and - buttons, but this does not use ajax.
+
+Hobo models -- improved support for mass assignment to has_many associations.
+
+    Any has_many association can now be assigned a hash. The keys are *only* for ordering purposes.
+    The values are themsleves hashes of attributes.
+    New records are created for any such hash that has no :id key
+
+Hobo model -- fix to has_one extension (was discarding the block)
+
+DRYML - New behaviour for context_map (repeat):
+  this_field is now the index (0 based) when iterating over a collection.
+  New helpers (HoboHelper) first_item? and last_item?
+
+DRYML - fix to loading of nested taglibs
+
+Rapid user pages -- don't show forgot-password link if the route is not present
+
+<empty-collection-message> should use <div> instead of <p>, otherwise block level elements won't be allowed inside and Firefox
+will sometimes treat them as if they are outside
+
+Rapid page generators -- added param to <field-names-where-true> on <show-page>
+
+DRYML - fix to using <extend> in a taglib included by a taglib
+
+Migration generator -- convert spaces to _ when responding to rename questions
+
+Rapid user pages -- made forgot-password link a param
+
+hobo_model generator -- formatting improvement
+
+Model Controller -- new :redirect option for controller actions
+
+Use the rails 'pick_template' mechanism to determine the correct template path when rendering a DRYML view
+
+Rapid generators -- adding missing <error-messages/> tags to lifecycle forms
+
+
+
 === Hobo 0.8.2 ===
 
 Hobo models -- improvement to name-in-URL (#to_param)

data/Manifest

@@ -45,6 +45,7 @@ lib/hobo/lifecycles/lifecycle.rb
 lib/hobo/lifecycles/state.rb
 lib/hobo/lifecycles/transition.rb
 lib/hobo/lifecycles.rb
+lib/hobo/mass_assignment.rb
 lib/hobo/model.rb
 lib/hobo/model_controller.rb
 lib/hobo/model_router.rb
@@ -96,8 +97,6 @@ rails_generators/hobo_rapid/templates/hobo-rapid.css
 rails_generators/hobo_rapid/templates/hobo-rapid.js
 rails_generators/hobo_rapid/templates/IE7.js
 rails_generators/hobo_rapid/templates/lowpro.js
-rails_generators/hobo_rapid/templates/nicedit.js
-rails_generators/hobo_rapid/templates/nicEditorIcons.gif
 rails_generators/hobo_rapid/templates/reset.css
 rails_generators/hobo_rapid/templates/themes/clean/public/images/fieldbg.gif
 rails_generators/hobo_rapid/templates/themes/clean/public/images/pencil.png

data/Rakefile

@@ -42,11 +42,11 @@ Echoe.new('hobo') do |p|
   p.project = "hobo"
 
   p.changelog = "CHANGES.txt"
-  p.version   = "0.8.2"
+  p.version   = "0.8.3"
 
   p.dependencies = [
-    'hobosupport >=0.8.2',
-    'hobofields >=0.8.2',
+    'hobosupport >=0.8.3',
+    'hobofields >=0.8.3',
     'rails >=2.1',
     'mislav-will_paginate >=2.2.1']
     

data/dryml_generators/rapid/cards.dryml.erb

@@ -37,7 +37,7 @@ has_body    = (!show_link && content_attribute) || creator_link || creator_attri
 <% if has_body -%>
     <body: param>
 <% if !show_link && content_attribute -%>
-      <view:<%= content_attribute %> param="description"/>
+      <view:<%= content_attribute %> param="content"/>
 <% end -%>
 <% if creator_link -%>
       <a:<%= creator_attribute %> param="creator-link"/>

data/dryml_generators/rapid/forms.dryml.erb

@@ -7,7 +7,7 @@ cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
 -%>
 <def tag="form" for="<%= model.name %>">
   <form merge param="default">
-    <error-messages/>
+    <error-messages param/>
     <field-list fields="<%= form_fields * ', ' %>" param/>
     <div param="actions">
       <submit label="Save" param/><or-cancel param="cancel"/>
@@ -20,6 +20,7 @@ cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
 <def tag="<%= creator.name.dasherize %>-form" polymorphic/>
 <def tag="<%= creator.name.dasherize %>-form" for="<%= model.name %>">
   <form lifecycle="<%= creator.name %>">
+    <error-messages param/>
     <field-list fields="<%= creator.parameters * ', ' %>" param/>
     <div param="actions">
       <submit label="<%= creator.name.titleize %>" param/><or-cancel param="cancel"/>
@@ -32,6 +33,7 @@ cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
 <def tag="<%= transition.name.dasherize %>-form" polymorphic/>
 <def tag="<%= transition.name.dasherize %>-form" for="<%= model.name %>">
   <form lifecycle="<%= transition.name %>">
+    <error-messages param/>
     <input type="hidden" name="key" value="&this.lifecycle.provided_key" if="&this.lifecycle.provided_key"/>
     <field-list fields="<%= transition.parameters * ', ' %>" param/>
     <div param="actions">

data/dryml_generators/rapid/pages.dryml.erb

@@ -97,7 +97,7 @@ end
         <h2 param="heading"><name/></h2>
 <% if boolean_fields.any? -%>
 
-        <field-names-where-true fields="<%= boolean_fields * ', ' %>"/>        
+        <field-names-where-true fields="<%= boolean_fields * ', ' %>" param/>
 <% end -%>
 <% if creator_link -%>
 
@@ -176,8 +176,10 @@ name_attribute = model.name_attribute
 <%
 collection_name = model.reverse_reflection(owner).name.to_s
 owner_model     = model.reflections[owner].klass
-owner_tag       = linkable?(owner_model, :show) ? "a" : "name"
-owner    = owner.to_s
+linkable_owner  = linkable?(owner_model, :show)
+owner_tag       = linkable_owner ? "a" : "name"
+
+owner = model.reflections[owner].macro == :has_many ? owner.to_s.singularize : owner.to_s
 -%>
 <% if :index.in? actions -%>
 <%
@@ -185,13 +187,14 @@ 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="<%= model_name :title, :plural %> for #{name :with => @<%= owner %>}">
+  <page merge title="<%= model_name :title, :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">
-        <div param="back-to">Back to <a with="&@<%= owner %>"/></div>
+        <% if linkable_owner %><div param="back-to">Back to <a with="&@<%= owner %>"/></div><% end %>
         <h2 param="heading"><%= model_name :title, :plural %></h2>
+        <h3 param="subheading">For: <<%= owner_tag %> with="&@<%= owner %>"/></h3>
 
         <p param="count" if>There <count prefix="are"/></p>
       </header>

data/hobo.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Hobo-0.8.2
+# Gem::Specification for Hobo-0.8.3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Tom Locke
 autorequire: 
 bindir: bin
 
-date: 2008-09-14 00:00:00 +01:00
+date: 2008-10-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.2
+        version: 0.8.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobofields
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.2
+        version: 0.8.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -104,6 +104,7 @@ extra_rdoc_files:
 - lib/hobo/lifecycles/state.rb
 - lib/hobo/lifecycles/transition.rb
 - lib/hobo/lifecycles.rb
+- lib/hobo/mass_assignment.rb
 - lib/hobo/model.rb
 - lib/hobo/model_controller.rb
 - lib/hobo/model_router.rb
@@ -174,6 +175,7 @@ files:
 - lib/hobo/lifecycles/state.rb
 - lib/hobo/lifecycles/transition.rb
 - lib/hobo/lifecycles.rb
+- lib/hobo/mass_assignment.rb
 - lib/hobo/model.rb
 - lib/hobo/model_controller.rb
 - lib/hobo/model_router.rb
@@ -225,8 +227,6 @@ files:
 - rails_generators/hobo_rapid/templates/hobo-rapid.js
 - rails_generators/hobo_rapid/templates/IE7.js
 - rails_generators/hobo_rapid/templates/lowpro.js
-- rails_generators/hobo_rapid/templates/nicedit.js
-- rails_generators/hobo_rapid/templates/nicEditorIcons.gif
 - rails_generators/hobo_rapid/templates/reset.css
 - rails_generators/hobo_rapid/templates/themes/clean/public/images/fieldbg.gif
 - rails_generators/hobo_rapid/templates/themes/clean/public/images/pencil.png
@@ -296,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - "="
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "1.2"
   version: 

data/lib/active_record/association_collection.rb

@@ -34,7 +34,8 @@ module ActiveRecord
 
 
       def proxy_respond_to_with_automatic_scopes?(method, include_priv = false)
-        proxy_respond_to_without_automatic_scopes?(method, include_priv) || create_automatic_scope(method)
+        proxy_respond_to_without_automatic_scopes?(method, include_priv) ||
+          (@reflection.klass.create_automatic_scope(method) if @reflection.klass.respond_to?(:create_automatic_scope))
       end
       alias_method_chain :proxy_respond_to?, :automatic_scopes
 
@@ -42,7 +43,9 @@ module ActiveRecord
       private
 
         def set_reverse_association(object)
-          if @owner.new_record? && (refl = @owner.class.reverse_reflection(@reflection.name))
+          if @owner.new_record? &&
+              (refl = @owner.class.reverse_reflection(@reflection.name)) &&
+              refl.macro == :belongs_to
             bta = ActiveRecord::Associations::BelongsToAssociation.new(object, refl)
             bta.replace(@owner)
             object.instance_variable_set("@#{refl.name}", bta)

data/lib/active_record/association_reflection.rb

@@ -2,10 +2,19 @@ class ActiveRecord::Reflection::AssociationReflection
 
   alias_method :association_name, :name
 
-  def safe_class
-    klass
-  rescue NameError
-    nil
+  def klass_with_create_polymorphic_class
+    if options[:polymorphic]
+      begin
+        klass_without_create_polymorphic_class
+      rescue NameError => e
+        name = "#{active_record.name}::#{class_name}"
+        Object.class_eval "class #{name}; end"
+        active_record.const_get class_name
+      end
+    else
+      klass_without_create_polymorphic_class
+    end
   end
-  
+  alias_method_chain :klass, :create_polymorphic_class
+
 end

data/lib/hobo.rb

@@ -26,7 +26,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 
   class RawJs < String; end
 

data/lib/hobo/controller.rb

@@ -133,14 +133,15 @@ module Hobo
       tag_renderer.send(name, options)
     end
     
-
+    NO_SEARCH_RESULTS_HTML = "<p>Your search returned no matches.</p>"
     def site_search(query)
-      results = Hobo.find_by_search(query).select{|r| Hobo.can_view?(current_user, r, nil)}
-      if results.empty?
-        render :text => "<p>Your search returned no matches.</p>"
+      results_hash = Hobo.find_by_search(query)
+      all_results = results_hash.values.flatten.select { |r| Hobo.can_view?(current_user, r, nil) }
+      if all_results.empty?
+        render :text => NO_SEARCH_RESULTS_HTML
       else
         # TODO: call one tag that renders all the search results with headings for each model
-        render_tags(results.map {|r|r.last}.flatten, :search_card, :for_type => true)
+        render_tags(all_results, :search_card, :for_type => true)
       end
     end
 

data/lib/hobo/dryml.rb

@@ -79,16 +79,16 @@ module Hobo
           make_renderer_class("", page, local_names, DEFAULT_IMPORTS, included_taglibs)
         @tag_page_renderer_classes[controller_class.name].new(page, view)
       else
-        template_path = "app/views/" + page + ".dryml"
-        src_file = File.join(RAILS_ROOT, template_path)
-        mtime = File.mtime(src_file)
+        template_path = view.finder.pick_template(page, "dryml")
+ 
+        mtime = File.mtime(template_path)
         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 < mtime)                           # cache out of date?
-          renderer_class = make_renderer_class(File.read(src_file), template_path, local_names,
+          renderer_class = make_renderer_class(File.read(template_path), template_path, local_names,
                                                DEFAULT_IMPORTS, included_taglibs)
           renderer_class.load_time = mtime
           @renderer_classes[page] = renderer_class

data/lib/hobo/dryml/taglib.rb

@@ -67,13 +67,17 @@ module Hobo
         @module = Module.new do
 
           @tag_attrs = {}
-          @tag_aliases = {}
+          @tag_aliases = []
 
           class << self
 
             def included(base)
               @tag_aliases.each do |tag, feature|
-                base.send(:alias_method_chain, tag, feature)
+                if base.respond_to? :alias_method_chain_on_include
+                  base.alias_method_chain_on_include tag, feature
+                else
+                  base.send(:alias_method_chain, tag, feature)
+                end
               end
             end
 
@@ -83,7 +87,7 @@ module Hobo
             attr_reader :tag_attrs
 
             def alias_method_chain_on_include(tag, feature)
-              @tag_aliases[tag] = feature
+              @tag_aliases << [tag, feature]
             end
 
           end

data/lib/hobo/dryml/template_environment.rb

@@ -136,7 +136,7 @@ module Hobo::Dryml
     def dom_id(object=nil, attribute=nil)
       if object.nil?
         # nothing passed -- use context
-        if this_parent && this_field
+        if this_parent && this_field && !this_parent.respond_to?(:member_class)
           object, attribute = this_parent, this_field
         else
           object = this
@@ -316,17 +316,17 @@ module Hobo::Dryml
     def with_form_context
       @_form_this = this
       @_form_field_path = []
-      @_form_field_names = []
       @_form_field_paths_by_object = { @_form_this => [] }
-      res = yield
-      field_names = @_form_field_names
-      @_form_this = @_form_field_path = @_form_field_names = @_form_field_paths_by_object = nil
-      [res, field_names]
+      res = scope.new_scope :in_form => true, :form_field_names => [] do
+        yield
+      end
+      @_form_this = @_form_field_path = @_form_field_paths_by_object = nil
+      res
     end
 
 
     def register_form_field(name)
-      @_form_field_names << name
+      scope.form_field_names << name
     end