dat multi-speed test suit; add factories; wire up story_controller

Matt Swanson · Matt Swanson · commit eae4ff62d33c · 2013-04-11T22:40:39.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -23,7 +23,9 @@ end
 group(:development, :testing) do
   gem "pry"
   gem "rspec"
+  gem "rspec-html-matchers"
   gem "rack-test"
   gem "shotgun"
   gem "racksh"
+  gem "faker"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -46,6 +46,8 @@ GEM
       delayed_job (~> 3.0)
     diff-lcs (1.2.2)
     eventmachine (1.0.3)
+    faker (1.0.1)
+      i18n (~> 0.4)
     i18n (0.6.1)
     kgio (2.8.0)
     loofah (1.2.1)
@@ -75,6 +77,9 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
+    rspec-html-matchers (0.4.1)
+      nokogiri (>= 1.4.4)
+      rspec (>= 2.0.0)
     rspec-mocks (2.13.0)
     sax-machine (0.2.0.rc1)
       nokogiri (~> 1.5.2)
@@ -103,6 +108,7 @@ PLATFORMS
 
 DEPENDENCIES
   delayed_job_active_record
+  faker
   feedzirra!
   loofah
   pg
@@ -111,6 +117,7 @@ DEPENDENCIES
   racksh
   rake
   rspec
+  rspec-html-matchers
   shotgun
   sinatra
   sinatra-activerecord
diff --git a/Rakefile b/Rakefile
@@ -6,6 +6,7 @@ Bundler.require
 require "./app"
 require_relative "./app/tasks/fetch_feeds"
 
+desc "Fetch all feeds."
 task :fetch_feeds do
   FetchFeeds.new(Feed.all).fetch_all
 end
@@ -15,7 +16,17 @@ task :clear_jobs do
   Delayed::Job.delete_all
 end
 
-desc 'delayed_job worker process'
+desc "Work the delayed_job queue."
 task :work_jobs do
   Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY']).start
-end
+end
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:speedy_tests) do |t|
+  t.rspec_opts = "--tag ~speed:slow"
+end
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:speedy_tests]
diff --git a/app.rb b/app.rb
@@ -3,9 +3,6 @@
 require "sinatra/flash"
 require "sinatra/contrib/all"
 
-require_relative "app/models/feed"
-require_relative "app/models/story"
-
 class Stringer < Sinatra::Base
   configure do
     set :database_file, "config/database.yml"
@@ -33,8 +30,8 @@ def render(*args)
   end
 
   get "/" do
-    @stories = Story.all.sample(5)
-
-    erb :index
+    redirect to("/news")
   end
-end
+end
+
+require_relative "app/controllers/stories_controller"
diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
@@ -0,0 +1,9 @@
+require_relative "../repositories/story_repository"
+
+class Stringer < Sinatra::Base
+  get "/news" do
+    @unread_stories = StoryRepository.unread
+
+    erb :index
+  end
+end
diff --git a/app/models/story.rb b/app/models/story.rb
@@ -1,3 +1,5 @@
+require_relative "./feed"
+
 class Story < ActiveRecord::Base
   belongs_to :feed
 
diff --git a/app/repositories/story_repository.rb b/app/repositories/story_repository.rb
@@ -1,5 +1,11 @@
+require_relative "../models/story"
+
 class StoryRepository
   def self.add(entry, feed)
     Story.create(feed: feed, title: entry.title, permalink: entry.url, body: entry.content.sanitize)
   end
+
+  def self.unread
+    Story.all
+  end
 end
diff --git a/app/tasks/fetch_feed.rb b/app/tasks/fetch_feed.rb
@@ -14,12 +14,7 @@ def fetch
 
     unless result.last_modified < @feed.last_fetched
       result.entries.each do |entry|
-        begin
-          StoryRepository.add(entry, @feed) if is_new?(entry)
-        rescue
-          require "pry"
-          binding.pry
-        end
+        StoryRepository.add(entry, @feed) if is_new?(entry)
       end
 
       FeedRepository.update_last_fetched(@feed, result.last_modified)
diff --git a/app/views/index.erb b/app/views/index.erb
@@ -1,28 +1,29 @@
 <div id="action-bar">
   <div class="row-fluid">
     <div class="pull-left">
-      <a class="btn">
+      <a class="btn" id="mark-all">
         <i class="icon-ok"></i>
       </a>
-      <a class="btn" href="/">
+      <a class="btn" href="/" id="refresh">
         <i class="icon-repeat"></i>
       </a>
     </div>
 
     <div class="pull-right">
-      <a class="btn btn-primary">
+      <a class="btn btn-primary" id="settings">
         <i class="icon-cog"></i>
       </a>
-      <a class="btn btn-primary">
+      <a class="btn btn-primary" id="add-feed">
         <i class="icon-plus"></i>
       </a>
     </div>
   </div>
 </div>
 
+<% unless @unread_stories.empty? %>
 <div id="stories">
   <ul id="story-list">
-    <% @stories.each do |story| %>
+    <% @unread_stories.each do |story| %>
       <li class="story">
         <div class="row-fluid story-preview">
           <div class="span3">
@@ -61,4 +62,8 @@
       </li>
     <% end %>
   </ul>
-</div>
+</div>
+<% else %>
+<div id="zen">
+</div>
+<% end %>
diff --git a/spec/controllers/stories_controller_spec.rb b/spec/controllers/stories_controller_spec.rb
@@ -0,0 +1,45 @@
+require "spec_helper"
+
+app_require "controllers/stories_controller"
+
+describe "StoriesController" do
+  let(:story_one) { StoryFactory.build }
+  let(:story_two) { StoryFactory.build }
+  let(:stories) { [story_one, story_two] }
+
+  describe "/news" do
+    before { StoryRepository.stub(:unread).and_return(stories) }
+    
+    it "display list of unread stories" do
+      get "/news"
+
+      last_response.body.should have_tag("li.story", count: 2)
+    end
+
+    it "displays the blog title and article title" do
+      StoryRepository.should_receive(:unread).and_return([story_one])
+
+      get "/news"
+
+      last_response.body.should include(story_one.headline)
+      last_response.body.should include(story_one.source)
+    end
+
+    it "displays all user actions" do
+      get "/news"
+
+      last_response.body.should have_tag("#mark-all")
+      last_response.body.should have_tag("#refresh")
+      last_response.body.should have_tag("#settings")
+      last_response.body.should have_tag("#add-feed")
+    end
+
+    it "displays a zen-like message when there are no unread stories" do
+      StoryRepository.stub(:unread).and_return([])
+
+      get "/news"
+
+      last_response.body.should have_tag("#zen")
+    end
+  end
+end
diff --git a/spec/factories/feed_factory.rb b/spec/factories/feed_factory.rb
@@ -0,0 +1,10 @@
+class FeedFactory
+  class FakeFeed < OpenStruct; end;
+
+  def self.build(params = {})
+    FakeFeed.new(
+      name: params[:name] || Faker::Name.name + " on Software",
+      url: params[:url] || Faker::Internet.url,
+      last_fetched: params[:last_fetched] || Time.now)
+  end
+end
diff --git a/spec/factories/story_factory.rb b/spec/factories/story_factory.rb
@@ -0,0 +1,20 @@
+require_relative "./feed_factory"
+
+class StoryFactory
+  class FakeStory < OpenStruct
+    def headline
+      self.title[0, 50]
+    end
+
+    def source
+      self.feed.name
+    end
+  end;
+
+  def self.build
+    FakeStory.new(title: Faker::Lorem.sentence, 
+      permalink: Faker::Internet.url, 
+      body: Faker::Lorem.paragraph,
+      feed: FeedFactory.build)
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,15 +1,26 @@
 ENV['RACK_ENV'] = 'test'
 
 require "rspec"
+require "rspec-html-matchers"
 require "rack/test"
 require "pry"
+require "faker"
 require "ostruct"
 require "date"
 
+require "factories/feed_factory"
+require "factories/story_factory"
+
+require "./app"
+
 RSpec.configure do |config|
   config.include Rack::Test::Methods
 end
 
 def app_require(file)
   require File.expand_path(File.join("app", file))
+end
+
+def app
+  Stringer
 end
diff --git a/spec/tasks/fetch_feed_spec.rb b/spec/tasks/fetch_feed_spec.rb
@@ -1,15 +1,15 @@
 require "spec_helper"
 app_require "tasks/fetch_feed"
 
-class Feed < OpenStruct; end;
-
 describe FetchFeed do
   let (:daring_fireball) {
-    Feed.new(name: "Daring Fireball", url: "http://daringfireball.net/index.xml", last_fetched: Time.new(2013, 4, 5))
+    FeedFactory.build(name: "Daring Fireball", url: "http://daringfireball.net/index.xml", last_fetched: Time.new(2013, 4, 5))
   }
 
   describe "#fetch" do
-    it "fetches the feed" do
+    before { StoryRepository.stub(:add) }
+
+    it "fetches the feed", speed: "slow" do
       result = FetchFeed.new(daring_fireball).fetch
       result.title.should eq "Daring Fireball"
       result.entries.first.author.should eq "John Gruber"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+require_relative "./feed"`
	`2`	`+`
`1`	`3`	`class Story < ActiveRecord::Base`
`2`	`4`	`belongs_to :feed`
`3`	`5`