start first run experience.

Matt Swanson · Matt Swanson · commit 4ec3b5c19c37 · 2013-04-22T20:47:36.000-04:00
diff --git a/app/commands/users/create_user.rb b/app/commands/users/create_user.rb
@@ -0,0 +1,9 @@
+class CreateUser
+  def initialize(repository = User)
+    @repo = repository
+  end
+
+  def create(password)
+    @repo.create(password: password, password_confirmation: password)
+  end
+end
diff --git a/app/controllers/first_run_controller.rb b/app/controllers/first_run_controller.rb
@@ -1,4 +1,5 @@
 require_relative "../commands/feeds/import_from_opml"
+require_relative "../commands/users/create_user"
 
 class Stringer < Sinatra::Base
   get "/import" do
@@ -10,4 +11,28 @@ class Stringer < Sinatra::Base
 
     redirect to("/")
   end
+
+  get "/password" do
+    erb :"first_run/password"
+  end
+
+  post "/password" do
+    if no_password(params) or password_mismatch?(params)
+      flash.now[:error] = "Hey, your password confirmation didn't match. Try again."
+      erb :"first_run/password"
+    else
+      CreateUser.new.create(params[:password])
+
+      redirect to("/import")
+    end
+  end
+
+  private
+  def no_password(params)
+    params[:password].nil? || params[:password] == ""
+  end
+
+  def password_mismatch?(params)
+    params[:password] != params[:password_confirmation]
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,4 +1,4 @@
 class User < ActiveRecord::Base
-  attr_accessible :email, :password, :password_confirmation
+  attr_accessible :password, :password_confirmation
   has_secure_password
 end
diff --git a/app/public/css/styles.css b/app/public/css/styles.css
@@ -7,6 +7,13 @@ body {
   background-color: #FAF2E5;
 }
 
+hr {
+  border-bottom: 0px;
+  border-top: 1px solid #e5e5e5;
+  width: 100%;
+  margin: 20px auto;
+}
+
 .container {
   width: 720px;
   margin: 0 auto;
@@ -88,17 +95,22 @@ li.story {
   color: #484948;
 }
 
-li.story .story-body a {
+li.story .story-body a, .setup a {
   color: #F67100;
   text-decoration: none;
   border-bottom: 1px dotted #F67100;
 }
 
-li.story .story-body a:hover {
+li.story .story-body a:hover, .setup a:hover {
   color: #F59745;
   border-bottom: 1px dotted #F59745;
 }
 
+a.btn, a.btn:hover {
+  border-bottom: 0px;
+  color: white;
+}
+
 li.story.read {
   opacity: 0.5;
 }
@@ -216,4 +228,32 @@ li.story.open .story-preview {
 #zen #gtfo {
   color: #F59745;
   font-weight: bold;
+}
+
+.orange {
+  color: #F67100;
+}
+
+.setup {
+  width: 350px;
+  margin: 0 auto;
+  padding-top: 50px;
+}
+
+.setup h1 {
+  text-align: center;
+}
+
+.setup h2 {
+  text-align: center;
+  font-size: 18px;
+  line-height: 22px;
+}
+
+.setup p {
+  text-align: justify;
+}
+
+.setup .control-group input {
+  width: 336px;
 }
diff --git a/app/views/first_run/password.erb b/app/views/first_run/password.erb
@@ -0,0 +1,19 @@
+<div class="setup" id="password-setup">
+  <h1>Stringer is <span class="orange">anti-social</span>.</h1>
+  <h2>There is only one user: you.</h2>
+  <hr />
+  <p>Let's setup a password so only you can read your stories.</p>
+  <hr />
+  <form id="password_setup" method="POST" action="/password">
+    <div class="control-group">
+      <label for="password">Password</label>
+      <input type="password" name="password" id="password" />
+    </div>
+    <div class="control-group">
+      <label for="password">Confirm Password</label>
+      <input type="password" name="password_confirmation" id="password_confirmation" />
+    </div>
+
+    <input type="submit" id="submit" class="btn btn-primary pull-right" value="Next"/>
+  </form>
+</div>
diff --git a/app/views/import.erb b/app/views/import.erb
@@ -2,10 +2,19 @@
   <script src="/js/bootstrap.file-input.js"></script>
 <% end %>
 
+<div class="setup" id="feed-setup">
+  <h1>Stringer can <span class="orange">import</span>.</h1>
+  <h2>Let's setup your feeds.</h2>
+  
+  <hr />
+  <p>Use this <a href="#">guide</a> to export your feeds from Google Reader.</p>
+  <hr />
 
-<form id="import" method="POST" action="/import" enctype="multipart/form-data">
-  <input id="opml_file" name="opml_file" type="file" title="Browse" class="btn-primary" />
-</form> 
+  <form id="import" method="POST" action="/import" enctype="multipart/form-data">
+    <input id="opml_file" name="opml_file" type="file" title="Import OPML" class="btn-primary" />
+    <a id="skip" class="btn pull-right">Not now</a>
+  </form> 
+</div>
 
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/app/views/index.erb b/app/views/index.erb
@@ -18,4 +18,16 @@
 </div>
 <% else %>
   <%= render_partial :zen %>
+<% end %>
+
+<% content_for :footer do %>
+<div class="container">
+  <div class="row-fluid">
+    <div class="span12">
+      <p class="pull-right">
+        <b>Hey!</b> Get back to work, slacker!
+      </p>
+    </div>
+  </div>
+</div>
 <% end %>
diff --git a/app/views/layout.erb b/app/views/layout.erb
@@ -34,15 +34,7 @@
     </div>
 
     <div id="footer">
-      <div class="container">
-        <div class="row-fluid">
-          <div class="span12">
-            <p class="pull-right">
-              <b>Hey!</b> Get back to work, slacker!
-            </p>
-          </div>
-        </div>
-      </div>
+      <%= yield_content :footer %>
     </div>
   </body>
 </html>
diff --git a/app/views/partials/_flash.erb b/app/views/partials/_flash.erb
@@ -1,11 +1,11 @@
 <% if flash.has_key? :success %>
-  <div class="alert alert-success">
+  <div class="alert alert-success success">
     <%= flash[:success] %>
   </div>
 <% end %>
 
 <% if flash.has_key? :error %>
-  <div class="alert alert-error">
+  <div class="alert alert-error error">
     <%= flash[:error] %>
   </div>
 <% end %>
diff --git a/db/migrate/20130423001740_drop_email_from_user.rb b/db/migrate/20130423001740_drop_email_from_user.rb
@@ -0,0 +1,5 @@
+class DropEmailFromUser < ActiveRecord::Migration
+  def change
+    remove_column :users, :email
+  end
+end
diff --git a/spec/commands/users/create_user_spec.rb b/spec/commands/users/create_user_spec.rb
@@ -0,0 +1,17 @@
+require "spec_helper"
+
+app_require "commands/users/create_user"
+
+describe CreateUser do
+  let(:repo) { stub }
+
+  describe "#create" do
+    it "creates a user with the password supplied" do
+      command = CreateUser.new(repo)
+
+      repo.should_receive(:create)
+      
+      command.create("password")
+    end
+  end
+end
diff --git a/spec/controllers/first_run_controller_spec.rb b/spec/controllers/first_run_controller_spec.rb
@@ -0,0 +1,52 @@
+require "spec_helper"
+
+app_require "controllers/first_run_controller"
+
+describe "FirstRunController" do
+  describe "GET /password" do
+    it "displays a form to enter your password" do
+      get "/password"
+
+      page = last_response.body
+      page.should have_tag("form#password_setup")
+      page.should have_tag("input#password")
+      page.should have_tag("input#password_confirmation")
+      page.should have_tag("input#submit")
+    end
+  end
+
+  describe "POST /password" do
+    it "rejects empty passwords" do
+      post "/password"
+
+      page = last_response.body
+      page.should have_tag("div.error")
+    end
+
+    it "rejects when password isn't confirmed" do
+      post "/password", {password: "foo", password_confirmation: "bar"}
+
+      page = last_response.body
+      page.should have_tag("div.error")
+    end
+
+    it "accepts confirmed passwords and redirects to next step" do
+      CreateUser.any_instance.should_receive(:create).with("foo")
+
+      post "/password", {password: "foo", password_confirmation: "foo"}
+
+      last_response.status.should be 302
+      URI::parse(last_response.location).path.should eq "/import"
+    end
+  end
+
+  describe "GET /import" do
+    it "displays the import options" do
+      get "/import"
+
+      page = last_response.body
+      page.should have_tag("#opml_file")
+      page.should have_tag("#skip")
+    end
+  end
+end
