hobo 0.8.5 → 0.8.6

data/lib/hobo/dryml/template.rb

@@ -193,7 +193,7 @@ module Hobo::Dryml
     def set_element(el)
       assigns = el.attributes.map do |name, value|
         next if name.in?(SPECIAL_ATTRIBUTES)
-        dryml_exception("invalid name in <set>", el) unless name =~ /^#{DRYML_NAME}(\.#{DRYML_NAME})*$/
+        dryml_exception("invalid name in <set> (remember to use '-' rather than '_')", el) unless name =~ /^#{DRYML_NAME}(\.#{DRYML_NAME})*$/
         "#{ruby_name name} = #{attribute_to_ruby(value)}; "
       end.join
       code = apply_control_attributes("begin; #{assigns}; end", el)
@@ -203,7 +203,7 @@ module Hobo::Dryml
 
     def set_scoped_element(el)
       variables = el.attributes.map do |name, value|
-        dryml_exception("invalid name in <set-scoped>", el) unless name =~ DRYML_NAME_RX
+        dryml_exception("invalid name in <set-scoped> (remember to use '-' rather than '_')", el) unless name =~ DRYML_NAME_RX
         ":#{ruby_name name} => #{attribute_to_ruby(value)} "
       end
       "<% scope.new_scope(#{variables * ', '}) { #{tag_newlines(el)} %>#{children_to_erb(el)}<% } %>"
@@ -367,7 +367,7 @@ module Hobo::Dryml
         # reproduce any line breaks in the start-tag so that line numbers are preserved
         tag_newlines(el) + "%>" +
         wrap_tag_method_body_with_metadata(children_to_erb(el)) +
-        "<% _erbout; end"
+        "<% output_buffer; end"
     end
 
 
@@ -576,7 +576,7 @@ module Hobo::Dryml
              end
 
       call = apply_control_attributes(call, el)
-      call = maybe_make_part_call(el, "<% _output(#{call}) %>")
+      call = maybe_make_part_call(el, "<% concat(#{call}) %>")
       wrap_tag_call_with_metadata(el, call)
     end
 
@@ -678,7 +678,7 @@ module Hobo::Dryml
     def before_parameter_tag_hash_item(name, el, metadata_name)
       param_name = get_param_name(el)
       dryml_exception("param declaration not allowed on 'before' parameters", el) if param_name
-      content = children_to_erb(el) + "<% _output(#{param_restore_local_name(name)}.call({}, {})) %>"
+      content = children_to_erb(el) + "<% concat(#{param_restore_local_name(name)}.call({}, {})) %>"
       ":#{ruby_name name}_replacement => #{replace_parameter_proc(el, metadata_name, content)}"
     end
 
@@ -686,7 +686,7 @@ module Hobo::Dryml
     def after_parameter_tag_hash_item(name, el, metadata_name)
       param_name = get_param_name(el)
       dryml_exception("param declaration not allowed on 'after' parameters", el) if param_name
-      content = "<% _output(#{param_restore_local_name(name)}.call({}, {})) %>" + children_to_erb(el)
+      content = "<% concat(#{param_restore_local_name(name)}.call({}, {})) %>" + children_to_erb(el)
       ":#{ruby_name name}_replacement => #{replace_parameter_proc(el, metadata_name, content)}"
     end
 
@@ -851,7 +851,7 @@ module Hobo::Dryml
         end
 
         output_tag = "element(:#{el.name}, #{attrs}, new_context { %>#{body}<% })"
-        "<% _output(" + apply_control_attributes(output_tag, el) + ") %>"
+        "<% concat(" + apply_control_attributes(output_tag, el) + ") %>"
       end
     end
 

data/lib/hobo/dryml/template_environment.rb

@@ -240,24 +240,13 @@ module Hobo::Dryml
     end
 
 
-    def _erbout
-      @_erb_output
-    end
-
-
-    def _output(s)
-      @_erb_output.concat(s)
-    end
-
-
     def new_context
-      ctx = [ @_erb_output,
-              @_this, @_this_parent, @_this_field, @_this_type,
-              @_form_field_path ]
-      @_erb_output = ""
+      ctx = [ @_this, @_this_parent, @_this_field, @_this_type,
+              @_form_field_path, @_form_field_paths_by_object ]
       @_this_type = nil
-      res = yield
-      @_erb_output, @_this, @_this_parent, @_this_field, @_this_type, @_form_field_path = ctx
+      res = nil
+      @view.with_output_buffer { res = yield }
+      @_this, @_this_parent, @_this_field, @_this_type, @_form_field_path, @_form_field_paths_by_object = ctx
       res.to_s
     end
 
@@ -374,7 +363,7 @@ module Hobo::Dryml
 
 
     def call_tag_parameter_with_default_content(the_tag, attributes, default_content, overriding_content_proc)
-      if the_tag.is_a?(String, Symbol) && the_tag.to_s.in?(Hobo.static_tags)
+      if the_tag.is_one_of?(String, Symbol) && the_tag.to_s.in?(Hobo.static_tags)
         body = if overriding_content_proc
                  new_context { overriding_content_proc.call(proc { default_content._?.call(nil) }) }
                elsif default_content
@@ -451,7 +440,7 @@ module Hobo::Dryml
 
       default_content = parameters[:default]
 
-      if the_tag.is_a?(String, Symbol) && the_tag.to_s.in?(Hobo.static_tags)
+      if the_tag.is_one_of?(String, Symbol) && the_tag.to_s.in?(Hobo.static_tags)
         body = if overriding_default_content
                  new_context { overriding_default_content.call(proc { default_content.call(nil) if default_content }) }
                elsif default_content
@@ -470,7 +459,7 @@ module Hobo::Dryml
           parameters = parameters.merge(:default => d) 
         end
 
-        if the_tag.is_a?(String, Symbol)
+        if the_tag.is_one_of?(String, Symbol)
           # It's a defined DRYML tag
           send(the_tag, attributes, parameters)
         else
@@ -508,7 +497,7 @@ module Hobo::Dryml
               params[:default] =
                 if general_parameters[:default]
                   proc do |default|
-                    overriding_default.call(proc { new_context { _output(general_parameters[:default].call(default)) } } )
+                    overriding_default.call(proc { new_context { concat(general_parameters[:default].call(default)) } } )
                   end
                 else
                   proc do |default|
@@ -598,8 +587,8 @@ module Hobo::Dryml
             else
               "<#{name}#{attr_string}>#{content}</#{name}>"
             end
-      if block && eval("defined? _erbout", block.binding) # in erb context
-        _output(res)
+      if block_called_from_erb? block
+        concat res
       else
         res
       end

data/lib/hobo/dryml/template_handler.rb

@@ -60,24 +60,41 @@ module ActionController
       text = call_dryml_tag(tag, attributes)
       text && render({:text => text, :layout => false }.merge(options))
     end
-
-
+    
     # DRYML fallback tags -- monkey patch this method to attempt to render a tag if there's no template
-    def render_for_file_with_dryml(template_path, status = nil, layout = nil, locals = {})
-      render_for_file_without_dryml(template_path, status, layout, locals)
-    rescue ActionView::MissingTemplate => ex
-      # Try to use a DRYML <page> tag instead
-      tag_name = @dryml_fallback_tag || "#{File.basename(template_path).dasherize}-page"
-
-      text = call_dryml_tag(tag_name)
-      if text
-        render_for_text text, status 
+    def render_for_file_with_dryml(template, status = nil, layout = nil, locals = {})
+      # in rails 2.2, "template" is actually "template_path"
+      
+      # if we're passed a MissingTemplateWrapper, see if there's a
+      # dryml tag that will render the page
+      if template.respond_to? :original_template_path
+        # this is the Rails 2.3 path
+        tag_name = @dryml_fallback_tag || "#{File.basename(template.original_template_path).dasherize}-page"
+        
+        text = call_dryml_tag(tag_name)
+        if text
+          return render_for_text text, status 
+        else
+          template.raise_wrapped_exception
+        end
       else
-        raise ex
+        begin
+          result = render_for_file_without_dryml(template, status, layout, locals)
+        rescue ActionView::MissingTemplate => ex
+          # this is the Rails 2.2 path
+          tag_name = @dryml_fallback_tag || "#{File.basename(template).dasherize}-page"
+          
+          text = call_dryml_tag(tag_name)
+          if text
+            return render_for_text text, status 
+          else
+            raise ex
+          end
+        end
       end
     end
     alias_method_chain :render_for_file, :dryml
-
+      
   end
 end
 
@@ -96,22 +113,74 @@ class ActionView::Template
   # from trying to compile our template. DRYML templates are each compiled as a class, not just a method,
   # so the support for compiling templates that Rails provides is innadequate.
   def render_dryml(view, local_assigns = {})
-    stack = view.instance_variable_get(:@_render_stack)
-    stack.push(self)
+    if view.instance_variable_defined?(:@_render_stack)
+      # Rails 2.2
+      stack = view.instance_variable_get(:@_render_stack)
+      stack.push(self)
+ 
+      # This is only used for TestResponse to set rendered_template
+      unless is_a?(ActionView::InlineTemplate) || view.instance_variable_get(:@_first_render)
+        view.instance_variable_set(:@_first_render, self)
+      end
 
-    # This is only used for TestResponse to set rendered_template
-    unless is_a?(ActionView::InlineTemplate) || view.instance_variable_get(:@_first_render)
-      view.instance_variable_set(:@_first_render, self)
+      view.send(:_evaluate_assigns_and_ivars)
+      view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
+ 
+      result = Hobo::Dryml::TemplateHandler.new.render_for_rails22(self, view, local_assigns)
+ 
+      stack.pop
+      result
+    else
+      # Rails 2.3      
+      compile(local_assigns)
+
+      view.with_template self do
+        view.send(:_evaluate_assigns_and_ivars)
+        view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
+        
+        Hobo::Dryml::TemplateHandler.new.render_for_rails22(self, view, local_assigns)      
+      end
     end
+  end
+  
+end
 
-    view.send(:_evaluate_assigns_and_ivars)
-    view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
+# this is only used in Rails 2.3
+class MissingTemplateWrapper
+  attr_reader :original_template_path
+  
+  def initialize(exception, path)
+    @exception = exception
+    @original_template_path = path
+  end
 
-    result = Hobo::Dryml::TemplateHandler.new.render_for_rails22(self, view, local_assigns)
+  def method_missing(*args)
+    raise @exception
+  end
 
-    stack.pop
-    result
+  def render
+    raise @exception
   end
+end
   
-end  
-    
+    
+module ActionView
+  class PathSet < Array
+    # this is only used by Rails 2.3
+    def find_template_with_dryml(original_template_path, format = nil, html_fallback = true)
+      begin
+        find_template_without_dryml(original_template_path, format, html_fallback)
+      rescue ActionView::MissingTemplate => ex
+        # instead of throwing the exception right away, hand back a
+        # time bomb instead.  It'll blow if mishandled...
+        return MissingTemplateWrapper.new(ex, original_template_path)
+      end
+    end
+
+    if instance_methods.include? "find_template"
+      # only rails 2.3 has this function
+      alias_method_chain :find_template, :dryml
+    end
+  end
+end
+        

data/lib/hobo/find_for.rb

@@ -33,13 +33,13 @@ module Hobo
             #    result
             #  end
             #}
-            
+
             self.class.class_eval %{
               def #{name}
                 Hobo::FindFor::Finder.new(self, '#{name}', :#{collection_name}, :#{anchor_association_name})
               end
             }
-            
+
             return send(name, *args)
           end
         end

data/lib/hobo/hobo_helper.rb

@@ -124,7 +124,7 @@ module Hobo
       elsif obj.is_a? Hobo::RawJs
         "#{name}=' + #{obj} + '"
       else
-        v = if obj.is_a?(ActiveRecord::Base) or obj.is_a?(Array)
+        v = if obj.is_one_of?(ActiveRecord::Base, Array)
               "@" + typed_id(obj)
             else
               obj.to_s.gsub("'"){"\\'"}
@@ -286,7 +286,7 @@ module Hobo
         else
           object = this
         end
-      elsif args.first.is_a?(String, Symbol)
+      elsif args.first.is_one_of?(String, Symbol)
         object = this
         field  = args.first
       else
@@ -305,11 +305,11 @@ module Hobo
       
       @can_view_cache ||= {}
       @can_view_cache[ [object, field] ] ||=
-        if !object.respond_to?(:viewable_by)
+        if !object.respond_to?(:viewable_by?)
           true
         elsif object.viewable_by?(current_user, field)
           # If possible, we also check if the current *value* of the field is viewable
-          if field.is_a?(Symbol, String) && (v = object.send(field)) && v.respond_to?(:viewable_by?)
+          if field.is_one_of?(Symbol, String) && (v = object.send(field)) && v.respond_to?(:viewable_by?)
             v.viewable_by?(current_user, nil)
           else
             true
@@ -320,7 +320,6 @@ module Hobo
     end
     
 
-
     def select_viewable(collection=this)
       collection.select {|x| can_view?(x)}
     end
@@ -351,7 +350,7 @@ module Hobo
 
 
     def param_name_for(path)
-      field_path = field_path.to_s.split(".") if field_path.is_a?(String, Symbol)
+      field_path = field_path.to_s.split(".") if field_path.is_one_of?(String, Symbol)
       attrs = path.rest.map{|part| "[#{part.to_s.sub /\?$/, ''}]"}.join
       "#{path.first}#{attrs}"
     end
@@ -382,7 +381,11 @@ module Hobo
 
     def new_for_current_user(model_or_assoc=nil)
       model_or_assoc ||= this
-      model_or_assoc.user_new(current_user)
+      if model_or_assoc.respond_to?(:new_candidate)
+        model_or_assoc.user_new_candidate(current_user)
+      else
+        model_or_assoc.user_new(current_user)
+      end
     end
 
 
@@ -439,6 +442,7 @@ module Hobo
       result
     end
 
+
     def linkable?(*args)
       options = args.extract_options!
       target = args.empty? || args.first.is_a?(Symbol) ? this : args.shift
@@ -462,37 +466,33 @@ module Hobo
       Hobo::ModelRouter.linkable?(klass, action, options.reverse_merge(:subsite => subsite))
     end
     
+    
     def css_data(name, *args)
       "#{name.to_s.dasherize}::#{args * '::'}"
     end
-    
-
-    # Convenience helper for the default app
+        
 
-    # FIXME: this should interrogate the routes to find index methods, not the models
-    def front_models
-      Hobo::Model.all_models.select {|m| linkable?(m) }
-    end
-    
+    # --- ViewHint Helpers --- #
     
-    def this_field_name
-      this_parent.class.view_hints.field_name(this_field)
+    def this_field_name     
+      this_parent.class.try.view_hints.try.field_name(this_field) || this_field
     end
 
     def this_field_help
-      this_parent.class.view_hints.field_help[this_field.to_sym]
+      this_parent.class.try.view_hints.try.field_help[this_field.to_sym]
     end
 
 
-    # debugging support
+    # --- Debugging Helpers ---- #
 
     def abort_with(*args)
-      raise args.map{|arg| PP.pp(arg, "")}.join("-------\n")
+      raise args.*.pretty_inspect.join("-------\n")
     end
 
     def log_debug(*args)
+      return if not logger
       logger.debug("\n### DRYML Debug ###")
-      logger.debug(args.map {|a| PP.pp(a, "")}.join("-------\n"))
+      logger.debug(args.*.pretty_inspect.join("-------\n"))
       logger.debug("DRYML THIS = #{this.typed_id rescue this.inspect}")
       logger.debug("###################\n")
       args.first unless args.empty?

data/lib/hobo/include_in_save.rb

@@ -19,10 +19,13 @@ module Hobo
           added = false
           records.each do |record|
             # we want to call valid? on each one, but only add the error to self once
-            unless record.valid?
-              unless added
-                errors.add association, "..."
-                added = true
+            
+            record.with_acting_user(acting_user) do
+              unless record.valid?
+                unless added
+                  errors.add association, "..."
+                  added = true
+                end
               end
             end
           end
@@ -35,7 +38,8 @@ module Hobo
       if included_in_save
         included_in_save.each_pair do |association, records|
           records.each do |record|
-            record.save_without_validation # This means without transactions too
+            # save_without_validation means without transactions too
+            record.with_acting_user(acting_user) { record.save_without_validation }
           end
         end
       end

data/lib/hobo/lifecycles/transition.rb

@@ -20,7 +20,7 @@ module Hobo
 
 
       def extract_attributes(attributes)
-        update_attributes = options.fetch(:update, [])
+        update_attributes = options.fetch(:params, [])
         attributes & update_attributes
       end
         
@@ -50,7 +50,7 @@ module Hobo
 
 
       def parameters
-        options[:update] || []
+        options[:params] || []
       end