user_announcements 0.0.2 → 0.0.3

data/README.md

@@ -1,6 +1,8 @@
 # user_announcements
 
 [![Gem Version](https://badge.fury.io/rb/user_announcements.png)](http://badge.fury.io/rb/user_announcements)
+[![Build Status](https://travis-ci.org/stevedowney/user_announcements.png)](https://travis-ci.org/stevedowney/user_announcements)
+[![Coverage Status](https://coveralls.io/repos/stevedowney/user_announcements/badge.png?branch=master)](https://coveralls.io/r/stevedowney/user_announcements?branch=master)
 [![Code Climate](https://codeclimate.com/github/stevedowney/user_announcements.png)](https://codeclimate.com/github/stevedowney/user_announcements)
 
 Manage and display site-wide announcements on a per-user basis.

data/app/controllers/hidden_announcements_controller.rb

@@ -0,0 +1,23 @@
+class HiddenAnnouncementsController < ApplicationController
+  before_filter :ensure_current_user
+  
+  def index
+    @announcements = AnnouncementFinder.past_or_current
+    @hidden_announcement_ids = HiddenAnnouncement.hidden_announcement_ids_for(current_user.id)
+  end
+  
+  def create
+    @announcement_id = params.fetch(:announcement_id)
+    HiddenAnnouncement.create_for(current_user.id, @announcement_id)
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js
+    end
+  end
+  
+  def destroy
+    HiddenAnnouncement.delete_all(user_id: current_user.id, announcement_id: params.fetch(:announcement_id))
+    redirect_to action: 'index'
+  end
+  
+end

data/app/helpers/user_announcements_helper.rb

@@ -2,7 +2,7 @@ module UserAnnouncementsHelper
   
   # Helper method for displaying messages for +current_user+.
   def user_announcements(options={})
-    return if controller.controller_name == 'user_announcements'
+    return if controller.controller_name == 'hidden_announcements'
     
     announcements_rows = AnnouncementFinder.current_for_user(current_user)
     divs = announcements_rows.map do |announcement|
@@ -22,33 +22,44 @@ module UserAnnouncementsHelper
   
   def announcement_div_bootstrap(announcement)
     div_for announcement, class: 'alert', style: 'width:40em' do
-      link_to(hide_user_announcement_path(announcement), remote: true) do
+      link_to(*hide_announcement_link_args(announcement)) do
         content_tag(:button, raw('×'), type: 'button', class: 'close')
       end + 
       announcement.message.html_safe
     end
   end
   
+  def hide_announcement_link_args(announcement)
+    url = hidden_announcements_path(announcement_id: announcement)
+    options = {
+      method: :post,
+      remote: true,
+      id: "hide_#{dom_id(announcement)}"
+    }
+    
+    [url, options]
+  end
+  
   def announcement_div_non_bootstrap(announcement)
     div_for(announcement, class: 'non-bootstrap') do
       announcement.message.html_safe +
-      link_to("hide announcement", hide_user_announcement_path(announcement), remote: true)
+      link_to("hide announcement", *hide_announcement_link_args(announcement))
     end
   end
   
   def unhide_announcement_link(announcement)
     if @hidden_announcement_ids.include?(announcement.id)
       content_tag(:div) do
-        link_to('Unhide', unhide_user_announcement_path(announcement), method: :post)
+        link_to('Unhide', hidden_announcement_path(announcement, announcement_id: announcement), method: :delete)
       end
     end
   end
   
   def ua_table_attrs
     if bootstrap?
-      {class: "table table-striped table-bordered table-condensed table-hover"}
+      {class: "ua-table bootstrap table table-striped table-bordered table-condensed table-hover"}
     else
-      {class: 'ua-table'}
+      {class: 'ua-table non-bootstrap'}
     end
   end
   

data/app/models/announcement.rb

@@ -1,7 +1,7 @@
 class Announcement < ActiveRecord::Base
   attr_accessible :message, :starts_at, :ends_at, :active
 
-  has_many :user_announcements, :dependent => :destroy
+  has_many :hidden_announcements, :dependent => :destroy
   
   validates_presence_of :message, :starts_at, :ends_at
   
@@ -35,9 +35,22 @@ class Announcement < ActiveRecord::Base
     
     def new_with_defaults
       new do |ann|
-        ann.active = true
-        ann.starts_at = Time.now.at_beginning_of_day
-        ann.ends_at = 1.week.from_now.at_midnight
+        ann.active = get_default(:active)
+        ann.starts_at = get_default(:starts_at)
+        ann.ends_at = get_default(:ends_at)
+      end
+    end
+    
+    private
+    
+    def get_default(column)
+      config_key = "default_#{column}"
+      default = UserAnnouncements.config.send(config_key)
+      
+      if default.is_a?(Proc)
+        default.call
+      else
+        default
       end
     end
 

data/app/models/announcement_finder.rb

@@ -14,10 +14,14 @@ class AnnouncementFinder
     end
     
     def past_or_current
-      Announcement
+      Rails.logger.debug '***** start past_or_current'
+r =       Announcement
         .active
         .where("(starts_at is null or starts_at < :now)", :now => DateTime.now)
         .order('created_at desc')
+        Rails.logger.debug '***** end past_or_current'
+        # sleep 1
+    r  
     end
     
     def current_for_user(user)
@@ -30,7 +34,7 @@ class AnnouncementFinder
     # end
     
     def for_user(user, type)
-      hidden_announcement_ids = UserAnnouncement.hidden_announcement_ids_for(user.id)
+      hidden_announcement_ids = HiddenAnnouncement.hidden_announcement_ids_for(user.id)
       result = type
       result = result.where("id not in (?)", hidden_announcement_ids) if hidden_announcement_ids.present?
       result.sort_by(&:status_order)

data/app/models/hidden_announcement.rb

@@ -0,0 +1,28 @@
+class HiddenAnnouncement < ActiveRecord::Base
+  attr_accessible :user_id, :announcement_id
+  
+  validates_presence_of :user_id, :announcement_id
+  
+  class << self
+    
+    def hidden_announcement_ids_for(user_id)
+      where(user_id: user_id).pluck(:announcement_id)
+    end
+    
+    def create_for(user_id, announcement_id)
+      return if record_exists_for?(user_id, announcement_id)
+      
+      create!(
+        user_id: user_id,
+        announcement_id: announcement_id
+      )
+    end
+    
+    private
+    
+    def record_exists_for?(user_id, announcement_id)
+      where(user_id: user_id, announcement_id: announcement_id).count > 0
+    end
+  end
+  
+end

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

@@ -1,7 +1,7 @@
 <tr id="<%= dom_id(announcement) %>" class='<%= announcement.status %>'>
   <td><%=raw announcement.message %></td>
-  <td class='date'><%= announcement.starts_at.try(:to_s, :db) %></td>
-  <td class='date'><%= announcement.ends_at.try(:to_s, :db) %></td>
+  <td class='date'><%= announcement.starts_at.to_s(:long) %></td>
+  <td class='date'><%= announcement.ends_at.to_s(:long) %></td>
   <td><%= announcement.status %></td>
   <td><%= boolean_display(announcement.active)%></td>
   <td><%= link_to('edit', edit_admin_announcement_path(announcement), :class => 'btn btn-mini') %></td>

data/app/views/hidden_announcements/create.js.erb

@@ -0,0 +1 @@
+$("#announcement_<%= j @announcement_id %>").remove();

data/app/views/{user_announcements → hidden_announcements}/index.html.erb

@@ -8,7 +8,7 @@
     </tr>
   </thead>
   <tbody>
-    <%= render partial: 'user_announcements/announcement', collection: @announcements %>    
+    <%= render partial: 'hidden_announcements/announcement', collection: @announcements %>    
   </tbody>
 <% end %>
 

data/config/routes.rb

@@ -1,10 +1,7 @@
 Rails.application.routes.draw do
   
-  resources :user_announcements, path: '/announcements' do
-    get :hide, on: :member
-    post :unhide, on: :member
-  end
-# match 'announcements/:id/hide', to: 'announcements#hide', as: 'hide_announcement'
+  resources :hidden_announcements, path: '/announcements', only: [:index, :create, :destroy]
+
   namespace :admin do
     resources :announcements
   end

data/lib/generators/user_announcements/templates/css.scss

@@ -1,17 +1,21 @@
 table.ua-table {
-  border: 1px solid black;
-  
-  th, td {
-    border: 1px solid black;
-    padding: 0.5em;
+
+  td.date {
+    white-space: nowrap;
   }
 
-  td {
-    vertical-align: top;
-    
-    &.date {
-      white-space: nowrap;
+  &.non-bootstrap {
+    border: 1px solid black;
+  
+    th, td {
+      border: 1px solid black;
+      padding: 0.5em;
+    }
+
+    td {
+      vertical-align: top;
     }
+  
   }
 }
 

data/lib/generators/user_announcements/templates/initializer.rb

@@ -1,6 +1,9 @@
 UserAnnouncements.config do |c|
   
-  # uncomment to user Bootstrap styling
-  # c.bootstrap = true
+  # config.bootstrap = true
+
+  # config.default_active = true
+  # config.default_starts_at = lambda { Time.now.in_time_zone }
+  # config.default_ends_at = lambda { 1.week.from_now.in_time_zone.end_of_day }
   
 end

data/lib/generators/user_announcements/templates/migration.rb

@@ -10,13 +10,13 @@ class CreateUserAnnouncementTables < ActiveRecord::Migration
       t.timestamps
     end
     
-    create_table :user_announcements, :force => true do |t|
+    create_table :hidden_announcements, :force => true do |t|
       t.integer :user_id
       t.integer :announcement_id
       t.timestamps
     end
     
-    add_index :user_announcements, :user_id
-    add_index :user_announcements, :announcement_id
+    add_index :hidden_announcements, :user_id
+    add_index :hidden_announcements, :announcement_id
   end
 end

data/lib/user_announcements/engine.rb

@@ -1,9 +1,19 @@
 module UserAnnouncements
+  
   class Engine < ::Rails::Engine
     config.generators.integration_tool :rspec
     config.generators.test_framework :rspec
     
-    config.bootstrap = false
+    config.bootstrap = true
+  
+    config.default_active = true
+    config.default_starts_at = lambda { Time.now.in_time_zone }
+    config.default_ends_at = lambda { 1.week.from_now.in_time_zone.end_of_day }
+    
+    config.roles = []
+    config.types = []
+    config.styles = %w(error succes info)
+    
   end
   
   def self.config(&block)

data/lib/user_announcements/version.rb

@@ -1,3 +1,3 @@
 module UserAnnouncements
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: user_announcements
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +155,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-view-helpers
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -276,19 +340,19 @@ extra_rdoc_files: []
 files:
 - app/controllers/admin/announcements_controller.rb
 - app/controllers/admin/base_controller.rb
-- app/controllers/user_announcements_controller.rb
+- app/controllers/hidden_announcements_controller.rb
 - app/helpers/user_announcements_helper.rb
 - app/models/announcement.rb
 - app/models/announcement_finder.rb
-- app/models/user_announcement.rb
+- app/models/hidden_announcement.rb
 - app/views/admin/announcements/_announcement.html.erb
 - app/views/admin/announcements/_form.html.erb
 - app/views/admin/announcements/edit.html.erb
 - app/views/admin/announcements/index.html.erb
 - app/views/admin/announcements/new.html.erb
-- app/views/user_announcements/_announcement.html.erb
-- app/views/user_announcements/hide.js.erb
-- app/views/user_announcements/index.html.erb
+- app/views/hidden_announcements/_announcement.html.erb
+- app/views/hidden_announcements/create.js.erb
+- app/views/hidden_announcements/index.html.erb
 - config/routes.rb
 - lib/generators/user_announcements/install_generator.rb
 - lib/generators/user_announcements/templates/css.scss

data/app/controllers/user_announcements_controller.rb

@@ -1,26 +0,0 @@
-class UserAnnouncementsController < ApplicationController
-  before_filter :ensure_current_user
-  
-  def index
-    @announcements = AnnouncementFinder.past_or_current
-    @hidden_announcement_ids = UserAnnouncement.hidden_announcement_ids_for(current_user.id)
-  end
-  
-  def hide
-    @announcement_id = params.fetch(:id)
-    UserAnnouncement.create_for(current_user, @announcement_id)
-  end
-  
-  def unhide
-    UserAnnouncement.delete_all(user_id: current_user.id, announcement_id: params.fetch(:id))
-    redirect_to action: 'index'
-  end
-  
-  private
-  
-  def ensure_current_user
-  rescue NameError
-    raise "You must have a current_user method"
-  end
-  
-end

data/app/models/user_announcement.rb

@@ -1,19 +0,0 @@
-class UserAnnouncement < ActiveRecord::Base
-  attr_accessible :user_id, :announcement_id
-  
-  class << self
-    
-    def hidden_announcement_ids_for(user_id)
-      where(user_id: user_id).pluck(:announcement_id)
-    end
-    
-    def create_for(current_user, announcement_id)
-      create!(
-        user_id: current_user.id,
-        announcement_id: announcement_id
-      )
-    end
-    
-  end
-  
-end

data/app/views/user_announcements/hide.js.erb

@@ -1 +0,0 @@
-$("#announcement_<%= j params[:id] %>").remove();