finish up first run. add backgrounded feed fetching after import.

Matt Swanson · Matt Swanson · commit f43dce314683 · 2013-04-25T19:35:43.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -31,4 +31,5 @@ group(:development, :testing) do
   gem "shotgun"
   gem "racksh"
   gem "faker"
+  gem "foreman"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -53,9 +53,13 @@ GEM
       activerecord (>= 2.1.0, < 4)
       delayed_job (~> 3.0)
     diff-lcs (1.2.4)
+    dotenv (0.7.0)
     eventmachine (1.0.3)
     faker (1.1.2)
       i18n (~> 0.5)
+    foreman (0.63.0)
+      dotenv (>= 0.7)
+      thor (>= 0.13.6)
     i18n (0.6.4)
     kgio (2.8.0)
     loofah (1.2.1)
@@ -104,6 +108,7 @@ GEM
       sinatra (>= 1.0.0)
     slop (3.4.4)
     sqlite3 (1.3.7)
+    thor (0.18.1)
     tilt (1.3.7)
     tzinfo (0.3.37)
     unicorn (4.6.2)
@@ -120,6 +125,7 @@ DEPENDENCIES
   faker
   feedbag!
   feedzirra!
+  foreman
   loofah
   nokogiri
   pg
diff --git a/app.rb b/app.rb
@@ -5,6 +5,7 @@
 require "json"
 
 require_relative "app/helpers/authentication_helpers"
+require_relative "app/repositories/user_repository"
 
 class Stringer < Sinatra::Base
   configure do
@@ -33,6 +34,14 @@ def render_partial(name, locals = {})
       redirect '/login'
     end
   end
+
+  get "/" do
+    if UserRepository.setup_complete?
+      redirect to("/news")
+    else
+      redirect to("/setup/password")
+    end
+  end
 end
 
 require_relative "app/controllers/stories_controller"
diff --git a/app/commands/users/complete_setup.rb b/app/commands/users/complete_setup.rb
@@ -0,0 +1,7 @@
+class CompleteSetup
+  def self.complete(user)
+    user.setup_complete = true
+    user.save
+    user
+  end
+end
diff --git a/app/commands/users/create_user.rb b/app/commands/users/create_user.rb
@@ -4,6 +4,6 @@ def initialize(repository = User)
   end
 
   def create(password)
-    @repo.create(password: password, password_confirmation: password)
+    @repo.create(password: password, password_confirmation: password, setup_complete: false)
   end
 end
diff --git a/app/controllers/first_run_controller.rb b/app/controllers/first_run_controller.rb
@@ -1,58 +1,54 @@
 require_relative "../commands/feeds/import_from_opml"
 require_relative "../commands/users/create_user"
+require_relative "../commands/users/complete_setup"
 require_relative "../repositories/user_repository"
 require_relative "../repositories/story_repository"
+require_relative "../tasks/fetch_feeds"
 
 class Stringer < Sinatra::Base
-  #before /\/(password|import)/ do
-  #  if first_run_completed?
-  #    redirect to("/news")
-  #  end
-  #end
-
-  get "/" do
-    if first_run_completed?
-      redirect to("/news")
-    else
-      redirect to("/password")
+  namespace "/setup" do
+    before do
+      if UserRepository.setup_complete?
+        redirect to("/news")
+      end
     end
-  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."
+    get "/password" do
       erb :"first_run/password"
-    else
-      CreateUser.new.create(params[:password])
+    end
 
-      redirect to("/import")
+    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
+        user = CreateUser.new.create(params[:password])
+        session[:user_id] = user.id
+
+        redirect to("/setup/import")
+      end
     end
-  end
 
-  get "/import" do
-    erb :import
-  end
+    get "/import" do
+      erb :import
+    end
 
-  post "/import" do
-    ImportFromOpml.import(params["opml_file"][:tempfile].read, true)
+    post "/import" do
+      ImportFromOpml.import(params["opml_file"][:tempfile].read, true)
 
-    redirect to("/")
-  end
+      redirect to("/setup/tutorial")
+    end
 
-  get "/tutorial" do
-    @sample_stories = StoryRepository.samples
-    erb :tutorial
-  end
+    get "/tutorial" do
+      FetchFeeds.enqueue(Feed.all)
+      CompleteSetup.complete(current_user)
 
-  private
-  def first_run_completed?
-    UserRepository.any?
+      @sample_stories = StoryRepository.samples
+      erb :tutorial
+    end
   end
 
+  private
   def no_password(params)
     params[:password].nil? || params[:password] == ""
   end
diff --git a/app/helpers/authentication_helpers.rb b/app/helpers/authentication_helpers.rb
@@ -1,5 +1,7 @@
 require "sinatra/base"
 
+require_relative "../repositories/user_repository"
+
 module Sinatra
   module AuthenticationHelpers
     def is_authenticated?
@@ -8,8 +10,14 @@ def is_authenticated?
 
     def needs_authentication?(path)
       return false if ENV['RACK_ENV'] == 'test'
+      return false if !UserRepository.setup_complete?
       return false if path == "/login" || path == "/logout"
       true
     end
+
+    def current_user
+      nil unless is_authenticated?
+      UserRepository.fetch(session[:user_id])
+    end
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,4 +1,10 @@
 class User < ActiveRecord::Base
+  attr_accessible :setup_complete
+
   attr_accessible :password, :password_confirmation
   has_secure_password
+
+  def setup_complete?
+    setup_complete
+  end
 end
diff --git a/app/repositories/user_repository.rb b/app/repositories/user_repository.rb
@@ -1,7 +1,11 @@
 require_relative "../models/user"
 
 class UserRepository
-  def self.any?
-    User.any?
+  def self.fetch(id)
+    User.find(id)
+  end
+
+  def self.setup_complete?
+    User.any? && User.first.setup_complete?
   end
 end
diff --git a/app/tasks/fetch_feeds.rb b/app/tasks/fetch_feeds.rb
@@ -10,4 +10,8 @@ def fetch_all
       FetchFeed.new(feed).fetch
     end
   end
+
+  def self.enqueue(feeds)
+    self.new(feeds).delay.fetch_all
+  end
 end
diff --git a/app/views/first_run/password.erb b/app/views/first_run/password.erb
@@ -4,7 +4,7 @@
   <hr />
   <p>Let's pick a password so only you can read your stories.</p>
   <hr />
-  <form id="password_setup" method="POST" action="/password">
+  <form id="password_setup" method="POST" action="/setup/password">
     <div class="control-group">
       <input name="password" id="password" type="password" autofocus="autofocus"/ >
       <i class="icon-lock field-icon"></i>
diff --git a/app/views/import.erb b/app/views/import.erb
@@ -12,9 +12,9 @@
   </p>
   <hr />
 
-  <form id="import" method="POST" action="/import" enctype="multipart/form-data">
+  <form id="import" method="POST" action="/setup/import" enctype="multipart/form-data">
     <input id="opml_file" name="opml_file" type="file" title="Import" class="btn-primary" />
-    <a href="/tutorial" id="skip" class="btn pull-right">Not now</a>
+    <a href="/setup/tutorial" id="skip" class="btn pull-right">Not now</a>
   </form> 
 </div>
 
diff --git a/config/unicorn.rb b/config/unicorn.rb
@@ -1,19 +1,11 @@
-worker_processes 4
+worker_processes 3
 timeout 30
 preload_app true
 
+@delayed_job_pid = nil
+
 before_fork do |server, worker|
-  # Replace with MongoDB or whatever
-  if defined?(ActiveRecord::Base)
-    ActiveRecord::Base.connection.disconnect!
-  end
+  @delayed_job_pid ||= spawn("bundle exec rake work_jobs")
 
   sleep 1
-end
-
-after_fork do |server, worker|
-  # Replace with MongoDB or whatever
-  if defined?(ActiveRecord::Base)
-    ActiveRecord::Base.establish_connection
-  end
 end
diff --git a/db/migrate/20130425211008_add_setup_complete_to_user.rb b/db/migrate/20130425211008_add_setup_complete_to_user.rb
@@ -0,0 +1,5 @@
+class AddSetupCompleteToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :setup_complete, :boolean
+  end
+end
diff --git a/db/migrate/20130425222157_add_delayed_job.rb b/db/migrate/20130425222157_add_delayed_job.rb
@@ -0,0 +1,22 @@
+class AddDelayedJob < ActiveRecord::Migration
+  def self.up
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
+      table.text     :handler                      # YAML-encoded string of the object that will do work
+      table.text     :last_error                   # reason for last failure (See Note below)
+      table.datetime :run_at                       # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                    # Set when a client is working on this object
+      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string   :locked_by                    # Who is working on this object (if locked)
+      table.string   :queue                        # The name of the queue this job is in
+      table.timestamps
+    end
+
+    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
+  end
+
+  def self.down
+    drop_table :delayed_jobs
+  end
+end
diff --git a/spec/commands/users/complete_setup_spec.rb b/spec/commands/users/complete_setup_spec.rb
@@ -0,0 +1,13 @@
+require "spec_helper"
+
+app_require "commands/users/complete_setup"
+
+describe CompleteSetup do
+  let(:user) { UserFactory.build }
+  it "marks setup as complete" do
+    user.should_receive(:save).once
+
+    result = CompleteSetup.complete(user)
+    result.setup_complete.should be_true
+  end
+end
diff --git a/spec/controllers/first_run_controller_spec.rb b/spec/controllers/first_run_controller_spec.rb
diff --git a/spec/factories/user_factory.rb b/spec/factories/user_factory.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
