salted_login_generator 1.0.8 → 1.0.9

data/salted_login_generator.rb

@@ -20,7 +20,7 @@ class SaltedLoginGenerator < LocalizationGenerator #Rails::Generator::NamedBase
 
       m.template "user_test.rb", "test/unit/#{file_name}_test.rb"
       m.template "users.yml", "test/fixtures/#{plural_name}.yml"
-      m.file "user_model.erbsql", "db/user_model.erbsql"
+      m.template "user_model.erbsql", "db/user_model.erbsql"
 
       # Configuration and miscellaneous
       m.template "login_environment.rb", "config/environments/#{file_name}_environment.rb"

data/templates/README

@@ -48,13 +48,16 @@ error handling back.
 
 == Requirements
 
-You need a database table corresponding to the <%= class_name %> model. 
+You need a database table corresponding to the <%= class_name %> model. Note
+the table type for MySQL. Whatever DB you use, it must support transactions.
+If it does not, the functional tests will not work properly, nor will the
+application in the face of failures during certain DB creates and updates.
 
   mysql syntax:
   CREATE TABLE <%= plural_name %> (
     id INTEGER UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
     login VARCHAR(80) NOT NULL,
-    password VARCHAR(40) NOT NULL,
+    salted_password VARCHAR(40) NOT NULL,
     email VARCHAR(60) NOT NULL,
     firstname VARCHAR(40),
     lastname VARCHAR(40),
@@ -62,14 +65,16 @@ You need a database table corresponding to the <%= class_name %> model.
     verified INT default 0,
     role VARCHAR(40) default NULL,
     security_token CHAR(40) default NULL,
-    token_expiry DATETIME default NULL
+    token_expiry DATETIME default NULL,
+    deleted INT default 0,
+    delete_after DATETIME default NULL
   ) TYPE=InnoDB DEFAULT CHARSET=utf8;
 
   postgres:
   CREATE TABLE "<%= plural_name %>" (
     id SERIAL PRIMARY KEY
     login VARCHAR(80) NOT NULL,
-    password VARCHAR(40) NOT NULL,
+    salted_password VARCHAR(40) NOT NULL,
     email VARCHAR(60) NOT NULL,
     firstname VARCHAR(40),
     lastname VARCHAR(40),
@@ -77,14 +82,16 @@ You need a database table corresponding to the <%= class_name %> model.
     verified INT default 0,
     role VARCHAR(40) default NULL,
     security_token CHAR(40) default NULL,
-    token_expiry TIMESTAMP default NULL
+    token_expiry TIMESTAMP default NULL,
+    deleted INT default 0,
+    delete_after TIMESTAMP default NULL
   ) WITH OIDS;
 
   sqlite:
   CREATE TABLE '<%= plural_name %>' (
     id INTEGER PRIMARY KEY,
     login VARCHAR(80) NOT NULL,
-    password VARCHAR(40) NOT NULL,
+    salted_password VARCHAR(40) NOT NULL,
     email VARCHAR(60) NOT NULL,
     firstname VARCHAR(40),
     lastname VARCHAR(40),
@@ -92,7 +99,9 @@ You need a database table corresponding to the <%= class_name %> model.
     verified INT default 0,
     role VARCHAR(40) default NULL,
     security_token CHAR(40) default NULL,
-    token_expiry DATETIME default NULL
+    token_expiry DATETIME default NULL,
+    deleted INT default 0,
+    delete_after DATETIME default NULL
   );
 
 Of course your <%= singular_name %> model can have any amount of extra fields.
@@ -176,6 +185,7 @@ automatically on startup.
 
 == Changelog
 
+1.0.9 Fixed hardcoded generator name (in controller test) and README fixes
 1.0.8 Generator/schema fixes and some README fixes/improvements
 1.0.7 Fixed bad bug with missing attr_accessor :new_password in user class
 1.0.6 Proper delete support and bug fixes

data/templates/controller_test.rb

@@ -122,7 +122,7 @@ class <%= class_name %>ControllerTest < Test::Unit::TestCase
     post :edit, "<%= singular_name %>" => { "form" => "delete" }
     assert_equal 1, ActionMailer::Base.deliveries.size
     mail = ActionMailer::Base.deliveries[0]
-    mail.encoded =~ /user\[id\]=(.*?)&key=(.*?)"/
+    mail.encoded =~ /<%= singular_name%>\[id\]=(.*?)&key=(.*?)"/
     id = $1
     key = $2
     post :restore_deleted, "<%= singular_name %>" => { "id" => "#{id}" }, "key" => "badkey"
@@ -214,7 +214,7 @@ class <%= class_name %>ControllerTest < Test::Unit::TestCase
         assert_equal 1, ActionMailer::Base.deliveries.size
         mail = ActionMailer::Base.deliveries[0]
         assert_equal "bob@test.com", mail.to_addrs[0].to_s
-        mail.encoded =~ /user\[id\]=(.*?)&key=(.*?)"/
+        mail.encoded =~ /<%= singular_name %>\[id\]=(.*?)&key=(.*?)"/
         id = $1
         key = $2
         post :change_password, "<%= singular_name %>" => { "password" => "#{password}", "password_confirmation" => "#{password}", "id" => "#{id}" }, "key" => "#{key}"

data/templates/user_model.erbsql

@@ -1,5 +1,5 @@
-CREATE TABLE users (
-  id <%= @pk %>,
+CREATE TABLE <%= plural_name %> (
+  id <%%= @pk %>,
   login VARCHAR(80) NOT NULL,
   salted_password VARCHAR(40) NOT NULL,
   email VARCHAR(60) NOT NULL,
@@ -9,10 +9,10 @@ CREATE TABLE users (
   verified INT default 0,
   role VARCHAR(40) default NULL,
   security_token CHAR(40) default NULL,
-  token_expiry <%= @datetime %> default NULL,
-  created_at <%= @datetime %> default NULL,
-  updated_at <%= @datetime %> default NULL,
-  logged_in_at <%= @datetime %> default NULL,
+  token_expiry <%%= @datetime %> default NULL,
+  created_at <%%= @datetime %> default NULL,
+  updated_at <%%= @datetime %> default NULL,
+  logged_in_at <%%= @datetime %> default NULL,
   deleted INT default 0,
-  delete_after <%= @datetime %> default NULL
-) <%= @options %>;
+  delete_after <%%= @datetime %> default NULL
+) <%%= @options %>;

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: salted_login_generator
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
-date: 2005-05-11
+  version: 1.0.9
+date: 2005-05-19
 summary: "[Rails] Login generator with salted passwords."
 require_paths: 
   - "."