19 files changed, 176 insertions, 22 deletions

@@ -153,7 +153,6 @@
 
     .update-posted {
       display: block;
-      font-style: italic;
       background-color: #EAADEA;
       font-size: 16px;
       margin: .5em -20px;
@@ -161,6 +160,16 @@
       border-width: 1px 0 1px 0;
       border-style: solid;
       border-color: #DB70DB;
+
+      time {
+        font-style: italic;
+      }
+
+      .update-edit-link {
+        float: right;
+        color: blue;
+        font-weight: normal;
+      }
     }
   }
 }
@@ -463,3 +472,46 @@
 .next-post {
   float: right;
 }
+
+#streams-index {
+  width: 100%;
+  border-collapse: collapse;
+
+  #streams-index-header-row {
+    th {
+      background-color: #bdbdbd;
+      padding-left: 0.5em;
+      border-top: 1px solid #848484;
+      border-bottom: 1px solid #848484;
+    }
+  }
+
+  th {
+    padding-bottom: 0.5em;
+    padding-top: 0.5em;
+    text-align: left;
+  }
+
+  td {
+    padding-top: 1em;
+    padding-left: 0.5em;
+
+    time {
+      font-size: .75em;
+    }
+
+    .stream-link {
+      font-weight: bold;
+      text-decoration: none;
+
+      &, &:visited {
+        color: #ee2c2c;
+      }
+
+      &:hover {
+        text-decoration: underline;
+        color: #9ea1ad;
+      }
+    }
+  }
+}
@@ -228,3 +228,14 @@ h2.centered {
     text-decoration: none;
   }
 }
+
+#scrobble-box {
+  img {
+    margin: 0 auto;
+    display: block;
+  }
+
+  p {
+    text-align: center;
+  }
+}
@@ -1,9 +1,19 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
+  before_action :choose_random_song
 
   private
 
     def after_sign_out_path_for(resource)
       new_session_path(resource)
     end
+
+    def choose_random_song
+      ids = Scrobble.ids
+      if ids.empty?
+        @random_song = nil
+      else
+        @random_song = Scrobble.find(ids.sample)
+      end
+    end
 end
@@ -1,12 +1,7 @@
-require 'redcarpet/render_strip'
 
-class StrippedSummary < Redcarpet::Render::StripDown
-  def block_html(raw_html)
-    nil
-  end
-end
 
 class BlogsController < ApplicationController
+  include ApplicationHelper
 
   def summary
     @blogs = Blog.where(published: true).order(published_at: :desc).paginate(page: params[:page], per_page: 10)
@@ -33,12 +28,12 @@ class BlogsController < ApplicationController
     @prev = @blog.prev
     @next = @blog.next
 
-    body = Redcarpet::Markdown.new(StrippedSummary).render(@blog.body)
+    body = stripped_markdown(@blog.body)
 
     set_meta_tags(og: {
       title: @blog.title,
       type: "article",
-      description: (body.length <= 300 ? body : body[0..299]),
+      description: body[0, 299],
       url: blog_url(@blog, host: "www.fourisland.com"),
       article: {
         published_time: @blog.published_at.iso8601,
@@ -1,7 +1,26 @@
 class StreamsController < ApplicationController
+  include ApplicationHelper
+
+  def index
+    @streams = Stream.order(latest_post_at: :desc).paginate(page: params[:page], per_page: 10)
+  end
 
   def show
     @stream = Stream.find_by_slug(params[:slug])
+    @updates = @stream.updates.paginate(page: params[:page], per_page: 10)
+
+    body = stripped_markdown(@stream.body)
+
+    set_meta_tags(og: {
+      title: @stream.title,
+      type: "article",
+      description: body[0, 299],
+      url: stream_url(@stream, host: "www.fourisland.com"),
+      article: {
+        published_time: @stream.created_at.iso8601,
+        modified_time: @stream.latest_post_at.iso8601
+      }
+    })
   end
 
 end
@@ -1,6 +1,7 @@
 require 'redcarpet'
 require 'rouge'
 require 'rouge/plugins/redcarpet'
+require 'redcarpet/render_strip'
 
 module ApplicationHelper
 
@@ -45,4 +46,14 @@ module ApplicationHelper
     ]
   end
 
+  class StrippedSummary < Redcarpet::Render::StripDown
+    def block_html(raw_html)
+      nil
+    end
+  end
+
+  def stripped_markdown(text)
+    Redcarpet::Markdown.new(StrippedSummary).render(text)
+  end
+
 end
@@ -0,0 +1,2 @@
+class Scrobble < ApplicationRecord
+end
@@ -8,11 +8,22 @@ class Stream < ApplicationRecord
   validates :title, presence: true
   validates :slug, presence: true, format: /\A[-a-z0-9]+\z/
 
+  before_create :set_post_timestamp
+
   def path
     "/thinks/#{slug}"
   end
 
+  def to_param
+    slug
+  end
+
   def taggable
     self
   end
+
+  private
+    def set_post_timestamp
+      self.latest_post_at = self.created_at
+    end
 end
@@ -5,6 +5,8 @@ class Update < ApplicationRecord
 
   validates :stream, :body, presence: true
 
+  after_create :set_latest_timestamp
+
   def path
     "/thinks/#{stream.slug}\#update-#{id}"
   end
@@ -12,4 +14,10 @@ class Update < ApplicationRecord
   def taggable
     stream
   end
+
+  private
+    def set_latest_timestamp
+      self.stream.latest_post_at = self.created_at
+      self.stream.save!
+    end
 end
@@ -1,3 +1,3 @@
 - title "Editing #{@stream.title}"
-= form_for @stream, url: admin_stream_url(@stream), html: { id: "entry-form" } do |f|
+= form_for @stream, url: admin_stream_url(@stream.id), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -10,5 +10,5 @@
       %td= stream.created_at.strftime("%B %d, %Y, %l:%M%P")
       %td
         %ul.admin-actions
-          %li= link_to "Edit", edit_admin_stream_url(stream)
-          %li= link_to "Add Update", new_admin_stream_update_url(stream)
+          %li= link_to "Edit", edit_admin_stream_url(stream.id)
+          %li= link_to "Add Update", new_admin_stream_update_url(stream.id)
@@ -1,3 +1,3 @@
 - title "Editing stream update"
-= form_for @update, url: admin_stream_update_url(@stream, @update), html: { id: "entry-form" } do |f|
+= form_for @update, url: admin_stream_update_url(@stream.id, @update), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -24,5 +24,5 @@
     %time.dt-published{ datetime: blog.visible_date.strftime("%Y-%m-%dT%H:%M:%SZ%z") }= blog.visible_date.strftime("%B #{blog.visible_date.day.ordinalize}, %Y at %-I:%M:%S%P")
   .post-vote{ id: "blog-vote-section-#{blog.id}" }
     %span.vote-link{ id: "blog-upvote-link-#{blog.id}" }= link_to_unless (not blog.published or blog.already_upvoted?(request.remote_ip)), "👍", upvote_blog_path(blog), remote: true, rel: "nofollow", class: "blog-upvote-link", method: :post
-    %span.post-rating{ id: "blog-rating-#{blog.id}" }= blog.upvotes - blog.downvotes
+    %span.post-rating{ id: "blog-rating-#{blog.id}" }= blog.upvotes
     %span.vote-link{ id: "blog-downvote-link-#{blog.id}" }= link_to_unless (not blog.published or blog.already_downvoted?(request.remote_ip)), "👎", downvote_blog_path(blog), remote: true, rel: "nofollow", class: "blog-downvote-link", method: :post
@@ -73,6 +73,16 @@
                 %li
                   = image_tag "feed.png"
                   = link_to "Atom feed", blogs_url(format: :atom)
+          - unless @random_song.nil?
+            .sidebar-module#scrobble-box
+              .bubble.rounded
+                %h2 Listening to
+                = image_tag @random_song.image, width: "174px"
+                %p
+                  %strong= @random_song.title
+                  by
+                  = @random_song.artist
+                %p= @random_song.album
           .sidebar-module
             .bubble.rounded
               %h2 Meta
@@ -21,11 +21,12 @@
           %li= link_to_unless_current "Home", quotes_url
           %li= link_to_unless_current "Latest", latest_quotes_url
           %li= link_to_unless_current "Top", top_quotes_url
-          %li= link_to "Random", random_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to "Random", random_quotes_url
           - if user_signed_in?
             %li= link_to_unless_current "Submit", new_quote_url
           %li= link_to_unless_current "Tags", tags_quotes_url
-          %li= link_to_unless_current "Stats", stats_quotes_url
+          %li= link_to_unless_current "Search", search_form_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to_unless_current "Stats", stats_quotes_url 
           %li= link_to_unless_current "Feed", latest_quotes_url(:atom)
           - if user_signed_in?
             %li= link_to_unless_current "Admin", admin_url
@@ -1,6 +1,8 @@
 %article#stream-post
   %h2#stream-title= stream.title
   - unless stream.body.blank?
-    %header#stream-intro.entry-content= stream.body.html_safe
-  - unless stream.updates.empty?
-    = render stream.updates
+    %header#stream-intro.entry-content= markdown(stream.body)
+  = will_paginate @updates
+  - unless @updates.empty?
+    = render @updates
+  = will_paginate @updates
@@ -0,0 +1,19 @@
+%table#streams-index
+  %tr#streams-index-header-row
+    %th Stream Topic
+    %th Updates
+    %th Last Post
+  - @streams.each do |stream|
+    %tr
+      %td
+        = link_to stream.title, stream, class: "stream-link"
+        %br
+        %time= stream.created_at.strftime("%B #{stream.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+      %td= stream.updates.size
+      %td
+        - unless stream.updates.empty?
+          - latest_post = stream.updates.order(created_at: :desc).first
+          = link_to (stripped_markdown(latest_post.body)[0, 30] + "..."), stream
+          %br
+          %time= latest_post.created_at.strftime("%B #{latest_post.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+= will_paginate @streams
@@ -1,3 +1,3 @@
 - title @stream.title
-.breadcrumb= link_to "← Back to home page", root_path
+.breadcrumb= link_to "← Back to streams", streams_path
 = render @stream
@@ -1,3 +1,6 @@
 %section.stream-update.entry-content{ id: "update-#{update.id}" }
-  %time.update-posted= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
-  = update.body.html_safe
+  %header.update-posted
+    %time= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+    - if user_signed_in? and !update.new_record?
+      = link_to "Edit", edit_admin_stream_update_path(update.stream.id, update), :class => "update-edit-link"
+  = markdown(update.body)