rails_layout 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648e4f681b5ad19c5d2ae77d3e995e3fc9b6d700
-  data.tar.gz: 3472f3f3e947acce87a86c3a62296e48281b8da5
+  metadata.gz: 87ae1a1fb08c91a7cdc93b26bf54e89275469a93
+  data.tar.gz: faaf805b438ed561f5d192b0abfb80935da59596
 SHA512:
-  metadata.gz: 5487f8fa993f3191bcc7c700a6355992e94be99580e3d38b30fe389c36e451125cb387906de93da7bfffee122e7a45d0aa0c98b226ab8dcd3922bd4307143c75
-  data.tar.gz: 34ebc9843536c0cc7f64c024dbf13363ddd22a9b40558092e960f49288aa9c6447b4fe662ebf653d395f4fe6b84f6df75edbaa82778786df27eba12a2910a713
+  metadata.gz: f3eff8350dbddee8b339cafe7c875ca1679761fca70a16776f5c26fb6c9bb5de0119298bd15773e9790b456cde77dee4b992f59bb17c498e069379dbf054abe3
+  data.tar.gz: 9ace5b12b6e308e650d8cf8a237a348beac4ba3c6b653b3d953132e5c7b50d36e5454c9fa1585dbafc2f5735aa789d3c0214e444c2a70eca304951ae6b1e7ad0

data/CHANGELOG.textile

@@ -1,5 +1,11 @@
 h1. CHANGELOG
 
+h3. 1.0.16 May 10, 2014
+
+* add missing Devise form for password reset
+* add navigation spec when Devise is used and RSpec is installed
+* change "log in" to "sign in" and "logout" to "sign out"
+
 h3. 1.0.15 May 3, 2014
 
 * update navlinks partial to accommodate role-based authorization

data/README.textile

@@ -384,9 +384,9 @@ Here's an example of a file *app/views/layouts/_navigation_links.html.erb* appro
 <li><%= link_to 'Contact', new_contact_path %></li>
 <% if user_signed_in? %>
   <li><%= link_to 'Edit account', edit_user_registration_path %></li>
-  <li><%= link_to 'Logout', destroy_user_session_path, :method=>'delete' %></li>
+  <li><%= link_to 'Sign out', destroy_user_session_path, :method=>'delete' %></li>
 <% else %>
-  <li><%= link_to 'Login', new_user_session_path %></li>
+  <li><%= link_to 'Sign in', new_user_session_path %></li>
   <li><%= link_to 'Sign up', new_user_registration_path %></li>
 <% end %>
 <% if user_signed_in? %>

data/lib/generators/layout/devise/devise_generator.rb

@@ -29,6 +29,7 @@ module Layout
       def add_devise_views
         copy_file 'sessions/new.html.erb', 'app/views/devise/sessions/new.html.erb'
         copy_file 'passwords/new.html.erb', 'app/views/devise/passwords/new.html.erb'
+        copy_file 'passwords/edit.html.erb', 'app/views/devise/passwords/edit.html.erb'
         copy_file 'registrations/new.html.erb', 'app/views/devise/registrations/new.html.erb'
         copy_file 'registrations/edit.html.erb', 'app/views/devise/registrations/edit.html.erb'
       end

data/lib/generators/layout/devise/templates/passwords/edit.html.erb

@@ -0,0 +1,14 @@
+<div class="authform">
+  <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+    <h3>Change your password</h3>
+    <%= devise_error_messages! %>
+    <%= f.hidden_field :reset_password_token %>
+    <div class="form-group">
+      <%= f.label :password, 'New password' %>
+        <%= f.password_field :password, autofocus: true, autocomplete: 'off', class: 'form-control' %>
+      <%= f.label :password_confirmation, 'Confirm new password' %>
+        <%= f.password_field :password_confirmation, autocomplete: 'off', class: 'form-control' %>
+    </div>
+     <%= f.submit 'Change my Password', :class => 'button right' %>
+  <% end %>
+</div>

data/lib/generators/layout/devise/templates/sessions/new.html.erb

@@ -1,6 +1,6 @@
 <div class="authform">
   <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :role => 'form'}) do |f| %>
-    <h3>Log in</h3>
+    <h3>Sign in</h3>
     <%= devise_error_messages! %>
     <div class="form-group">
       <%- if devise_mapping.registerable? %>
@@ -16,7 +16,7 @@
       <%= f.label :password %>
       <%= f.password_field :password, class: 'form-control' %>
     </div>
-      <%= f.submit 'Log in', :class => 'button right' %>
+      <%= f.submit 'Sign in', :class => 'button right' %>
       <% if devise_mapping.rememberable? -%>
         <div class="checkbox">
           <%= f.check_box :remember_me %> <%= f.label :remember_me %>

data/lib/generators/layout/navigation/navigation_generator.rb

@@ -21,9 +21,9 @@ module Layout
           append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
 <% if user_signed_in? %>
   <li><%= link_to 'Edit account', edit_user_registration_path %></li>
-  <li><%= link_to 'Logout', destroy_user_session_path, :method=>'delete' %></li>
+  <li><%= link_to 'Sign out', destroy_user_session_path, :method=>'delete' %></li>
 <% else %>
-  <li><%= link_to 'Login', new_user_session_path %></li>
+  <li><%= link_to 'Sign in', new_user_session_path %></li>
   <li><%= link_to 'Sign up', new_user_registration_path %></li>
 <% end %>
 LINKS
@@ -59,15 +59,21 @@ LINKS
         if File.exists?('config/initializers/omniauth.rb')
           append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
 <% if user_signed_in? %>
-  <li><%= link_to 'Logout', signout_path %></li>
+  <li><%= link_to 'Sign out', signout_path %></li>
 <% else %>
-  <li><%= link_to 'Login', signin_path %></li>
+  <li><%= link_to 'Sign in', signin_path %></li>
 <% end %>
 LINKS
           end
         end
       end
 
+      def add_tests
+        return unless File.exists?('config/initializers/devise.rb')
+        return unless File.exists?('spec/spec_helper.rb')
+        copy_file 'navigation_spec.rb', 'spec/features/visitors/navigation_spec.rb'
+      end
+
     end
   end
 end

data/lib/generators/layout/navigation/templates/navigation_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+# Feature: Navigation links
+#   As a visitor
+#   I want to see navigation links
+#   So I can find home, sign in, or sign up
+feature 'Navigation links', :devise do
+
+  # Scenario: View navigation links
+  #   Given I am a visitor
+  #   When I visit the home page
+  #   Then I see "home," "sign in," and "sign up"
+  scenario 'view navigation links' do
+    visit root_path
+    expect(page).to have_content 'Home'
+    expect(page).to have_content 'Sign in'
+    expect(page).to have_content 'Sign up'
+  end
+
+end

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "1.0.15"
+  VERSION = "1.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - lib/generators/layout/devise/devise_generator.rb
 - lib/generators/layout/devise/templates/bootstrap3.css.scss
 - lib/generators/layout/devise/templates/foundation5.css.scss
+- lib/generators/layout/devise/templates/passwords/edit.html.erb
 - lib/generators/layout/devise/templates/passwords/new.html.erb
 - lib/generators/layout/devise/templates/registrations/edit.html.erb
 - lib/generators/layout/devise/templates/registrations/new.html.erb
@@ -122,6 +123,7 @@ files:
 - lib/generators/layout/install/templates/simple.css
 - lib/generators/layout/navigation/navigation_generator.rb
 - lib/generators/layout/navigation/templates/navigation_links.html.erb
+- lib/generators/layout/navigation/templates/navigation_spec.rb
 - lib/rails_layout.rb
 - lib/rails_layout/version.rb
 - rails_layout.gemspec