generators/authenticated/templates/features/accounts.feature generators/authenticated/templates/features/sessions.feature generators/authenticated/templates/features/step_definitions/ra_env.rb generators/authenticated/templates/features/step_definitions/ra_navigation_steps.rb generators/authenticated/templates/features/step_definitions/ra_resource_steps.rb generators/authenticated/templates/features/step_definitions/ra_response_steps.rb generators/authenticated/templates/features/step_definitions/rest_auth_features_helper.rb generators/authenticated/templates/features/step_definitions/user_steps.rb @@ -103,8 +103,8 @@ class AuthenticatedGenerator < Rails::Generator::NamedBase m.directory File.join('spec/models', class_path) m.directory File.join('spec/helpers', model_controller_class_path) m.directory File.join('spec/fixtures', class_path) - m.directory File.join('stories', model_controller_file_path) - m.directory File.join('stories', 'steps') + m.directory 'features' + m.directory File.join('features', 'step_definitions') else m.directory File.join('test/functional', controller_class_path) m.directory File.join('test/functional', model_controller_class_path) @@ -174,23 +174,23 @@ class AuthenticatedGenerator < Rails::Generator::NamedBase class_path, "#{table_name}.yml") - # RSpec Stories - m.template 'stories/steps/ra_navigation_steps.rb', - File.join('stories/steps/ra_navigation_steps.rb') - m.template 'stories/steps/ra_response_steps.rb', - File.join('stories/steps/ra_response_steps.rb') - m.template 'stories/steps/ra_resource_steps.rb', - File.join('stories/steps/ra_resource_steps.rb') - m.template 'stories/steps/user_steps.rb', - File.join('stories/steps/', "#{file_name}_steps.rb") - m.template 'stories/users/accounts.story', - File.join('stories', model_controller_file_path, 'accounts.story') - m.template 'stories/users/sessions.story', - File.join('stories', model_controller_file_path, 'sessions.story') - m.template 'stories/rest_auth_stories_helper.rb', - File.join('stories', 'rest_auth_stories_helper.rb') - m.template 'stories/rest_auth_stories.rb', - File.join('stories', 'rest_auth_stories.rb') + # Cucumber features + m.template 'features/step_definitions/ra_navigation_steps.rb', + File.join('features/step_definitions/ra_navigation_steps.rb') + m.template 'features/step_definitions/ra_response_steps.rb', + File.join('features/step_definitions/ra_response_steps.rb') + m.template 'features/step_definitions/ra_resource_steps.rb', + File.join('features/step_definitions/ra_resource_steps.rb') + m.template 'features/step_definitions/user_steps.rb', + File.join('features/step_definitions/', "#{file_name}_steps.rb") + m.template 'features/accounts.feature', + File.join('features', 'accounts.feature') + m.template 'features/sessions.feature', + File.join('features', 'sessions.feature') + m.template 'features/step_definitions/rest_auth_features_helper.rb', + File.join('features', 'step_definitions', 'rest_auth_features_helper.rb') + m.template 'features/step_definitions/ra_env.rb', + File.join('features', 'step_definitions', 'ra_env.rb') else m.template 'test/functional_test.rb', generators/authenticated/authenticated_generator.rb @@ -1,7 +1,7 @@ module AuthenticatedTestHelper # Sets the current <%= file_name %> in the session from the <%= file_name %> fixtures. def login_as(<%= file_name %>) - @request.session[:<%= file_name %>_id] = <%= file_name %> ? <%= table_name %>(<%= file_name %>).id : nil + @request.session[:<%= file_name %>_id] = <%= file_name %> ? (<%= file_name %>.is_a?(<%= file_name.camelize %>) ? <%= file_name %>.id : <%= table_name %>(<%= file_name %>).id) : nil end def authorize_as(<%= file_name %>) generators/authenticated/templates/authenticated_test_helper.rb @@ -55,9 +55,9 @@ class <%= class_name %> < ActiveRecord::Base # def self.authenticate(login, password) return nil if login.blank? || password.blank? - u = <% if options[:stateful] %>find_in_state :first, :active, :conditions => {:login => login}<% + u = <% if options[:stateful] %>find_in_state :first, :active, :conditions => {:login => login.downcase}<% elsif options[:include_activation] %>find :first, :conditions => ['login = ? and activated_at IS NOT NULL', login]<% - else %>find_by_login(login)<% end %> # need to get the salt + else %>find_by_login(login.downcase)<% end %> # need to get the salt u && u.authenticated?(password) ? u : nil end generators/authenticated/templates/model.rb @@ -1,4 +1,4 @@ -# -*- coding: mule-utf-8 -*- +# -*- coding: utf-8 -*- module Authentication module ByCookieToken # Stuff directives into including module lib/authentication/by_cookie_token.rb generators/authenticated/templates/stories/rest_auth_stories.rb generators/authenticated/templates/stories/rest_auth_stories_helper.rb generators/authenticated/templates/stories/steps/ra_navigation_steps.rb generators/authenticated/templates/stories/steps/ra_resource_steps.rb generators/authenticated/templates/stories/steps/ra_response_steps.rb generators/authenticated/templates/stories/steps/user_steps.rb generators/authenticated/templates/stories/users/accounts.story generators/authenticated/templates/stories/users/sessions.story install.rb 700e02b804247a3073d5362ddec47d9af2319dc1 2ae4c22f5a42100458f8be89c9f366b4099a4451 Diego Carrion dc.rec1@gmail.com http://github.com/dcrec1/restful-authentication-i18n/commit/2884f0a395a1d1ccd1211c9cb03b2b6f101be595 2884f0a395a1d1ccd1211c9cb03b2b6f101be595 2009-02-25T18:38:54-08:00 2009-02-25T18:38:54-08:00 fixed conflicts 32b45118af677b681e326419b6c9f59f20d4f421 Diego Carrion dc.rec1@gmail.com