distributed_demo 1.0.2 → 1.0.3

data/bin/distributed_demo

@@ -1,7 +1,34 @@
 #!/usr/bin/env ruby
 
 require 'client'
+require 'socket'
+require 'net/dns/mdns-sd'
 
 Thread.abort_on_exception = true
-Dist::Client.new(ARGV[0], ARGV[1] || '9501')
+
+if ARGV[0]
+  Dist::Client.new(ARGV[0])
+else
+  address = nil
+
+  puts "Searching for server..."
+  service = Net::DNS::MDNSSD.browse('_demo_server._tcp') do |r|
+    Net::DNS::MDNSSD.resolve(r.name, r.type, r.domain) do |rr|
+      puts "Found!"
+      service.stop
+      address = "#{rr.target}:#{rr.port}"
+    end
+  end
+  50.times do
+    sleep 0.1
+    break if address
+  end
+
+  if address
+    Dist::Client.new(address)
+  else
+    puts "Couldn't find a demo server."
+  end
+end
+
 

data/bin/distributed_demo_server

@@ -3,6 +3,16 @@
 require 'server'
 
 Thread.abort_on_exception = true
+
+require 'socket'
+require 'net/dns/mdns-sd'
+
+record = { 'description' => 'distributed_demo_server' }
+Net::DNS::MDNSSD.register(Socket.gethostname, '_demo_server._tcp', 'local', ARGV[0].to_i, record) do |reply|
+  p reply
+end
+
+
 server = Dist::Server.new(ARGV[0].to_i)
 Thread.new { server.listen }
 Rack::Handler::Thin.run MasterApp.new(server), :Port => 9505

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: distributed_demo
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  hash: 17
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -9,10 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 +00:00
-default_executable: 
-dependencies: []
-
+date: 2010-03-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-mdns
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: "Demo for my talk at the Scottish Ruby Conference: Distributed Systems with Rack."
 email: 
 executables: 
@@ -23,32 +69,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/array.rb
-- lib/client.rb
-- lib/dist.rb
-- lib/encoding.rb
-- lib/master_app.rb
-- lib/messages.rb
-- lib/server.rb
-- lib/tcp_socket.rb
-- roles/content/view.erb
-- roles/old_content/view.erb
-- roles/popular/view.erb
-- roles/recent_comments/view.erb
-- roles/recent_posts/view.erb
-- roles/content/app.rb
-- roles/old_content/app.rb
-- roles/popular/app.rb
-- roles/recent_comments/app.rb
-- roles/recent_posts/app.rb
-- nginx/mime.types
-- nginx/nginx.conf
 - bin/distributed_demo
 - bin/distributed_demo_server
-- lib/views/master.erb
-- lib/views/status.erb
-- README
-has_rdoc: false
 homepage: 
 licenses: []
 
@@ -58,21 +80,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Distributed systems demo

data/README

@@ -1,34 +0,0 @@
-Demo for the talk "Distributed Systems with Rack"
--------------------------------------------------
-
-This is the complete code for my Scottish Ruby Conference talk. It demonstrates the idea
-of having a website generated by multiple distinct and distributed services.  For the
-purposes of the demo, we have a server application which assigns roles to computers that
-connect.  In reality, you'd probably have a legitimate proxy server sit in front of the
-clusters of nodes...
-
-In our case though, we keep a list of clients that are connected, and which roles
-they've been assigned to. When we want to generate a page, we determine which roles are
-necessary, pick one of the clients from each role at random, and use Nginx to combine
-the results into a single page.
-
-
-
-Client Startup
---------------
-
-ruby client.rb 1.2.3.4:9876
-
-
-
-Server Startup
---------------
-
-nginx -c /path/to/distributed_demo/nginx/nginx.conf
-ruby server.rb 9876
-
-
-
-Cheers,
-
-  Tyler

data/lib/array.rb

@@ -1,5 +0,0 @@
-class Array
-  def rand
-    self[Kernel.rand * self.size]
-  end
-end

data/lib/client.rb

@@ -1,71 +0,0 @@
-$: << File.join(File.dirname(__FILE__), '..')
-
-require 'dist'
-require 'encoding'
-require 'messages'
-require 'rubygems'
-require 'rack'
-
-module Dist
-  class Client
-    include Encoding
-
-    def initialize(address, rack_port)
-      leave_a_will
-
-      host, port = address.split(':')
-      @socket = TCPSocket.new(host, port.to_i)
-
-      @socket << Messages::REQUEST_ROLE
-
-      receive_message Messages::SEND_ROLE_CONFIRM
-      role = receive_string
-
-      puts "Your role: #{role.dump}"
-
-      @socket << Messages::CONFIRM_ROLE
-      send_string @socket, role
-      send_string @socket, rack_port
-
-      # spin up rack app
-      require "roles/#{role}/app"
-      @webserver = Thread.new do
-        begin
-          require 'mongrel'
-          Rack::Handler::Mongrel.run App.new, :Port => rack_port.to_i
-        rescue LoadError
-          Rack::Handler::WEBrick.run App.new, :Port => rack_port.to_i
-        end
-      end
-
-      while true
-        receive_message Messages::REQUEST_HEARTBEAT
-        @socket << Messages::HEARTBEAT
-      end
-    rescue UnexpectedMessage
-      puts 'Disconnected.'
-    end
-
-    private
-
-    def leave_a_will
-      graceful_death = lambda {
-        @socket.close rescue nil
-        @webserver.kill! if @webserver
-      }
-      %w[INT TERM].each { |code| Signal.trap(code, &graceful_death) }
-    end
-
-    def receive_message(expected_message=nil)
-      message = @socket.recv(1)
-      raise UnexpectedMessage if expected_message && expected_message != message
-    end
-
-    def receive_string
-      length = @socket.recv(2).unpack('n')[0]
-      return '' if !length || length < 1
-      return @socket.recv(length)      
-    end
-  end
-end
-

data/lib/dist.rb

@@ -1,5 +0,0 @@
-require 'socket'
-
-module Dist
-  class UnexpectedMessage < StandardError ; end
-end

data/lib/encoding.rb

@@ -1,8 +0,0 @@
-module Dist
-  module Encoding
-    def send_string(out, string)
-      out << [string.size].pack('n')
-      out << string
-    end
-  end
-end

data/lib/master_app.rb

@@ -1,33 +0,0 @@
-require 'erb'
-require 'array'
-require 'ruby-debug'
-require 'sinatra/base'
-
-class MasterApp < Sinatra::Base
-  def initialize(demo_server)
-    @demo_server = demo_server
-  end
-
-  set :views, File.join(File.dirname(__FILE__), 'views')
-
-  get '/disconnect' do
-    @demo_server.disconnect_ip params[:ip], params[:port]
-    redirect '/status'
-  end
-
-  get '/status' do
-    erb :status
-  end
-
-  get '/debug' do
-    debugger
-  end
-
-  get '/' do
-    @roles = @demo_server.pick_servers
-
-    halt(503) unless @roles['content']
-
-    erb :master
-  end
-end

data/lib/messages.rb

@@ -1,9 +0,0 @@
-module Dist
-  module Messages
-    REQUEST_ROLE = 1.chr
-    SEND_ROLE_CONFIRM = 2.chr
-    CONFIRM_ROLE = 3.chr
-    REQUEST_HEARTBEAT = 4.chr
-    HEARTBEAT = 5.chr
-  end
-end

data/lib/server.rb

@@ -1,134 +0,0 @@
-$: << File.join(File.dirname(__FILE__), '..')
-
-require 'rubygems'
-require 'dist'
-require 'encoding'
-require 'messages'
-require 'set'
-require 'rack'
-require 'master_app'
-require 'ruby-debug'
-require 'tcp_socket'
-
-module Dist
-  class Server
-    include Encoding
-
-    def initialize(port)
-      @server = TCPServer.new(port)
-      @roles = Dir[File.join(File.dirname(__FILE__), '..', 'roles', '*')].map { |p| p.split('/').last }.inject({}) { |o,f| o[f] = Set.new; o }
-    end
-
-    attr_reader :roles
-
-    def pick_servers
-      roles.inject({}) do |o,(role,nodes)|
-        node = nil
-        while !node && nodes.size > 0
-          node = nodes.to_a.rand
-          if node.closed?
-            nodes.delete(node)
-            node = nil
-          end
-        end
-        o[role] = "#{node.remote_ip}:#{node.rack_port}" if node
-        o
-      end
-    end
-
-    def disconnect_ip(ip,port)
-      @roles.each do |role,sockets|
-        sockets.select { |sock|
-          begin
-            sock.remote_ip == ip && sock.rack_port.to_i == port.to_i
-          rescue IOError
-            true
-          end
-        }.each do |sock|
-          sockets.delete(sock)
-          sock.close rescue nil
-        end
-      end
-    end
-
-    def listen
-      puts 'Listening...'
-
-      while (tcp_session = @server.accept)
-        
-        remote_ip = tcp_session.remote_ip
-
-        Thread.new do
-          puts "Client connected: #{tcp_session.peeraddr.inspect}"
-          
-          role = next_role
-
-          begin
-            receive_message tcp_session, Messages::REQUEST_ROLE
-            
-            tcp_session << Messages::SEND_ROLE_CONFIRM
-            send_string tcp_session, role
-            
-            receive_message tcp_session, Messages::CONFIRM_ROLE
-            confirmed_role = receive_string(tcp_session)
-            remote_port = receive_string(tcp_session)
-
-            disconnect_ip remote_ip, remote_port
-
-            tcp_session.rack_port = remote_port
-            
-            if confirmed_role == role
-              puts 'Role confirmation complete. Putting client into production.'
-              @roles[role] << tcp_session
-            else
-              puts 'Role client sent back did not match role server sent... disconnecting client.'
-              tcp_session.close rescue nil
-            end
-          rescue UnexpectedMessage
-            puts 'Unexpected message... disconnecting client.'
-            tcp_session.close rescue nil
-          end
-
-          p @roles
-          
-          begin
-            while true
-              tcp_session << Messages::REQUEST_HEARTBEAT
-              if tcp_session.ready_to_read?(10)
-                receive_message tcp_session, Messages::HEARTBEAT
-              else
-                puts "#{remote_ip} - #{role}: Timeout"
-                break
-              end
-              sleep 15
-            end
-          rescue => e
-            puts "#{remote_ip} - #{role}: #{e.message}"
-            puts "#{remote_ip} - #{role}: Dead"
-          ensure
-            tcp_session.close rescue nil
-            @roles[role].delete(tcp_session)
-          end
-        end
-      end
-    end
-
-    def next_role
-      sorted_roles = @roles.sort { |(k1,v1),(k2,v2)| v1.size <=> v2.size }
-      min_size = sorted_roles[0][1].size
-      sorted_roles.select { |_,socks| socks.size == min_size }.map { |role,_| role }.rand
-    end
-
-    def receive_message(session, expected_message=nil)
-      message = session.recvfrom(1).first
-      raise UnexpectedMessage if expected_message && expected_message != message
-    end
-      
-    def receive_string(session)
-      length = session.recvfrom(2).first.unpack('n')[0]
-      return '' if length < 1
-      return session.recvfrom(length).first
-    end
-  end
-end
-

data/lib/tcp_socket.rb

@@ -1,12 +0,0 @@
-class TCPSocket
-  attr_accessor :rack_port
-
-  def remote_ip
-    peeraddr.last.split(':').last
-  end
-
-  def ready_to_read?(timeout=5)
-    r,_,__ = IO.select([self], nil, nil, timeout)
-    return r.first == self
-  end
-end

data/lib/views/master.erb

@@ -1,125 +0,0 @@
-<html>
-    <head>
-        <style type="text/css">
-            body {
-              width: 900px;
-              margin: 0 auto;
-            }
-
-            h1 {
-              margin: 20px 0 25px;
-            }
-
-            ul#menu {
-              padding: 0;
-              margin: 0;
-              overflow: hidden;
-            }
-
-            ul#menu li {
-              float: left;
-              width: 100px;
-              font: 15px/15px Helvetica;
-              color: #35D;
-              text-decoration: underline;
-              text-align: left;
-            }
-
-            h2 {
-              margin-bottom: 5px;
-            }
-
-            #content span.date {
-              font: 12px/15px Helvetica;
-            }
-
-            #content span.author {
-              font: 13px/15px Helvetica;
-              color: #333;
-            }
-
-            #content {
-              margin-top: 20px;
-              width: 600px;
-              float: left;
-            }
-            
-            #content p {
-              line-height: 20px;
-            }
-            
-            #content div.post {
-              margin-bottom: 50px;
-            }
-
-            #sidebar {
-              float: right;
-              margin-top: 45px;
-              width: 250px;
-            }
-
-            #sidebar > div {
-              margin-bottom: 20px;
-            }
-
-            #sidebar h3 {
-              margin: 0 0 10px;;
-            }
-
-            #sidebar div.post {
-              margin-bottom: 5px;
-            }
-            #sidebar div.post span.date {
-              display: block;
-              font: 12px/16px Helvetica;
-            }
-            #sidebar div.post span.views {
-              display: block;
-              font: bold 12px/16px Helvetica;
-            }
-
-            #recent_comments p {
-              margin: 0 0 10px;
-              font: 12px/16px Helvetica;
-            }
-        </style>
-    </head>
-
-    <body>
-        <h1>Some Technical Blog</h1>
-
-        <ul id="menu">
-            <li>Home</li>
-            <li>Explore</li>
-            <li>Something</li>
-        </ul>
-
-        <div id="content">
-            <% if @roles['content'] %>
-            <!--# include virtual="/remote/<%= @roles['content'] %>" -->
-            <% end %>
-
-            <% if @roles['old_content'] %>
-            <!--# block name="old_content" --><!--# endblock -->
-            <!--# include virtual="/remote/<%= @roles['old_content'] %>" stub="old_content" -->
-            <% end %>
-        </div>
-
-        <div id="sidebar">
-            <% if @roles['popular'] %>
-            <!--# block name="popular" --><!--# endblock -->
-            <!--# include virtual="/remote/<%= @roles['popular'] %>" stub="popular" -->
-            <% end %>
-            
-            <% if @roles['recent_posts'] %>
-            <!--# block name="recent_posts" --><!--# endblock -->
-            <!--# include virtual="/remote/<%= @roles['recent_posts'] %>" stub="recent_posts" -->
-            <% end %>
-            
-            <% if @roles['recent_comments'] %>
-            <!--# block name="recent_comments" --><!--# endblock -->
-            <!--# include virtual="/remote/<%= @roles['recent_comments'] %>" stub="recent_comments" -->
-            <% end %>
-        </div>
-    </body>
-</html>

data/lib/views/status.erb

@@ -1,23 +0,0 @@
-<html>
-    <head>
-        <style type="text/css">
-        </style>
-    </head>
-
-    <body>
-        <h1>Connection Status</h1>
-
-        <% @demo_server.roles.each do |role,clients| %>
-
-        <h2><%= role %></h2>
-        <ul>
-            <% clients.each do |client| %>
-            <li>
-                <%= client.remote_ip %>:<%= client.rack_port %>
-                (<a href="/disconnect?ip=<%= client.remote_ip %>&port=<%= client.rack_port %>">disconnect</a>)
-            </li>
-            <% end %>
-        </ul>
-        <% end %>
-    </body>
-</html>

data/nginx/mime.types

@@ -1,73 +0,0 @@
-
-types {
-    text/html                             html htm shtml;
-    text/css                              css;
-    text/xml                              xml;
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
-    application/x-javascript              js;
-    application/atom+xml                  atom;
-    application/rss+xml                   rss;
-
-    text/mathml                           mml;
-    text/plain                            txt;
-    text/vnd.sun.j2me.app-descriptor      jad;
-    text/vnd.wap.wml                      wml;
-    text/x-component                      htc;
-
-    image/png                             png;
-    image/tiff                            tif tiff;
-    image/vnd.wap.wbmp                    wbmp;
-    image/x-icon                          ico;
-    image/x-jng                           jng;
-    image/x-ms-bmp                        bmp;
-    image/svg+xml                         svg;
-
-    application/java-archive              jar war ear;
-    application/mac-binhex40              hqx;
-    application/msword                    doc;
-    application/pdf                       pdf;
-    application/postscript                ps eps ai;
-    application/rtf                       rtf;
-    application/vnd.ms-excel              xls;
-    application/vnd.ms-powerpoint         ppt;
-    application/vnd.wap.wmlc              wmlc;
-    application/vnd.wap.xhtml+xml         xhtml;
-    application/vnd.google-earth.kml+xml  kml;
-    application/vnd.google-earth.kmz      kmz;
-    application/x-cocoa                   cco;
-    application/x-java-archive-diff       jardiff;
-    application/x-java-jnlp-file          jnlp;
-    application/x-makeself                run;
-    application/x-perl                    pl pm;
-    application/x-pilot                   prc pdb;
-    application/x-rar-compressed          rar;
-    application/x-redhat-package-manager  rpm;
-    application/x-sea                     sea;
-    application/x-shockwave-flash         swf;
-    application/x-stuffit                 sit;
-    application/x-tcl                     tcl tk;
-    application/x-x509-ca-cert            der pem crt;
-    application/x-xpinstall               xpi;
-    application/zip                       zip;
-
-    application/octet-stream              bin exe dll;
-    application/octet-stream              deb;
-    application/octet-stream              dmg;
-    application/octet-stream              eot;
-    application/octet-stream              iso img;
-    application/octet-stream              msi msp msm;
-
-    audio/midi                            mid midi kar;
-    audio/mpeg                            mp3;
-    audio/x-realaudio                     ra;
-
-    video/3gpp                            3gpp 3gp;
-    video/mpeg                            mpeg mpg;
-    video/quicktime                       mov;
-    video/x-flv                           flv;
-    video/x-mng                           mng;
-    video/x-ms-asf                        asx asf;
-    video/x-ms-wmv                        wmv;
-    video/x-msvideo                       avi;
-}

data/nginx/nginx.conf

@@ -1,36 +0,0 @@
-worker_processes  1;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  text/html;
-
-    sendfile        on;
-    keepalive_timeout  65;
-
-    resolver 4.2.2.2;
-
-    error_log "/Users/tyler/Code/dist-demo/logs/error.log" debug;
-
-    server {
-        listen       9510;
-        server_name  127.0.0.1;
-
-        root /Users/tyler/Code/dist-demo;
-
-        location / {
-            ssi on;
-            proxy_pass http://127.0.0.1:9505/;
-        }
-
-        location ~* /remote/(.*)$ {
-            proxy_connect_timeout 2;
-            proxy_read_timeout 2;
-            proxy_send_timeout 1;
-            proxy_pass http://$1/;
-        }
-    }
-}

data/roles/content/app.rb

@@ -1,11 +0,0 @@
-require 'erb'
-
-class App
-  def initialize
-    @view = ERB.new(File.read(File.join(File.dirname(__FILE__), 'view.erb')))
-  end
-
-  def call(env)
-    return [200, { 'Content-Type' => 'text/html' }, [@view.result(binding)]]
-  end
-end

data/roles/content/view.erb

@@ -1,10 +0,0 @@
-<div class="post">
-    <h2>A Recent Post</h2>
-    <span class="date">March 24, 2010</span>
-    
-    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur lobortis libero et mi mollis bibendum. Pellentesque id enim vestibulum quam fermentum lacinia imperdiet eu sapien. Aenean eget nisl risus. Vivamus consequat ultricies sollicitudin. Nullam a nibh viverra odio suscipit mattis. Mauris tempus bibendum condimentum. Pellentesque non dui ac lacus euismod sodales et et nibh. Suspendisse purus urna, interdum eu placerat at, tristique id nulla. Aliquam metus orci, facilisis et accumsan vitae, imperdiet quis diam. Phasellus urna erat, dignissim sed varius vitae, tincidunt ac nisl. Morbi a sem eu sapien rhoncus rhoncus. Morbi aliquet est a nisl interdum ut molestie tellus pellentesque. Nunc eu nulla metus, at eleifend libero. Aenean ut odio eget felis sollicitudin aliquet at dapibus dolor. Suspendisse consectetur ipsum a enim rhoncus vehicula. In eleifend congue tortor id eleifend.</p>
-    
-    <p>Quisque nec magna tortor, at eleifend lacus. Sed vel tortor leo. Sed et urna quis nunc tristique condimentum ac sed leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras varius scelerisque ligula, sit amet adipiscing mi gravida non. Pellentesque a pharetra risus. Nunc ut nunc nec tortor pharetra tristique vel nec arcu. Pellentesque sit amet eros sapien, eget ullamcorper nibh. Etiam sit amet dui at velit eleifend pellentesque vel at ligula. Curabitur dictum accumsan vulputate. Duis nibh lorem, tincidunt nec volutpat vitae, tincidunt sit amet libero. Cras tempor nisi non mi eleifend tristique. Vestibulum eu dolor sed dui iaculis tincidunt ut id mauris. Fusce accumsan nunc vel lectus tincidunt at auctor arcu volutpat. Mauris et aliquet purus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam ac lectus eget lacus gravida rhoncus id id justo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In in urna erat, id rutrum mauris.</p>
-
-    <span class="author">Tyler McMullen</span>
-</div>

data/roles/old_content/app.rb

@@ -1,11 +0,0 @@
-require 'erb'
-
-class App
-  def initialize
-    @view = ERB.new(File.read(File.join(File.dirname(__FILE__), 'view.erb')))
-  end
-
-  def call(env)
-    return [200, { 'Content-Type' => 'text/html' }, [@view.result(binding)]]
-  end
-end

data/roles/old_content/view.erb

@@ -1,21 +0,0 @@
-<div class="post">
-    <h2>An Older Writing</h2>
-    <span class="date">March 15, 2010</span>
-    
-    <p>Quisque nec magna tortor, at eleifend lacus. Sed vel tortor leo. Sed et urna quis nunc tristique condimentum ac sed leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras varius scelerisque ligula, sit amet adipiscing mi gravida non. Pellentesque a pharetra risus. Nunc ut nunc nec tortor pharetra tristique vel nec arcu. Pellentesque sit amet eros sapien, eget ullamcorper nibh. Etiam sit amet dui at velit eleifend pellentesque vel at ligula. Curabitur dictum accumsan vulputate. Duis nibh lorem, tincidunt nec volutpat vitae, tincidunt sit amet libero. Cras tempor nisi non mi eleifend tristique. Vestibulum eu dolor sed dui iaculis tincidunt ut id mauris. Fusce accumsan nunc vel lectus tincidunt at auctor arcu volutpat. Mauris et aliquet purus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam ac lectus eget lacus gravida rhoncus id id justo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In in urna erat, id rutrum mauris.</p>
-
-    <p>Suspendisse mi libero, accumsan at porta in, mollis id eros. Etiam quis tristique lectus. Ut a diam sit amet eros rhoncus mollis id eu purus. Phasellus elit justo, feugiat a scelerisque aliquam, ultrices dapibus quam. Nam sagittis convallis nunc, ut scelerisque mauris bibendum quis. Phasellus auctor sem eleifend urna accumsan nec aliquam magna posuere. Duis turpis magna, accumsan sit amet mollis quis, vehicula sed est. Donec luctus egestas dui. Proin vulputate mauris et mi hendrerit porttitor. Etiam nec magna metus. Pellentesque faucibus tellus nec justo fringilla quis volutpat lectus malesuada. Suspendisse potenti. Nulla sed est quis mauris imperdiet dignissim vel non augue.</p>
-
-    <span class="author">Tyler McMullen</span>
-</div>
-
-<div class="post">
-    <h2>An Even Older Post</h2>
-    <span class="date">March 9, 2010</span>
-
-    <p>Suspendisse mi libero, accumsan at porta in, mollis id eros. Etiam quis tristique lectus. Ut a diam sit amet eros rhoncus mollis id eu purus. Phasellus elit justo, feugiat a scelerisque aliquam, ultrices dapibus quam. Nam sagittis convallis nunc, ut scelerisque mauris bibendum quis. Phasellus auctor sem eleifend urna accumsan nec aliquam magna posuere. Duis turpis magna, accumsan sit amet mollis quis, vehicula sed est. Donec luctus egestas dui. Proin vulputate mauris et mi hendrerit porttitor. Etiam nec magna metus. Pellentesque faucibus tellus nec justo fringilla quis volutpat lectus malesuada. Suspendisse potenti. Nulla sed est quis mauris imperdiet dignissim vel non augue.</p>
-
-    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur lobortis libero et mi mollis bibendum. Pellentesque id enim vestibulum quam fermentum lacinia imperdiet eu sapien. Aenean eget nisl risus. Vivamus consequat ultricies sollicitudin. Nullam a nibh viverra odio suscipit mattis. Mauris tempus bibendum condimentum. Pellentesque non dui ac lacus euismod sodales et et nibh. Suspendisse purus urna, interdum eu placerat at, tristique id nulla. Aliquam metus orci, facilisis et accumsan vitae, imperdiet quis diam. Phasellus urna erat, dignissim sed varius vitae, tincidunt ac nisl. Morbi a sem eu sapien rhoncus rhoncus. Morbi aliquet est a nisl interdum ut molestie tellus pellentesque. Nunc eu nulla metus, at eleifend libero. Aenean ut odio eget felis sollicitudin aliquet at dapibus dolor. Suspendisse consectetur ipsum a enim rhoncus vehicula. In eleifend congue tortor id eleifend.</p>
-
-    <span class="author">Tyler McMullen</span>
-</div>

data/roles/popular/app.rb

@@ -1,11 +0,0 @@
-require 'erb'
-
-class App
-  def initialize
-    @view = ERB.new(File.read(File.join(File.dirname(__FILE__), 'view.erb')))
-  end
-
-  def call(env)
-    return [200, { 'Content-Type' => 'text/html' }, [@view.result(binding)]]
-  end
-end

data/roles/popular/view.erb

@@ -1,19 +0,0 @@
-<div id="popular">
-    <h3>Popular Posts</h3>
-
-    <div class="post">
-        <a href="#" class="name">Something Extremely Controversial</a>
-        <span class="date">10 months ago</span>
-        <span class="views">12,029 views</span>
-    </div>
-    <div class="post">
-        <a href="#" class="name">Obscure Language vs. Popular Language</a>
-        <span class="date">10 months ago</span>
-        <span class="views">10,399 views</span>
-    </div>
-    <div class="post">
-        <a href="#" class="name">Why is Ruby cooler than your mom?</a>
-        <span class="date">10 months ago</span>
-        <span class="views">9,523 views</span>
-    </div>
-</div>

data/roles/recent_comments/app.rb

@@ -1,11 +0,0 @@
-require 'erb'
-
-class App
-  def initialize
-    @view = ERB.new(File.read(File.join(File.dirname(__FILE__), 'view.erb')))
-  end
-
-  def call(env)
-    return [200, { 'Content-Type' => 'text/html' }, [@view.result(binding)]]
-  end
-end

data/roles/recent_comments/view.erb

@@ -1,16 +0,0 @@
-<div id="recent_comments">
-    <h3>Recent Comments</h3>
-
-    <div class="comment">
-        <a href="#" class="name">Bob the Jerk</a>
-        <p>This article makes no sense and you smell kinda like ...</p>
-    </div>
-    <div class="comment">
-        <a href="#" class="name">Jill the Apologist</a>
-        <p>Well, maybe Java isn't such a bad language if you're extremely ...</p>
-    </div>
-    <div class="comment">
-        <a href="#" class="name">Tim the Fanboy</a>
-        <p>OMG how coold any1 evar have used any other langiage, like, omg ...</p>
-    </div>
-</div>

data/roles/recent_posts/app.rb

@@ -1,11 +0,0 @@
-require 'erb'
-
-class App
-  def initialize
-    @view = ERB.new(File.read(File.join(File.dirname(__FILE__), 'view.erb')))
-  end
-
-  def call(env)
-    return [200, { 'Content-Type' => 'text/html' }, [@view.result(binding)]]
-  end
-end

data/roles/recent_posts/view.erb

@@ -1,19 +0,0 @@
-<div id="recent_posts">
-    <h3>Recent Posts</h3>
-
-    <div class="post">
-        <a href="#" class="name">Are Java programmers masochists?</a>
-        <span class="date">1 week ago</span>
-        <span class="views">2029 views</span>
-    </div>
-    <div class="post">
-        <a href="#" class="name">Whatever happened to Ada?</a>
-        <span class="date">2 weeks ago</span>
-        <span class="views">103 views</span>
-    </div>
-    <div class="post">
-        <a href="#" class="name">Should Matz get the Nobel prize?</a>
-        <span class="date">1 month ago</span>
-        <span class="views">523 views</span>
-    </div>
-</div>