hobo 0.5.3 → 0.6

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

@@ -6,7 +6,7 @@ module Hobo
 
     class PermissionDeniedError < RuntimeError; end
 
-    VIEWLIB_DIR = "hobolib"
+    VIEWLIB_DIR = "taglibs"
     
     GENERIC_PAGE_TAGS = [:index, :show, :new, :edit, :show_collection, :new_in_collection]
 
@@ -16,17 +16,13 @@ module Hobo
         base.extend(ClassMethods)
         base.helper_method(:find_partial, :model, :current_user)
 
-        Hobo::ControllerHelpers.public_instance_methods.each {|m| base.hide_action(m)}
-
         for collection in base.collections
           add_collection_actions(base, collection.to_sym)
         end
 
         base.before_filter :set_no_cache_headers
-
-        base.class_eval do
-          alias_method_chain :redirect_to, :object_url
-        end
+        
+        Hobo::Controller.included_in_class(base)
       end
 
       def find_partial(klass, as)
@@ -36,7 +32,8 @@ module Hobo
 
       def template_path(dir, name, is_partial)
         fileRx = is_partial ? /^_#{name}\.[^.]+/ : /^#{name}\.[^.]+/
-        unless Dir.entries("#{RAILS_ROOT}/app/views/#{dir}").grep(fileRx).empty?
+        full_dir = "#{RAILS_ROOT}/app/views/#{dir}"
+        unless !File.exists?(full_dir) || Dir.entries(full_dir).grep(fileRx).empty?
           return "#{dir}/#{name}"
         end
       end
@@ -131,7 +128,7 @@ module Hobo
       def show_action(*names)
         show_actions.concat(names)
         for name in names
-          class_eval "def #{name}; show; end"
+          class_eval "def #{name}; hobo_show; end"
         end
       end
       
@@ -201,7 +198,7 @@ module Hobo
     def hobo_index(options = {})
       options = LazyHash.new(options)
       @model = model
-      @this = options[:collection] || paginated_find
+      @this = options[:collection] || paginated_find(options)
 
       instance_variable_set("@#{@model.name.pluralize.underscore}", @this)
       if block_given?
@@ -216,15 +213,18 @@ module Hobo
       options = extract_options_from_args!(args)
       
       total_number = options.delete(:total_number)
-      if args.empty?
-        total_number ||= count_with_data_filter
-      else
-        owner, collection_name = args
-        @association = collection_name.to_s.split(".").inject(owner) { |m, name| m.send(name) }
-        total_number ||= @association.size
-        @reflection = @association.proxy_reflection
+      @association = options.delete(:association) or
+        if args.any?
+          owner, collection_name = args
+          @association = collection_name.to_s.split(".").inject(owner) { |m, name| m.send(name) }
+        end
+        
+      if @association
+        total_number ||= @association.count
+        @reflection = @association.proxy_reflection if @association.respond_to?(:proxy_reflection)
       end
       
+      total_number ||= count_with_data_filter
       page_size = options.delete(:page_size) || 20
       page = options.delete(:page) || params[:page]
       @pages = ::ActionController::Pagination::Paginator.new(self, total_number, page_size, page)
@@ -237,7 +237,7 @@ module Hobo
       if @association
         @association.find(:all, options, &b)
       else
-        options[:order] = :default
+        options[:order] ||= :default
         find_with_data_filter(options, &b)
       end
     end
@@ -262,7 +262,8 @@ module Hobo
       if @this
         if Hobo.can_view?(current_user, @this)
           set_named_this!
-          block_given? ? yield : hobo_render
+          yield if block_given?
+          hobo_render unless performed?
         else
           permission_denied(options)
         end
@@ -273,40 +274,41 @@ module Hobo
     def hobo_new(options={})
       options = LazyHash.new(options)
       @this = options[:this] || model.new
-      @this.created_by(current_user) unless options.has_key?(:set_creator) && !options[:set_creator]
+      @this.set_creator(current_user) unless options.has_key?(:set_creator) && !options[:set_creator]
       
       if Hobo.can_create?(current_user, @this)
         set_named_this!
-        block_given? ? yield : hobo_render
+        yield if block_given?
+        hobo_render unless performed?
       else
         permission_denied(options)
       end
     end
     
-    
+
     def hobo_create(options={})
       options = LazyHash.new(options)
       
-      @this = (options[:this] || 
-               begin
-                 attributes = params[model.name.underscore]
-                 type_attr = params['type']
-                 create_model = if 'type'.in?(model.column_names) and 
-                                    type_attr and type_attr.in?(model.send(:subclasses).omap{name})
-                                  type_attr.constantize
-                                else
-                                  model
-                                end
-                 this = create_model.new
-                 @check_create_permission = [this]
-                 initialize_from_params(this, attributes)
-                 for obj in @check_create_permission
-                   permission_denied(options) and return unless Hobo.can_create?(current_user, obj)
-                 end
-                 @check_create_permission = nil
-                 this
-               end)
-
+      if (@this = options[:this])
+        permission_denied(options) and return unless Hobo.can_create?(current_user, @this)
+      else
+        attributes = params[model.name.underscore]
+        type_attr = params['type']
+        create_model = if 'type'.in?(model.column_names) and 
+                           type_attr and type_attr.in?(model.send(:subclasses).omap{name})
+                         type_attr.constantize
+                       else
+                         model
+                       end
+        @this = create_model.new
+        @check_create_permission = [@this]
+        initialize_from_params(@this, attributes)
+        for obj in @check_create_permission
+          permission_denied(options) and return unless Hobo.can_create?(current_user, obj)
+        end
+        @check_create_permission = nil
+      end
+      
       set_named_this!
       if @this.save
         if block_given?
@@ -375,8 +377,9 @@ module Hobo
               overridable_response(options, :js_response) do
                 if changes.size == 1
                   # Decreasingly hacky support for the scriptaculous in-place-editor
-                  new_val = Hobo::Dryml.render_tag(@template, "show",
-                                                   :obj => @this, :attr => changes.keys.first, :no_span => true)
+                  new_val = Hobo::Dryml.render_tag(@template, "view",
+                                                   :with => @this, :field => changes.keys.first,
+                                                   :no_wrapper => true)
                   hobo_ajax_response(@this, :new_field_value => new_val)
                 else
                   hobo_ajax_response(@this)
@@ -457,8 +460,8 @@ module Hobo
       permission_denied(options) and return unless Hobo.can_view?(current_user, @owner, collection)
       
       @association = options[:collection] || @owner.send(collection)
-      @this = options[:this] || @association.new_without_appending
-      @this.created_by(current_user) unless options.has_key?(:set_creator) && !options[:set_creator]
+      @this = options[:this] || @association.new
+      @this.set_creator(current_user) unless options.has_key?(:set_creator) && !options[:set_creator]
 
       permission_denied(options) and return unless Hobo.can_create?(current_user, @this)
       
@@ -533,7 +536,7 @@ module Hobo
         true
       else
         if page_kind.in? GENERIC_PAGE_TAGS
-          render_tag("#{page_kind}_page", :obj => @this)
+          render_tag("#{page_kind.to_s.camelize}Page", :with => @this)
           true
         else
           false
@@ -586,7 +589,7 @@ module Hobo
 
     def initialize_from_params(obj, params)
       update_with_params(obj, params)
-      obj.created_by(current_user)
+      obj.set_creator(current_user)
       (@check_create_permission ||= []) << obj
       obj
     end
@@ -627,7 +630,9 @@ module Hobo
 
 
     def param_to_value(field_type, value)
-      if field_type <= Date
+      if field_type.nil?
+        value
+      elsif field_type <= Date
         if value.is_a? Hash
           Date.new(*(%w{year month day}.map{|s| value[s].to_i}))
         elsif value.is_a? String
@@ -640,6 +645,8 @@ module Hobo
         elsif value.is_a? String
           parse_datetime(value)
         end
+      elsif field_type <= TrueClass
+        (value.is_a?(String) && value.strip.downcase.in?(['0', 'false']) || value.blank?) ? false : true
       else
         # primitive field
         value

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

@@ -1,3 +1,5 @@
 class Hobo::PasswordString < String
+  
+  COLUMN_TYPE = :string
 
 end

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

@@ -0,0 +1,75 @@
+module ::Hobo::Plugins
+  class HoboPlugin
+
+    def initialize(opt=nil)
+      @opt = opt || Hash.new
+      set_up_options(self.class::PLUGIN_DEFAULTS)
+
+      send @opt[:setup_using] || :default
+    end
+
+    def set_up_options(*defaults)
+      @opt = @opt.reverse_merge(*defaults)
+      make_variations(self.class::PLUGIN_SYMBOLS)
+    end
+
+    def make_variations(h)
+      h.each do |name|
+        if @opt[name] && @opt[name] != false
+          # start with :product_category
+        
+          # add :product_categories
+          @opt[name.to_s.pluralize.to_sym] = @opt[name].to_s.pluralize.to_sym 
+
+          # :ProductCategory
+          @opt[name.to_s.camelize.to_sym] = @opt[name].to_s.camelize.to_sym 
+
+          # :ProductCategories
+          @opt[name.to_s.camelize.pluralize.to_sym] = @opt[name].to_s.camelize.pluralize.to_sym 
+        
+          # :ProductCategoriesController
+          @opt[(name.to_s.camelize.pluralize+'Controller').to_sym] =
+            (@opt[name].to_s.camelize.pluralize+'Controller').to_sym
+        else
+          @opt[name.to_s.pluralize.to_sym] = false
+        end
+      end
+    end
+
+    def hobo_model(name, &b)
+      make_class @opt[name], ActiveRecord::Base do
+        hobo_model
+        class_eval &b if b
+      end
+    end
+
+    def resource_controller(name, &b)
+      make_class @opt[name], ApplicationController do
+        hobo_model_controller
+        
+        class_eval &b if b
+      end
+    end
+  
+    def make_class(class_name, base_class, &b)
+      opt = @opt
+      c = Class.new(base_class)
+      silence_warnings { Object.const_set(class_name, c) }
+      c.class_eval do
+        @plugin_opt = opt
+        def self.sym
+          @plugin_opt
+        end
+        def self.has_feature(name)
+          !@plugin_opt[name].nil? && @plugin_opt[name] != false
+        end
+        def sym
+          self.class.sym
+        end
+      end
+      c.class_eval &b if b
+      c
+    end
+    
+  end    
+end

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

@@ -0,0 +1,98 @@
+module Hobo::RapidHelper
+
+  def options_for_hobo_ajax(options)
+    js_options = build_callbacks(options)
+
+    js_options['asynchronous']  = false if options[:type] == :synchronous
+    js_options['method']        = method_option_to_s(options[:method]) if options[:method]
+    js_options['evalScripts']   = false if options[:script] == false
+    js_options['form']          = options[:form] if options[:form]
+    js_options['params']        = make_params_js(options[:params]) if options[:params]
+    js_options['resultUpdate']  = js_result_updates(options[:result_update]) if options[:result_update]
+    js_options['resetForm']     = false if options[:reset_form] == false
+    js_options['refocusForm']   = false if options[:refocus_form] == false
+    
+    js_options.empty? ? nil : options_for_javascript(js_options)
+  end
+
+  
+  def js_updates(updates)
+    return '[]' unless updates
+    updates = [updates] unless updates.is_a? Array
+    '[' + comma_split(updates).map{|u| js_str(u)}.join(', ') + ']'
+  end
+  
+  
+  def js_result_updates(updates)
+    return '[]' unless updates
+    updates = [updates] unless updates.is_a? Array
+    pairs = comma_split(updates).omap{split(/\s*=\s*/)}
+    '[' + pairs.map{|p| "{id: #{js_str(p[0])}, result: #{js_str(p[1])}}"}.join(", ") + ']'
+  end
+
+
+  def ajax_updater(url_or_form, message, update, options={})
+    options ||= {}
+    options.symbolize_keys!
+    
+    target = if url_or_form == :post_form
+               target = "this"
+             else
+               js_str(url_or_form)
+             end
+    js_options = options_for_hobo_ajax(options)
+    args = [target, js_str(message || "..."), js_updates(update), js_options].compact
+    
+    confirm = options.delete(:confirm)
+    
+    func = "Hobo.ajaxRequest(#{args * ', '})"
+    if confirm
+      "if (confirm(#{js_str(confirm)})) { #{func} }"
+    else
+      func
+    end
+  end
+
+
+  def a_or_an(word)
+    if word =~ /^[aeiouh]/
+      "an #{word}"
+    else
+      "a #{word}"
+    end
+  end
+
+
+  def no_break(s)
+    s = new_context { yield } if block_given?
+    s.gsub(' ', ' ')
+  end
+
+
+
+  
+  def in_place_editor(behaviour_class, attributes)
+    blank_message = attributes.delete(:blank_message) || "(click to edit)"
+
+    attributes = add_classes(attributes, behaviour_class)
+    attributes.update(:hobo_model_id => this_field_dom_id,
+                      :hobo_blank_message => blank_message,
+                      :if_blank => blank_message)
+
+    update = attributes.delete(:update)
+    attributes[:hobo_update] = update if update 
+    
+    view(attributes)
+  end
+    
+  
+
+  AJAX_ATTRS = [:before, :success, :failure, :complete, :type, :method,
+                :script, :form, :params, :confirm,
+                :reset_form, :refocus_form, :result_update]
+
+
+  def editor_class
+  end
+
+end

data/hobo_files/plugin/lib/hobo/static_tags

@@ -1,4 +1,3 @@
-a
 abbr
 acronym
 address
@@ -30,7 +29,6 @@ em
 embed
 fieldset
 font
-form
 frame
 frameset
 h1
@@ -45,7 +43,6 @@ html
 i
 iframe
 img
-input
 ins
 isindex
 kbd

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

@@ -1,7 +1,9 @@
 class Hobo::TextileString < String
 
+  COLUMN_TYPE = :text
+
   def to_html
-    if text.blank?
+    if blank?
       ""
     else
       textilized = RedCloth.new(self, [ :hard_breaks ])
@@ -11,3 +13,11 @@ class Hobo::TextileString < String
   end  
   
 end
+
+class RedCloth
+  # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
+  # http://code.whytheluckystiff.net/redcloth/changeset/128
+  def hard_break( text ) 
+    text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks && RedCloth::VERSION == "3.0.4"
+  end 
+end

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

@@ -31,7 +31,7 @@ module Hobo
     end
 
     def method_missing(name, *args)
-      raise UndefinedAccessError.new("call to: #{name}")
+      raise UndefinedAccessError.new("call to: Hobo::Undefined##{name}")
     end
     
     undef_method :==