generic_app 0.1.1 → 1.0.0

data/spec/lib/1_new_app_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'generic_app'
+require 'string_in_file'
+
+dir_app_1 = "#{ENV['DIR_PARENT']}/tmp1"
+
+describe GenericApp do
+  it "New Rails app" do
+    puts
+    puts '**************'
+    puts 'CREATING APP 1'
+    puts 'New Rails app'
+    system("rm -rf #{dir_app_1}")
+    Dir.chdir("#{ENV['DIR_PARENT']}") do
+      GenericApp.create_new('tmp1', '007@railstutorial.org')
+    end
+  end
+  
+  it 'Email address should be updated' do
+    expect(StringInFile.present('007@railstutorial.org', "#{dir_app_1}/config/initializers/devise.rb")).to eq(true)
+  end
+  
+  it "Bash scripts should be provided" do
+    expect(StringInFile.present("heroku run rake db:migrate", "#{dir_app_1}/heroku_upload.sh")).to eq(true)
+    expect(StringInFile.present("pkill", "#{dir_app_1}/kill_spring.sh")).to eq(true)
+    expect(StringInFile.present("ls -R1 -I concerns app/controllers", "#{dir_app_1}/list_files.sh")).to eq(true)
+    expect(StringInFile.present("rails console --sandbox", "#{dir_app_1}/sandbox.sh")).to eq(true)
+    expect(StringInFile.present("rake db:seed", "#{dir_app_1}/seed.sh")).to eq(true)
+    expect(StringInFile.present("rails server -b 0.0.0.0", "#{dir_app_1}/server.sh")).to eq(true)
+    expect(StringInFile.present("bundle install", "#{dir_app_1}/test_app.sh")).to eq(true)
+  end
+  
+  it "New README.md file should be provided" do
+    expect(StringInFile.present("list_files.sh", "#{dir_app_1}/README.md")).to eq(true)
+  end
+  
+  it "Guardfile should be set to automatically run tests upon startup" do
+    expect(StringInFile.present("all_on_start: true", "#{dir_app_1}/Guardfile")).to eq(true)
+  end
+  
+  it "The .gitignore file includes tmp, tmp*, and ,DS_Store" do
+    expect(StringInFile.present("tmp", "#{dir_app_1}/.gitignore")).to eq(true)
+    expect(StringInFile.present("tmp*", "#{dir_app_1}/.gitignore")).to eq(true)
+    expect(StringInFile.present(".DS_Store", "#{dir_app_1}/.gitignore")).to eq(true)
+  end
+  
+  it "The notes/1-file_list.txt file should be in place" do
+    expect(StringInFile.present("app/models", "#{dir_app_1}/notes/1-file_list.txt")).to eq(true)
+    expect(StringInFile.present("app/views", "#{dir_app_1}/notes/1-file_list.txt")).to eq(true)
+    expect(StringInFile.present("app/controllers", "#{dir_app_1}/notes/1-file_list.txt")).to eq(true)
+  end
+  
+  it "The notes/mvc-users.txt file should be in place" do
+    expect(StringInFile.present("users_controller.rb", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
+    expect(StringInFile.present("users_controller_test.rb", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
+    expect(StringInFile.present("users_helper.rb", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
+    expect(StringInFile.present("def index", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
+    expect(StringInFile.present("def show", "#{dir_app_1}/notes/mvc-users.txt")).to eq(true)
+  end
+end

data/spec/lib/2_legacy_app_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'generic_app'
+require 'string_in_file'
+
+dir_app_2 = "#{ENV['DIR_PARENT']}/tmp2"
+
+describe GenericApp do
+  it 'Legacy app' do
+    puts
+    puts '**************'
+    puts 'STARTING APP 2'
+    puts 'Legacy Rails app'
+
+    system("rm -rf #{dir_app_2}")
+    Dir.chdir("#{ENV['DIR_PARENT']}") do
+      t1 = Thread.new {
+        puts '------------------'
+        puts 'Getting legacy app'
+        system('git clone https://github.com/mhartl/sample_app_3rd_edition.git tmp2')
+        system("git checkout remotes/origin/account-activation-password-reset")
+        puts 'Finished acquiring legacy app'
+        puts '-----------------------------'
+      }
+      t1.join
+      GenericApp.add ('tmp2')
+    end
+  end
+
+  it "Bash scripts should be provided" do
+    expect(StringInFile.present("heroku run rake db:migrate", "#{dir_app_2}/heroku_upload.sh")).to eq(true)
+    expect(StringInFile.present("pkill", "#{dir_app_2}/kill_spring.sh")).to eq(true)
+    expect(StringInFile.present("ls -R1 -I concerns app/controllers", "#{dir_app_2}/list_files.sh")).to eq(true)
+    expect(StringInFile.present("rails console --sandbox", "#{dir_app_2}/sandbox.sh")).to eq(true)
+    expect(StringInFile.present("rake db:seed", "#{dir_app_2}/seed.sh")).to eq(true)
+    expect(StringInFile.present("rails server -b 0.0.0.0", "#{dir_app_2}/server.sh")).to eq(true)
+    expect(StringInFile.present("bundle install", "#{dir_app_2}/test_app.sh")).to eq(true)
+  end
+
+  it "The .gitignore file includes tmp, tmp*, and ,DS_Store" do
+    expect(StringInFile.present("tmp", "#{dir_app_2}/.gitignore")).to eq(true)
+    expect(StringInFile.present("tmp*", "#{dir_app_2}/.gitignore")).to eq(true)
+    expect(StringInFile.present(".DS_Store", "#{dir_app_2}/.gitignore")).to eq(true)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: generic_app
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jason Hsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: figaro
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 description: Instead of creating your Rails app from scratch, start with a generic
   app.
 email:
@@ -104,32 +90,9 @@ files:
 - generic_app.gemspec
 - lib/generic_app.rb
 - lib/generic_app/version.rb
-- spec/lib/1_sq_spec.rb
-- spec/lib/2_pg_spec.rb
-- spec/lib/3_pg_spec.rb
-- spec/lib/4_addon_spec.rb
+- spec/lib/1_new_app_spec.rb
+- spec/lib/2_legacy_app_spec.rb
 - spec/spec_helper.rb
-- to_add/README.md
-- to_add/heroku_upload.sh
-- to_add/kill_spring.sh
-- to_add/list_files.sh
-- to_add/notes/0-README.md
-- to_add/notes/2-db.txt
-- to_add/notes/3-db-summary.txt
-- to_add/notes/mvc-account_activations.txt
-- to_add/notes/mvc-application.txt
-- to_add/notes/mvc-layouts.txt
-- to_add/notes/mvc-password_resets.txt
-- to_add/notes/mvc-sessions.txt
-- to_add/notes/mvc-shared_views.txt
-- to_add/notes/mvc-static.txt
-- to_add/notes/mvc-users.txt
-- to_add/notes/tests.txt
-- to_add/sandbox.sh
-- to_add/seed.sh
-- to_add/server.sh
-- to_add/test.sh
-- to_add_pg/config/database.yml
 homepage: https://github.com/jhsu802701/generic_app
 licenses:
 - MIT
@@ -150,13 +113,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Save time by instantly create a generic Rails app.
 test_files:
-- spec/lib/1_sq_spec.rb
-- spec/lib/2_pg_spec.rb
-- spec/lib/3_pg_spec.rb
-- spec/lib/4_addon_spec.rb
+- spec/lib/1_new_app_spec.rb
+- spec/lib/2_legacy_app_spec.rb
 - spec/spec_helper.rb

data/spec/lib/1_sq_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper'
-require 'generic_app'
-require 'string_in_file'
-
-describe GenericApp do
-  it "SQLite version should execute" do
-    puts
-    puts "****************************"
-    puts "Testing the SQLite procedure"
-    system("rm -rf tmp1")
-    GenericApp.sq("tmp1")
-    GenericApp.git_init("tmp1")
-    
-  end
-  
-  it "Bash scripts should be provided" do
-    expect(StringInFile.present("heroku run rake db:migrate", "tmp1/heroku_upload.sh")).to eq(true)
-    expect(StringInFile.present("pkill", "tmp1/kill_spring.sh")).to eq(true)
-    expect(StringInFile.present("ls -R1 -I concerns app/controllers", "tmp1/list_files.sh")).to eq(true)
-    expect(StringInFile.present("rails console --sandbox", "tmp1/sandbox.sh")).to eq(true)
-    expect(StringInFile.present("rake db:seed", "tmp1/seed.sh")).to eq(true)
-    expect(StringInFile.present("rails server -b 0.0.0.0", "tmp1/server.sh")).to eq(true)
-    expect(StringInFile.present("bundle install", "tmp1/test.sh")).to eq(true)
-  end
-  
-  it "New README.md file should be provided" do
-    expect(StringInFile.present("list_files.sh", "tmp1/README.md")).to eq(true)
-  end
-  
-  it "Guardfile should be set to automatically run tests upon startup" do
-    expect(StringInFile.present("all_on_start: true", "tmp1/Guardfile")).to eq(true)
-  end
-  
-  it "Suggestions to use password management software should be provided" do
-    expect(StringInFile.present("KeePassX", "tmp1/app/views/users/new.html.erb")).to eq(true)
-    expect(StringInFile.present("KeePassX", "tmp1/app/views/users/edit.html.erb")).to eq(true)
-    expect(StringInFile.present("KeePassX", "tmp1/app/views/password_resets/new.html.erb")).to eq(true)
-    expect(StringInFile.present("KeePassX", "tmp1/app/views/password_resets/edit.html.erb")).to eq(true)
-  end
-  
-  it "The .gitignore file includes tmp, tmp*, and ,DS_Store" do
-    expect(StringInFile.present("tmp", "tmp1/.gitignore")).to eq(true)
-    expect(StringInFile.present("tmp*", "tmp1/.gitignore")).to eq(true)
-    expect(StringInFile.present(".DS_Store", "tmp1/.gitignore")).to eq(true)
-  end
-  
-  it "The notes/1-file_list.txt file should be in place" do
-    expect(StringInFile.present("app/models", "tmp1/notes/1-file_list.txt")).to eq(true)
-    expect(StringInFile.present("app/views", "tmp1/notes/1-file_list.txt")).to eq(true)
-    expect(StringInFile.present("app/controllers", "tmp1/notes/1-file_list.txt")).to eq(true)
-  end
-  
-  it "The notes/mvc-users.txt file should be in place" do
-    expect(StringInFile.present("app/controllers/users_controller.rb", "tmp1/notes/mvc-users.txt")).to eq(true)
-    expect(StringInFile.present("test/controllers/users_controller_test.rb", "tmp1/notes/mvc-users.txt")).to eq(true)
-    expect(StringInFile.present("app/helpers/users_helper.rb", "tmp1/notes/mvc-users.txt")).to eq(true)
-    expect(StringInFile.present("def index", "tmp1/notes/mvc-users.txt")).to eq(true)
-    expect(StringInFile.present("def show", "tmp1/notes/mvc-users.txt")).to eq(true)
-  end
-   
-end
-

data/spec/lib/2_pg_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-require 'generic_app'
-require 'string_in_file'
-
-describe GenericApp do  
-  it "PostgreSQL version should execute" do
-    puts
-    puts "********************************"
-    puts "Testing the PostgreSQL procedure"
-    system("rm -rf tmp2")
-    
-    n = Time.now.to_i
-    
-    GenericApp.pg("tmp2", "db_tmp2_#{n}", "eu_tmp2_#{n}", "ep_tmp2_#{n}", "u_tmp2_#{n}", "abcdef")
-    
-    GenericApp.git_init("tmp2")
-    
-    expect(StringInFile.present("sqlite", "tmp2/Gemfile")).to eq(false)
-    expect(StringInFile.present("gem 'pg'", "tmp2/Gemfile")).to eq(true)
-  end
-  
-end
-

data/spec/lib/3_pg_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-require 'generic_app'
-require 'string_in_file'
-
-describe GenericApp do  
-  it "PostgreSQL version works with changed parameters" do
-    puts
-    puts "************************************************************************************"
-    puts "Testing the PostgreSQL procedure given new databases, a new user, and a new password"
-    puts "Copying the PostgreSQL-based Rails app previously created."
-    system("rm -rf tmp3")
-    t1 = Thread.new {
-      system("cp -rf tmp2 tmp3")
-    }
-    t1.join
-    n = (Time.now.to_i ) * 2
-    
-    GenericApp.set_pg_params("tmp3", "db_tmp3_#{n}", "eu_tmp3_#{n}", "ep_tmp3_#{n}", "u_tmp3_#{n}", "fedcba")
-    
-    expect(StringInFile.present("sqlite", "tmp3/Gemfile")).to eq(false)
-    expect(StringInFile.present("gem 'pg'", "tmp3/Gemfile")).to eq(true)
-    expect(StringInFile.present("u_tmp3_#{n}", "tmp3/config/application.yml")).to eq(true)
-    expect(StringInFile.present("fedcba", "tmp3/config/application.yml")).to eq(true)
-    expect(StringInFile.present("eu_tmp3_#{n}", "tmp3/config/application.yml")).to eq(true)
-    expect(StringInFile.present("ep_tmp3_#{n}", "tmp3/config/application.yml")).to eq(true)
-    expect(StringInFile.present("db_tmp3_#{n}_dev", "tmp3/config/database.yml")).to eq(true)
-    expect(StringInFile.present("db_tmp3_#{n}_test", "tmp3/config/database.yml")).to eq(true)
-    expect(StringInFile.present("db_tmp3_#{n}_pro", "tmp3/config/database.yml")).to eq(true)
-    expect(StringInFile.present("eu_tmp3_#{n}", "tmp3/config/database.yml")).to eq(true)
-    expect(StringInFile.present("ep_tmp3_#{n}", "tmp3/config/database.yml")).to eq(true)
-  end
-end
-

data/spec/lib/4_addon_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-require 'generic_app'
-require 'string_in_file'
-
-describe GenericApp do
-  
-  it "Adding scripts to an existing app should work" do
-    puts
-    puts "********************************************************"
-    puts "Testing the addition of scripts to an existing Rails app"
-    system("rm -rf tmp4")
-    t1 = Thread.new {
-      system("git clone https://github.com/mhartl/sample_app_3rd_edition.git tmp4")
-    }
-    t1.join
-    GenericApp.add_scripts ("tmp4")
-    GenericApp.update_gitignore ("tmp4")
-  end
-  
-  it "Bash scripts should be provided" do
-    expect(StringInFile.present("heroku run rake db:migrate", "tmp4/heroku_upload.sh")).to eq(true)
-    expect(StringInFile.present("pkill", "tmp4/kill_spring.sh")).to eq(true)
-    expect(StringInFile.present("ls -R1 -I concerns app/controllers", "tmp4/list_files.sh")).to eq(true)
-    expect(StringInFile.present("rails console --sandbox", "tmp4/sandbox.sh")).to eq(true)
-    expect(StringInFile.present("rake db:seed", "tmp4/seed.sh")).to eq(true)
-    expect(StringInFile.present("rails server -b 0.0.0.0", "tmp4/server.sh")).to eq(true)
-    expect(StringInFile.present("bundle install", "tmp4/test.sh")).to eq(true)
-  end
-  
-  it "The .gitignore file includes tmp, tmp*, and ,DS_Store" do
-    expect(StringInFile.present("tmp", "tmp4/.gitignore")).to eq(true)
-    expect(StringInFile.present("tmp*", "tmp4/.gitignore")).to eq(true)
-    expect(StringInFile.present(".DS_Store", "tmp4/.gitignore")).to eq(true)
-  end
-  
-  it "The notes/1-file_list.txt file should be in place" do
-    expect(StringInFile.present("app/models", "tmp4/notes/1-file_list.txt")).to eq(true)
-    expect(StringInFile.present("app/views", "tmp4/notes/1-file_list.txt")).to eq(true)
-    expect(StringInFile.present("app/controllers", "tmp4/notes/1-file_list.txt")).to eq(true)
-  end
-  
-end
-

data/to_add/README.md

@@ -1,32 +0,0 @@
-# Generic App
-
-This is the generic Rails app created with the use of the generic_app Ruby gem.  More details on the generic_app Ruby gem are available at https://github.com/jhsu802701/generic_app .
-
-This app consists of all of the features of the Rails Tutorial Sample App except for microposts and relationships.  The basic elements essential to most Rails apps are included.  It is up to you to customize this app and add the features and capabilities specific to your endeavor.
-
-The original Rails Tutorial Sample App provides the following features:
-
-1. Static pages
-2. Tests
-3. Automated tests through Guard
-4. Twitter bootstrap
-5. Databases: SQLite3 for development and PostgreSQL for production
-6. Ready for Heroku deployment
-7. User functionality: includes hashed passwords, administrative users, account activations, and password resets
-
-This generic Rails app provides the above features PLUS these additional features:
-
-1. Bash scripts in the root directory that allow you to perform routine tasks in only one step.  (These scripts are likely to be useful in Rails apps that were not created with this generic_app Ruby gem.)
-2. Recommendations that the user make use of password management software to generate and store secure passwords
-3. Outlines of the MVC, test suite, and database seeding process in the notes folder
-4. Guard automatically runs tests upon startup.
-
-To execute the Bash (*.sh) scripts, enter the command "sh (name of script)".  The Bash scripts provided are:
-
-1. test.sh: When you first create the app, or anytime that you clone this app, you must run the setup.sh script to set up the app.  This is a prerequisite for running Guard, running the local server, and many other basic tasks.
-2. server.sh: This script runs your local Rails server.  Note that it specifies port 0.0.0.0 so that you can view your Rails app in your web browser when you do your Rails development in Vagrant.
-3. seed.sh: This script populates the database in the development environment with simulated data.
-4. sandbox.sh: This script gives you the Rails console sandbox environment.
-5. heroku_upload.sh: This script uploads your Rails source code to Heroku AND runs the "rake db:migrate" command in the Heroku environment.
-6. kill_spring.sh: The Spring tool is useful but may occasionally slow down your Rails app.  If you believe that this is happening, run this script to kill the Spring tool.
-7. list_files.sh: This script prints outlines of the path structure of the MVC and testing architectures in your Rails app into the file notes/1-list_files.txt.  While this script has no impact on how your Rails app runs, it aids the process of outlining the MVC structure and the testing procedure in your app.

data/to_add/heroku_upload.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-# Proper header for a Bash script.
-
-git push heroku
-heroku run rake db:migrate

data/to_add/kill_spring.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-# Proper header for a Bash script.
-
-pkill -9 -f spring

data/to_add/list_files.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-# Proper header for a Bash script.
-
-echo "****************************************************************"
-echo "BEGIN compiling the list of files that make up the MVC structure"
-
-mkdir -p notes
-
-echo "This file was AUTOMATICALLY generated by the list_files.sh script." > notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns app/controllers >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns app/helpers >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns app/mailers >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns app/models >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns app/views >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns db >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns features >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns spec >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-ls -R1 -I concerns test >> notes/1-file_list.txt
-
-echo "" >> notes/1-file_list.txt
-cat config/routes.rb >> notes/1-file_list.txt
-
-echo "FINISHED compiling the list of files that make up the MVC structure"
-echo "*******************************************************************"

data/to_add/notes/0-README.md

@@ -1,9 +0,0 @@
-# NOTES DIRECTORY
-
-## 1-file_list.txt
-
-* The file 1-file_list.txt lists the contents of the app/controllers, app/helpers, app/mailers, app/views, db, features, spec, and test directories.
-
-* The file 1-file_list.txt is AUTOMATICALLY generated by the list_files.sh script.  Please do NOT manually edit the 1-file_list.txt file, because your changes will be wiped out the next time you run the list_files.sh script.
-
-* The purpose of this file is to aid the process of outlining the MVC structure of this Rails app.

data/to_add/notes/2-db.txt

@@ -1,77 +0,0 @@
-============
-db/schema.rb
-  create_table "users", force: :cascade do |t|
-    t.string   "name"
-    t.string   "email"
-    t.datetime "created_at",                        null: false
-    t.datetime "updated_at",                        null: false
-    t.string   "password_digest"
-    t.string   "remember_digest"
-    t.boolean  "admin",             default: false
-    t.string   "activation_digest"
-    t.boolean  "activated",         default: false
-    t.datetime "activated_at"
-    t.string   "reset_digest"
-    t.datetime "reset_sent_at"
-  end
-
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-
-===========
-db/migrate:
-20141014183645_create_users.rb
-  def change
-    create_table :users do |t|
-      t.string :name
-      t.string :email
-
-      t.timestamps null: false
-    end
-  end
-20141014205756_add_index_to_users_email.rb
-  def change
-    add_index :users, :email, unique: true
-  end
-20141014234032_add_password_digest_to_users.rb
-  def change
-    add_column :users, :password_digest, :string
-  end
-20141030174712_add_remember_digest_to_users.rb
-  def change
-    add_column :users, :remember_digest, :string
-  end
-20141104004736_add_admin_to_users.rb
-  def change
-    add_column :users, :admin, :boolean, default: false
-  end
-20141106193737_add_activation_to_users.rb
-  def change
-    add_column :users, :activation_digest, :string
-    add_column :users, :activated, :boolean, default: false
-    add_column :users, :activated_at, :datetime
-  end
-20141107180258_add_reset_to_users.rb
-  def change
-    add_column :users, :reset_digest, :string
-    add_column :users, :reset_sent_at, :datetime
-  end
-===========  
-db/seeds.rb
-User.create!(name:  "Example User",
-             email: "example@railstutorial.org",
-             password:              "foobar",
-             password_confirmation: "foobar",
-             admin: true,
-             activated:    true,
-             activated_at: Time.zone.now)
-99.times do |n|
-  name  = Faker::Name.name
-  email = "example-#{n+1}@railstutorial.org"
-  password = "password"
-  User.create!(name:  name,
-               email: email,
-               password:              password,
-               password_confirmation: password,
-               activated:    true,
-               activated_at: Time.zone.now)  
-end

data/to_add/notes/3-db-summary.txt

@@ -1,19 +0,0 @@
-TABLES
-users (name, email, created_at, updated_at, timestamps, password_digest, remember_digest, admin, activation_digest, activated, activated_at, reset_digest, reset_sent_at)
-  index: named "index_users_on_email", based on email (must be unique)
-  
-SEED
-Create user
-  name:  "Example User",
-  email: "example@railstutorial.org",
-  password:              "foobar",
-  password_confirmation: "foobar",
-  admin: true,
-  activated:    true,
-  activated_at: Time.zone.now
-Create users example-1@railstutorial.org to example-99@railstutorial.org
-  name  = Faker::Name.name
-  email = "example-#{n+1}@railstutorial.org", 
-  password, password_confirmation = "password"
-  activated:    true,
-  activated_at: Time.zone.now)  

data/to_add/notes/mvc-account_activations.txt

@@ -1,10 +0,0 @@
-ACCOUNT ACTIVATIONS
-app/controllers/account_activations_controller.rb
-  def edit
-test/controllers/account_activations_controller_test.rb
-app/helpers/account_activations_helper.rb
-app/views/user_mailer/account_activation.html.erb
-app/views/user_mailer/account_activation.text.erb
-config/routes.rb
-  get 'account_activations/edit'
-  resources :account_activations, only: [:edit]

data/to_add/notes/mvc-application.txt

@@ -1,7 +0,0 @@
-APPLICATION
-app/controllers/application_controller.rb
-  include SessionsHelper
-app/helpers/application_helper.rb
-  def full_title(page_title = '')
-app/mailers/application_mailer.rb
-app/views/layouts/application.html.erb

data/to_add/notes/mvc-layouts.txt

@@ -1,9 +0,0 @@
-LAYOUTS
-
-app/views/layouts
-  application.html.erb
-  _footer.html.erb
-  _header.html.erb
-  mailer.html.erb
-  mailer.text.erb
-  _shim.html.erb

data/to_add/notes/mvc-password_resets.txt

@@ -1,25 +0,0 @@
-app/controllers/password_resets_controller.rb
-  before_action :get_user,         only: [:edit, :update]
-  before_action :valid_user,       only: [:edit, :update]
-  before_action :check_expiration, only: [:edit, :update]
-  def new
-  def create
-  def edit
-  def update
-  private
-    def user_params
-    def both_passwords_blank?
-    def get_user
-    def valid_user
-    def check_expiration
-app/helpers/password_resets_helper.rb
-app/views/password_resets
-  edit.html.erb
-  new.html.erb
-app/views/user_mailer
-  password_reset.html.erb
-  password_reset.text.erb
-config/routes.rb
-  get 'password_resets/new'
-  get 'password_resets/edit'
-  resources :password_resets,     only: [:new, :create, :edit, :update]

data/to_add/notes/mvc-sessions.txt

@@ -1,27 +0,0 @@
-SESSIONS
-app/controllers/sessions_controller.rb
-  def new
-  def create
-  def destroy
-test/controllers/sessions_controller_test.rb
-  test "should get new" do
-app/helpers/sessions_helper.rb
-  def log_in(user)
-  def remember(user)
-  def current_user?(user)
-  def current_user
-  def logged_in?
-  def forget(user)
-  def log_out
-  def redirect_back_or(default)
-  def store_location
-test/helpers/sessions_helper_test.rb
-  def setup
-  test "current_user returns right user when session is nil" do
-  test "current_user returns nil when remember digest is wrong" do
-app/views/sessions/new.html.erb
-config/routes.rb
-  get 'sessions/new'
-  get    'login'   => 'sessions#new'
-  post   'login'   => 'sessions#create'
-  delete 'logout'  => 'sessions#destroy'

data/to_add/notes/mvc-shared_views.txt

@@ -1,4 +0,0 @@
-SHARED VIEWS
-
-app/views/shared
-  _error_messages.html.erb