spree_core 0.50.2 → 0.50.3

data/app/controllers/admin/base_controller.rb

@@ -1,11 +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 render_js_for_destroy
     render :partial => "/admin/shared/destroy"
     flash.notice = nil

data/app/models/app_configuration.rb

@@ -32,6 +32,9 @@ class AppConfiguration < Configuration
   preference :cache_static_content, :boolean, :default => true
   preference :use_content_controller, :boolean, :default => true
   preference :allow_checkout_on_gateway_error, :boolean, :default => false
+  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

@@ -28,6 +28,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

@@ -19,7 +19,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

@@ -158,7 +158,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.50.2"
+    "0.50.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: 211
+  hash: 209
   prerelease: 
   segments: 
   - 0
   - 50
-  - 2
-  version: 0.50.2
+  - 3
+  version: 0.50.3
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,13 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -04:00
-default_executable: 
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: acts_as_list
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -32,12 +29,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nested_set
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: acts_as_list
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -48,12 +45,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rd_unobtrusive_date_picker
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: nested_set
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -64,12 +61,12 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
+  requirement: *id003
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: rd_unobtrusive_date_picker
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -80,12 +77,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
+  requirement: *id004
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: stringex
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: highline
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -96,12 +93,12 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
+  requirement: *id005
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: state_machine
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: stringex
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -112,12 +109,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
+  requirement: *id006
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: faker
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: state_machine
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -128,12 +125,12 @@ dependencies:
         - 9
         - 5
         version: 0.9.5
+  requirement: *id007
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: paperclip
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: faker
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -144,12 +141,12 @@ dependencies:
         - 3
         - 8
         version: 2.3.8
+  requirement: *id008
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rd_resource_controller
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: paperclip
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,12 +155,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id009
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: meta_search
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: rd_resource_controller
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -174,12 +171,12 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
+  requirement: *id010
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: activemerchant
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: meta_search
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -190,12 +187,12 @@ dependencies:
         - 12
         - 0
         version: 1.12.0
+  requirement: *id011
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  name: activemerchant
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -207,12 +204,12 @@ dependencies:
         - pre
         - 2
         version: 3.0.pre2
+  requirement: *id012
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  name: will_paginate
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -223,12 +220,12 @@ dependencies:
         - 0
         - 7
         version: 3.0.7
+  requirement: *id013
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: jquery-rails
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  name: rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -239,8 +236,10 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
+  requirement: *id014
   type: :runtime
-  version_requirements: *id014
+  prerelease: false
+  name: jquery-rails
 description: Required dependancy for Spree
 email: sean@railsdog.com
 executables: []
@@ -369,6 +368,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
@@ -496,6 +496,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
@@ -1094,7 +1095,6 @@ files:
 - public/stylesheets/datepicker.css
 - public/stylesheets/jquery.autocomplete.css
 - public/stylesheets/screen.css
-has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -1126,7 +1126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.4.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.