spree_api 3.7.14.1 → 4.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e95b4dd375ca3352b36e5cf43149af4c4bd1a2888b129dc0062e22a4cc851fa4
-  data.tar.gz: 216504eec54335aa7127682fc5f2c40b51f2b2c748e86473a96321e966db0db8
+  metadata.gz: 72f06e43e51c1833d120d602a9558aad7f5ccf2e21bfc2d98bb72a34f1dfd86d
+  data.tar.gz: a81013706d6a7e712cc183bffb7d2222bf94e07da568c943daad27e5d3fd7a59
 SHA512:
-  metadata.gz: 2f9ed96506e51d38bcd329cc2f9d472da590f48e2b35cdda9aa4c5ed072e32d01084dd98f843b3fbc68f7afa8e7e5f764e866d539c2816577721bbf885d1148c
-  data.tar.gz: d24344cf64fb701559e67e4b768c1c23149c702c74c8c029ab5994428dd71d667f9fdd855eae98a6cce1f5fe26546ef948a9042e5e15c3d0079032a898376673
+  metadata.gz: 93248446a291211f90371a8f6f1355193497e0bae48fa2e9c91e45273d2385d38dbbf108b0b554ac805d993e207d14056a6d0b4962fef56242b9c793755d3e05
+  data.tar.gz: 69a6cbd99a6faf0a3e4f7ae450027d99c02ddb7454400f29587d7f866540fff57e3ddb257fe7479c85d67299b06743f67af5b40f4b5ebce583e1ae2fe0476364

data/Gemfile

@@ -1,4 +1,4 @@
-eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
+eval_gemfile('../common_spree_dependencies.rb')
 
 gem 'spree_core', path: '../core'
 

data/app/controllers/spree/api/base_controller.rb

@@ -133,12 +133,12 @@ module Spree
 
       def product_scope
         if @current_user_roles.include?('admin')
-          scope = Product.with_deleted.accessible_by(current_ability, :read).includes(*product_includes)
+          scope = Product.with_deleted.accessible_by(current_ability, :show).includes(*product_includes)
 
           scope = scope.not_deleted unless params[:show_deleted]
           scope = scope.not_discontinued unless params[:show_discontinued]
         else
-          scope = Product.accessible_by(current_ability, :read).active.includes(*product_includes)
+          scope = Product.accessible_by(current_ability, :show).active.includes(*product_includes)
         end
 
         scope
@@ -158,7 +158,7 @@ module Spree
 
       def authorize_for_order
         @order = Spree::Order.find_by(number: order_id)
-        authorize! :read, @order, order_token
+        authorize! :show, @order, order_token
       end
     end
   end

data/app/controllers/spree/api/v1/addresses_controller.rb

@@ -5,7 +5,7 @@ module Spree
         before_action :find_order
 
         def show
-          authorize! :read, @order, order_token
+          authorize! :show, @order, order_token
           @address = find_address
           respond_with(@address)
         end
@@ -14,7 +14,7 @@ module Spree
           authorize! :update, @order, order_token
           @address = find_address
 
-          if @address.update_attributes(address_params)
+          if @address.update(address_params)
             respond_with(@address, default_template: :show)
           else
             invalid_resource!(@address)

data/app/controllers/spree/api/v1/countries_controller.rb

@@ -5,7 +5,7 @@ module Spree
         skip_before_action :authenticate_user
 
         def index
-          @countries = Country.accessible_by(current_ability, :read).ransack(params[:q]).result.
+          @countries = Country.accessible_by(current_ability).ransack(params[:q]).result.
                        order('name ASC').
                        page(params[:page]).per(params[:per_page])
           country = Country.order('updated_at ASC').last
@@ -13,7 +13,7 @@ module Spree
         end
 
         def show
-          @country = Country.accessible_by(current_ability, :read).find(params[:id])
+          @country = Country.accessible_by(current_ability, :show).find(params[:id])
           respond_with(@country)
         end
       end

data/app/controllers/spree/api/v1/credit_cards_controller.rb

@@ -7,7 +7,7 @@ module Spree
         def index
           @credit_cards = user.
                           credit_cards.
-                          accessible_by(current_ability, :read).
+                          accessible_by(current_ability).
                           with_payment_profile.
                           ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           respond_with(@credit_cards)
@@ -17,7 +17,7 @@ module Spree
 
         def user
           if params[:user_id].present?
-            @user ||= Spree.user_class.accessible_by(current_ability, :read).find(params[:user_id])
+            @user ||= Spree.user_class.accessible_by(current_ability, :show).find(params[:user_id])
           end
         end
       end

data/app/controllers/spree/api/v1/images_controller.rb

@@ -3,12 +3,12 @@ module Spree
     module V1
       class ImagesController < Spree::Api::BaseController
         def index
-          @images = scope.images.accessible_by(current_ability, :read)
+          @images = scope.images.accessible_by(current_ability)
           respond_with(@images)
         end
 
         def show
-          @image = Image.accessible_by(current_ability, :read).find(params[:id])
+          @image = Image.accessible_by(current_ability, :show).find(params[:id])
           respond_with(@image)
         end
 
@@ -26,7 +26,7 @@ module Spree
 
         def update
           @image = scope.images.accessible_by(current_ability, :update).find(params[:id])
-          if @image.update_attributes(image_params)
+          if @image.update(image_params)
             respond_with(@image, default_template: :show)
           else
             invalid_resource!(@image)

data/app/controllers/spree/api/v1/inventory_units_controller.rb

@@ -13,7 +13,7 @@ module Spree
           authorize! :update, inventory_unit.order
 
           inventory_unit.transaction do
-            if inventory_unit.update_attributes(inventory_unit_params)
+            if inventory_unit.update(inventory_unit_params)
               fire
               render :show, status: 200
             else
@@ -25,7 +25,7 @@ module Spree
         private
 
         def inventory_unit
-          @inventory_unit ||= InventoryUnit.accessible_by(current_ability, :read).find(params[:id])
+          @inventory_unit ||= InventoryUnit.accessible_by(current_ability, :show).find(params[:id])
         end
 
         def prepare_event

data/app/controllers/spree/api/v1/option_types_controller.rb

@@ -6,19 +6,19 @@ module Spree
           @option_types =  if params[:ids]
                              Spree::OptionType.
                                includes(:option_values).
-                               accessible_by(current_ability, :read).
+                               accessible_by(current_ability).
                                where(id: params[:ids].split(','))
                            else
                              Spree::OptionType.
                                includes(:option_values).
-                               accessible_by(current_ability, :read).
+                               accessible_by(current_ability).
                                load.ransack(params[:q]).result
                            end
           respond_with(@option_types)
         end
 
         def show
-          @option_type = Spree::OptionType.accessible_by(current_ability, :read).find(params[:id])
+          @option_type = Spree::OptionType.accessible_by(current_ability, :show).find(params[:id])
           respond_with(@option_type)
         end
 
@@ -36,7 +36,7 @@ module Spree
 
         def update
           @option_type = Spree::OptionType.accessible_by(current_ability, :update).find(params[:id])
-          if @option_type.update_attributes(option_type_params)
+          if @option_type.update(option_type_params)
             render :show
           else
             invalid_resource!(@option_type)

data/app/controllers/spree/api/v1/option_values_controller.rb

@@ -30,7 +30,7 @@ module Spree
 
         def update
           @option_value = scope.accessible_by(current_ability, :update).find(params[:id])
-          if @option_value.update_attributes(option_value_params)
+          if @option_value.update(option_value_params)
             render :show
           else
             invalid_resource!(@option_value)
@@ -47,9 +47,9 @@ module Spree
 
         def scope
           @scope ||= if params[:option_type_id]
-                       Spree::OptionType.find(params[:option_type_id]).option_values.accessible_by(current_ability, :read)
+                       Spree::OptionType.find(params[:option_type_id]).option_values.accessible_by(current_ability, :show)
                      else
-                       Spree::OptionValue.accessible_by(current_ability, :read).load
+                       Spree::OptionValue.accessible_by(current_ability, :show).load
                      end
         end
 

data/app/controllers/spree/api/v1/payments_controller.rb

@@ -29,7 +29,7 @@ module Spree
           authorize! params[:action], @payment
           if !@payment.editable?
             render 'update_forbidden', status: 403
-          elsif @payment.update_attributes(payment_params)
+          elsif @payment.update(payment_params)
             respond_with(@payment, default_template: :show)
           else
             invalid_resource!(@payment)
@@ -60,7 +60,7 @@ module Spree
 
         def find_order
           @order = Spree::Order.find_by!(number: order_id)
-          authorize! :read, @order, order_token
+          authorize! :show, @order, order_token
         end
 
         def find_payment

data/app/controllers/spree/api/v1/product_properties_controller.rb

@@ -6,7 +6,7 @@ module Spree
         before_action :product_property, only: [:show, :update, :destroy]
 
         def index
-          @product_properties = @product.product_properties.accessible_by(current_ability, :read).
+          @product_properties = @product.product_properties.accessible_by(current_ability).
                                 ransack(params[:q]).result.
                                 page(params[:page]).per(params[:per_page])
           respond_with(@product_properties)
@@ -31,7 +31,7 @@ module Spree
         def update
           authorize! :update, @product_property
 
-          if @product_property.update_attributes(product_property_params)
+          if @product_property.update(product_property_params)
             respond_with(@product_property, status: 200, default_template: :show)
           else
             invalid_resource!(@product_property)
@@ -51,7 +51,7 @@ module Spree
         end
 
         def authorize_product!
-          authorize! :read, @product
+          authorize! :show, @product
         end
 
         def product_property
@@ -60,7 +60,7 @@ module Spree
             @product_property ||= @product.product_properties.includes(:property).where(spree_properties: { name: params[:id] }).first
             raise ActiveRecord::RecordNotFound unless @product_property
 
-            authorize! :read, @product_property
+            authorize! :show, @product_property
           end
         end
 

data/app/controllers/spree/api/v1/properties_controller.rb

@@ -5,7 +5,7 @@ module Spree
         before_action :find_property, only: [:show, :update, :destroy]
 
         def index
-          @properties = Spree::Property.accessible_by(current_ability, :read)
+          @properties = Spree::Property.accessible_by(current_ability)
 
           @properties = if params[:ids]
                           @properties.where(id: params[:ids].split(',').flatten)
@@ -36,7 +36,7 @@ module Spree
         def update
           if @property
             authorize! :update, @property
-            @property.update_attributes(property_params)
+            @property.update(property_params)
             respond_with(@property, status: 200, default_template: :show)
           else
             invalid_resource!(@property)
@@ -56,9 +56,9 @@ module Spree
         private
 
         def find_property
-          @property = Spree::Property.accessible_by(current_ability, :read).find(params[:id])
+          @property = Spree::Property.accessible_by(current_ability, :show).find(params[:id])
         rescue ActiveRecord::RecordNotFound
-          @property = Spree::Property.accessible_by(current_ability, :read).find_by!(name: params[:id])
+          @property = Spree::Property.accessible_by(current_ability, :show).find_by!(name: params[:id])
         end
 
         def property_params

data/app/controllers/spree/api/v1/return_authorizations_controller.rb

@@ -20,7 +20,7 @@ module Spree
 
         def index
           authorize! :admin, ReturnAuthorization
-          @return_authorizations = order.return_authorizations.accessible_by(current_ability, :read).
+          @return_authorizations = order.return_authorizations.accessible_by(current_ability).
                                    ransack(params[:q]).result.
                                    page(params[:page]).per(params[:per_page])
           respond_with(@return_authorizations)
@@ -32,13 +32,13 @@ module Spree
 
         def show
           authorize! :admin, ReturnAuthorization
-          @return_authorization = order.return_authorizations.accessible_by(current_ability, :read).find(params[:id])
+          @return_authorization = order.return_authorizations.accessible_by(current_ability, :show).find(params[:id])
           respond_with(@return_authorization)
         end
 
         def update
           @return_authorization = order.return_authorizations.accessible_by(current_ability, :update).find(params[:id])
-          if @return_authorization.update_attributes(return_authorization_params)
+          if @return_authorization.update(return_authorization_params)
             respond_with(@return_authorization, default_template: :show)
           else
             invalid_resource!(@return_authorization)
@@ -58,7 +58,7 @@ module Spree
 
         def order
           @order ||= Spree::Order.find_by!(number: order_id)
-          authorize! :read, @order
+          authorize! :show, @order
         end
 
         def return_authorization_params

data/app/controllers/spree/api/v1/shipments_controller.rb

@@ -20,7 +20,7 @@ module Spree
 
         def create
           @order = Spree::Order.find_by!(number: params.fetch(:shipment).fetch(:order_id))
-          authorize! :read, @order
+          authorize! :show, @order
           authorize! :create, Shipment
           quantity = params[:quantity].to_i
           @shipment = @order.shipments.create(stock_location_id: params.fetch(:stock_location_id))
@@ -126,13 +126,13 @@ module Spree
           @original_shipment         = Spree::Shipment.find_by!(number: params[:original_shipment_number])
           @variant                   = Spree::Variant.find(params[:variant_id])
           @quantity                  = params[:quantity].to_i
-          authorize! :read, @original_shipment
+          authorize! :show, @original_shipment
           authorize! :create, Shipment
         end
 
         def find_and_update_shipment
           @shipment = Spree::Shipment.accessible_by(current_ability, :update).readonly(false).find_by!(number: params[:id])
-          @shipment.update_attributes(shipment_params)
+          @shipment.update(shipment_params)
           @shipment.reload
         end
 

data/app/controllers/spree/api/v1/states_controller.rb

@@ -24,10 +24,10 @@ module Spree
 
         def scope
           if params[:country_id]
-            @country = Country.accessible_by(current_ability, :read).find(params[:country_id])
-            @country.states.accessible_by(current_ability, :read).order('name ASC')
+            @country = Country.accessible_by(current_ability, :show).find(params[:country_id])
+            @country.states.accessible_by(current_ability).order('name ASC')
           else
-            State.accessible_by(current_ability, :read).order('name ASC')
+            State.accessible_by(current_ability).order('name ASC')
           end
         end
       end

data/app/controllers/spree/api/v1/stock_items_controller.rb

@@ -65,12 +65,12 @@ module Spree
 
         def stock_location
           render 'spree/api/v1/shared/stock_location_required', status: 422 and return unless params[:stock_location_id]
-          @stock_location ||= StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
+          @stock_location ||= StockLocation.accessible_by(current_ability, :show).find(params[:stock_location_id])
         end
 
         def scope
           includes = { variant: [{ option_values: :option_type }, :product] }
-          @stock_location.stock_items.accessible_by(current_ability, :read).includes(includes)
+          @stock_location.stock_items.accessible_by(current_ability, :show).includes(includes)
         end
 
         def stock_item_params

data/app/controllers/spree/api/v1/stock_locations_controller.rb

@@ -3,8 +3,9 @@ module Spree
     module V1
       class StockLocationsController < Spree::Api::BaseController
         def index
-          authorize! :read, StockLocation
-          @stock_locations = StockLocation.accessible_by(current_ability, :read).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          authorize! :index, StockLocation
+          @stock_locations = StockLocation.accessible_by(current_ability).order('name ASC').
+                             ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           respond_with(@stock_locations)
         end
 
@@ -24,7 +25,7 @@ module Spree
 
         def update
           authorize! :update, stock_location
-          if stock_location.update_attributes(stock_location_params)
+          if stock_location.update(stock_location_params)
             respond_with(stock_location, status: 200, default_template: :show)
           else
             invalid_resource!(stock_location)
@@ -40,7 +41,7 @@ module Spree
         private
 
         def stock_location
-          @stock_location ||= StockLocation.accessible_by(current_ability, :read).find(params[:id])
+          @stock_location ||= StockLocation.accessible_by(current_ability, :show).find(params[:id])
         end
 
         def stock_location_params

data/app/controllers/spree/api/v1/stock_movements_controller.rb

@@ -5,7 +5,7 @@ module Spree
         before_action :stock_location, except: [:update, :destroy]
 
         def index
-          authorize! :read, StockMovement
+          authorize! :index, StockMovement
           @stock_movements = scope.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           respond_with(@stock_movements)
         end
@@ -29,11 +29,11 @@ module Spree
 
         def stock_location
           render 'spree/api/v1/shared/stock_location_required', status: 422 and return unless params[:stock_location_id]
-          @stock_location ||= StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
+          @stock_location ||= StockLocation.accessible_by(current_ability, :show).find(params[:stock_location_id])
         end
 
         def scope
-          @stock_location.stock_movements.accessible_by(current_ability, :read)
+          @stock_location.stock_movements.accessible_by(current_ability, :show)
         end
 
         def stock_movement_params

data/app/controllers/spree/api/v1/stores_controller.rb

@@ -5,8 +5,8 @@ module Spree
         before_action :get_store, except: [:index, :create]
 
         def index
-          authorize! :read, Store
-          @stores = Store.accessible_by(current_ability, :read).all
+          authorize! :index, Store
+          @stores = Store.accessible_by(current_ability).all
           respond_with(@stores)
         end
 
@@ -23,7 +23,7 @@ module Spree
 
         def update
           authorize! :update, @store
-          if @store.update_attributes(store_params)
+          if @store.update(store_params)
             respond_with(@store, status: 200, default_template: :show)
           else
             invalid_resource!(@store)
@@ -31,7 +31,7 @@ module Spree
         end
 
         def show
-          authorize! :read, @store
+          authorize! :show, @store
           respond_with(@store)
         end
 

data/app/controllers/spree/api/v1/taxonomies_controller.rb

@@ -29,7 +29,7 @@ module Spree
 
         def update
           authorize! :update, taxonomy
-          if taxonomy.update_attributes(taxonomy_params)
+          if taxonomy.update(taxonomy_params)
             respond_with(taxonomy, status: 200, default_template: :show)
           else
             invalid_resource!(taxonomy)
@@ -45,13 +45,13 @@ module Spree
         private
 
         def taxonomies
-          @taxonomies = Taxonomy.accessible_by(current_ability, :read).order('name').includes(root: :children).
+          @taxonomies = Taxonomy.accessible_by(current_ability).order('name').includes(root: :children).
                         ransack(params[:q]).result.
                         page(params[:page]).per(params[:per_page])
         end
 
         def taxonomy
-          @taxonomy ||= Taxonomy.accessible_by(current_ability, :read).find(params[:id])
+          @taxonomy ||= Taxonomy.accessible_by(current_ability, :show).find(params[:id])
         end
 
         def taxonomy_params

data/app/controllers/spree/api/v1/taxons_controller.rb

@@ -6,9 +6,9 @@ module Spree
           @taxons = if taxonomy
                       taxonomy.root.children
                     elsif params[:ids]
-                      Spree::Taxon.includes(:children).accessible_by(current_ability, :read).where(id: params[:ids].split(','))
+                      Spree::Taxon.includes(:children).accessible_by(current_ability).where(id: params[:ids].split(','))
                     else
-                      Spree::Taxon.includes(:children).accessible_by(current_ability, :read).order(:taxonomy_id, :lft)
+                      Spree::Taxon.includes(:children).accessible_by(current_ability).order(:taxonomy_id, :lft)
                     end
           @taxons = @taxons.ransack(params[:q]).result
           @taxons = @taxons.page(params[:page]).per(params[:per_page])
@@ -48,7 +48,7 @@ module Spree
 
         def update
           authorize! :update, taxon
-          if taxon.update_attributes(taxon_params)
+          if taxon.update(taxon_params)
             respond_with(taxon, status: 200, default_template: :show)
           else
             invalid_resource!(taxon)
@@ -74,12 +74,12 @@ module Spree
 
         def taxonomy
           if params[:taxonomy_id].present?
-            @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :read).find(params[:taxonomy_id])
+            @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :show).find(params[:taxonomy_id])
           end
         end
 
         def taxon
-          @taxon ||= taxonomy.taxons.accessible_by(current_ability, :read).find(params[:id])
+          @taxon ||= taxonomy.taxons.accessible_by(current_ability, :show).find(params[:id])
         end
 
         def taxon_params

data/app/controllers/spree/api/v1/users_controller.rb

@@ -5,7 +5,7 @@ module Spree
         rescue_from Spree::Core::DestroyWithOrdersError, with: :error_during_processing
 
         def index
-          @users = Spree.user_class.accessible_by(current_ability, :read)
+          @users = Spree.user_class.accessible_by(current_ability, :show)
 
           @users = if params[:ids]
                      @users.ransack(id_in: params[:ids].split(','))
@@ -37,7 +37,7 @@ module Spree
 
         def update
           authorize! :update, user
-          if user.update_attributes(user_params)
+          if user.update(user_params)
             respond_with(user, status: 200, default_template: :show)
           else
             invalid_resource!(user)
@@ -53,7 +53,7 @@ module Spree
         private
 
         def user
-          @user ||= Spree.user_class.accessible_by(current_ability, :read).find(params[:id])
+          @user ||= Spree.user_class.accessible_by(current_ability, :show).find(params[:id])
         end
 
         def user_params

data/app/controllers/spree/api/v1/variants_controller.rb

@@ -38,7 +38,7 @@ module Spree
 
         def update
           @variant = scope.accessible_by(current_ability, :update).find(params[:id])
-          if @variant.update_attributes(variant_params)
+          if @variant.update(variant_params)
             respond_with(@variant, status: 200, default_template: :show)
           else
             invalid_resource!(@product)
@@ -49,7 +49,7 @@ module Spree
 
         def product
           if params[:product_id]
-            @product ||= Spree::Product.accessible_by(current_ability, :read).
+            @product ||= Spree::Product.accessible_by(current_ability, :show).
                          friendly.find(params[:product_id])
           end
         end
@@ -65,7 +65,7 @@ module Spree
             variants = variants.with_deleted
           end
 
-          variants.eligible.accessible_by(current_ability, :read)
+          variants.eligible.accessible_by(current_ability)
         end
 
         def variant_params

data/app/controllers/spree/api/v1/zones_controller.rb

@@ -19,7 +19,7 @@ module Spree
         end
 
         def index
-          @zones = Zone.accessible_by(current_ability, :read).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          @zones = Zone.accessible_by(current_ability).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           respond_with(@zones)
         end
 
@@ -29,7 +29,7 @@ module Spree
 
         def update
           authorize! :update, zone
-          if zone.update_attributes(zone_params)
+          if zone.update(zone_params)
             respond_with(zone, status: 200, default_template: :show)
           else
             invalid_resource!(zone)
@@ -47,7 +47,7 @@ module Spree
         end
 
         def zone
-          @zone ||= Spree::Zone.accessible_by(current_ability, :read).find(params[:id])
+          @zone ||= Spree::Zone.accessible_by(current_ability, :show).find(params[:id])
         end
       end
     end

data/app/controllers/spree/api/v2/base_controller.rb

@@ -55,12 +55,7 @@ module Spree
         end
 
         def spree_current_user
-          return nil unless doorkeeper_token
-          return @spree_current_user if @spree_current_user
-
-          doorkeeper_authorize!
-
-          @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id)
+          @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id) if doorkeeper_token
         end
 
         def spree_authorize!(action, subject, *args)

data/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb

@@ -41,7 +41,7 @@ module Spree
             end
 
             def scope
-              spree_current_user.credit_cards.accessible_by(current_ability, :read)
+              spree_current_user.credit_cards.accessible_by(current_ability, :show)
             end
           end
         end

data/app/controllers/spree/api/v2/storefront/countries_controller.rb

@@ -36,6 +36,7 @@ module Spree
             return scope.default if params[:iso] == 'default'
 
             scope.find_by(iso: params[:iso]&.upcase) ||
+              scope.find_by(id: params[:iso]&.upcase) ||
               scope.find_by(iso3: params[:iso]&.upcase)
           end
 
@@ -52,7 +53,7 @@ module Spree
           end
 
           def scope
-            Spree::Country.accessible_by(current_ability, :read)
+            Spree::Country.accessible_by(current_ability, :show)
           end
         end
       end