hobo 0.8 → 0.8.1

data/lib/hobo/model_controller.rb

@@ -55,7 +55,11 @@ module Hobo
       if force || !@controllers_loaded[subsite]
         dir = "#{RAILS_ROOT}/app/controllers#{'/' + subsite if subsite}"
         Dir.entries(dir).each do |f|
-          f =~ /^[a-zA-Z_][a-zA-Z0-9_]*_controller\.rb$/ and f.sub(/.rb$/, '').camelize.constantize
+          if f =~ /^[a-zA-Z_][a-zA-Z0-9_]*_controller\.rb$/
+            name = f.sub(/.rb$/, '').camelize
+            name = "#{subsite.camelize}::#{name}" if subsite
+            name.constantize
+          end
         end
         @controllers_loaded[subsite] = true
       end

data/lib/hobo/model_router.rb

@@ -32,7 +32,7 @@ module Hobo
   class ModelRouter
 
     class << self
-      
+
       attr_accessor :reload_routes_on_every_request
 
       def reset_linkables
@@ -102,6 +102,8 @@ module Hobo
 
     end
 
+    # specify that an id CANNOT be null - needed to disambiguate /models from /models/[nil] - see #251
+    ID_REQUIREMENT = { :id => /[^#{ActionController::Routing::SEPARATORS.join}]+/ }
 
     def initialize(map, controller, subsite)
       @map = map
@@ -132,7 +134,7 @@ module Hobo
     def add_routes
       # Simple support for composite models, we might later need a CompositeModelController
       if model < Hobo::CompositeModel
-        map.connect "#{plural}/:id", :controller => plural, :action => 'show'
+        map.connect "#{plural}/:id", :controller => plural, :action => 'show', :requirements => ID_REQUIREMENT
 
       elsif controller < Hobo::ModelController
         # index routes need to be first so the index names don't get
@@ -161,11 +163,11 @@ module Hobo
       linkable_route("new_#{singular}",  "#{plural}/new",      :new,  :conditions => { :method => :get })
       linkable_route("edit_#{singular}", "#{plural}/:id/edit", :edit, :conditions => { :method => :get })
 
-      linkable_route(singular, "#{plural}/:id", :show, :conditions => { :method => :get })
+      linkable_route(singular, "#{plural}/:id", :show, :conditions => { :method => :get }, :requirements => ID_REQUIREMENT)
 
       linkable_route("create_#{singular}",  plural,          :create,  :conditions => { :method => :post })
-      linkable_route("update_#{singular}",  "#{plural}/:id", :update,  :conditions => { :method => :put })
-      linkable_route("destroy_#{singular}", "#{plural}/:id", :destroy, :conditions => { :method => :delete })
+      linkable_route("update_#{singular}",  "#{plural}/:id", :update,  :conditions => { :method => :put }, :requirements => ID_REQUIREMENT)
+      linkable_route("destroy_#{singular}", "#{plural}/:id", :destroy, :conditions => { :method => :delete }, :requirements => ID_REQUIREMENT)
     end
 
 

data/lib/hobo/rapid_helper.rb

@@ -95,7 +95,7 @@ module Hobo::RapidHelper
   def in_place_editor(attributes)
     blank_message = attributes.delete(:blank_message) || "(click to edit)"
 
-    attributes = add_classes(attributes, behaviour_class, model_id_class(this_parent, this_field))
+    attributes = add_classes(attributes, "in-place-edit", model_id_class(this_parent, this_field))
     attributes.update(:hobo_blank_message => blank_message,
                       :if_blank => blank_message,
                       :no_wrapper => false)
@@ -115,10 +115,6 @@ module Hobo::RapidHelper
                                   :reset_form, :refocus_form, :result_update, :spinner_next_to ]
 
 
-  def editor_class
-  end
-
-
   def through_collection_names(object=this)
     object.class.reflections.values.select do |refl|
       refl.macro == :has_many && refl.options[:through]

data/lib/hobo/user.rb

@@ -97,6 +97,10 @@ module Hobo
 
     end
 
+    def account_active?
+      state == 'active'
+    end
+
     # Encrypts the password with the user salt
     def encrypt(password)
       self.class.encrypt(password, salt)

data/lib/hobo/user_controller.rb

@@ -88,9 +88,9 @@ module Hobo
 
     def hobo_do_signup(&b)
       do_creator_action(:signup) do
+        flash[:notice] = "Thanks for signing up!" if valid?
         response_block(&b) or if valid?
-                                self.current_user = this
-                                flash[:notice] = "Thanks for signing up!"
+                                self.current_user = this if this.account_active?
                                 redirect_back_or_default(home_page)
                               end
       end
@@ -112,8 +112,6 @@ module Hobo
       if request.post?
         user = model.find_by_email_address(params[:email_address])
         if user && (!block_given? || yield(user))
-          Hobo::Controller.request_host = request.host_with_port
-          Hobo::Controller.app_name = call_tag(:app_name)
           user.lifecycle.request_password_reset(:nobody)
         end
         render_tag :forgot_password_email_sent_page

data/lib/hobo.rb

@@ -7,7 +7,7 @@ rescue MissingSourceFile
   # OK, Hobo won't do pagination then
 end
 
-Dependencies.load_paths |= [ File.dirname(__FILE__) ]
+(defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : Dependencies).load_paths |= [ File.dirname(__FILE__) ]
 
 # Hobo can be installed in /vendor/hobo, /vendor/plugins/hobo, vendor/plugins/hobo/hobo, etc.
 ::HOBO_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
@@ -26,7 +26,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "0.8"
+  VERSION = "0.8.1"
 
   class RawJs < String; end
 

data/rails_generators/hobo/hobo_generator.rb

@@ -22,6 +22,7 @@ class HoboGenerator < Rails::Generator::Base
       m.file "dryml-support.js",      File.join("public/javascripts/dryml-support.js")
       m.file "application.css",       File.join("public/stylesheets/application.css")
       m.file "initializer.rb",        File.join("config/initializers/hobo.rb")
+      m.file "patch_routing.rb",      File.join("config/initializers/patch_routing.rb")
     end
   end
 

data/rails_generators/hobo/templates/patch_routing.rb

@@ -0,0 +1,32 @@
+if Rails::VERSION::STRING.in? ["2.1.0", "2.1.1"]
+  module ActionController
+    module Routing
+      class RouteSet
+        def clear_recognize_optimized!
+          instance_eval %{
+            def recognize_optimized(path, env)
+              write_recognize_optimized
+              recognize_optimized(path, env)            
+            end
+          }, __FILE__, __LINE__
+        end
+      
+        def clear_with_optimization!
+          clear_without_optimization!
+          clear_recognize_optimized!
+        end
+        alias_method_chain :clear!, :optimization
+
+      end
+    end
+  end
+
+  ActionController::Routing::Routes.reload!
+
+else
+  RAILS_DEFAULT_LOGGER.info "****"
+  RAILS_DEFAULT_LOGGER.info "**** The file config/initializers/patch_routing.rb is not in use"
+  RAILS_DEFAULT_LOGGER.info "**** with this version of Rails and can be removed"
+  RAILS_DEFAULT_LOGGER.info "****"
+end
+  

data/rails_generators/hobo_rapid/templates/hobo-rapid.js

@@ -617,25 +617,25 @@ Event.addBehavior({
     '.autocompleter' : AutocompleteBehavior(),
 
     '.string.in-place-edit, .datetime.in-place-edit, .date.in-place-edit, .integer.in-place-edit, .float.in-place.edit, big-integer.in-place-edit' :
-     function (el) {
-        var ipe = Hobo._makeInPlaceEditor(el)
+     function (e) {
+        var ipe = Hobo._makeInPlaceEditor(this)
         ipe.getText = function() {
             return this.element.innerHTML.gsub(/<br\s*\/?>/, "\n").unescapeHTML()
         }
     },
 
-    '.text.in-place-edit' : function (el) {
-        var ipe = Hobo._makeInPlaceEditor(el, {rows: 2})
+    '.text.in-place-edit, .markdown.in-place-edit, .textile.in-place-edit' : function (e) {
+        var ipe = Hobo._makeInPlaceEditor(this, {rows: 2})
         ipe.getText = function() {
             return this.element.innerHTML.gsub(/<br\s*\/?>/, "\n").unescapeHTML()
         }
     },
 
-    ".html.in-place-edit" : function (el) {
+    ".html.in-place-edit" : function (e) {
         var nicEditPresent = typeof(nicEditor) != "undefined"
         var options = { rows: 2, handleLineBreaks: false, okButton: true, cancelLink: true, okText: "Save" }
         if (nicEditPresent) options["submitOnBlur"] = false
-        var ipe = Hobo._makeInPlaceEditor(el, options) 
+        var ipe = Hobo._makeInPlaceEditor(this, options) 
         if (nicEditPresent) {
             ipe.afterEnterEditMode = function() {
                 var editor = this._controls.editor
@@ -652,7 +652,8 @@ Event.addBehavior({
         }
     },
 
-    "select.integer.editor" : function(el) {
+    "select.integer.editor" : function(e) {
+        var el = this
         el.onchange = function() {
             Hobo.ajaxSetFieldForElement(el, $F(el))
         }

data/rails_generators/hobo_subsite/hobo_subsite_generator.rb

@@ -45,7 +45,7 @@ class HoboSubsiteGenerator < Rails::Generator::NamedBase
       m.directory File.join('app', 'controllers', file_name)
       m.directory File.join('app', 'views', file_name)
 
-      m.template "controller.rb", File.join('app/controllers', file_name, "#{file_name}_site.rb")
+      m.template "controller.rb", File.join('app/controllers', file_name, "#{file_name}_site_controller.rb")
       m.template "site_taglib.dryml",  File.join('app/views/taglibs', "#{file_name}_site.dryml")
     end
   end

data/rails_generators/hobo_user_model/templates/forgot_password.erb

@@ -1,9 +1,9 @@
 <%%= @user %>,
 
-If you have forgotton your password for <%%= @app_name %>, you can chose
+If you have forgotten your password for <%%= @app_name %>, you can chose
 a new one by clicking on this link:
 
-  <%%= user_reset_password_url :host => @host, :id => @user, :key => @key %>
+  <%%= <%= name -%>_reset_password_url :host => @host, :id => @user, :key => @key %>
 
 Thanks very much,
 

data/rails_generators/hobo_user_model/templates/mailer.rb

@@ -1,4 +1,4 @@
-class UserMailer < ActionMailer::Base
+class <%= class_name -%>Mailer < ActionMailer::Base
   
   def forgot_password(user, key)
     host = Hobo::Controller.request_host

data/rails_generators/hobo_user_model/templates/model.rb

@@ -24,8 +24,8 @@ class <%= class_name %> < ActiveRecord::Base
            :params => [:username, :email_address, :password, :password_confirmation],
            :become => :active, :if => proc {|_, u| u.guest?}
 
-    transition :nobody, :request_password_reset, { :active => :active } do
-      UserMailer.deliver_forgot_password(self, lifecycle.generate_key)
+    transition :nobody, :request_password_reset, { :active => :active }, :new_key => true do
+      <%= class_name %>Mailer.deliver_forgot_password(self, lifecycle.key)
     end
 
     transition :with_key, :reset_password, { :active => :active }, 

data/taglibs/rapid_forms.dryml

@@ -1,4 +1,5 @@
 <def tag="hidden-fields" attrs="fields, skip, for-query-string"><%= 
+  skip = comma_split(skip)
   pairs = if for_query_string
             query_params.to_a
           else
@@ -20,7 +21,7 @@
 %></def>
 
 
-<def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner"><%= 
+<def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner, enctype"><%= 
   ajax_attrs, html_attrs = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
    
   new_record = this.try.new_record?
@@ -94,6 +95,8 @@
         add_classes!(html_attrs, "#{'new_' if new_record}#{type_id}")
       end
     end
+
+    html_attrs[:enctype] = enctype
      
     Hobo::Dryml.last_if = true
     element("form", html_attrs, body)

data/taglibs/rapid_plus.dryml

@@ -5,7 +5,7 @@
     <div class="header" param="header">
       <div class="search">
         <form param="search-form" method="get" action="">
-          <hidden-fields for-query-string skip="page, search_form"/>
+          <hidden-fields for-query-string skip="page, search"/>
           <span>Search</span>
           <input class="search" type="search" name="search" value="&params[:search]"/>
           <submit label="Go" class="search-button" param="search-submit"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: "0.8"
+  version: 0.8.1
 platform: ruby
 authors: 
 - Tom Locke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-03 00:00:00 +01:00
+date: 2008-09-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobofields
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: The web app builder for Rails
 email: tom@tomlocke.com
 executables: 
@@ -195,6 +205,7 @@ files:
 - rails_generators/hobo/templates/dryml-support.js
 - rails_generators/hobo/templates/guest.rb
 - rails_generators/hobo/templates/initializer.rb
+- rails_generators/hobo/templates/patch_routing.rb
 - rails_generators/hobo_front_controller/hobo_front_controller_generator.rb
 - rails_generators/hobo_front_controller/templates/controller.rb
 - rails_generators/hobo_front_controller/templates/functional_test.rb
@@ -247,6 +258,7 @@ files:
 - rails_generators/hobo_user_model/templates/model.rb
 - rails_generators/hobo_user_model/templates/unit_test.rb
 - rails_generators/hobo_user_model/USAGE
+- Rakefile
 - README
 - script/destroy
 - script/generate
@@ -291,9 +303,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - "="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []