cartoonist-announcements 0.0.16 → 0.0.17

data/app/assets/javascripts/admin/announcements.js.coffee

@@ -0,0 +1,5 @@
+//= require jquery
+//= require jquery.ui.datepicker
+$ ->
+    $("input[name='posted_at_date']").datepicker dateFormat: "yy-mm-dd"
+    $("input[name='expired_at_date']").datepicker dateFormat: "yy-mm-dd"

data/app/assets/javascripts/cartoonist-announcements.js.coffee

@@ -0,0 +1,71 @@
+do ($ = jQuery) ->
+    CLOSED_ANNOUNCEMENTS_COOKIE = "closedAnnouncements"
+    COOKIE_EXPIRATION = 5 * 365 * 24 * 60 * 60 * 1000
+
+    $.announcement = (announcement) ->
+        $.extend announcement,
+            append: () ->
+                return @appendedContent if @appendedContent
+                @appendedContent = $ @content
+
+                if @isSession()
+                    button = $ """<button class="close-announcent">&times;</button>"""
+                    button.click =>
+                        @markCookie()
+                        @appendedContent?.slideUp => @appendedContent.remove()
+                        false
+                    @appendedContent.append button
+
+                @appendedContent.addClass("announcement #{@location}-announcement").attr("id", "announcement-#{@id}").hide()
+                $(@target()).append @appendedContent
+                @appendedContent
+
+            getCookieValue: () ->
+                return [] unless document.cookie
+                cookies = document.cookie.split ";"
+                announcementCookie = null
+
+                $.each cookies, (_, cookie) ->
+                    value = cookie.split "="
+                    if $.trim(value[0]) == CLOSED_ANNOUNCEMENTS_COOKIE
+                        announcementCookie = value
+                        return false
+
+                return [] unless announcementCookie
+
+                $.map $.trim(announcementCookie[1]).split(","), (id, _) ->
+                    parseInt id, 10
+
+            isSession: () ->
+                @location == "session"
+
+            isDisplayed: () ->
+                return true unless @isSession()
+                $.inArray(@id, @getCookieValue()) < 0
+
+            markCookie: () ->
+                expiration = new Date()
+                expiration.setTime(expiration.getTime() + COOKIE_EXPIRATION)
+                value = @getCookieValue()
+                value.push @id unless $.inArray(@id, value) >= 0
+                value = value.join ","
+                document.cookie = "#{CLOSED_ANNOUNCEMENTS_COOKIE}=#{value}; expires=#{expiration.toGMTString()}"
+
+            show: () ->
+                @append().slideDown() if @isDisplayed()
+
+            target: () ->
+                if @isSession()
+                    $("body").prepend("""<div class="session-announcements-container" />""") unless $(".session-announcements-container").size() > 0
+                    ".session-announcements-container"
+                else
+                    ".header"
+
+    $ ->
+        $.ajax
+            url: "/announcements"
+            dataType: "json"
+            success: (data) ->
+                return unless data.announcements?.length > 0
+                $.each data.announcements, (_, announcement) ->
+                    $.announcement(announcement).show()

data/app/assets/stylesheets/admin/announcements.css.scss

@@ -0,0 +1,3 @@
+/*
+ *= require jquery.ui.datepicker
+ */

data/app/controllers/admin/announcements_controller.rb

@@ -1,7 +1,40 @@
 class Admin::AnnouncementsController < AdminCartoonistController
+  def new
+  end
+
+  def create
+    announcement = Announcement.create_announcement params
+    redirect_to "/admin/announcements/#{announcement.id}/edit"
+  end
+
+  def edit
+    @announcement = Announcement.find params[:id].to_i
+  end
+
+  def update
+    announcement = Announcement.update_announcement params
+    redirect_to "/admin/announcements/#{announcement.id}/edit"
+  end
+
   def index
     @unposted = Announcement.future.all
     @active = Announcement.active.all
     @expired = Announcement.expired.all
   end
+
+  def lock
+    announcement = Announcement.find params[:id].to_i
+    announcement.lock!
+    redirect_to "/admin/announcements/#{announcement.id}/edit"
+  end
+
+  def unlock
+    announcement = Announcement.find params[:id].to_i
+    announcement.unlock!
+    redirect_to "/admin/announcements/#{announcement.id}/edit"
+  end
+
+  def preview_content
+    render :text => Markdown.render(params[:content]), :layout => false
+  end
 end

data/app/controllers/announcements_controller.rb

@@ -1,2 +1,7 @@
 class AnnouncementsController < CartoonistController
+  def index
+    cache_page_as "announcements.#{cache_type}.tmp.json" do
+      render :json => { :announcements => Announcement.actives_as_hash }
+    end
+  end
 end

data/app/helpers/admin/announcements_helper.rb

@@ -0,0 +1,5 @@
+module Admin::AnnouncementsHelper
+  def lock_disabled
+    @announcement.lock_disabled_html
+  end
+end

data/app/models/announcement.rb

@@ -1,5 +1,9 @@
+# TODO: Make this searchable
 class Announcement < ActiveRecord::Base
-  attr_accessible :posted_at, :expired_at, :title, :content, :location, :enabled
+  include Postable
+  include Expirable
+  include Lockable
+  attr_accessible :posted_at, :expired_at, :title, :content, :location
   validate :posted_at_must_be_before_expired_at, :posted_at_must_exist_if_expired_at_exists
 
   def posted_at_must_be_before_expired_at
@@ -14,25 +18,47 @@ class Announcement < ActiveRecord::Base
     end
   end
 
+  def as_hash
+    {
+      :id => id,
+      :title => title,
+      :content => Markdown.render(content),
+      :location => location
+    }
+  end
+
   class << self
-    def disabled
-      where :enabled => false
+    def create_announcement(params)
+      create :title => params[:title], :content => params[:content], :location => params[:location], :locked => true
     end
 
-    def enabled
-      where :enabled => true
+    def update_announcement(params)
+      announcement = find params[:id].to_i
+      announcement.ensure_unlocked!
+      announcement.title = params[:title]
+      announcement.location = params[:location]
+      announcement.content = params[:content]
+      announcement.post_from params
+      announcement.expire_from params
+      announcement.locked = true
+      announcement.save!
+      announcement
     end
 
-    def active
-      where "posted_at < ? AND (expired_at IS NULL OR expired_at > ?)", DateTime.now, DateTime.now
+    def actives_as_hash
+      active.creation_order.map &:as_hash
     end
 
-    def expired
-      where "expired_at < ?", DateTime.now
+    def creation_order
+      order :id
+    end
+
+    def active
+      posted.unexpired
     end
 
     def future
-      where "posted_at IS NULL OR posted_at > ?", DateTime.now
+      unposted
     end
   end
 end

data/app/views/admin/announcements/edit.html.erb

@@ -0,0 +1,43 @@
+<p>
+  <%= form_tag "/admin/announcements/#{@announcement.id}/#{@announcement.toggle_lock_target}", :method => :post do %>
+    <input type="submit" value="<%= @announcement.toggle_lock_target %>" />
+  <% end %>
+</p>
+
+<%= form_tag "/admin/announcements/#{@announcement.id}", :method => :put do %>
+  <p>
+    <%= partial "shared/post_date_time", :postable => @announcement %>
+  </p>
+
+  <p>
+    <%= partial "shared/expire_date_time", :expirable => @announcement %>
+  </p>
+
+  <p>
+    <label>
+      <%= t "admin.announcements.edit.title_label" %>
+      <input type="text" name="title" value="<%= @announcement.title %>" <%= lock_disabled %> />
+    </label>
+  </p>
+
+  <p>
+    <label>
+      <%= t "admin.announcements.edit.location" %>
+      <select name="location" <%= lock_disabled %>>
+        <option value="session" <%= selected @announcement.location, "session" %>><%= t "admin.announcements.edit.location_option.session" %></option>
+        <option value="top" <%= selected @announcement.location, "top" %>><%= t "admin.announcements.edit.location_option.top" %></option>
+      </select>
+    </label>
+  </p>
+
+  <p>
+    <label>
+      <%= t "admin.announcements.edit.content" %><br />
+      <textarea name="content" rows="15" cols="100" <%= lock_disabled %>><%= @announcement.content %></textarea>
+    </label>
+  </p>
+
+  <p>
+    <input type="submit" value="<%= t "admin.announcements.edit.save" %>" <%= lock_disabled %> />
+  </p>
+<% end %>

data/app/views/admin/announcements/index.html.erb

@@ -2,7 +2,9 @@
 
 <ul>
   <% @unposted.each do |announcement| %>
-    <li><%= announcement.title %></li>
+    <li>
+      <a href="/admin/announcements/<%= announcement.id %>/edit"><%= announcement.title %></a>
+    </li>
   <% end %>
 </ul>
 
@@ -10,7 +12,9 @@
 
 <ul>
   <% @active.each do |announcement| %>
-    <li><%= announcement.title %></li>
+    <li>
+      <a href="/admin/announcements/<%= announcement.id %>/edit"><%= announcement.title %></a>
+    </li>
   <% end %>
 </ul>
 
@@ -18,6 +22,8 @@
 
 <ul>
   <% @expired.each do |announcement| %>
-    <li><%= announcement.title %></li>
+    <li>
+      <a href="/admin/announcements/<%= announcement.id %>/edit"><%= announcement.title %></a>
+    </li>
   <% end %>
 </ul>

data/app/views/admin/announcements/new.html.erb

@@ -0,0 +1,31 @@
+<% content_for :title, t("admin.announcements.new.title") %>
+
+<%= form_tag "/admin/announcements", :method => :post do %>
+  <p>
+    <label>
+      <%= t "admin.announcements.new.title_label" %>
+      <input type="text" name="title" />
+    </label>
+  </p>
+
+  <p>
+    <label>
+      <%= t "admin.announcements.new.location" %>
+      <select name="location">
+        <option value="session"><%= t "admin.announcements.new.location_option.session" %></option>
+        <option value="top"><%= t "admin.announcements.new.location_option.top" %></option>
+      </select>
+    </label>
+  </p>
+
+  <p>
+    <label>
+      <%= t "admin.announcements.new.content" %><br />
+      <textarea name="content" rows="15" cols="100"></textarea>
+    </label>
+  </p>
+
+  <p>
+    <input type="submit" value="<%= t "admin.announcements.new.save" %>" />
+  </p>
+<% end %>

data/app/views/layouts/admin/announcements.html.erb

@@ -1,7 +1,7 @@
 <% content_for :subtabs do %>
   <a class="subtab" href="/admin/announcements"><%= t "admin.announcements.layout.list" %></a>
-  <!-- Disable until they are ready.
   <a class="subtab" href="/admin/announcements/new"><%= t "admin.announcements.layout.new" %></a>
+  <!-- Disable until they are ready.
   <a class="subtab" href="/admin/announcements/preview"><%= t "admin.announcements.layout.preview" %></a>
   -->
 <% end %>

data/config/locales/en.yml

@@ -1,6 +1,14 @@
 en:
   admin:
     announcements:
+      edit:
+        content: "Content:"
+        location: "Location:"
+        location_option:
+          session: Session
+          top: Top
+        save: Save
+        title_label: "Title:"
       index:
         active: Currently active
         expired: Expired
@@ -10,6 +18,15 @@ en:
         new: New Announcement
         preview: Preview
         section: Announcements
+      new:
+        content: "Content:"
+        location: "Location:"
+        location_option:
+          session: Session
+          top: Top
+        save: Save
+        title: New Announcement
+        title_label: "Title:"
     layout:
       tab:
         announcements: Announcements

data/db/migrate/20121219051501_add_locked_column_to_announcements.rb

@@ -0,0 +1,7 @@
+class AddLockedColumnToAnnouncements < ActiveRecord::Migration
+  def change
+    change_table :announcements do |t|
+      t.boolean :locked, :null => false, :default => false
+    end
+  end
+end

data/db/migrate/20121227022810_remove_enabled_column_from_announcements.rb

@@ -0,0 +1,9 @@
+class RemoveEnabledColumnFromAnnouncements < ActiveRecord::Migration
+  def change
+    remove_index :announcements, [:posted_at, :expired_at, :enabled]
+    remove_index :announcements, [:expired_at, :enabled]
+    remove_column :announcements, :enabled
+    add_index :announcements, [:posted_at, :expired_at]
+    add_index :announcements, [:expired_at]
+  end
+end

data/lib/cartoonist-announcements/engine.rb

@@ -1,16 +1,29 @@
 module CartoonistAnnouncements
   class Engine < ::Rails::Engine
     Cartoonist::Admin::Tab.add :announcements, :url => "/admin/announcements"
+    Cartoonist::Asset.add "admin/announcements.css"
+    Cartoonist::Asset.add "admin/announcements.js"
     Cartoonist::Asset.include_js "cartoonist-announcements.js"
     Cartoonist::Migration.add_for self
+
     Cartoonist::Backup.for :announcements do
       Announcement.order(:id)
     end
+
     Cartoonist::Routes.add do
-      resources :announcements, :only => []
+      resources :announcements, :only => [:index]
 
       namespace :admin do
-        resources :announcements, :only => [:index]
+        resources :announcements, :only => [:new, :create, :edit, :update, :index] do
+          member do
+            post "lock"
+            post "unlock"
+          end
+
+          collection do
+            post "preview_content"
+          end
+        end
       end
     end
   end

data/lib/cartoonist-announcements/version.rb

@@ -2,7 +2,7 @@ module CartoonistAnnouncements
   class Version
     class << self
       def to_s
-        "0.0.16"
+        "0.0.17"
       end
     end
   end

metadata

@@ -1,75 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cartoonist-announcements
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cartoonist
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.0.16
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.17
   type: :runtime
-  version_requirements: *id001
-description: This plugin for Cartoonist adds announcements for things like announcing a new website.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.17
+description: This plugin for Cartoonist adds announcements for things like announcing
+  a new website.
 email: reasonnumber@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- app/assets/javascripts/cartoonist-announcements.js
+files:
+- app/assets/javascripts/admin/announcements.js.coffee
+- app/assets/javascripts/cartoonist-announcements.js.coffee
+- app/assets/stylesheets/admin/announcements.css.scss
 - app/controllers/admin/announcements_controller.rb
 - app/controllers/announcements_controller.rb
+- app/helpers/admin/announcements_helper.rb
 - app/models/announcement.rb
+- app/views/admin/announcements/edit.html.erb
 - app/views/admin/announcements/index.html.erb
+- app/views/admin/announcements/new.html.erb
 - app/views/layouts/admin/announcements.html.erb
 - cartoonist-announcements.gemspec
 - config/locales/en.yml
 - db/migrate/20120412035009_create_announcements.rb
+- db/migrate/20121219051501_add_locked_column_to_announcements.rb
+- db/migrate/20121227022810_remove_enabled_column_from_announcements.rb
 - lib/cartoonist-announcements.rb
 - lib/cartoonist-announcements/engine.rb
 - lib/cartoonist-announcements/version.rb
 homepage: http://reasonnumber.com/cartoonist
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cartoonist Announcements
 test_files: []
-

data/app/assets/javascripts/cartoonist-announcements.js

@@ -1,4 +0,0 @@
-(function($) {
-    $(function() {
-    });
-})(jQuery);