spree_core 0.70.0 → 0.70.1

data/app/assets/javascripts/admin/admin.js.erb

@@ -210,7 +210,7 @@ $(document).ready(function(){
           $.each($('table.sortable tbody tr'), function(position, obj){
             reg = /(\w+_?)+_(\d+)/;
             parts = reg.exec($(obj).attr('id'));
-            if (parts) { 
+            if (parts) {
               positions['positions['+parts[2]+']'] = position;
               type = parts[1];
             }
@@ -227,3 +227,9 @@ $(document).ready(function(){
   });
 
 });
+
+jQuery(document).ready(function() {
+  $('div.alert a.dismiss').click(function() {
+    $(this).parent().fadeOut();
+  });
+});

data/app/assets/stylesheets/admin/admin.css.erb

@@ -588,3 +588,31 @@ 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;
+}

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

@@ -18,4 +18,13 @@ class Admin::GeneralSettingsController < Admin::BaseController
     redirect_to admin_general_settings_path
   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

@@ -39,6 +39,9 @@ class AppConfiguration < Configuration
   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 :max_level_in_taxons_menu, :integer, :default => 1 # maximum nesting level in taxons menu
+  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/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

@@ -40,6 +40,8 @@
       <div class="flash notice"><%= notice %></div>
     <% end %>
 
+    <%= render :partial => 'admin/shared/alert', :collection => session[:alerts] %>
+
     <%= yield %>
 
     <% if content_for?(:sidebar) %>

data/config/locales/en.yml

@@ -937,6 +937,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/generators/spree/site/site_generator.rb

@@ -56,15 +56,25 @@ Disallow: /users
       template "app/assets/stylesheets/admin/all.css"
     end
 
+    def create_overrides_directory
+      empty_directory "app/overrides"
+    end
+
     def configure_application
       application <<-APP
   config.middleware.use "SeoAssist"
     config.middleware.use "RedirectLegacyProductUrl"
 
     config.to_prepare do
+      #loads application's model / class decorators
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
+
+      #loads application's deface view overrides
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
     end
       APP
 

data/lib/spree_core/railtie.rb

@@ -55,7 +55,7 @@ module SpreeCore
     end
 
     # sets the manifests / assets to be precompiled
-    initializer "spree.assets.precompile", :group => :assets do |app|
+    initializer "spree.assets.precompile" do |app|
       app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js']
     end
 

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.70.0"
+    "0.70.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 263
+  hash: 261
   prerelease: 
   segments: 
   - 0
   - 70
-  - 0
-  version: 0.70.0
+  - 1
+  version: 0.70.1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 Z
+date: 2011-10-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -31,12 +29,12 @@ dependencies:
         - 1
         - 4
         version: 0.1.4
-  version_requirements: *id001
-  name: acts_as_list
-- !ruby/object:Gem::Dependency 
+  requirement: *id001
   type: :runtime
   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: 
     - - "="
@@ -47,12 +45,12 @@ dependencies:
         - 6
         - 8
         version: 1.6.8
-  version_requirements: *id002
-  name: nested_set
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
   type: :runtime
   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: 
     - - "="
@@ -63,12 +61,12 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  version_requirements: *id003
-  name: rd_find_by_param
-- !ruby/object:Gem::Dependency 
+  requirement: *id003
   type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: rd_find_by_param
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,12 +77,12 @@ dependencies:
         - 0
         - 14
         version: 1.0.14
-  version_requirements: *id004
-  name: jquery-rails
-- !ruby/object:Gem::Dependency 
+  requirement: *id004
   type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: jquery-rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -95,12 +93,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  version_requirements: *id005
-  name: highline
-- !ruby/object:Gem::Dependency 
+  requirement: *id005
   type: :runtime
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: highline
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -111,12 +109,12 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  version_requirements: *id006
-  name: stringex
-- !ruby/object:Gem::Dependency 
+  requirement: *id006
   type: :runtime
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: stringex
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -127,12 +125,12 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  version_requirements: *id007
-  name: state_machine
-- !ruby/object:Gem::Dependency 
+  requirement: *id007
   type: :runtime
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: state_machine
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -143,12 +141,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id008
-  name: faker
-- !ruby/object:Gem::Dependency 
+  requirement: *id008
   type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: faker
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -159,12 +157,12 @@ dependencies:
         - 4
         - 1
         version: 2.4.1
-  version_requirements: *id009
-  name: paperclip
-- !ruby/object:Gem::Dependency 
+  requirement: *id009
   type: :runtime
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: paperclip
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -173,12 +171,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
-  name: rd_resource_controller
-- !ruby/object:Gem::Dependency 
+  requirement: *id010
   type: :runtime
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: rd_resource_controller
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -189,12 +187,12 @@ dependencies:
         - 1
         - 1
         version: 1.1.1
-  version_requirements: *id011
-  name: meta_search
-- !ruby/object:Gem::Dependency 
+  requirement: *id011
   type: :runtime
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  name: meta_search
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -205,12 +203,12 @@ dependencies:
         - 17
         - 0
         version: 1.17.0
-  version_requirements: *id012
-  name: activemerchant
-- !ruby/object:Gem::Dependency 
+  requirement: *id012
   type: :runtime
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  name: activemerchant
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -221,12 +219,12 @@ dependencies:
         - 1
         - 1
         version: 3.1.1
-  version_requirements: *id013
-  name: rails
-- !ruby/object:Gem::Dependency 
+  requirement: *id013
   type: :runtime
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  name: rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -237,23 +235,25 @@ dependencies:
         - 12
         - 4
         version: 0.12.4
-  version_requirements: *id014
-  name: kaminari
-- !ruby/object:Gem::Dependency 
+  requirement: *id014
   type: :runtime
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  name: kaminari
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
-        - 6
-        - 1
-        version: 0.6.1
-  version_requirements: *id015
+        - 7
+        - 0
+        version: 0.7.0
+  requirement: *id015
+  type: :runtime
+  prerelease: false
   name: deface
 description: Required dependency for Spree
 email: sean@railsdog.com
@@ -510,6 +510,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
@@ -621,6 +622,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