spree_auth 1.1.0 → 1.1.1

data/app/controllers/spree/admin/admin_controller_decorator.rb

@@ -4,12 +4,12 @@ Spree::Admin::BaseController.class_eval do
 
   def authorize_admin
     begin
-      model = model_class
+      record = model_class.new
     rescue
-      model = Object
+      record = Object.new
     end
-    authorize! :admin, model
-    authorize! params[:action].to_sym, model
+    authorize! :admin, record
+    authorize! params[:action].to_sym, record
   end
 
   protected

data/app/controllers/spree/admin/admin_orders_controller_decorator.rb

@@ -6,7 +6,7 @@ Spree::Admin::OrdersController.class_eval do
       load_order
       session[:access_token] ||= params[:token]
 
-      resource = @order || Spree::Order
+      resource = @order || Spree::Order.new
       action = params[:action].to_sym
 
       authorize! action, resource, session[:access_token]

data/app/controllers/spree/orders_controller_decorator.rb

@@ -9,7 +9,7 @@ Spree::OrdersController.class_eval do
       if order
         authorize! :edit, order, session[:access_token]
       else
-        authorize! :create, Spree::Order
+        authorize! :create, Spree::Order.new
       end
     end
 end

data/app/controllers/spree/products_controller_decorator.rb

@@ -0,0 +1,13 @@
+Spree::ProductsController.class_eval do
+  rescue_from CanCan::AccessDenied, :with => :render_404
+
+  private
+    def load_product
+      @product = Spree::Product.find_by_permalink!(params[:id])
+      if !@product.deleted? && (@product.available_on.nil? || @product.available_on.future?)
+        # Allow admins to view any yet to be available products
+        raise CanCan::AccessDenied unless current_user && current_user.admin?
+      end
+    end
+end
+

data/app/controllers/spree/users_controller.rb

@@ -42,7 +42,7 @@ class Spree::UsersController < Spree::BaseController
     end
 
     def authorize_actions
-      authorize! params[:action].to_sym, Spree::User
+      authorize! params[:action].to_sym, Spree::User.new
     end
 
     def accurate_title

data/app/overrides/admin_payment_methods_index.rb

@@ -1,6 +1,7 @@
 Deface::Override.new(:virtual_path => "spree/admin/payment_methods/index",
                      :name => "gateway_banner",
                      :insert_after => "#listing_payment_methods",
-                     :partial => "spree/admin/banners/gateway")
+                     :partial => "spree/admin/banners/gateway",
+                     :original => '93c6a827573cd5b5410992477389e178b9965630' )
 
 

data/app/overrides/auth_admin_login_navigation_bar.rb

@@ -1,4 +1,5 @@
 Deface::Override.new(:virtual_path => "spree/layouts/admin",
                      :name => "auth_admin_login_navigation_bar",
                      :replace => "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]",
-                     :partial => "spree/layouts/admin/login_nav")
+                     :partial => "spree/layouts/admin/login_nav",
+                     :original => '0a5476d4d5db90ec8dd200ebaa0109a6a54ec6bc' )

data/app/overrides/auth_admin_user_roles.rb

@@ -2,4 +2,5 @@ Deface::Override.new(:virtual_path => "spree/admin/users/_form",
                      :name => "auth_admin_user_roles",
                      :insert_after => "[data-hook='admin_user_form_fields']",
                      :partial => "spree/admin/users/roles",
-                     :disabled => false)
+                     :disabled => false,
+                     :original => '0e121156115799a53f5c5dddfb65c1ec80cb5f09')

data/app/overrides/auth_shared_login_bar.rb

@@ -2,5 +2,6 @@ Deface::Override.new(:virtual_path => "spree/shared/_nav_bar",
                      :name => "auth_shared_login_bar",
                      :insert_before => "li#search-bar",
                      :partial => "spree/shared/login_bar",
-                     :disabled => false)
+                     :disabled => false, 
+                     :original => 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac')
 

data/app/overrides/auth_user_login_form.rb

@@ -2,4 +2,5 @@ Deface::Override.new(:virtual_path => "spree/checkout/registration",
                      :name => "auth_user_login_form",
                      :replace_contents => "[data-hook='registration'] #account, #registration[data-hook] #account",
                      :template => "spree/user_sessions/new",
-                     :disabled => false)
+                     :disabled => false,
+                     :original => 'ab20ac9e90baa11b847b30040aef863d2e1af17a')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70189511168680 !ruby/object:Gem::Requirement
+  requirement: &70261468871880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70189511168680
+  version_requirements: *70261468871880
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70189511168160 !ruby/object:Gem::Requirement
+  requirement: &70261468871080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70189511168160
+  version_requirements: *70261468871080
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70189511167300 !ruby/object:Gem::Requirement
+  requirement: &70261468870180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70189511167300
+  version_requirements: *70261468870180
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -63,6 +63,7 @@ files:
 - app/controllers/spree/base_controller_decorator.rb
 - app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/orders_controller_decorator.rb
+- app/controllers/spree/products_controller_decorator.rb
 - app/controllers/spree/user_passwords_controller.rb
 - app/controllers/spree/user_registrations_controller.rb
 - app/controllers/spree/user_sessions_controller.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -910771523182878833
+      hash: 2326672717691546910
 requirements:
 - none
 rubyforge_project: