hobo 0.7.4 → 0.7.5

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

@@ -2,20 +2,47 @@ module Hobo::Dryml::Parser
   
   class Document < REXML::Document        
     
-    attr_accessor :default_attribute_value
-    
-    def initialize(source=nil, context={})
-      super(nil, context)
+    def initialize(source, path)
+      super(nil)
+      
+      # Replace <%...%> scriptlets with xml-safe references into a hash of scriptlets
+      @scriptlets = {}
+      source = source.gsub(/<%(.*?)%>/m) do
+        _, scriptlet = *Regexp.last_match
+        id = @scriptlets.size + 1
+        @scriptlets[id] = scriptlet
+        newlines = "\n" * scriptlet.count("\n")
+        "[![DRYML-ERB#{id}#{newlines}]!]"
+      end
+      
+      
+      @reference_src = "<dryml_page>" + source + "</dryml_page>"
+      rex_src = Hobo::Dryml::Parser::Source.new(@reference_src)
+        
       @elements = Hobo::Dryml::Parser::Elements.new(self)
-      if source.kind_of? Document
-        @context = source.context
-        super source
-      else
-        build(  source )
-      end 
+      build(rex_src)
+      
+    rescue REXML::ParseException => e
+      raise DrymlSyntaxError, "File: #{path}\n#{e}"
+    end
+    
+    
+    def element_line_num(el)
+      offset = el.source_offset
+      @reference_src[0..offset].count("\n") + 1
+    end
+    
+    
+    def default_attribute_value
+      "&true"
     end
     
+    
+    def restore_erb_scriptlets(src)
+      src.gsub(/\[!\[DRYML-ERB(\d+)\s*\]!\]/m) {|s| "<%#{@scriptlets[$1.to_i]}%>" }
+    end
 
+    
     private
     def build( source )
       Hobo::Dryml::Parser::TreeParser.new( source, self ).parse

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

@@ -89,30 +89,14 @@ module Hobo::Dryml
 
     
     def process_src
-      # Replace <%...%> scriptlets with xml-safe references into a hash of scriptlets
-      @scriptlets = {}
-      src = @src.gsub(/<%(.*?)%>/m) do
-        _, scriptlet = *Regexp.last_match
-        id = @scriptlets.size + 1
-        @scriptlets[id] = scriptlet
-        newlines = "\n" * scriptlet.count("\n")
-        "[![HOBO-ERB#{id}#{newlines}]!]"
-      end
-
-      @xmlsrc = "<dryml_page>" + src + "</dryml_page>"
-      begin
-        @doc = Hobo::Dryml::Parser::Document.new(Hobo::Dryml::Parser::Source.new(@xmlsrc))
-      rescue REXML::ParseException => e
-        raise DrymlSyntaxError, "File: #{@template_path}\n#{e}"
-      end
-      @doc.default_attribute_value = "&true"
-      
-      restore_erb_scriptlets(children_to_erb(@doc.root))
+      @doc = Hobo::Dryml::Parser::Document.new(@src, @template_path)
+      result = children_to_erb(@doc.root)
+      restore_erb_scriptlets(result)
     end
 
 
     def restore_erb_scriptlets(src)
-      src.gsub(/\[!\[HOBO-ERB(\d+)\s*\]!\]/m) {|s| "<%#{@scriptlets[$1.to_i]}%>" }
+      @doc.restore_erb_scriptlets(src)
     end
 
     
@@ -896,8 +880,7 @@ module Hobo::Dryml
     end
 
     def element_line_num(el)
-      offset = el.source_offset
-      @xmlsrc[0..offset].count("\n") + 1
+      @doc.element_line_num(el)
     end
 
     def tag_newlines(el)

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

@@ -455,7 +455,7 @@ module Hobo::Dryml
         res = (send(method_name, attributes) + part_contexts_javascripts).strip
 
         # TODO: Temporary hack to get the dryml metadata comments in the right place
-        if RAILS_ENV == "development"
+        if false && RAILS_ENV == "development"
           res.gsub(/^(.*?)(<!DOCTYPE.*?>).*?(<html.*?>)/m, "\\2\\3\\1") 
         else
           res

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

@@ -39,16 +39,24 @@ module ActionController
       @dryml_fallback_tag = tag_name
     end
     
-    def render_tag(tag, options={}, render_options={})
+    
+    def call_dryml_tag(tag, options={})
       add_variables_to_assigns
       
+      # TODO: Figure out what this bit is all about :-)
       if options[:with]
         @this = options[:with] unless options[:field]
       else
         options[:with] = dryml_context
       end
       
-      text = Hobo::Dryml.render_tag(@template, tag, options)
+      Hobo::Dryml.render_tag(@template, tag, options)
+    end
+    
+    
+    # TODO: This is namespace polution, should be called render_dryml_tag
+    def render_tag(tag, options={}, render_options={})
+      text = call_dryml_tag(tag, options)
       text && render({:text => text, :layout => false }.merge(render_options))
     end
 

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

@@ -8,6 +8,13 @@ module Hobo
     end
      
     protected
+    
+    
+    def uid
+      @hobo_uid ||= 0
+      @hobo_uid += 1
+    end
+    
      
     def current_user
       # simple one-hit-per-request cache

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

@@ -78,8 +78,6 @@ module Hobo
         send("find_by_#{name_attribute}", *args)
       end
       
-      alias_method :[], :named
-      
       
       def field_added(name, type, args, options)
         self.name_attribute            = name.to_sym if options.delete(:name)
@@ -291,17 +289,20 @@ module Hobo
       
       
       def manage_join_records(association)
-        through = reflections[association].through_reflection
-        source  = reflections[association].source_reflection
         
         method = "manage_join_records_for_#{association}"
         after_save method
         class_eval %{
           def #{method}
-            current = #{through.name}.*.#{source.name}
-            to_delete = current - #{association}
-            to_add    = #{association} - current
-            #{through.klass.name}.delete_all(["#{through.primary_key_name} = ? and #{source.primary_key_name} in (?)", 
+            assigned = #{association}.dup
+            current = #{association}.reload
+              
+            through = #{association}.proxy_reflection.through_reflection
+            source  = #{association}.proxy_reflection.source_reflection
+
+            to_delete = current - assigned
+            to_add    = assigned - current
+            through.klass.delete_all(["\#{through.primary_key_name} = ? and \#{source.primary_key_name} in (?)", 
                                              self.id, to_delete.*.id]) if to_delete.any?
             to_add.each { |record| #{association} << record }
           end
@@ -363,7 +364,7 @@ module Hobo
     
 
     def user_view(user, field=nil)
-      raise PermissionDeniedError unless Hobo.can_view?(user, self, field)
+      raise PermissionDeniedError, self.inspect unless Hobo.can_view?(user, self, field)
     end
     
     
@@ -511,9 +512,13 @@ module Hobo
     
     def convert_associated_records_for_mass_assignment(reflection, value)
       if reflection.macro.in?([:belongs_to, :has_one])
-        if value.is_a?(String) && value.starts_with?('@')
-          # TODO: This @foo_1 feature is rarely (never?) used - get rid of it
-          Hobo.object_from_dom_id(value[1..-1])
+        if value.is_a?(String)
+          if value.starts_with?('@')
+            # TODO: This @foo_1 feature is rarely (never?) used - get rid of it
+            Hobo.object_from_dom_id(value[1..-1])
+          else
+            reflection.klass.named(value)
+          end
         else
           value
         end
@@ -521,7 +526,7 @@ module Hobo
         if reflection.klass.try.name_attribute
           value.map do |x| 
             if x.is_a?(String) 
-              reflection.klass[x] unless x.blank?
+              reflection.klass.named(x) unless x.blank?
             else
               x
             end

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

@@ -6,7 +6,7 @@ module Hobo
 
     VIEWLIB_DIR = "taglibs"
     
-    PAGINATE_FORMATS = [ Mime::HTML, Mime::ALL ]
+    DONT_PAGINATE_FORMATS = [ Mime::CSV, Mime::YAML, Mime::JSON, Mime::XML, Mime::ATOM, Mime::RSS ]
     
     READ_ONLY_ACTIONS  = [:index, :show]
     WRITE_ONLY_ACTIONS = [:create, :update, :destroy]
@@ -17,9 +17,12 @@ module Hobo
       def included(base)
         base.class_eval do 
           @auto_actions ||= {}
+
+          inheriting_cattr_reader :web_methods => [], :show_actions => [], :index_actions => []
           
           extend ClassMethods
           
+          
           helper_method :model, :current_user
           before_filter :set_no_cache_headers
           
@@ -30,7 +33,6 @@ module Hobo
           alias_method_chain :render, :hobo_model
 
         end
-        base.template_path_cache = {}        
 
         Hobo::Controller.included_in_class(base)
       end
@@ -42,25 +44,12 @@ module Hobo
 
       attr_writer :model
       
-      attr_accessor :template_path_cache      
-
-      def web_methods
-        @web_methods ||= superclass.respond_to?(:web_methods) ? superclass.web_methods : []
-      end
-      
-      
-      def show_actions
-        @show_actions ||= superclass.respond_to?(:show_actions) ? superclass.show_actions : []
-      end
-      
-      
-      def index_actions
-        @index_actions ||= superclass.respond_to?(:index_actions) ? superclass.index_actions : []
-      end
-      
-      
       def collections
-        # By default, all has_many associations are published
+        # FIXME The behaviour here is weird if the superclass does
+        # define collections *and* this class adds some more. The
+        # added ones won't be published
+        
+        # by default By default, all has_many associations are published
         @collections ||= if superclass.respond_to?(:collections)
                            superclass.collections
                          else
@@ -74,10 +63,15 @@ module Hobo
       end
       
       
-      def autocomplete_for(field, options={})
-        options = options.reverse_merge(:limit => 15)
-        index_action "complete_#{field}" do
-          hobo_completions(model.limit(options[:limit]).send("#{field}_contains", params[:query]))
+      def autocomplete(name, options={}, &block)
+        options = options.dup
+        field = options.delete(:field) || name
+        if block
+          index_action "complete_#{name}", &block
+        else
+          index_action "complete_#{name}" do
+            hobo_completetions name, model, options
+          end
         end
       end
 
@@ -121,7 +115,7 @@ module Hobo
           end
         end
         
-        @auto_actions -= except_actions
+        @auto_actions -= except_actions.flatten
         
         def_auto_actions
       end
@@ -255,10 +249,8 @@ module Hobo
     # --- Action implementation helpers --- #
     
 
-    def find_instance(*args)
-      options = args.extract_options!
-      id = args.first || params[:id]
-      model.user_find(current_user, id, options)
+    def find_instance(options={})
+      model.user_find(current_user, params[:id], options)
     end
     
     
@@ -279,17 +271,20 @@ module Hobo
     end
     
     
-    def destination_after_submit(record=nil)
+    def destination_after_submit(record=nil, destroyed=false)
       record ||= this
       
+      after_submit = params[:after_submit]
+      
       # The after_submit post parameter takes priority
-      params[:after_submit] || 
+      (after_submit == "stay-here" ? :back : after_submit) || 
+        
         
         # Then try the record's show page
-        object_url(@this) || 
+        (!destroyed && object_url(@this)) || 
         
         # Then the show page of the 'owning' object if there is one
-        (@this.class.default_dependent_on && object_url(@this.send(@this.class.default_dependent_on))) ||
+        (!destroyed && (@this.class.default_dependent_on && object_url(@this.send(@this.class.default_dependent_on)))) ||
         
         # Last try - the index page for this model
         object_url(@this.class) ||
@@ -312,21 +307,14 @@ module Hobo
     
     
     def request_requires_pagination?
-      # Internet explorer has a penchant for saying it would mostly
-      # like an image, if you clicked on an image link
-      request.format.in?(PAGINATE_FORMATS) || request.format.to_s =~ %r(image/)
+      request.format.not_in?(DONT_PAGINATE_FORMATS)
     end
     
     
     def find_or_paginate(finder, options)
       options = options.reverse_merge(:paginate => request_requires_pagination?)
-      do_pagination = options.delete(:paginate)
+      do_pagination = options.delete(:paginate) && finder.respond_to?(:paginate)
       
-      if do_pagination && !finder.respond_to?(:paginate)
-        do_pagination = false
-        logger.warn "Hobo::ModelController: Pagination is not available. To enable, please install will_paginate or a duck-type compatible paginator"
-      end
-
       if do_pagination
         finder.paginate(options.reverse_merge(:page => params[:page] || 1))
       else
@@ -388,7 +376,7 @@ module Hobo
         if valid?
           respond_to do |wants|
             wants.html { redirect_to destination_after_submit }
-            wants.js   { hobo_ajax_response || render(:text => "") }
+            wants.js   { hobo_ajax_response || render(:nothing => true) }
           end
         else
           respond_to do |wants|
@@ -404,7 +392,7 @@ module Hobo
     def hobo_update(*args, &b)
       options = args.extract_options!
       
-      self.this ||= args.first || find_instance
+      self.this = args.first || find_instance
       changes = options[:attributes] || attribute_parameters
       this.user_save_changes(current_user, changes)
 
@@ -428,7 +416,7 @@ module Hobo
             wants.js do
               if in_place_edit_field
                 # Decreasingly hacky support for the scriptaculous in-place-editor
-                new_val = Hobo::Dryml.render_tag(@template, "view", :field => in_place_edit_field, :no_wrapper => true)
+                new_val = call_dryml_tag("view", :field => in_place_edit_field, :no_wrapper => true)
                 hobo_ajax_response(this, :new_field_value => new_val)
               else
                 hobo_ajax_response(this)
@@ -451,7 +439,7 @@ module Hobo
     
     def hobo_destroy(*args, &b)
       options = args.extract_options!
-      self.this ||= args.first || find_instance
+      self.this = args.first || find_instance
       this.user_destroy(current_user)
       flash[:notice] = "The #{model.name.titleize.downcase} was deleted" unless request.xhr?
       destroy_response(&b)
@@ -461,7 +449,7 @@ module Hobo
     def destroy_response(&b)
       response_block(&b) or
         respond_to do |wants|
-          wants.html { redirect_to(:action => "index") }
+          wants.html { redirect_to destination_after_submit(this, true) }
           wants.js   { hobo_ajax_response || render(:nothing => true) }
         end
     end
@@ -490,9 +478,12 @@ module Hobo
     end
     
 
-    def hobo_completions(finder)
+    def hobo_completions(attribute, finder, options={})
+      options = options.reverse_merge(:limit => 10, :param => :query)
+      finder = finder.limit(options[:limit]) unless finder.scope(:find, :limit)
+      finder = finder.send("#{attribute}_contains", params[options[:param]])
       items = finder.find(:all)
-      render :text => "<ul>\n" + items.map {|i| "<li>#{i.send(attr)}</li>\n"}.join + "</ul>"
+      render :text => "<ul>\n" + items.map {|i| "<li>#{i.send(attribute)}</li>\n"}.join + "</ul>"
     end
     
     
@@ -506,11 +497,11 @@ module Hobo
     
     
     # --- Response helpers --- #
-
     
     def permission_denied(error)
-      if respond_to? :permission_denied_response
-        permission_denied_response
+      self.this = nil # Otherwise this gets sent user_view
+      if :permission_denied.in?(superclass.instance_methods)
+        super
       else
         respond_to do |wants|
           wants.html do
@@ -529,8 +520,8 @@ module Hobo
     
     
     def not_found(error)
-      if respond_to? :not_found_response
-        not_found_response
+      if :not_found_response.in?(superclass.instance_methods)
+        super
       elsif render_tag("not-found-page", {}, :status => 404)
         # cool
       else