hobo 1.1.0 → 1.3.0.RC

data/{taglibs → lib/hobo/rapid/taglibs}/rapid_user_pages.dryml

@@ -16,30 +16,31 @@
  -->
 <def tag="login-form" attrs="user-model">
   <% user_model ||= self.try.model -%>
-  <form action="&request.request_uri" class="login" merge>
+  <form action="&request.fullpath" class="login" merge>
     <labelled-item-list param>
       <labelled-item>
-        <item-label param="login-label"><ht key="hobo.login.email"><%= user_model.login_attribute.to_s.titleize %></ht></item-label>
+
+        <item-label param="login-label"><t key="hobo.login.#{user_model.login_attribute}"><%= user_model.login_attribute.to_s.titleize %></t></item-label>
         <item-value><input type="text" name="login" id="login" class="string" param="login-input" /></item-value>
       </labelled-item>
-      
+
       <labelled-item>
-        <item-label param="password-label"><ht key="hobo.login.password">Password</ht></item-label>
+        <item-label param="password-label"><t key="hobo.login.password">Password</t></item-label>
         <item-value>
           <input type="password" name="password" id="password" class="string" param="password-input"/>
         </item-value>
       </labelled-item>
-      
+
       <labelled-item param="remember-me">
-        <item-label class="field-label" param="remember-me-label"><ht key="hobo.login.remember_me">Remember me:</ht></item-label>
+        <item-label class="field-label" param="remember-me-label"><t key="hobo.login.remember_me">Remember me:</t></item-label>
         <item-value>
           <input type="checkbox" name="remember_me" id="remember-me" param="remember-me-input" checked/>
         </item-value>
       </labelled-item>
     </labelled-item-list>
     <div param="actions">
-      <submit label="#{ht 'hobo.actions.login', :default=>['Log in'] }" param/><if test="&signup_url" class='nav-item'>
-      <ht key="hobo.support.or">or</ht> <a param="signup" href="&signup_url"><ht key="hobo.login.signup">Sign up</ht></a></if>
+      <submit label="#{t 'hobo.actions.login', :default=>['Log in'] }" param/><if test="&signup_url" class='nav-item'>
+      <t key="hobo.support.or">or</t> <a param="signup" href="&signup_url"><t key="hobo.login.signup">Sign up</t></a></if>
     </div>
   </form>
 </def>
@@ -47,18 +48,18 @@
 <!-- Simple log-in page  -->
 <def tag="login-page">
   <% remember_me = true if remember_me.nil? %>
-  <simple-page title="#{ht 'hobo.login.title', :default=>['Log in'] }" merge>
-   
+  <simple-page title="#{t 'hobo.login.title', :default=>['Log in'] }" merge>
+
     <body: class="login-page" param/>
-    
+
     <content: param>
       <header param="content-header">
-        <h2 param="heading"><ht key="hobo.login.heading">Log In</ht></h2>
+        <h2 param="heading"><t key="hobo.login.heading">Log In</t></h2>
       </header>
-      
-      <section param="content-body">      
+
+      <section param="content-body">
         <login-form param="form" user-model="&model"/>
-        <a href="&forgot_password_url" param="forgot-password" if="&forgot_password_url"><ht key="hobo.login.forgot_password">Forgot your password?</ht></a>
+        <a href="&forgot_password_url" param="forgot-password" if="&forgot_password_url"><t key="hobo.login.forgot_password">Forgot your password?</t></a>
       </section>
     </content:>
   </simple-page>
@@ -68,35 +69,35 @@
 <!-- The page that initiates the forgotten password process. Contains a single text-input where the user can provide
  their email address -->
 <def tag="forgot-password-page">
-  <simple-page title="#{ht 'hobo.forgot_password.title', :default=>['Forgotten Password'] }" merge>
-   
+  <simple-page title="#{t 'hobo.forgot_password.title', :default=>['Forgotten Password'] }" merge>
+
     <body: class="forgot-password-page" param/>
-    
+
     <content: param>
       <header param="content-header">
-        <h2 param="heading"><ht key="hobo.forgot_password.heading">Forgotten Password</ht></h2>
-        <p><ht key="hobo.forgot_password.text">Enter the email address you signed up with. If we have it in
+        <h2 param="heading"><t key="hobo.forgot_password.heading">Forgotten Password</t></h2>
+        <p><t key="hobo.forgot_password.text">Enter the email address you signed up with. If we have it in
         our records we'll send you an email allowing you to choose a new
-        password.</ht></p>
+        password.</t></p>
       </header>
 
       <section param="content-body">
         <form action="" class="forgot-password" param>
           <labelled-item-list param>
             <labelled-item>
-              <item-label param="email-address-label"><ht key="hobo.forgot_password.email">Email Address</ht></item-label>
+              <item-label param="email-address-label"><t key="hobo.forgot_password.email_address">Email Address</t></item-label>
               <item-value>
                 <input type="text" name="email_address" id="email-address" class="email-address" param="email-address-input" />
               </item-value>
             </labelled-item>
           </labelled-item-list>
           <div param="actions">
-            <submit label="#{ht 'hobo.actions.send', :default=>['Send'] }" param/>
+            <submit label="#{t 'hobo.actions.send', :default=>['Send'] }" param/>
           </div>
         </form>
       </section>
     </content:>
-      
+
   </simple-page>
 </def>
 
@@ -104,26 +105,26 @@
 entered is in our records". This is to avoid a privacy concern that the forgotten-password mechanism can be otherwise used to tell
 if a given email is associated with an account or not. -->
 <def tag="forgot-password-email-sent-page">
-  <simple-page title="#{ht 'hobo.forgot_password_sent.title', :default=>['Forgotten Password - Sent'] }" merge>
+  <simple-page title="#{t 'hobo.forgot_password_sent.title', :default=>['Forgotten Password - Sent'] }" merge>
     <body: class="forgot-password-page" param/>
-    
+
     <content: param>
       <header param="content-header">
-        <h2 param><ht key="hobo.forgot_password_sent.heading">Forgotten Password - Sent</ht></h2>
+        <h2 param><t key="hobo.forgot_password_sent.heading">Forgotten Password - Sent</t></h2>
       </header>
 
       <section param="content-body">
         <p param="message">
-        	<ht key="hobo.forgot_password_sent.text" email="#{params[:email_address]}">
+        	<t key="hobo.forgot_password_sent.text" email-address="#{params[:email_address]}">
         	If the e-mail address you entered, <%= h params[:email_address] %>,
           is in our records, you will
         receive an e-mail from us with instructions for resetting your
         password. If you don't receive this e-mail, please check your
-        junk mail folder.</ht></p>
-        <p><a href="#{base_url}/"><ht key="hobo.actions.back">Back to</ht> <app-name/></a></p>
+        junk mail folder.</t></p>
+        <p><a href="#{base_url}/"><t key="hobo.actions.back">Back to</t> <app-name/></a></p>
       </section>
     </content:>
-        
+
   </simple-page>
 </def>
 
@@ -131,17 +132,17 @@ if a given email is associated with an account or not. -->
 <!-- The page that is displayed on attempting to log in to an account that has been disabled. -->
 <def tag="account-disabled-page">
 
-  <simple-page title="Account not available" merge>
-       
+  <simple-page title="#{t 'hobo.account_disabled_page.title', :default=>['Account Disabled'] }" merge>
+
     <body: class="account-disabled-page" param/>
 
     <content: param>
       <header param="content-header">
-        <h2 param>Account is not available</h2>
+        <h2 param><t key="hobo.account_disabled_page.heading">Account is disabled</t></h2>
       </header>
 
       <section param="content-body">
-        <p>Your account is not available at this time.</p>
+        <p><t key="hobo.account_disabled_page.text">Your account is disabled at this time.</t></p>
       </section>
     </content:>
   </simple-page>
@@ -152,7 +153,7 @@ if a given email is associated with an account or not. -->
 <!-- Basic account page that provides the ability for the user to change their email address and password. -->
 <def tag="account-page">
 
-  <page title="#{name} - Account" merge>
+  <page title="#{t 'hobo.account_page.title', :default=>['Your Account'] }" merge>
 
     <body: class="user-account-page #{type_name}" param/>
 
@@ -165,17 +166,17 @@ if a given email is associated with an account or not. -->
         <error-messages param/>
         <form class="change-password" param>
           <field-list fields="email_address, current_password, password, password_confirmation" param>
-              <password-label:><ht key="users.new_password">"New Password</ht></password-label:>
-              <password-confirmation-label:><ht key="users.confirm_new_password">Confirm New Password</ht></password-confirmation-label:>
+            <password-label:><t key="hobo.account_page.new_password">New Password</t></password-label:>
+            <password-confirmation-label:><t key="hobo.account_page.confirm_new_password">Confirm New Password</t></password-confirmation-label:>
           </field-list>
 
           <div class="actions" param="actions">
-            <submit label="Save" param/>
+            <submit label="#{t 'hobo.actions.save_account', :default=>'Save'}" param/>
           </div>
         </form>
       </section>
     </content:>
-    
+
   </page>
 
 </def>

data/lib/hobo/routes.rb

@@ -0,0 +1,31 @@
+module Hobo
+  module Routes
+    extend self
+
+    def reset_linkables
+      @linkable_keys = Set.new
+    end
+
+    def linkable_key(klass, action, options)
+      subsite = options[:subsite] || options['subsite']
+      method  = options[:method]  || options['method'] || :get
+      [ subsite, klass.name, action, method ].join('/')
+    end
+
+    def linkable!(klass, action, options={})
+      @linkable_keys << linkable_key(klass, action, options)
+    end
+
+    def linkable?(klass, action, options={})
+      @linkable_keys.member? linkable_key(klass, action, options)
+    end
+
+    def models_with(wanted_action)
+      @linkable_keys.map do |k|
+        subsite, class_name, action, method = k.split('/')
+        (action == wanted_action.to_s) ? class_name.constantize : nil
+      end.compact
+    end
+
+  end
+end

data/{doctest → test/doctest}/hobo/hobo_helper.rdoctest

@@ -1,19 +1,19 @@
-# Hobo::HoboHelper
+# Hobo::Helper
 
 Various view helpers
 
         doctest_require: 'rubygems'
         doctest_require: 'active_support'
         doctest_require: 'mocha'
-        doctest_require: '../../../hobosupport/lib/hobosupport'
-        doctest_require: '../../../hobofields/lib/hobofields'
+        doctest_require: '../../../hobo_support/lib/hobo_support'
+        doctest_require: '../../../hobo_fields/lib/hobo_fields'
         doctest_require: '../../lib/hobo'
 
 Create a mock view layer:
 
-        >> 
+        >>
          class View
-           extend Hobo::HoboHelper
+           extend Hobo::Helper
            class << self
              protected_instance_methods.each {|m| public m }
 
@@ -22,7 +22,7 @@ Create a mock view layer:
              def base_url; "" ;end
            end
          end
-        >> RAILS_ROOT = "test-app"
+        >> Rails.root = "test-app"
 
 Useful stuff
 
@@ -49,19 +49,19 @@ Something to link to:
 
 ### Simple 'show' URLs
 
-        >> Hobo::ModelRouter.expects(:linkable?).with(Thing, :show, {:subsite => ''}).returns(true)
+        >> Hobo::Routes.expects(:linkable?).with(Thing, :show, {:subsite => ''}).returns(true)
         >> View.object_url(thing)
         => "/things/1"
 
-Returns nil if ModelRouter says it's not linkable
+Returns nil if Routes says it's not linkable
 
-        >> Hobo::ModelRouter.expects(:linkable?).with(Thing, :show, {:subsite => ''}).returns(false)
+        >> Hobo::Routes.expects(:linkable?).with(Thing, :show, {:subsite => ''}).returns(false)
         >> View.object_url(thing)
         => nil
 
 A URL to the 'edit' page:
 
-        >> Hobo::ModelRouter.expects(:linkable?).with(Thing, :edit, {:subsite => ''}).returns(true)
+        >> Hobo::Routes.expects(:linkable?).with(Thing, :edit, {:subsite => ''}).returns(true)
         >> View.object_url(thing, :edit)
         => "/things/1/edit"
 
@@ -69,7 +69,7 @@ A URL to the 'edit' page:
 ### POST URLs for creating new items in collections:
 
         >> collection = mock(:origin => thing, :origin_attribute => "parts")
-        >> Hobo::ModelRouter.expects(:linkable?).with(Thing, :create_part, {:subsite => '', :method => :post}).returns(true)
+        >> Hobo::Routes.expects(:linkable?).with(Thing, :create_part, {:subsite => '', :method => :post}).returns(true)
         >> View.object_url(collection, :method => :post)
         => "/things/1/parts"
 

data/test/irt/generators/admin_subsite.irt

@@ -0,0 +1,27 @@
+require File.expand_path('../helper.rb', __FILE__)
+
+
+invoke 'hobo:assets', %w[ -q ]
+invoke 'hobo:admin_subsite', %w[ -q ]
+desc "Admin Subsite files exist"
+files_exist? %w[ app/controllers/admin/admin_site_controller.rb
+                 test/functional/admin_site_controller_test.rb
+                 public/stylesheets/admin.css
+                 app/controllers/admin/users_controller.rb
+                 app/helpers/admin/users_helper.rb
+                 test/unit/helpers/admin/users_helper_test.rb
+                 app/views/taglibs/admin_site.dryml
+]
+test_value_eql? true
+
+desc "application.dryml injection matches"
+file_include? "app/views/taglibs/application.dryml",
+%(<extend tag="page">
+  <old-page merge>
+    <footer:>
+      <a href="&admin_users_url" if="&current_user.administrator?">Admin</a>
+    </footer:>
+  </old-page>
+</extend>
+)
+test_value_eql? true

data/test/irt/generators/assets.irt

@@ -0,0 +1,16 @@
+require File.expand_path('../helper.rb', __FILE__)
+
+
+desc "hobo:assets invoke"
+invoke 'hobo:assets', %w(-q)
+
+files_exist? %w[ app/views/taglibs/application.dryml
+                 public/stylesheets/application.css
+                 public/javascripts/dryml-support.js
+                 app/models/guest.rb
+]
+test_value_eql? true
+
+desc "Application.dryml content matches"
+file_include? 'app/views/taglibs/application.dryml', '<set-theme name="clean"/>'
+test_value_eql? true

data/test/irt/generators/controller.irt

@@ -0,0 +1,6 @@
+require File.expand_path('../helper.rb', __FILE__)
+
+
+invoke 'hobo:controller' , %w(houses -q)
+
+eval_file '../partials/_house_controller_tests.rb'

data/test/irt/generators/front_controller.irt

@@ -0,0 +1,30 @@
+require File.expand_path('../helper.rb', __FILE__)
+
+
+invoke 'hobo:front_controller', %w[ -q ]
+desc "All files exist"
+files_exist? %w[ app/controllers/front_controller.rb
+                 app/helpers/front_helper.rb
+                 test/unit/helpers/front_helper_test.rb
+                 test/functional/front_controller_test.rb
+                 app/views/front/index.dryml ]
+test_value_eql? true
+
+desc "public/index.html removed"
+File.exists? 'public/index.html'
+test_value_eql? false
+
+
+desc "front_controller.rb content matches"
+file_include? 'app/controllers/front_controller.rb',
+              'hobo_controller',
+              'def index',
+              'def search'
+test_value_eql? true
+
+
+desc "Routes added"
+file_include? 'config/routes.rb',
+              %(match 'search' => 'front#search', :as => 'site_search'),
+              %(root :to => 'front#index')
+test_value_eql? true

data/test/irt/generators/helper.rb

@@ -0,0 +1,31 @@
+irt_at_exit{git_reset_app}
+
+def invoke(*args)
+  Rails::Generators.invoke *args
+end
+
+def files_exist?(paths)
+  missing = paths.reject{|f| File.exists?(f)}
+  missing.empty? || missing
+end
+
+def file_include?(path, *strings)
+  file_content path, :select, *strings
+end
+
+def file_exclude?(path, *strings)
+  file_content path, :reject, *strings
+end
+
+def file_content(path, action, *strings)
+  f = File.read(path)
+  wrong = strings.send(action) do |s|
+            re = s.is_a?(Regexp) ? s : /#{Regexp.escape(s)}/
+            !(f =~ re)
+          end
+  wrong.empty? || wrong
+end
+
+def git_reset_app
+  system %(cd #{Hobo.root} && rake test:prepare_testapp -q)
+end

data/test/irt/generators/model.irt

@@ -0,0 +1,28 @@
+require File.expand_path('../helper.rb', __FILE__)
+
+
+invoke 'hobo:model', %w(house alpha:string -q)
+
+eval_file '../partials/_house_model_tests.rb'
+
+invoke 'hobo:model', %w(nest/ed alpha:string -q)
+
+desc "Nested files exist"
+files_exist? %w[ app/models/nest/ed.rb
+        app/models/nest.rb
+        test/unit/nest/ed_test.rb
+        test/fixtures/nest/eds.yml
+        app/viewhints/nest/ed_hints.rb ]
+test_value_eql? true
+
+desc "Nested injection matches"
+file_include? 'app/models/nest/ed.rb',
+              'hobo_model',
+              'fields do',
+              /alpha\s+\:string/
+test_value_eql? true
+
+desc "Nested hint content matches"
+file_include? 'app/viewhints/nest/ed_hints.rb',
+              'class Nest::EdHints'
+test_value_eql? true

data/test/irt/generators/partials/_account_user_model_tests.rb

@@ -0,0 +1,21 @@
+desc "Account Model files exist"
+files_exist? %w[ app/models/account.rb
+                 app/models/account.rb
+                 test/unit/account_test.rb
+                 test/fixtures/accounts.yml
+                 app/viewhints/account_hints.rb
+]
+test_value_eql? true
+
+desc "Account Model injection matches"
+file_include? 'app/models/account.rb',
+              'hobo_user_model',
+              'fields do',
+              /name\s+\:string/ ,
+              /email_address\s+\:email_address/
+test_value_eql? true
+
+desc "Nested hint content matches"
+file_include? 'app/viewhints/account_hints.rb',
+              'class AccountHints'
+test_value_eql? true