hobo 1.3.0.pre24 → 1.3.0.pre25

data/VERSION

@@ -1 +1 @@
-1.3.0.pre24
+1.3.0.pre25

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

@@ -43,7 +43,7 @@ module Hobo
 
     def add_routes
       return unless options[:add_routes]
-      route "match 'search' => '#{file_path}#search', :as => 'search'"
+      route "match 'search' => '#{file_path}#search', :as => 'site_search'"
       if class_path.empty?
         route "root :to => '#{file_path}#index'"
       else

data/lib/generators/hobo/user_mailer/templates/activation.erb

@@ -1,8 +1,8 @@
-<%%= @user %>,
+<%%= @<%= name.underscore -%> %>,
 
 To activate your account for <%%= @app_name %>, click on this link:
 
-  <%%= user_activate_url :id => @user, :key => @key %>
+  <%%= <%= name.underscore -%>_activate_url :id => @<%= name.underscore -%>, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_mailer/templates/forgot_password.erb

@@ -1,9 +1,9 @@
-<%%= @user %>,
+<%%= @<%= name.underscore -%> %>,
 
 If you have forgotten your password for <%%= @app_name %>, you can choose
 a new one by clicking on this link:
 
-  <%%= <%= name.underscore -%>_reset_password_url :id => @user, :key => @key %>
+  <%%= <%= name.underscore -%>_reset_password_url :id => @<%= name.underscore -%>, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_mailer/templates/invite.erb

@@ -1,8 +1,8 @@
-<%%= @user %>,
+<%%= @<%= name.underscore %> %>,
 
 You have been invited to join <%%= @app_name %>. If you wish to accept, please click on the following link
 
-  <%%= user_accept_invitation_url :id => @user, :key => @key %>
+  <%%= <%= name.underscore %>_accept_invitation_url :id => @<%= name.underscore %>, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_mailer/templates/mailer.rb.erb

@@ -1,24 +1,24 @@
 class <%= class_name -%>Mailer < ActionMailer::Base
   default :from => "no-reply@#{host}"
 
-  def forgot_password(user, key)
-    @user, @key = user, key
+  def forgot_password(<%= name.underscore %>, key)
+    @<%= name.underscore %>, @key = <%= name.underscore %>, key
     mail( :subject => "#{app_name} -- forgotten password",
-          :to      => user.email_address )
+          :to      => <%= name.underscore %>.email_address )
   end
 
 <% if invite_only? -%>
-  def invite(user, key)
-    @user, @key = user, key
+  def invite(<%= name.underscore %>, key)
+    @<%= name.underscore %>, @key = <%= name.underscore %>, key
     mail( :subject => "Invitation to #{app_name}",
-          :to      => user.email_address )
+          :to      => <%= name.underscore %>.email_address )
   end
 
 <% elsif options[:activation_email] %>
-  def activation(user, key)
-    @user, @key = user, key
-    mail :subject => "#{app_name} -- activate",
-         :to      => user.email_address
+  def activation(<%= name.underscore %>, key)
+    @<%= name.underscore %>, @key = <%= name.underscore %>, key
+    mail( :subject => "#{app_name} -- activate",
+          :to      => <%= name.underscore %>.email_address )
   end
 
 <% end -%>

data/lib/hobo/routes.rb

@@ -23,7 +23,7 @@ module Hobo
     def models_with(wanted_action)
       @linkable_keys.map do |k|
         subsite, class_name, action, method = k.split('/')
-        (action == wanted_action) ? class_name.constantize : nil
+        (action == wanted_action.to_s) ? class_name.constantize : nil
       end.compact
     end
 

data/test/irt/generators/front_controller.irt

@@ -25,6 +25,6 @@ test_value_eql? true
 
 desc "Routes added"
 file_include? 'config/routes.rb',
-              %(match 'search' => 'front#search', :as => 'search'),
+              %(match 'search' => 'front#search', :as => 'site_search'),
               %(root :to => 'front#index')
 test_value_eql? true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637108446
+  hash: -1637108445
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre24
-  version: 1.3.0.pre24
+  - pre25
+  version: 1.3.0.pre25
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -04:00
+date: 2010-12-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108446
+        hash: -1637108445
         segments: 
         - 1
         - 3
         - 0
-        - pre24
-        version: 1.3.0.pre24
+        - pre25
+        version: 1.3.0.pre25
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108446
+        hash: -1637108445
         segments: 
         - 1
         - 3
         - 0
-        - pre24
-        version: 1.3.0.pre24
+        - pre25
+        version: 1.3.0.pre25
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108446
+        hash: -1637108445
         segments: 
         - 1
         - 3
         - 0
-        - pre24
-        version: 1.3.0.pre24
+        - pre25
+        version: 1.3.0.pre25
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency