hobo 0.7.5 → 0.8

data/rails_generators/hobo_subsite/templates/application.dryml

@@ -0,0 +1 @@
+<!-- Global taglib - these tags are shared across all subsites -->

data/rails_generators/hobo_subsite/templates/controller.rb

@@ -0,0 +1,5 @@
+class <%= subsite_name %>::<%= subsite_name %>SiteController < ApplicationController
+
+  hobo_controller
+  
+end

data/rails_generators/hobo_subsite/templates/site_taglib.dryml

@@ -0,0 +1,13 @@
+<!-- Tag definitions for the <%= subsite_name %> subsite -->
+  
+<% if options[:rapid] -%>
+<include src="rapid" plugin="hobo"/>
+
+<include src="taglibs/auto/<%= file_name %>/rapid/cards"/>
+<include src="taglibs/auto/<%= file_name %>/rapid/pages"/>
+<include src="taglibs/auto/<%= file_name %>/rapid/forms"/>
+
+<set-theme name="clean"/>
+<% end -%>
+
+<def tag="app-name"><%= app_name %></def>

data/rails_generators/hobo_user_model/hobo_user_model_generator.rb

@@ -0,0 +1,30 @@
+class HoboUserModelGenerator < Rails::Generator::NamedBase
+
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, class_name, "#{class_name}Test"
+
+      # Model, test, and fixture directories.
+      m.directory File.join('app/models', class_path)
+      m.directory File.join('test/unit', class_path)
+      m.directory File.join('test/fixtures', class_path)
+      mailer_dir = File.join("app/views", class_path[0..-2], "#{file_name.singularize}_mailer")
+      m.directory mailer_dir
+
+      # Model class, unit test, and fixtures.
+      m.template 'model.rb',            File.join('app/models',    class_path, "#{file_name}.rb")
+      m.template 'unit_test.rb',        File.join('test/unit',     class_path, "#{file_name}_test.rb")
+      m.template 'fixtures.yml',        File.join('test/fixtures', class_path, "#{table_name}.yml")
+
+      m.template 'mailer.rb',           File.join('app/models', class_path, "#{file_name}_mailer.rb")
+      m.template 'forgot_password.erb', File.join(mailer_dir, "forgot_password.erb")
+    end
+  end
+
+  protected
+    def banner
+      "Usage: #{$0} #{spec.name} ModelName"
+    end
+
+end

data/rails_generators/hobo_user_model/templates/forgot_password.erb

@@ -0,0 +1,10 @@
+<%%= @user %>,
+
+If you have forgotton 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 %>
+
+Thanks very much,
+
+The <%%= @app_name %> team.

data/rails_generators/hobo_user_model/templates/mailer.rb

@@ -0,0 +1,14 @@
+class UserMailer < ActionMailer::Base
+  
+  def forgot_password(user, key)
+    host = Hobo::Controller.request_host
+    app_name = Hobo::Controller.app_name || host
+    @subject    = "#{app_name} -- forgotten password"
+    @body       = { :user => user, :key => key, :host => host, :app_name => app_name }
+    @recipients = user.email_address
+    @from       = "no-reply@#{host}"
+    @sent_on    = Time.now
+    @headers    = {}
+  end
+  
+end

data/rails_generators/hobo_user_model/templates/model.rb

@@ -0,0 +1,55 @@
+class <%= class_name %> < ActiveRecord::Base
+
+  hobo_user_model # Don't put anything above this
+
+  fields do
+    username :string, :login => true, :name => true
+    email_address :email_address
+    administrator :boolean, :default => false
+    timestamps
+  end
+
+  # This gives admin rights to the first sign-up.
+  # Just remove it if you don't want that
+  before_create { |user| user.administrator = true if count == 0 }
+  
+  
+  # --- Signup lifecycle --- #
+
+  lifecycle do
+
+    initial_state :active
+
+    create :anybody, :signup, 
+           :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)
+    end
+
+    transition :with_key, :reset_password, { :active => :active }, 
+               :update => [ :password, :password_confirmation ]
+
+  end
+  
+
+  # --- Hobo Permissions --- #
+
+  def creatable_by?(creator)
+    creator.administrator? || !administrator
+  end
+
+  def updatable_by?(updater, new)
+    updater.administrator? || (updater == self && only_changed_fields?(new, :password, :password_confirmation))
+  end
+
+  def deletable_by?(deleter)
+    deleter.administrator?
+  end
+
+  def viewable_by?(viewer, field)
+    true
+  end
+
+end

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)

data/{hobo_files/plugin/taglibs → taglibs}/core.dryml

@@ -5,7 +5,7 @@
 
 <def tag="wrap" attrs="tag, when, parameter">
   <% parameter ||= :default %>
-  <%= when_ ? send(tag, attributes, { parameter.to_sym => parameters[:default] }) : parameter.default %>
+  <%= when_ ? send(tag, attributes, { parameter.to_sym => parameters[:default] }) : parameters.default %>
 </def>
 
     
@@ -18,14 +18,13 @@
 <def tag="repeat" attrs="even-odd, join">
   <if><%= 
     if even_odd
-      map_this do
-        klass = [attributes[:class], cycle("even", "odd")].compact.join(' ')
-        element(even_odd, attributes.merge(:class => klass, "hobo-model-id" => dom_id(this)), parameters.default)
+      context_map do
+        klass = [attributes[:class], model_id_class, cycle("even", "odd")].compact.join(' ')
+        element(even_odd, attributes.merge(:class => klass), parameters.default)
       end.join(join)
     else
-      scope.new_scope do
-        scope[:even_odd] = "odd"
-        map_this do
+      scope.new_scope :even_odd => "odd" do
+        context_map do
           res = parameters.default
           scope.even_odd = scope.even_odd == "even" ? "odd" : "even"
           res

data/{hobo_files/plugin/taglibs → taglibs}/rapid.dryml

@@ -8,7 +8,7 @@
 <include src="rapid_navigation"/>
 <include src="rapid_plus"/>
 <include src="rapid_generics"/>
-
+<include src="rapid_lifecycles"/>
 
 <def tag="field-list" attrs="tag">
   <% tag ||= scope.in_form ? "input" : "view" %>
@@ -29,26 +29,8 @@
 
 <def tag="item"><% scope.items << parameters.default %></def>
 
-<def tag="nil-view"><%= scope.nil_view || "(Not Available)" %></def>
 
-<def tag="ul" attrs="empty">
-  <% if all_parameters.li? # don't use dryml if, because it will mess up <ul/><else> %>
-    <if test="&empty || all_parameters[:head] || all_parameters[:foot] || !this.empty?">
-      <% element "ul", attributes do %>
-      <do param="head"/>
-      <repeat>
-        <li param if="&can_view?" class="#{scope.even_odd} #{this_type.name.underscore.dasherize}"
-            merge-attrs="&{'hobo-model-id' => dom_id(this)} if this.respond_to?(:typed_id)">
-          <do param="default"><a/></do>
-        </li>
-      </repeat>
-      <do param="foot"/>
-      <% end %>
-    </if>
-  <% else %>
-    <%= element("ul", attributes, all_parameters.default) %>
-  <% end %>      
-</def>
+<def tag="nil-view"><%= scope.nil_view || "(Not Available)" %></def>
 
 
 <def tag="table" attrs="fields, field-tag, empty">
@@ -70,8 +52,7 @@
       <tbody>
         <repeat>
           <tr param if="&can_view?"
-              class="#{scope.even_odd} #{this_type.name.underscore}"
-              hobo-model-id="#{dom_id(this)}">
+              class="#{scope.even_odd} #{this_type.name.underscore} #{model_id_class}">
             <if test="&fields">
               <with-fields merge-attrs="&all_attributes & attrs_for(:with_fields)" force-all>
                 <td param="#{this_field.to_s.sub('?', '').gsub('.', '-')}-view"><call-tag tag="&field_tag"/></td>
@@ -101,14 +82,15 @@
 </def>
 
 
-<def tag="hobo-rapid-javascripts" attrs="tiny-mce"><%=
-   res = '<script type="text/javascript">var hoboParts = {};'
+<def tag="hobo-rapid-javascripts"><%=
+   res = 'var hoboParts = {};'
    # FIXME: This should interrogate the model-router - not the models
-   unless Hobo.all_models.empty?
+   unless Hobo::Model.all_models.empty?
      # Tell JS code how to pluralize names, unless they follow the simple rule
-     names = Hobo.all_models.map do |m|
-                                "#{m}: '#{m.pluralize}'" unless m.pluralize == m + 's'
-                              end.compact
+     names = Hobo::Model.all_models.map do |m|
+                                          m = m.name.underscore
+                                          "#{m}: '#{m.pluralize}'" unless m.pluralize == m + 's'
+                                        end.compact
      res << "var pluralisations = {#{names * ', '}}; "
    end
    base = [base_url, subsite].compact.join("/")
@@ -116,21 +98,6 @@
    if request_forgery_protection_token
      res << "; formAuthToken = { name: '#{request_forgery_protection_token}', value: '#{form_authenticity_token}' }"
    end
-   res << "</script>"
-   
-   if tiny_mce
-     res += javascript_include_tag("tiny_mce/tiny_mce_src") + %{
-               <script type="text/javascript">
-                 tinyMCE.init({ mode: "textareas", editor_selector: "tiny-mce",
-                       plugins: 'save',
-                       theme_advanced_buttons1 : "bold, italic, separator, " +
-                                                 "bullist, outdent, indent, separator, " +
-                                                 "undo, redo, separator, link, unlink",
-                       theme_advanced_buttons2 : "",
-                       theme_advanced_buttons3 : ""
-                 });
-               </script>}
-   end
    res
 %></def>
 
@@ -146,16 +113,15 @@
       count
     elsif this.is_a? Class and this < ActiveRecord::Base
       this.name.pluralize.titleize
-    elsif this.respond_to?(:name) && can_view?(this, :name)
-      view(merge_attrs(attributes, {:field => 'name'}))
-    elsif this.respond_to?(:title) && can_view?(this, :title)
-      view(merge_attrs(attributes, {:field => 'title'}))
+    elsif (name_attr = this.class.try.name_attribute) && can_view?(this, name_attr)
+      view(merge_attrs(attributes, {:field => name_attr}))
     elsif can_view?(this)
       this.to_s
     end
   end
 %></def>
 
+
 <def tag="type-name" attrs="type, plural, lowercase, dasherize"><%=
   type ||= (this if this.is_a?(Class)) || this.try.member_class || this.class
 
@@ -166,16 +132,16 @@
 %></def>
      
 
-<def tag="name-for-collection" attrs="singular, lowercase"><%=
+<def tag="collection-name" attrs="singular, lowercase, dasherize"><%=
   name = (attr = this.try.origin_attribute and attr.to_s) || type_name(:plural => true)
   name = name.titleize
   name = name.singularize if singular
   name = name.downcase if lowercase
+  name = name.underscore.gsub('_', '-') if dasherize
   name
 %></def>
 
 
-
 <def tag="a" attrs="action, to, params, query-params, href, format, subsite"><%=
   content = parameters.default
    
@@ -183,7 +149,7 @@
   
   if href || attributes[:name]
     # Regular link
-    href += "?" + params.map { |n, v| "#{n}=#{v}" }.join('&') if params
+    href += "?" + params.map { |n, v| "#{n}=#{v}" }.join('&') if !params.blank?
     element(:a, attributes.update(:href => href), content)
   else
     target = to || this
@@ -249,14 +215,12 @@
           
           if view_tag == "view" # i.e. it didn't find a type specific tag
             if this.respond_to?(:to_html)
-              this.to_html
+              this.to_html(scope.xmldoctype)
             else
-              raise HoboError, "Cannot view: #{this.inspect} (field is #{this_field}, type is #{this.class})"
+              this.to_s
             end
           else
-            attrs = add_classes(attributes, "view", type_and_field)
-            id = dom_id
-            attrs['hobo-model-id'] = id unless id == "nil"
+            attrs = add_classes(attributes, "view", type_and_field._?.dasherize, model_id_class)
 
             view_attrs = attrs_for(view_tag)
             the_view = send(view_tag, attrs & view_attrs)
@@ -272,7 +236,7 @@
             else
               wrapper = if inline
                           :span
-                        elsif block || (this.class.const_defined?(:COLUMN_TYPE) && this.class::COLUMN_TYPE == :text)
+                        elsif block || this.is_a?(HoboFields::Text)
                           :div
                         else
                           :span
@@ -288,25 +252,27 @@
     
 <def tag="belongs-to-view"><a merge-attrs/></def>
 
-<def tag="has-many-view"><%= this.empty? ? "(none)" : map_this { a }.join(", ") %></def>
+<def tag="has-many-view"><%= this.empty? ? "(none)" : context_map { a }.join(", ") %></def>
 
 <def tag="view" for="Date" attrs="format"><%= this && (format ? this.strftime(format) : this.to_s(:long)) %></def>
 
 <def tag="view" for="Time" attrs="format"><%= this && (format ? this.strftime(format) : this.to_s(:long)) %></def>
 
+<def tag="view" for="ActiveSupport::TimeWithZone" attrs="format"><%= this && (format ? this.strftime(format) : this.to_s(:long)) %></def>
+
 <def tag="view" for="Numeric" attrs="format"><%= format ? format % this : this.to_s %></def>
 
-<def tag="view" for="string"><%= this.try.to_html || h(this).gsub("\n", "<br/>") %></def>
+<def tag="view" for="string"><%= this.try.to_html(scope.xmldoctype) || h(this).gsub("\n", "<br#{scope.xmldoctype ? ' /' : ''}>") %></def>
 
 <def tag="view" for="boolean"><%= this ? 'Yes' : 'No' %></def>
 
 <def tag="view" for="ActiveRecord::Base"><a/></def>
 
 
-<def tag="count" attrs="label, prefix, if-any, lowercase"><%=
+<def tag="count" attrs="label, prefix, if-any, lowercase"><span class="count"><%=
   raise Exception.new("asked for count of a string") if this.is_a?(String)
    
-  c = this.try.to_int || this.try.total_entries || this.try.count || this.try.length
+  c = this.try.to_int || this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
 
   label ||= if this.is_a?(Class)
               this.name
@@ -331,7 +297,7 @@
       main
     end
   end
-%></def>
+%></span></def>
 
 
 <def tag="theme-stylesheet" attrs="name">
@@ -354,7 +320,7 @@ in the future - use at your own risk. -->
     </if>
   </table-for>
   <else>
-    <p>There are no <%= this.member_class.name.titleize.pluralize.downcase %></p>
+    <p>No <%= this.member_class.name.titleize.pluralize.downcase %> to display</p>
   </else>
   <div>
     <create-button update="&id || part_id"/>
@@ -404,7 +370,7 @@ in the future - use at your own risk. -->
 
 <def tag="live-search">
   <div class="search">
-    <label for="search-field">Search</label><input type="search" id="search-field" name="search-field" class="search-bhv search"/>
+    <label for="search-field">Search</label><input type="search" class="live-search"/>
     <spinner id="search-spinner"/>
   </div>
   <section class="hidden" id="search-results-panel">
@@ -415,22 +381,25 @@ in the future - use at your own risk. -->
 
 
 <def tag="a-or-an" attrs="word"><%=
-  (word =~ /^[aeiouh]/i ? "an " : "a ") + word
+  (word =~ /^[aeiou]/i ? "an " : "a ") + word
 %></def>
 
 
 <def tag="A-or-An" attrs="word"><%=
-  (word =~ /^[aeiouh]/i ? "An " : "A ") + word
+  (word =~ /^[aeiou]/i ? "An " : "A ") + word
 %></def>
 
 
 <def tag="filter-menu" attrs="param-name, options, no-filter">
   <% no_filter ||= "All" %>
   <form action="&request.request_uri" method="get" class="filter-menu">
-    <hidden-field name="filter-parameter" value="&param_name"/>
-    <select-menu name="&param_name" options="&options" selected="&params[param_name.gsub('-', '_')]" first-option="&no_filter" merge-params/>
+    <div>
+      <input type="hidden" name="filter-parameter" value="&param_name"/>
+      <select-menu name="&param_name" options="&options" selected="&params[param_name.gsub('-', '_')]" first-option="&no_filter" merge-params/>
+    </div>
   </form>
 </def>
 
 
 <def tag="comma-list" attrs="separator"><%= this.join(separator || ", ") %></def>
+