splendeo-generators 0.2.0 → 0.2.1

data/rails_generators/splendeo_authentication/templates/authentication.rb

@@ -42,7 +42,7 @@ module Authentication
   
   def login_required
     unless logged_in?
-      flash[:error] = "You must first log in or sign up before accessing this page."
+      flash[:error] = t('flash_error_login_required')
       store_target_location
       redirect_to login_url
     end

data/rails_generators/splendeo_authentication/templates/sessions_controller.rb

@@ -7,9 +7,10 @@ class <%= session_plural_class_name %>Controller < ApplicationController
   def create
     @<%= session_singular_name %> = <%= session_class_name %>.new(params[:<%= session_singular_name %>])
     if @<%= session_singular_name %>.save
-      flash[:notice] = "Logged in successfully."
+      flash[:notice] = t('flash_notice_logged_in')
       redirect_to_target_or_default(root_url)
     else
+      flash.now[:error] = t('flash_error_invalid_login')
       render :action => 'new'
     end
   end
@@ -17,7 +18,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
   def destroy
     @<%= session_singular_name %> = <%= session_class_name %>.find
     @<%= session_singular_name %>.destroy
-    flash[:notice] = "You have been logged out."
+    flash[:notice] = t('flash_notice_logged_out')
     redirect_to root_url
   end
 <%- else -%>
@@ -28,17 +29,17 @@ class <%= session_plural_class_name %>Controller < ApplicationController
     <%= user_singular_name %> = <%= user_class_name %>.authenticate(params[:login], params[:password])
     if <%= user_singular_name %>
       session[:<%= user_singular_name %>_id] = <%= user_singular_name %>.id
-      flash[:notice] = "Logged in successfully."
+      flash[:notice] = t('flash_notice_logged_in')
       redirect_to_target_or_default(root_url)
     else
-      flash.now[:error] = "Invalid login or password."
+      flash.now[:error] = t('flash_error_invalid_login')
       render :action => 'new'
     end
   end
   
   def destroy
     session[:<%= user_singular_name %>_id] = nil
-    flash[:notice] = "You have been logged out."
+    flash[:notice] = t('flash_notice_logged_out')
     redirect_to root_url
   end
 <%- end -%>

data/rails_generators/splendeo_authentication/templates/user.rb

@@ -10,7 +10,7 @@ class <%= user_class_name %> < ActiveRecord::Base
   
   validates_presence_of :username
   validates_uniqueness_of :username, :email, :allow_blank => true
-  validates_format_of :username, :with => /^[-\w\._@]+$/i, :allow_blank => true, :message => "should only contain letters, numbers, or .-_@"
+  validates_format_of :username, :with => /^[-\w\._@]+$/i, :allow_blank => true, :message => t('username_validation_message')
   validates_format_of :email, :with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
   validates_presence_of :password, :on => :create
   validates_confirmation_of :password

data/rails_generators/splendeo_authentication/templates/users_controller.rb

@@ -9,7 +9,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController
     <%- unless options[:authlogic] -%>
       session[:<%= user_singular_name %>_id] = @<%= user_singular_name %>.id
     <%- end -%>
-      flash[:notice] = "Thank you for signing up! You are now logged in."
+      flash[:notice] = t('flash_notice_signed_up')
       redirect_to root_url
     else
       render :action => 'new'

data/rails_generators/splendeo_authentication/templates/views/erb/login.html.erb

@@ -1,30 +1,31 @@
-<%% title "Log in" %>
+<%% title t('log_in_title') %>
 
-<p>Don't have an account? <%%= link_to "Sign up!", signup_path %></p>
+<p><%%= t('sign_up_message', :url => signup_path) %></p>
 
 <%- if options[:authlogic] -%>
-<%% form_for @<%= session_singular_name %> do |f| %>
-  <%%= f.error_messages %>
-  <p>
-    <%%= f.label :username %><br />
-    <%%= f.text_field :username %>
-  </p>
-  <p>
-    <%%= f.label :password %><br />
-    <%%= f.password_field :password %>
-  </p>
-  <p><%%= f.submit "Log in" %></p>
+<%% semantic_form_for @<%= session_singular_name %> do |f| %>
+  <%= f.error_message_on :base %>
+  
+  <%% f.inputs do %>
+    <%%= f.input :username %>
+    <%%= f.input :password %>
+  <%% end %>
+
+  <%% f.buttons do %>
+    <%%= f.commit_button t('log_in_button') %>
+  <%% end %>
+
 <%% end %>
 <%- else -%>
 <%% form_tag <%= session_plural_name %>_path do %>
   <p>
-    <%%= label_tag :login, "Username or Email Address" %><br />
+    <%%= label_tag :login, t('login_label') %><br />
     <%%= text_field_tag :login, params[:login] %>
   </p>
   <p>
-    <%%= label_tag :password %><br />
+    <%%= label_tag :password, t('password_label') %><br />
     <%%= password_field_tag :password %>
   </p>
-  <p><%%= submit_tag "Log in" %></p>
+  <p><%%= submit_tag t('log_in_button') %></p>
 <%% end %>
 <%- end -%>

data/rails_generators/splendeo_authentication/templates/views/erb/signup.html.erb

@@ -1,24 +1,16 @@
-<%% title "Sign up" %>
+<%% title t('sign_up_title') %>
 
-<p>Already have an account? <%%= link_to "Log in", login_path %>.</p>
+<p><%%= t('log_in_message', :url => login_path) %></p>
 
-<%% form_for @<%= user_singular_name %> do |f| %>
-  <%%= f.error_messages %>
-  <p>
-    <%%= f.label :username %><br />
-    <%%= f.text_field :username %>
-  </p>
-  <p>
-    <%%= f.label :email, "Email Address" %><br />
-    <%%= f.text_field :email %>
-  </p>
-  <p>
-    <%%= f.label :password %><br />
-    <%%= f.password_field :password %>
-  </p>
-  <p>
-    <%%= f.label :password_confirmation, "Confirm Password" %><br />
-    <%%= f.password_field :password_confirmation %>
-  </p>
-  <p><%%= f.submit "Sign up" %></p>
+<%% semantic_form_for @<%= user_singular_name %> do |f| %>
+  <%%= f.error_message_on :base %>
+  <%% f.inputs do %>
+    <%%= f.input :username %>
+    <%%= f.input :email %>
+    <%%= f.input :password %>
+    <%%= f.input :password_confirmation %>
+  <%% end %>
+  <%% f.buttons do %>
+    <%%= f.commit_button t('sign_up_button') %>
+  <%% end %>
 <%% end %>

data/rails_generators/splendeo_authentication/templates/views/haml/login.html.haml

@@ -1,30 +1,25 @@
-- title "Log in"
+- title t('log_in_title')
 
-%p== Don't have an account? #{link_to "Sign up!", signup_path}
+%p== t('sign_up_message', :url => signup_path)
 
 <%- if options[:authlogic] -%>
-- form_for @<%= session_singular_name %> do |f|
-  = f.error_messages
-  %p
-    = f.label :username
-    %br
-    = f.text_field :username
-  %p
-    = f.label :password
-    %br
-    = f.password_field :password
-  %p
-    = f.submit "Log in"
+- semantic_form_for @<%= session_singular_name %> do |f|
+  = f.error_message_on :base
+  - f.inputs do
+    = f.input :username
+    = f.input :password
+  - f.buttons do
+    = f.commit_button t('log_in_button')
 <%- else -%>
 - form_tag <%= session_plural_name %>_path do
   %p
-    = label_tag :login, "Username or Email Address"
+    = label_tag :login, t('login_label')
     %br
     = text_field_tag :login, params[:login]
   %p
-    = label_tag :password
+    = label_tag :password, t('password_label')
     %br
     = password_field_tag :password
   %p
-    = submit_tag "Log in"
+    = submit_tag t('log_in_button')
 <%- end -%>

data/rails_generators/splendeo_authentication/templates/views/haml/signup.html.haml

@@ -1,24 +1,13 @@
-- title "Sign up"
+- title t('sign_up_title')
 
-%p== Already have an account? #{link_to "Log in", login_path}.
+%p=t('log_in_message', :url => login_path)
 
-- form_for @<%= user_singular_name %> do |f|
-  = f.error_messages
-  %p
-    = f.label :username
-    %br
-    = f.text_field :username
-  %p
-    = f.label :email, "Email Address"
-    %br
-    = f.text_field :email
-  %p
-    = f.label :password
-    %br
-    = f.password_field :password
-  %p
-    = f.label :password_confirmation, "Confirm Password"
-    %br
-    = f.password_field :password_confirmation
-  %p
-    = f.submit "Sign up"
+- semantic_form_for @<%= user_singular_name %> do |f|
+  = f.error_message_on :base
+  - f.inputs do
+    = f.input :username
+    = f.input :email
+    = f.input :password
+    = f.input :password_confirmation
+  - f.buttons do
+    = f.commit_button t('sign_up_button')

data/rails_generators/splendeo_layout/templates/config/locales/en.yml

@@ -12,3 +12,30 @@ en:
   flash_notice_successfully_created: "Successfully created {{model}}"
   flash_notice_successfully_destroyed: "Successfully destroyed {{model}}"
   flash_notice_successfully_updated: "Successfully destroyed {{model}}"
+
+  # Formtastic buttons
+  formtastic:
+    actions:
+      create: "Create {{model}}"
+      update: "Update {{model}}"
+
+  # Authentication
+  log_in_button: "Log In"
+  log_in_message: "Already have an account? <a href='{{url}}>Log in!</a>"
+  log_in_title: "Log In"
+  sign_up_button: "Sign Up"
+  sign_up_message: "Don't have an account? <a href='{{url}}'>Sign up!</a>"
+  sign_up_title: "Sign Up"
+  login_label: "Login"
+  password_label: "Password"
+
+  flash_notice_logged_in: "Logged in successfully."
+  flash_notice_logged_out: "You have been logged out."
+  flash_notice_signed_up: "Thank you for signing up! You are now logged in."
+  flash_error_login_required: "You must first log in or sign up before accessing this page."
+  flash_error_invalid_login: "Invalid login or password."
+
+  username_validation_message: "should only contain letters, numbers, or .-_@"
+
+
+

data/rails_generators/splendeo_scaffold/splendeo_scaffold_generator.rb

@@ -109,6 +109,10 @@ class SplendeoScaffoldGenerator < Rails::Generator::Base
     names.all? { |n| action? n.to_s }
   end
   
+  def actions_with_find
+    %w[ show edit update destroy ].select{|a| action?(a)}
+  end
+  
   def singular_name
     name.underscore
   end

data/rails_generators/splendeo_scaffold/templates/actions/destroy.rb

@@ -1,5 +1,4 @@
   def destroy
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
     @<%= singular_name %>.destroy
     flash[:notice] = t('flash_notice_successfully_destroyed', :model => <%=class_name%>.human_name)
     redirect_to <%= items_path('url') %>

data/rails_generators/splendeo_scaffold/templates/actions/edit.rb

@@ -1,3 +1,2 @@
   def edit
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
   end

data/rails_generators/splendeo_scaffold/templates/actions/show.rb

@@ -1,3 +1,2 @@
   def show
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
   end

data/rails_generators/splendeo_scaffold/templates/actions/update.rb

@@ -1,5 +1,4 @@
   def update
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
     if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
       flash[:notice] = t('flash_notice_successfully_updated', :model => <%=class_name%>.human_name)
       redirect_to <%= item_path('url') %>

data/rails_generators/splendeo_scaffold/templates/controller.rb

@@ -1,3 +1,23 @@
 class <%= plural_class_name %>Controller < ApplicationController
+
+<%- if actions_with_find.length > 0 -%>
+  before_filter :find_<%= singular_name %>, :only => [ <%= actions_with_find.collect{|a| ":#{a}"}.join(', ') %> ]
+<%- end -%>
+
   <%= controller_methods :actions %>
+
+<%- if actions_with_find.length > 0 -%>
+  protected
+
+  def find_<%= singular_name %>
+    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+  rescue ActiveRecord::RecordNotFound => msg
+    flash[:error] = msg
+    <%- if action?(:index) -%>
+      redirect_to :action => :index
+    <%- else -%>
+      redirect_to root_path
+    <%- end -%>
+  end
+<%- end -%>
 end

data/rails_generators/splendeo_scaffold/templates/views/erb/_form.html.erb

@@ -1,4 +1,5 @@
 <%% semantic_form_for @<%= singular_name %> do |f| %>
+  <%%= f.error_message_on :base %>
   <%% f.inputs do %>
     <%- for attribute in attributes -%>
       <%%= f.input :<%= attribute.name %> %>

data/rails_generators/splendeo_scaffold/templates/views/erb/index.html.erb

@@ -3,7 +3,7 @@
 <table>
   <tr>
   <%- for attribute in attributes -%>
-    <th><%= attribute.column.human_name.titleize %></th>
+    <th><%%= <%= class_name %>.human_attribute_name('<%= attribute.name %>') %></th>
   <%- end -%>
   </tr>
   <%% for <%= singular_name %> in @<%= plural_name %> %>

data/rails_generators/splendeo_scaffold/templates/views/haml/_form.html.haml

@@ -1,4 +1,5 @@
 - semantic_form_for @<%= singular_name %> do |f|
+  = f.error_message_on :base
   - f.inputs do
     <%- for attribute in attributes -%>
     = f.input :<%= attribute.name %>

data/rails_generators/splendeo_scaffold/templates/views/haml/index.html.haml

@@ -3,7 +3,7 @@
 %table
   %tr
     <%- for attribute in attributes -%>
-    %th <%= attribute.column.human_name %>
+    %th= <%= class_name %>.human_attribute_name('<%= attribute.name %>')
     <%- end -%>
   - for <%= singular_name %> in @<%= plural_name %>
     %tr

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ryan Bates