user_announcements 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Change Log
+
+## v 0.0.5
+
+* support for StrongParameters
+* moved Bootstrap announcement width control to stylesheet
+* changed admin announcements flash type from :success to :notice
+* display roles vertically on edit page
+
+## v 0.0.4
+
+* support for scoping announcement by roles
+* support for styling announcements
+* added several configuration options

data/README.md

@@ -36,16 +36,12 @@ Add it to your Gemfile:
 gem "user_announcements"
 ```
 
-Run bundler:
+From the command line:
 
 ```sh
-bundle install
-```
-
-Install files:
-
-```sh
-rails generate user_announcements:install
+$ bundle install
+$ rails generate user_announcements:install
+$ rake db:migrate
 ```
 
 ## Getting Started
@@ -160,3 +156,11 @@ end
 
 Don't forget to restart your Rails server after changes to the config file.
 
+### Stylesheets
+
+When the `user_announcements:install` command is run `app/assets/stylesheets/user_announcements.css`
+is created.  
+
+When you change the CSS pay attention to the selectors -- some are for when you are configured
+with `config.bootstrap = true`; most are for when `config.bootstrap = false`.
+

data/app/controllers/admin/announcements_controller.rb

@@ -1,4 +1,5 @@
 class Admin::AnnouncementsController < ApplicationController
+
   before_filter :ensure_admin_user
   before_filter :find_announcement, :only => [:edit, :update, :destroy]
 
@@ -14,20 +15,19 @@ class Admin::AnnouncementsController < ApplicationController
   end
   
   def create
-    @announcement = Announcement.new(params.fetch(:announcement))
+    @announcement = Announcement.new(announcement_params)
     if @announcement.save
-      redirect_to admin_announcements_path, :flash => { success: 'Announcement created'}
+      redirect_to admin_announcements_path, :flash => { notice: 'Announcement created'}
     else
       render "new"
     end
   end
   
   def update
-    attributes = params.fetch(:announcement)
-      .reverse_merge(roles: [])
-      
-    if @announcement.update_attributes(attributes)
-      redirect_to admin_announcements_path, :flash => { success: 'Announcement updated' }
+    @announcement.attributes = announcement_params
+    @announcement.roles = [] unless announcement_params.has_key?(:roles)  
+    if @announcement.save
+      redirect_to admin_announcements_path, :flash => { notice: 'Announcement updated' }
     else
       render "edit"
     end
@@ -35,12 +35,36 @@ class Admin::AnnouncementsController < ApplicationController
   
   def destroy
     @announcement.destroy
-    redirect_to admin_announcements_path, :flash => { success: 'Announcement deleted' }
+    redirect_to admin_announcements_path, :flash => { notice: 'Announcement deleted' }
   end
 
-protected
+  private
 
   def find_announcement
     @announcement = Announcement.find(params.fetch(:id))
   end
+  
+  def announcement_params
+    if defined?(StrongParameters)
+      params.require(:announcement).permit(
+       :active,
+       :message,
+       :"starts_at(1i)",
+       :"starts_at(2i)",
+       :"starts_at(3i)",
+       :"starts_at(4i)",
+       :"starts_at(5i)",
+       :"ends_at(1i)",
+       :"ends_at(2i)",
+       :"ends_at(3i)",
+       :"ends_at(4i)",
+       :"ends_at(5i)",
+       :style,
+       {:roles => []},
+       :type,
+      )
+    else
+      params.fetch(:announcement)
+    end
+  end
 end

data/app/helpers/user_announcements/misc_helper.rb

@@ -32,7 +32,7 @@ module UserAnnouncements::MiscHelper
     if params.has_key?(:bootstrap)
       params[:bootstrap] == 'true'
     else
-      UserAnnouncements.config.bootstrap
+      UserAnnouncements[:bootstrap]
     end
   end
   

data/app/helpers/user_announcements/roles_helper.rb

@@ -20,7 +20,7 @@ module UserAnnouncements::RolesHelper
   private
   
   def _ua_roles_checkboxes(roles)
-    safe_join( roles.map { |role| _ua_role_checkbox(role) } )
+    safe_join( roles.map { |role| _ua_role_checkbox(role) }, '<br>'.html_safe )
   end
 
   def _ua_role_checkbox(role)

data/app/helpers/user_announcements/show_announcements.rb

@@ -23,7 +23,7 @@ module UserAnnouncements::ShowAnnouncements
   end
   
   def _ua_announcement_div_bootstrap(ann)
-    div_for ann, class: _ua_announcement_classes(ann.style), style: 'width:40em' do
+    div_for ann, class: _ua_announcement_classes(ann.style) do
       link_to(*_ua_hide_announcement_link_args(ann)) do
         content_tag(:button, raw('×'), type: 'button', class: 'close')
       end + 

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

@@ -33,6 +33,10 @@ table.ua-table td {
   vertical-align: top;
 }
 
+.announcement.bootstrap {
+  width: 40em;
+}
+
 .announcement.non-bootstrap {
   background-color: #fcf8e3;
   color: #c09853;
@@ -42,7 +46,6 @@ table.ua-table td {
   text-align: center;
 }
 
-
 .announcement.non-bootstrap a {
     font-size: 12px;
     margin-left: 5px;

data/lib/user_announcements/version.rb

@@ -1,3 +1,3 @@
 module UserAnnouncements
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: user_announcements
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails