14 files changed, 48 insertions, 9 deletions

@@ -23,3 +23,5 @@ $(document).on "turbolinks:load", ->
     create_record_toggle($(this).prop("checked"))
   $(".published-field input[type=checkbox]").change ->
     published_field_toggle($(this).prop("checked"))
+  $("input[type=tags]").each ->
+    tagsInput(this)
@@ -14,4 +14,5 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require ckeditor/init
+//= require tags-input
 //= require_tree ./admin
@@ -1,4 +1,5 @@
 /*
  *= require normalize-rails
+ *= require tags-input
  *= require_tree ./admin
  */
@@ -196,6 +196,14 @@ body {
   }
 }
 
+.tags-field {
+  label {
+    font-size: .75em;
+    display: block;
+    margin-bottom: 0.5em;
+  }
+}
+
 .record-description-field {
   display: none;
   margin-top: 1em;
@@ -31,6 +31,7 @@
     .tags {
       margin: .25em;
       display: flex;
+      flex-wrap: wrap;
       padding-left: 0;
 
       li {
@@ -58,6 +59,7 @@
           }
         }
 
+        &.entry-tag {
         & + li {
           margin-left: 1em;
         }
@@ -56,7 +56,7 @@ class Admin::BlogsController < Admin::AdminController
   private
 
     def blog_params
-      params.require(:blog).permit(:title, :body, :slug, :published, records_attributes: [:description, :_destroy])
+      params.require(:blog).permit(:title, :body, :slug, :published, :tag_list, records_attributes: [:description, :_destroy])
     end
 
     def set_section
@@ -42,7 +42,7 @@ class Admin::StreamsController < Admin::AdminController
   private
 
     def stream_params
-      params.require(:stream).permit(:title, :body, :slug, records_attributes: [:description, :_destroy])
+      params.require(:stream).permit(:title, :body, :slug, :tag_list, records_attributes: [:description, :_destroy])
     end
 
     def set_section
@@ -1,6 +1,8 @@
 class Blog < ApplicationRecord
   include Recordable
 
+  acts_as_taggable
+
   validates :title, presence: true
   validates :body, presence: true, if: :published
   validates :slug, presence: true, format: /\A[-a-z0-9]+\z/, if: :published
@@ -12,6 +14,10 @@ class Blog < ApplicationRecord
     "/says/#{slug}"
   end
 
+  def taggable
+    self
+  end
+
   private
     def set_draft_title
       if self.title.blank? and not self.published
@@ -1,6 +1,8 @@
 class Stream < ApplicationRecord
   include Recordable
 
+  acts_as_taggable
+
   has_many :updates
 
   validates :title, presence: true
@@ -9,4 +11,8 @@ class Stream < ApplicationRecord
   def path
     "/thinks/#{slug}"
   end
+
+  def taggable
+    self
+  end
 end
@@ -8,4 +8,8 @@ class Update < ApplicationRecord
   def path
     "/thinks/#{stream.slug}\#update-#{id}"
   end
+
+  def taggable
+    stream
+  end
 end
@@ -22,6 +22,10 @@
       - else
         = link_to "Preview post", admin_blog_url(f.object), target: "entry-preview"
   .details-module
+    .tags-field
+      = f.label :tag_list, "Tags"
+      = f.text_field :tag_list, type: :tags, value: f.object.tag_list.join(",")
+  .details-module
     .published-field
       = f.check_box :published
       = f.label :published
@@ -16,6 +16,10 @@
         - f.object.errors.full_messages.each do |error|
           %li= error
   .details-module
+    .tags-field
+      = f.label :tag_list, "Tags"
+      = f.text_field :tag_list, type: :tags, value: f.object.tag_list.join(",")
+  .details-module
     = f.fields_for :records, Record.new do |builder|
       .should-create-record-field
         = builder.check_box :_destroy, {checked: false}, "0", "1"
@@ -0,0 +1,7 @@
+%li
+  %span.description= link_to record.description, record.recordable.path
+  %ul.tags
+    %li.record-date= record.created_at.strftime("%m.%d.%y")
+    %li.entry-type{ class: "entry-type-#{record.recordable_type.downcase}" }= record.recordable_type
+    - record.recordable.taggable.tag_list.each do |tag|
+      %li.entry-tag= tag
@@ -1,7 +1 @@
-%ul#records
-  - @records.each do |record|
-    %li
-      %span.description= link_to record.description, record.recordable.path
-      %ul.tags
-        %li.record-date= record.created_at.strftime("%m.%d.%y")
-        %li.entry-type{ class: "entry-type-#{record.recordable_type.downcase}" }= record.recordable_type
+%ul#records= render @records