hobo 0.8.10 → 0.9.0

data/lib/hobo/model_router.rb

@@ -227,14 +227,14 @@ module Hobo
     def lifecycle_routes
       model::Lifecycle.creators.values.where.publishable?.*.name.each do |creator|
         linkable_route("do_#{singular}_#{creator}", "#{plural}/#{creator}", "do_#{creator}",
-                       :conditions => { :method => :post }, :format => false, :linkable_action => creator)
-        linkable_route("#{singular}_#{creator}",    "#{plural}/#{creator}", creator,  :conditions => { :method => :get },  :format => false)
+                       :conditions => { :method => :post }, :linkable_action => creator)
+        linkable_route("#{singular}_#{creator}",    "#{plural}/#{creator}", creator,  :conditions => { :method => :get })
       end
       model::Lifecycle.transitions.where.publishable?.*.name.each do |transition|
         linkable_route("do_#{singular}_#{transition}", "#{plural}/:id/#{transition}", "do_#{transition}",
-                       :conditions => { :method => :put }, :format => false, :linkable_action => transition)
+                       :conditions => { :method => :put }, :linkable_action => transition)
         linkable_route("#{singular}_#{transition}", "#{plural}/:id/#{transition}", transition,
-                       :conditions => { :method => :get }, :format => false)
+                       :conditions => { :method => :get })
       end
     end
 
@@ -252,9 +252,13 @@ module Hobo
         options.reverse_merge!(:controller => route_with_subsite(plural))
         name = name_with_subsite(name)
         route = route_with_subsite(route)
-        format_route = options.delete(:format) != false
-        map.named_route(name, route, options)
-        map.named_route("formatted_#{name}", "#{route}.:format", options) if format_route
+        if HoboSupport::RAILS_AT_LEAST_23
+          map.named_route(name, "#{route}.:format", options)
+        else
+          # kick it old-skool
+          map.named_route(name, route, options)
+          map.named_route("formatted_#{name}", "#{route}.:format", options)
+        end
         true
       else
         false

data/lib/hobo/permissions.rb

@@ -46,7 +46,7 @@ module Hobo
           r.set_creator user
           yield r if block_given? 
           r.user_view(user)
-          r.send :callback, :after_user_new
+          r.with_acting_user(user) { r.send :callback, :after_user_new }
         end
       end
 
@@ -75,7 +75,7 @@ module Hobo
       def viewable_by?(user, attribute=nil)
         new.viewable_by?(user, attribute)
       end
-      
+
     end
     
     
@@ -190,9 +190,9 @@ module Hobo
       if attribute
         attribute = attribute.to_s.sub(/\?$/, '').to_sym
 
-        # Try the attribute-specic edit-permission method if there is one
+        # Try the attribute-specific edit-permission method if there is one
         if has_hobo_method?(meth = "#{attribute}_edit_permitted?")
-          with_acting_user(user) { send(meth) } 
+          return with_acting_user(user) { send(meth) } 
         end
       
         # No setter = no edit permission
@@ -375,20 +375,22 @@ module Hobo
         end
       end
     end
-    
+
     # Best. Name. Ever
-    def deunknownify_attribute(attr)
+    def deunknownify_attribute(attr, remove_globals = true)
       attr = attr.to_sym
-      
+
       metaclass.send :remove_method, attr
-      
+
       if (refl = self.class.reflections[attr]) && refl.macro == :belongs_to
         # A belongs_to -- restore the underlying fields
         deunknownify_attribute refl.primary_key_name
-        deunknownify_attribute refl.options[:foreign_type] if refl.options[:polymorphic]
+        deunknownify_attribute(refl.options[:foreign_type], false) if refl.options[:polymorphic]
       else
         # A regular field -- restore the dirty tracking methods
-        ["#{attr}_change", "#{attr}_was", "#{attr}_changed?", :changed?, :changed, :changes].each do |m|
+        # if remove_globals is false, skip the top-level methods, as we have already removed them
+        to_remove = remove_globals ? [:changed?, :changed, :changes] : []
+        (["#{attr}_change", "#{attr}_was", "#{attr}_changed?"] + to_remove).each do |m|
           metaclass.send :remove_method, m.to_sym
         end
       end

data/lib/hobo/permissions/associations.rb

@@ -84,7 +84,7 @@ module Hobo
           end
 
 
-          def create!(attrs = nil)
+          def create(attrs = nil)
             klass = @reflection.klass
             user = acting_user if klass < Hobo::Model
             klass.transaction do

data/lib/hobo/static_tags

@@ -2,6 +2,8 @@ abbr
 acronym
 address
 applet
+article
+audio
 b
 basefont
 bdo
@@ -9,14 +11,20 @@ big
 blockquote
 body
 button
+canvas
 caption
 center
 cite
 code
 colgroup
+command
+datagrid
+datalist
 dd
 del
+details
 dfn
+dialog
 dir
 div
 dl
@@ -24,6 +32,7 @@ dt
 em
 embed
 fieldset
+figure
 font
 frameset
 h1
@@ -33,6 +42,7 @@ h4
 h5
 h6
 head
+hgroup
 i
 iframe
 ins
@@ -42,21 +52,30 @@ label
 legend
 li
 map
+mark
 menu
+meter
+nav
 noframes
 noscript
 object
 ol
 optgroup
 option
+output
 p
 pre
+progress
 q
+rp
+rt
+ruby
 s
 samp
 script
 select
 small
+source
 span
 strike
 strong
@@ -69,9 +88,11 @@ textarea
 tfoot
 th
 thead
+time
 title
 tr
 tt
 u
 ul
 var
+video

data/lib/hobo/user.rb

@@ -37,6 +37,10 @@ module Hobo
         validate :validate_current_password_when_changing_password
 
         # Virtual attributes for setting and changing the password
+        # note that :password_confirmation= is also defined by
+        # validates_confirmation_of, so this line must follow any
+        # validates_confirmation_of statements.
+        # https://hobo.lighthouseapp.com/projects/8324-hobo/tickets/530
         attr_accessor :current_password, :password, :password_confirmation, :type => :password
 
         before_save :encrypt_password
@@ -70,7 +74,7 @@ module Hobo
         end
       end
 
-      attr_reader :login_attribute
+      inheriting_cattr_reader :login_attribute
 
 
       # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
@@ -153,7 +157,7 @@ module Hobo
     
     
     def lifecycle_changing_password?
-      lifecycle.active_step && :password.in?(lifecycle.active_step.parameters)
+      self.class.has_lifecycle? && lifecycle.active_step && :password.in?(lifecycle.active_step.parameters)
     end
 
     # Is a new password (and confirmation) required? (i.e. signing up or changing password)
@@ -163,7 +167,7 @@ module Hobo
 
 
     def validate_current_password_when_changing_password
-      changing_password? && !authenticated?(current_password) and errors.add :current_password, "is not correct"
+      changing_password? && !authenticated?(current_password) and errors.add :current_password, ht(:hobo.messages.current_password_is_not_correct, :default["is not correct"])
     end
 
   end

data/lib/hobo/user_controller.rb

@@ -57,8 +57,8 @@ module Hobo
       (redirect_to home_page; return) if logged_in?
 
       login_attr = model.login_attribute.to_s.titleize.downcase
-      options.reverse_merge!(:success_notice => "You have logged in.",
-                             :failure_notice => "You did not provide a valid #{login_attr} and password.")
+      options.reverse_merge!(:success_notice => ht(:"users.messages.login.success", :default=>["You have logged in."]),
+                             :failure_notice => ht(:"users.messages.login.error", :login=>login_attr, :default=>["You did not provide a valid #{login_attr} and password."]))
 
       if request.post?
         user = model.authenticate(params[:login], params[:password])
@@ -97,8 +97,8 @@ module Hobo
     def hobo_do_signup(&b)
       do_creator_action(:signup) do
         if valid?
-          flash[:notice] = "Thanks for signing up!"
-          flash[:notice] << " You must activate your account before you can log in. Please check your email." unless this.account_active?
+          flash[:notice] = ht(:"users.messages.signup.success", :default=>["Thanks for signing up!"])
+          flash[:notice] << ht(:"users.messages.signup.must_activate", :default=>[" You must activate your account before you can log in. Please check your email."]) unless this.account_active?
         end
         response_block(&b) or if valid?
                                 if this.account_active?
@@ -111,7 +111,7 @@ module Hobo
 
 
     def hobo_logout(options={})
-      options = options.reverse_merge(:notice => "You have logged out.",
+      options = options.reverse_merge(:notice => ht(:"users.messages.logout", :default=>["You have logged out."]),
                                       :redirect_to => base_url)
 
       logout_current_user
@@ -136,7 +136,7 @@ module Hobo
       do_transition_action :reset_password do
         response_block(&b) or if valid?
                                 self.current_user = this
-                                flash[:notice] = "Your password has been reset"
+                                flash[:notice] = ht(:"users.messages.reset_password", :default=>["Your password has been reset"])
                                 redirect_to home_page
                               end
       end
@@ -145,7 +145,7 @@ module Hobo
 
     def hobo_update_with_account_flash(*args)
       hobo_update_without_account_flash(*args) do
-        flash[:notice] = "Changes to your account were saved" if valid? && @this == current_user
+        flash[:notice] = ht(:"users.messages.update.success", :default=>["Changes to your account were saved"]) if valid? && @this == current_user
         yield if block_given?
       end
     end

data/lib/hobo/view_hints.rb

@@ -18,7 +18,7 @@ module Hobo
           val
         else 
           arg = if block
-                  block[*args] 
+                  instance_exec(*args, &block)
                 else
                   args.first
                 end
@@ -43,9 +43,16 @@ module Hobo
                                  model < ActiveRecord::Acts::List::InstanceMethods &&
                                  model.new.try.scope_condition == "1 = 1" }
 
-    
+    setter :inline_booleans, [] do |*args|
+     if args[0] == true
+       model.columns.select { |c| c.type == :boolean }.*.name
+     else
+       args.*.to_s
+     end
+    end
+
     # Accessors
-    
+
     class << self
       
       def model

data/rails_generators/hobo/USAGE

@@ -0,0 +1,4 @@
+Description:
+
+    Adds support for the basic Hobo & DRYML system, not including
+    Rapid.

data/rails_generators/hobo_admin_site/USAGE

@@ -0,0 +1,16 @@
+Description:
+
+    Creates a subsite, a namespaced section of your application.
+
+    The subsite will use app/views/taglibs/<subsite_name>_site.dryml
+    instead of app/views/taglibs/appplication.dryml.  This allows you
+    to easily set different themes and choose different CSS files for
+    the subsite.
+
+    Controllers for the subsite are created in
+    app/controllers/<subsite_name>/ and views are also in their own
+    subdirectory.   This allows you to have two different controllers
+    and two different sets of views for the same model.
+
+    The difference between hobo_admin_site and hobo_subsite is that
+    hobo_admin_site limits the subsite to use by administrators only.

data/rails_generators/hobo_front_controller/hobo_front_controller_generator.rb

@@ -35,6 +35,7 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
 
 
       m.template("index.dryml", File.join('app/views', class_path, file_name, "index.dryml"))
+      m.template("summary.dryml", File.join('app/views', class_path, file_name, "summary.dryml"))
     end
   end
 
@@ -46,8 +47,16 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
     routes_path = File.join(RAILS_ROOT, "config/routes.rb")
     name = full_class_path
 
-    route = ("  map.site_search  'search', :controller => '#{name}', :action => 'search'\n" +
-             "  map.root :controller => '#{name}', :action => 'index'")
+    root = class_nesting_depth>0 ? class_nesting.underscore : "root"
+
+    route = "  map.site_search  'search', :controller => '#{name}', :action => 'search'\n"
+    if class_nesting_depth == 0
+      route+= "  map.root :controller => '#{name}', :action => 'index'"
+    elsif class_nesting_depth == 1
+      route+= "  map.#{class_nesting.underscore} '/#{class_nesting.underscore}', :controller => '#{name}', :action => 'index'"
+    else
+      assert false, "no support for class_nesting_depth>1"      
+    end
 
     route_src = File.read(routes_path)
     return if route_src.include?(route)

data/rails_generators/hobo_front_controller/templates/controller.rb

@@ -4,6 +4,12 @@ class <%= class_name %>Controller < ApplicationController
 
   def index; end
 
+  def summary
+    if !current_user.administrator?
+      redirect_to user_login_path
+    end
+  end
+
   def search
     if params[:query]
       site_search(params[:query])

data/rails_generators/hobo_front_controller/templates/summary.dryml

@@ -0,0 +1,103 @@
+<page>
+  <content:>
+    <div class="content-body">
+    <h2>Application Summary</h2>
+
+    <table class="app-summary">
+      <tr> <th></th><th></th></tr>
+      <tr> <td>Application Name</td>           <td><app-name/></td>         </tr>
+      <tr> <td>Application Location</td>       <td><rails-root/></td>     </tr>
+      <tr> <td>Rails Version</td>              <td><rails-version/></td>    </tr>
+      <tr> <td>Rails Location</td>             <td><rails-location/></td>     </tr>
+      <tr> <td>Mode</td>                       <td><rails-env/></td> </tr>
+    </table>
+
+    <h3>Change Control</h3>
+    <table class="app-summary">      
+      <tr> <th></th><th></th></tr>
+      <tr> <td>Method</td>                 <td><cms-method/></td> </tr>
+      <if test="&cms_method.strip=='git'">
+        <tr> <td>Version</td>                <td><cms-version/></td> </tr>
+        <tr> <td>Date</td>                   <td><cms-last-commit-time/></td> </tr>
+        <tr> <td>Branch</td>                 <td><cms-branch/></td> </tr>
+        <tr> <td>Clean?</td>                 <td><cms-clean/></td></tr>
+      </if>
+    </table>
+
+
+    <h3>Gems</h3>
+    <table class="app-summary">
+      <with-gems>
+        <tr if="&first_item?"><th></th><th>Required</th><th>Installed</th><th>Status</th><th>Dependencies</th></tr>
+        <tr>
+          <td><gem-name/></td>
+          <td><gem-version-required/></td>
+          <td><gem-version/></td>          
+          <td><gem-frozen/></td>
+          <td><gem-dependencies/></td>
+        </tr>
+      </with-gems>
+    </table>
+
+    <h3>Plugins</h3>
+    <table class="app-summary">
+      <with-plugins>
+        <tr if="&first_item?"><th></th><th>Location</th><th>Method</th><th>Clean?</th><th>Version</th></tr>
+        <tr>
+          <td><plugin-name/></td>
+          <td><plugin-location/></td>
+          <td><plugin-method/></td>
+          <td><plugin-clean/></td>
+          <td><plugin-version/></td>
+        </tr>
+      </with-plugins>
+    </table>
+
+    <h3>Environments</h3>
+    <table class="app-summary">
+      <tr><th></th><th colspan='2'>database</th></tr>
+      <with-environments>
+        <tr>
+          <td><environment-name /></td>
+          <td><database-type /></td>
+          <td><database-name /></td>
+        </tr>
+      </with-environments>
+    </table>
+
+    <h2>Models</h2>
+    <table class="app-summary">
+      <tr><th>Class</th><th>Table</th></tr>
+      <with-models>
+        <tr>
+          <td><model-name/></td>
+          <td><model-table-name/></td>
+        </tr>
+      </with-models>
+    </table>        
+    
+    <with-models>
+      <h3 if="&this.try.table_name"><model-name /></h3>
+      <table class="app-summary">
+        <with-model-columns>
+          <tr if="&first_item?"><th>Column</th><th>Type</th></tr>
+          <tr>
+            <td><model-column-name/></td>
+            <td><model-column-type/></td>
+          </tr>
+        </with-model-columns>
+      </table>
+      <table class="app-summary">
+        <with-model-associations>
+          <tr if="&first_item?"><th>Association</th><th>Macro</th><th>Class</th></tr>
+          <tr>
+            <td><model-association-name/></td>
+            <td><model-association-macro/></td>
+            <td><model-association-class-name/></td>
+          </tr>
+        </with-model-associations>
+      </table>
+    </with-models>
+    </div>
+  </content:>
+</page>