hobo 1.4.0.pre6 → 1.4.0.pre7

data/CHANGES-1.3.txt

@@ -29,7 +29,7 @@ Examples
 
 # Configuration Variables #
 
-They are set by the hobo engine at startup, and they can be overwrited by adding in `config/application.rb`:
+They are set by the hobo engine at startup, and they can be overwritten by adding in `config/application.rb`:
 
     config.hobo.<variable_name> = <value>
 

data/CHANGES-1.4.txt

@@ -354,6 +354,10 @@ If you have malsup's form plugin installed, Ajax file uploads should
 "just work", as long as you don't have debug_rjs turned on in your
 config/initializers/development.rb.
 
+Make sure you're form uses multipart encoding:
+
+     <form multipart ajax/>
+
 ### AJAX events
 
 The standard 'before', 'success', 'done' and 'error' callbacks may
@@ -438,6 +442,8 @@ of new options that control how the spinner is displayed.
 - spinner-options: passed to [jQuery-UI's position](http://jqueryui.com/demos/position/).   Defaults are `{my: 'right bottom', at: 'left top'}`
 - message: the message to display inside the spinner
 
+The above attributes may be added to most tags that accept the standard ajax attributes.
+
 These options may be overridden globally by adding them as attributes to the `page-scripts` parameter for the page.
 
      <extend tag="page">
@@ -511,6 +517,11 @@ The helper functions have been renamed.   For instance,
 Dialog positioning has been updated and should work better now.   See
 the documentation for more details.
 
+### search-filter
+
+The table-plus search filter has been extracted into its own tag for
+use outside of table-plus. It has also gained a "clear" button.
+
 ### live-search
 
 `live-search` works in a substantially different fashion now, it has
@@ -545,6 +556,37 @@ if you still need it.
 There's a new helper function called query_parameters_filtered that
 returns query parameters with the ajax parameters removed.
 
+### parse_sort_param
+
+The controller function parse_sort_param has been updated so that it
+can take a hash instead of or as well as an argument list.  The key of
+the hash is the field name and the value is the column name.
+Example:
+
+     Book.include(:authors).order(parse_sort_param(:title, :authors => "authors.last_name")
+
+parse_sort_param now also pluralizes table names. For example, if the
+field is named "project.title", parse_sort_param will sort on the
+column "projects.title".
+
+### controller actions
+
+Hobo no longer attempts to perform its part-based AJAX actions when
+sent an xhr request. Instead, Hobo performs part-based AJAX when
+params[:render] is set.
+
+The signature for the function update_response and friends has changed.   This should make it useful for use in your application.   It can be used like this:
+
+    def update
+      hobo_update do
+        if params[:foo]==17
+          render_my_way
+        else
+          update_response   # let Hobo handle it all
+        end
+      end
+    end
+
 ## Editors
 
 Editors are no longer special-cased, they now use the standard DRYML

data/TODO-1.4.txt

@@ -2,7 +2,7 @@
 
 ## regressions
 
- * after-submit, sortable-input-many do not work
+ * sortable-input-many does not work
  * remote-method-button, create-button, update-button,
    transition-button: normal usages of these tags work, but they do
    not work if you ask them to do AJAX
@@ -24,6 +24,8 @@
  * admin subsite
  * books
  * ajax manual section
+ * miscellaneous controller extensions
+ * there's some nice stuff in HoboFields::Model that should be documented & tested
 
 ## Cookbook
 
@@ -34,11 +36,8 @@
 
 ## new features that aren't "done"
 
- * create_response: mirror update_response
- * taglib cleanup
  * clean_sidemenu -> plugin
- * nested-cache: csrf workaround
- * nested-cache: enhanced sweeper version
+ * cache: csrf warning
  * monkey patch will_paginate if my patches are not upstreamed
 
 It's quite likely that some of the new tag definitions are missing
@@ -48,6 +47,8 @@ you notice any such omissions, please let us know, it is easy to fix..
 
 ## stuff that we really want to do
 
+ * multiple file support for AJAX uploads
+ * cache: redis support
  * fixup deprecation warnings
  * port to Rails 3.2 and/or 4.0
  * nuke any remaining prototype code

data/VERSION

@@ -1 +1 @@
-1.4.0.pre6
+1.4.0.pre7

data/app/helpers/hobo_permissions_helper.rb

@@ -21,7 +21,7 @@ module HoboPermissionsHelper
         object = object.new
       elsif (refl = object.try.proxy_reflection) && refl.macro == :has_many
         if Hobo.simple_has_many_association?(object)
-          object = object.new
+          object = object.build
           object.set_creator(current_user)
         else
           return false

data/app/helpers/hobo_route_helper.rb

@@ -2,7 +2,7 @@ module HoboRouteHelper
   extend HoboHelperBase
   protected
     def base_url
-      "#{Rails.application.config.action_controller.relative_url_root}"
+      ENV['RAILS_RELATIVE_URL_ROOT'] || ''
     end
 
     def controller_for(obj)
@@ -41,7 +41,7 @@ module HoboRouteHelper
           if method.to_s == 'post'
             action = :"create_for_#{owner_name}"
           else
-O            action = :"index_for_#{owner_name}"
+            action = :"index_for_#{owner_name}"
           end
         end
         klass = obj.member_class
@@ -112,7 +112,12 @@ O            action = :"index_for_#{owner_name}"
     def recognize_page_path
       # round tripping params through the router will remove
       # unnecessary params
-      Rails.application.routes.recognize_path(params[:page_path] || url_for(params))
+      url = params[:page_path] || url_for(params)
+      if ENV['RAILS_RELATIVE_URL_ROOT']
+        url.gsub!(/^#{ENV['RAILS_RELATIVE_URL_ROOT']}/, "")
+        url.gsub!(/^https?:\/\/.*?#{ENV['RAILS_RELATIVE_URL_ROOT']}/, "")
+      end
+      Rails.application.routes.recognize_path(url)
     end
 
     def url_for_page_path(options={})

data/lib/generators/hobo/front_controller/front_controller_generator.rb

@@ -46,6 +46,7 @@ module Hobo
       route "match 'search' => '#{file_path}#search', :as => 'site_search'"
       if class_path.empty?
         route "root :to => '#{file_path}#index'"
+        route "match ENV['RAILS_RELATIVE_URL_ROOT'] => 'front#index' if ENV['RAILS_RELATIVE_URL_ROOT']"
       else
         route "match '#{file_path}' => '#{file_path}#index', :as => '#{file_path.gsub(/\//,'_')}'"
       end

data/lib/generators/hobo/routes/router.rb

@@ -40,7 +40,7 @@ module Generators
         def resource_routes
           [
           link("get '#{records}(.:format)' => '#{records}#index', :as => '#{records}'", 'index'),
-          link("get '#{records}/new(.:format)', :as => 'new_#{record}'", 'new'),
+          link("get '#{records}/new(.:format)' => '#{records}#new', :as => 'new_#{record}'", 'new'),
           link("get '#{records}/:id/edit(.:format)' => '#{records}#edit', :as => 'edit_#{record}'", 'edit'),
           link("get '#{records}/:id(.:format)' => '#{records}#show', :as => '#{record}', :constraints => #{ID_REQUIREMENT}", 'show'),
           link("post '#{records}(.:format)' => '#{records}#create', :as => 'create_#{record}'", 'create', :post),

data/lib/hobo.rb

@@ -26,7 +26,7 @@ module Hobo
 
   class << self
 
-    attr_accessor :engines
+    attr_accessor :engines, :stable_cache
 
     def raw_js(s)
       RawJs.new(s)
@@ -76,6 +76,7 @@ module Hobo
   end
 
   self.engines = []
+  self.stable_cache = nil
 
 end
 

data/lib/hobo/controller.rb

@@ -3,6 +3,7 @@ module Hobo
   module Controller
 
     include AuthenticationSupport
+    include Cache
 
     class << self
 

data/lib/hobo/controller/cache.rb

@@ -0,0 +1,35 @@
+module Hobo
+  module Controller
+    module Cache
+      def expire_swept_caches_for(obj, attr=nil)
+        typed_id = if attr.nil?
+                     if obj.respond_to?(:typed_id)
+                       obj.typed_id
+                     else
+                       obj.to_s
+                     end
+                   else
+                     "#{obj.typed_id}:#{attr}"
+                   end
+        sweep_key = ActiveSupport::Cache.expand_cache_key(typed_id, :sweep_key)
+        if Hobo.stable_cache.respond_to?(:read_matched)
+          Hobo.stable_cache.read_matched(/#{sweep_key}/).each do |k,v|
+            key=k[sweep_key.length+1..-1]
+            Rails.logger.debug "CACHE DELETING #{key}"
+            Rails.cache.delete(key)
+            Hobo.stable_cache.delete(k)
+          end
+        else
+          keys = Hobo.stable_cache.read(sweep_key)
+          return if keys.nil? || keys.empty?
+          keys.each do |key|
+            Rails.logger.debug "CACHE DELETING #{key}"
+            Rails.cache.delete(key)
+          end
+          Hobo.stable_cache.delete(sweep_key)
+        end
+      end
+
+    end
+  end
+end

data/lib/hobo/controller/model.rb

@@ -330,20 +330,26 @@ module Hobo
     protected
 
 
-    def parse_sort_param(*sort_fields)
+    def parse_sort_param(*args)
       _, desc, field = *params[:sort]._?.match(/^(-)?([a-z_]+(?:\.[a-z_]+)?)$/)
 
       if field
-        if field.in?(sort_fields.*.to_s)
+        hash = args.extract_options!
+        db_sort_field = (hash[field] || hash[field.to_sym] || (field if field.in?(args) || field.to_sym.in?(args))).to_s
+
+        if db_sort_field
+          if db_sort_field == field && field.match(/\./)
+            fields = field.split(".", 2)
+            db_sort_field = "#{fields[0].pluralize}.#{fields[1]}"
+          end
           @sort_field = field
           @sort_direction = desc ? "desc" : "asc"
 
-          [@sort_field, @sort_direction]
+          "#{db_sort_field} #{@sort_direction}"
         end
       end
     end
 
-
     # --- Action implementation helpers --- #
 
 
@@ -476,7 +482,7 @@ module Hobo
       options = args.extract_options!
       finder = args.first || model
       self.this ||= find_or_paginate(finder, options)
-      index_response(&b)
+      response_block(&b) || index_response
     end
 
 
@@ -485,7 +491,7 @@ module Hobo
       owner, association = find_owner_and_association(owner)
       finder = args.first || association
       self.this ||= find_or_paginate(finder, options)
-      index_response(&b)
+      response_block(&b) || index_response
     end
 
 
@@ -498,7 +504,7 @@ module Hobo
           this.with_acting_user(current_user) { this.attributes = parms }
         end
       end
-      show_response(&b)
+      response_block(&b) || show_response
     end
 
     def hobo_edit(*args, &b)
@@ -507,33 +513,27 @@ module Hobo
 
     def hobo_new(record=nil, &b)
       self.this = record || model.user_new(current_user, attribute_parameters)
-      show_response(&b)
+      response_block(&b) || show_response
     end
 
-    def show_response(&b)
-      response_block(&b) or
-        begin
-          if request.xhr? && params[:render]
-            hobo_ajax_response
-            render :nothing => true unless performed?
-          end
-        end
+    def show_response
+      if request.xhr? && params[:render]
+        hobo_ajax_response
+        render :nothing => true unless performed?
+      end
     end
 
-    def index_response(&b)
-      response_block(&b) or
-        begin
-          if request.xhr? && params[:render]
-            hobo_ajax_response(:page => :blah)
-            render :nothing => true unless performed?
-          end
-        end
+    def index_response
+      if request.xhr? && params[:render]
+        hobo_ajax_response(:page => :blah)
+        render :nothing => true unless performed?
+      end
     end
 
     def hobo_new_for(owner, record=nil, &b)
       owner, association = find_owner_and_association(owner)
       self.this = record || association.user_new(current_user, attribute_parameters)
-      show_response(&b)
+      response_block(&b) || show_response
     end
 
 
@@ -546,7 +546,7 @@ module Hobo
         self.this = new_for_create(attributes)
         this.user_save(current_user)
       end
-      create_response(:new, options, &b)
+      response_block(&b) || create_response(:new, options)
     end
 
 
@@ -560,7 +560,7 @@ module Hobo
         self.this = association.new(attributes)
         this.save
       end
-      create_response(:"new_for_#{name_of_auto_action_for(owner_association)}", options, &b)
+      response_block(&b) || create_response(:"new_for_#{name_of_auto_action_for(owner_association)}", options)
     end
 
 
@@ -589,45 +589,6 @@ module Hobo
     def create_response(new_action, options={}, &b)
       flash_notice (ht( :"#{@this.class.to_s.underscore}.messages.create.success", :default=>["The #{@this.class.model_name.human} was created successfully"])) if valid?
 
-      response_block(&b) or
-        if valid?
-          respond_to do |wants|
-            wants.html { redirect_after_submit(options) }
-            wants.js   { hobo_ajax_response || render(:nothing => true) }
-          end
-        else
-          respond_to do |wants|
-			# errors is used by the translation helper, ht, below.
-			errors = this.errors.full_messages.join("\n")
-            wants.html { re_render_form(new_action) }
-            wants.js   { render(:status => 500,
-                                :text => ht( :"#{this.class.to_s.underscore}.messages.create.error", :errors=>errors,:default=>["Couldn't create the #{this.class.name.titleize.downcase}.\n #{errors}"])
-                               )}
-          end
-        end
-    end
-
-
-    def hobo_update(*args, &b)
-      options = args.extract_options!
-
-      self.this ||= args.first || find_instance
-      changes = options[:attributes] || attribute_parameters or raise RuntimeError, t("hobo.messages.update.no_attribute_error", :default=>["No update specified in params"])
-
-      if this.user_update_attributes(current_user, changes)
-        # Ensure current_user isn't out of date
-        @current_user = @this if @this == current_user
-      end
-
-      in_place_edit_field = changes.keys.first if changes.size == 1 && params[:render]
-      update_response(in_place_edit_field, options, &b)
-    end
-
-
-    def update_response(in_place_edit_field=nil, options={}, &b)
-
-      flash_notice (ht(:"#{@this.class.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"])) if valid?
-
       response_block(&b) or begin
                               valid = valid?  # valid? can be expensive
                               if params[:render]
@@ -638,19 +599,75 @@ module Hobo
                                   render :nothing => true unless performed?
                                 else
                                   errors = @this.errors.full_messages.join('\n')
-                                  message = ht(:"#{@this.class.to_s.underscore}.messages.update.error",:default=>["There was a problem with that change\\n#{errors}"], :errors=>errors)
+                                  message = ht( :"#{this.class.to_s.underscore}.messages.create.error", :errors=>errors,:default=>["Couldn't create the #{this.class.name.titleize.downcase}.\n #{errors}"])
                                   ajax_response("alert('#{message}');", params[:render_options])
                                 end
                               else
                                 if valid
                                   redirect_after_submit options
                                 else
-                                  re_render_form(:edit)
+                                  re_render_form(new_action)
                                 end
                               end
                             end
     end
 
+
+    def hobo_update(*args, &b)
+      options = args.extract_options!
+
+      self.this ||= args.first || find_instance
+      changes = options[:attributes] || attribute_parameters or raise RuntimeError, t("hobo.messages.update.no_attribute_error", :default=>["No update specified in params"])
+
+      if this.user_update_attributes(current_user, changes)
+        # Ensure current_user isn't out of date
+        @current_user = @this if @this == current_user
+      end
+
+      response_block(&b) ||  update_response(nil, options)
+    end
+
+
+    # typically used like this:
+    # def update
+    #   hobo_update do
+    #     if params[:foo]==17
+    #       render_my_way
+    #     else
+    #       update_response   # let Hobo handle it all
+    #     end
+    #   end
+    # end
+    #
+    # parameters:
+    #   valid is a cache of valid?
+    #   options is passed through to redirect_after_submit
+    def update_response(valid=nil, options={})
+      # valid? can be expensive, cache it
+      valid = valid? if valid.nil?
+      if params[:render]
+        if (params[:render_options] && params[:render_options][:errors_ok]) || valid
+          hobo_ajax_response
+
+          # Maybe no ajax requests were made
+          render :nothing => true unless performed?
+        else
+          errors = @this.errors.full_messages.join('\n')
+          message = ht(:"#{@this.class.to_s.underscore}.messages.update.error", :default=>["There was a problem with that change\\n#{errors}"], :errors=>errors)
+
+          ajax_response("alert('#{message}');", params[:render_options])
+        end
+      else
+        if valid
+          flash_notice (ht(:"#{@this.class.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"]))
+
+          redirect_after_submit options
+        else
+          re_render_form(:edit)
+        end
+      end
+    end
+
     def hobo_destroy(*args, &b)
       options = args.extract_options!
       self.this ||= args.first || find_instance

data/lib/hobo/engine.rb

@@ -16,6 +16,7 @@ module Hobo
       h.read_only_file_system = !!ENV['HEROKU_TYPE']
       h.show_translation_keys = false
       h.dryml_only_templates = false
+      h.stable_cache_store = nil
     end
 
     ActiveSupport.on_load(:action_controller) do
@@ -34,6 +35,7 @@ module Hobo
       require 'hobo/extensions/active_record/relation_with_origin'
       require 'hobo/extensions/active_model/name'
       require 'hobo/extensions/active_model/translation'
+      require 'hobo/extensions/active_support/cache/file_store'
       # added legacy namespace for backward compatibility
       # TODO: remove the following line if Hobo::VERSION > 1.3.x
       Hobo::ViewHints = Hobo::Model::ViewHints
@@ -76,5 +78,13 @@ module Hobo
       end
     end
 
+    initializer 'hobo.cache' do |app|
+      if app.config.hobo.stable_cache_store
+        Hobo.stable_cache = ActiveSupport::Cache.lookup_store(app.config.hobo.stable_cache_store)
+      else
+        Hobo.stable_cache = Rails.cache
+      end
+    end
+
   end
 end

data/lib/hobo/extensions/active_record/permissions.rb

@@ -42,7 +42,11 @@ ActiveRecord::Associations::HasManyAssociation.class_eval do
   def insert_record_with_owner_attributes(record, force = true, raise = false)
     set_owner_attributes(record)
     if (user = acting_user) && record.is_a?(Hobo::Model)
-      with_acting_user(user) { insert_record_without_owner_attributes(record, force, raise) }
+      if respond_to?(:with_acting_user)
+        with_acting_user(user) { insert_record_without_owner_attributes(record, force, raise) }
+      else
+        record.with_acting_user(user) { insert_record_without_owner_attributes(record, force, raise) }
+      end
     else
       insert_record_without_owner_attributes(record, force, raise)
     end

data/lib/hobo/extensions/active_support/cache/file_store.rb

@@ -0,0 +1,18 @@
+module ActiveSupport
+  module Cache
+    class FileStore
+      def hobo_read_matched(matcher, options = nil)
+        Enumerator.new do |y|
+          options = merged_options(options)
+          matcher = key_matcher(matcher, options)
+          search_dir(cache_path) do |path|
+            key = file_path_key(path)
+            y << [key, read_entry(key, options)] if key.match(matcher)
+          end
+        end
+      end
+
+      alias_method(:read_matched, :hobo_read_matched) unless method_defined?(:read_matched)
+    end
+  end
+end

data/lib/hobo/model.rb

@@ -167,10 +167,10 @@ module Hobo
           #       (ie X belongs_to Y (polymorphic), Z is a subclass of Y; @x.y_is?(some_z) will never pass)
           class_eval %{
             def #{name}_is?(target)
-              target.class.name == self.#{refl.options[:foreign_type]} && target.#{id_method} == self.#{refl.foreign_key}
+              target.class.name == self.#{refl.foreign_type} && target.#{id_method} == self.#{refl.foreign_key}
             end
             def #{name}_changed?
-              #{refl.foreign_key}_changed? || #{refl.options[:foreign_type]}_changed?
+              #{refl.foreign_key}_changed? || #{refl.foreign_type}_changed?
             end
           }
         else

metadata

@@ -2,7 +2,7 @@
 name: hobo
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.4.0.pre6
+  version: 1.4.0.pre7
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 Z
+date: 2012-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hobo_support
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre6
+        version: 1.4.0.pre7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre6
+        version: 1.4.0.pre7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre6
+        version: 1.4.0.pre7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -226,6 +226,7 @@ files:
 - lib/hobo.rb
 - lib/hobo/controller.rb
 - lib/hobo/controller/authentication_support.rb
+- lib/hobo/controller/cache.rb
 - lib/hobo/controller/model.rb
 - lib/hobo/controller/user_base.rb
 - lib/hobo/engine.rb
@@ -243,6 +244,7 @@ files:
 - lib/hobo/extensions/active_record/hobo_methods.rb
 - lib/hobo/extensions/active_record/permissions.rb
 - lib/hobo/extensions/active_record/relation_with_origin.rb
+- lib/hobo/extensions/active_support/cache/file_store.rb
 - lib/hobo/extensions/array.rb
 - lib/hobo/extensions/enumerable.rb
 - lib/hobo/extensions/i18n.rb
@@ -328,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: The web app builder for Rails