spree_core 0.60.2 → 0.60.3

data/app/controllers/admin/base_controller.rb

@@ -1,12 +1,42 @@
 class Admin::BaseController < Spree::BaseController
   ssl_required
 
+  before_filter :check_alerts if Rails.env.production?
+
   helper :search
   helper 'admin/navigation'
   layout 'admin'
 
   protected
-  
+  def check_alerts
+    return unless current_user and should_check_alerts?
+
+    unless session.has_key? :alerts
+      begin
+        session[:alerts] = Spree::Alert.current(request.host)
+        filter_dismissed_alerts
+        Spree::Config.set :last_check_for_spree_alerts => DateTime.now.to_s
+      rescue
+        session[:alerts] = nil
+      end
+    end
+  end
+
+  def should_check_alerts?
+    return false if not Spree::Config[:check_for_spree_alerts]
+
+    last_check = Spree::Config[:last_check_for_spree_alerts]
+    return true if last_check.blank?
+
+    DateTime.parse(last_check) < 12.hours.ago
+  end
+
+  def filter_dismissed_alerts
+    return unless session[:alerts]
+    dismissed = (Spree::Config[:dismissed_spree_alerts] || '').split(',')
+    session[:alerts].reject! { |a| dismissed.include? a.id.to_s }
+  end
+
   def flash_message_for(object, event_sym)
     resource_desc  = object.class.model_name.human
     resource_desc += " \"#{object.name}\"" if object.respond_to?(:name)

data/app/controllers/admin/general_settings_controller.rb

@@ -10,4 +10,13 @@ class Admin::GeneralSettingsController < Admin::BaseController
     end
   end
 
+  def dismiss_alert
+    if request.xhr? and params[:alert_id]
+      dismissed = Spree::Config[:dismissed_spree_alerts] || ''
+      Spree::Config.set :dismissed_spree_alerts => dismissed.split(',').push(params[:alert_id]).join(',')
+      filter_dismissed_alerts
+      render :nothing => true
+    end
+  end
+
 end

data/app/models/app_configuration.rb

@@ -35,6 +35,9 @@ class AppConfiguration < Configuration
   preference :use_content_controller, :boolean, :default => true
   preference :allow_checkout_on_gateway_error, :boolean, :default => false
   preference :select_taxons_from_tree, :boolean, :default => false # provide opportunity to select taxons from tree instead of search with autocomplete
+  preference :check_for_spree_alerts, :boolean, :default => true
+  preference :dismissed_spree_alerts, :string, :default => ''
+  preference :last_check_for_spree_alerts, :string, :default => nil
 
   validates :name, :presence => true, :uniqueness => true
 

data/app/models/spree/alert.rb

@@ -0,0 +1,13 @@
+class Spree::Alert < ActiveResource::Base
+  self.site = "http://alerts.spreecommerce.com/"
+  self.format = :json
+
+  def self.current(host)
+    find(:all, :params => { :version => Spree.version,
+                            :name => Spree::Config[:site_name],
+                            :host => host,
+                            :rails_env => Rails.env,
+                            :rails_version => Rails.version })
+  end
+end
+

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

@@ -31,6 +31,14 @@
     </label>
   </p>
 
+  <p>
+    <label>
+      <input name="preferences[check_for_spree_alerts]" type="hidden" value="0" />
+      <%= check_box_tag('preferences[check_for_spree_alerts]', "1", Spree::Config[:check_for_spree_alerts]) %>
+      <%= t('spree_alert_checking') %>
+    </label>
+ </p>
+
   <p class="form-buttons">
     <%= button t('update') %>
     <%= t("or") %> <%= link_to t("cancel"), admin_general_settings_url %>

data/app/views/admin/general_settings/show.html.erb

@@ -23,7 +23,11 @@
   <tr>
 	<td colspan="2">
 	  <%= (Spree::Config[:allow_ssl_in_development_and_test] ? t("ssl_will_be_used_in_development_and_test_modes") : t("ssl_will_not_be_used_in_development_and_test_modes")) %>
-	</td>
+  </td>
+  </tr>
+  <tr>
+  <td colspan="2">
+    <%= (Spree::Config[:check_for_spree_alerts] ? t("spree_alert_checking") : t("spree_alert_not_checking")) %>
   </tr>
 </table>
 

data/app/views/admin/shared/_alert.html.erb

@@ -0,0 +1,6 @@
+<div class="alert <%= alert.severity.downcase %>">
+  <%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
+  <%= link_to 'X', dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
+              :remote => true, :method => :post, :class => 'dismiss' %>
+</div>
+

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

@@ -45,6 +45,7 @@
     <div class="flash notice"><%= self.notice %></div>
     <% end %>
 
+    <%= render :partial => 'admin/shared/alert', :collection => session[:alerts] %>
 
     <%= yield %>
 

data/config/locales/en.yml

@@ -907,6 +907,8 @@ en:
   ssl_will_be_used_in_production_mode: "SSL will be used in production mode"
   ssl_will_not_be_used_in_development_and_test_modes: "SSL will not be used in development and test mode if necessary."
   ssl_will_not_be_used_in_production_mode: "SSL will not be used in production mode"
+  spree_alert_checking: "Check for Spree security and release alerts"
+  spree_alert_not_checking: "Not checking for Spree security and release alerts"
   start: Start
   start_date: Valid from
   state: State

data/config/routes.rb

@@ -159,7 +159,11 @@ Rails.application.routes.draw do
       end
     end
 
-    resource :general_settings
+    resource :general_settings do
+      collection do
+        post :dismiss_alert
+      end
+    end
 
     resources :taxonomies do
       member do

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.60.2"
+    "0.60.3"
   end
 end

data/public/javascripts/admin.js

@@ -224,3 +224,9 @@ jQuery(".observe_field").live('change', function() {
     }
   );
 });
+
+jQuery(document).ready(function() {
+  $('div.alert a.dismiss').click(function() {
+    $(this).parent().fadeOut();
+  });
+});

data/public/stylesheets/admin/admin.css

@@ -583,3 +583,32 @@ span.handle{
   width:14px;
   height:15px;
 }
+
+.alert {
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  font-size: 1.3em;
+  margin-bottom: 1em;
+  padding: 0.8em;
+}
+.alert a.dismiss {
+  float:right;
+  font-size: 0.8em;
+}
+.alert.release {
+  background: #ccddff url(../images/shadow_top.png) 0px -50px repeat-x;
+  color: #556699;
+  border: 1px solid #99aacc;
+}
+.alert.security {
+  background: #f4b4b4 url(../images/shadow_top.png) 0px -50px repeat-x;
+  color: #000000;
+  border: 1px solid #e75b5b;
+}
+.alert.news {
+  background: #ccffd4 url(../images/shadow_top.png) 0px -50px repeat-x;
+  color: #000000;
+  border: 1px solid #66ff7e;
+}
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 235
+  hash: 233
   prerelease: 
   segments: 
   - 0
   - 60
-  - 2
-  version: 0.60.2
+  - 3
+  version: 0.60.3
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 Z
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -385,6 +385,7 @@ files:
 - app/models/shipment.rb
 - app/models/shipping_category.rb
 - app/models/shipping_method.rb
+- app/models/spree/alert.rb
 - app/models/state.rb
 - app/models/state_event.rb
 - app/models/tax_category.rb
@@ -509,6 +510,7 @@ files:
 - app/views/admin/shared/_additional_field.html.erb
 - app/views/admin/shared/_address.html.erb
 - app/views/admin/shared/_address_form.html.erb
+- app/views/admin/shared/_alert.html.erb
 - app/views/admin/shared/_calculator_fields.html.erb
 - app/views/admin/shared/_configuration_menu.html.erb
 - app/views/admin/shared/_destroy.js.erb