spree_backend 3.0.0.rc1 → 3.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b7d72a3f5c456c8cb327b2f3f6c804198cf654
-  data.tar.gz: d6387bce54baf4307ece321f040be10cefe0d8cb
+  metadata.gz: 5f5db59f9bb47a1c51a531a664dfef2aa549dee7
+  data.tar.gz: 426c2b2ff66046c8fe9bcb9f9f72f174a7c26a1e
 SHA512:
-  metadata.gz: e56440fb7535e7ca2529d9e43805a99765749651a5484687d169e17dd6d14b2cbb826668742f4e750462a41bce0e403a6eb42bef6dcf6a3c301eb59feec188cb
-  data.tar.gz: b7aade6d27904a5baececec20e03996ff570aa3b39e0086e5ab39fe4712711a6d980536866324c2158510bc8f01ee1e6c2a957fc841fa13104ec46184bdef9e6
+  metadata.gz: 9d3060c017cb9bcc9d65bbcb76622450005b8eb7c6de162c86ad543519f2705e0d4dcc598102f3da2d0829ee4666f0e932ce6aaad1398b4c060f22c77766272e
+  data.tar.gz: f0736eafd142aa3acabd97408f501f97c6a6dd13c96e382cc6c77e2c781b46b8cc51ac3bd65a17a757ae4bcfa63a773f63c83dffd652177c8f4f7e62dda57b3c

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

@@ -17,16 +17,16 @@ module Spree
 
         current_store.update_attributes store_params
 
-        flash[:success] = Spree.t(:successfully_updated, :resource => Spree.t(:general_settings))
+        flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
         redirect_to edit_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(',')
+          Spree::Config.set dismissed_spree_alerts: dismissed.split(',').push(params[:alert_id]).join(',')
           filter_dismissed_alerts
-          render :nothing => true
+          render nothing: true
         end
       end
 

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

@@ -100,159 +100,162 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   protected
 
-    class << self
-      attr_accessor :parent_data
-
-      def belongs_to(model_name, options = {})
-        @parent_data ||= {}
-        @parent_data[:model_name] = model_name
-        @parent_data[:model_class] = model_name.to_s.classify.constantize
-        @parent_data[:find_by] = options[:find_by] || :id
-      end
-    end
-
-    def resource_not_found
-      flash[:error] = flash_message_for(model_class.new, :not_found)
-      redirect_to collection_url
+  class << self
+    attr_accessor :parent_data
+
+    def belongs_to(model_name, options = {})
+      @parent_data ||= {}
+      @parent_data[:model_name] = model_name
+      @parent_data[:model_class] = model_name.to_s.classify.constantize
+      @parent_data[:find_by] = options[:find_by] || :id
     end
+  end
 
-    def model_class
-      "Spree::#{controller_name.classify}".constantize
-    end
+  def model_class
+    @model_class ||= resource.model_class
+  end
 
-    def model_name
-      parent_data[:model_name].gsub('spree/', '')
-    end
+  def resource_not_found
+    flash[:error] = flash_message_for(model_class.new, :not_found)
+    redirect_to collection_url
+  end
 
-    def object_name
-      controller_name.singularize
+  def resource
+    return @resource if @resource
+    if parent_data
+      parent_model_name = parent_data[:model_name]
     end
+    @resource = Spree::Admin::Resource.new controller_path, controller_name, parent_model_name
+  end
 
-    def load_resource
-      if member_action?
-        @object ||= load_resource_instance
+  def load_resource
+    if member_action?
+      @object ||= load_resource_instance
 
-        # call authorize! a third time (called twice already in Admin::BaseController)
-        # this time we pass the actual instance so fine-grained abilities can control
-        # access to individual records, not just entire models.
-        authorize! action, @object
+      # call authorize! a third time (called twice already in Admin::BaseController)
+      # this time we pass the actual instance so fine-grained abilities can control
+      # access to individual records, not just entire models.
+      authorize! action, @object
 
-        instance_variable_set("@#{object_name}", @object)
-      else
-        @collection ||= collection
+      instance_variable_set("@#{resource.object_name}", @object)
+    else
+      @collection ||= collection
 
-        # note: we don't call authorize here as the collection method should use
-        # CanCan's accessible_by method to restrict the actual records returned
+      # note: we don't call authorize here as the collection method should use
+      # CanCan's accessible_by method to restrict the actual records returned
 
-        instance_variable_set("@#{controller_name}", @collection)
-      end
+      instance_variable_set("@#{controller_name}", @collection)
     end
+  end
 
-    def load_resource_instance
-      if new_actions.include?(action)
-        build_resource
-      elsif params[:id]
-        find_resource
-      end
+  def load_resource_instance
+    if new_actions.include?(action)
+      build_resource
+    elsif params[:id]
+      find_resource
     end
+  end
 
-    def parent_data
-      self.class.parent_data
-    end
+  def parent_data
+    self.class.parent_data
+  end
 
-    def parent
-      if parent_data.present?
-        @parent ||= parent_data[:model_class].send("find_by_#{parent_data[:find_by]}", params["#{model_name}_id"])
-        instance_variable_set("@#{model_name}", @parent)
-      else
-        nil
-      end
+  def parent
+    if parent_data.present?
+      @parent ||= parent_data[:model_class].
+          send("find_by_#{parent_data[:find_by]}", params["#{resource.model_name}_id"])
+      instance_variable_set("@#{resource.model_name}", @parent)
+    else
+      nil
     end
+  end
 
-    def find_resource
-      if parent_data.present?
-        parent.send(controller_name).find(params[:id])
-      else
-        model_class.find(params[:id])
-      end
+  def find_resource
+    if parent_data.present?
+      parent.send(controller_name).find(params[:id])
+    else
+      model_class.find(params[:id])
     end
+  end
 
-    def build_resource
-      if parent_data.present?
-        parent.send(controller_name).build
-      else
-        model_class.new
-      end
+  def build_resource
+    if parent_data.present?
+      parent.send(controller_name).build
+    else
+      model_class.new
     end
+  end
 
-    def collection
-      return parent.send(controller_name) if parent_data.present?
-      if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
-        model_class.accessible_by(current_ability, action)
-      else
-        model_class.where(nil)
-      end
+  def collection
+    return parent.send(controller_name) if parent_data.present?
+    if model_class.respond_to?(:accessible_by) &&
+        !current_ability.has_block?(params[:action], model_class)
+      model_class.accessible_by(current_ability, action)
+    else
+      model_class.where(nil)
     end
+  end
 
-    def location_after_destroy
-      collection_url
-    end
+  def location_after_destroy
+    collection_url
+  end
 
-    def location_after_save
-      collection_url
-    end
+  def location_after_save
+    collection_url
+  end
 
-    # URL helpers
+  # URL helpers
 
-    def new_object_url(options = {})
-      if parent_data.present?
-        spree.new_polymorphic_url([:admin, parent, model_class], options)
-      else
-        spree.new_polymorphic_url([:admin, model_class], options)
-      end
+  def new_object_url(options = {})
+    if parent_data.present?
+      spree.new_polymorphic_url([:admin, parent, model_class], options)
+    else
+      spree.new_polymorphic_url([:admin, model_class], options)
     end
+  end
 
-    def edit_object_url(object, options = {})
-      if parent_data.present?
-        spree.send "edit_admin_#{model_name}_#{object_name}_url", parent, object, options
-      else
-        spree.send "edit_admin_#{object_name}_url", object, options
-      end
+  def edit_object_url(object, options = {})
+    if parent_data.present?
+      spree.send "edit_admin_#{resource.model_name}_#{resource.object_name}_url",
+                 parent, object, options
+    else
+      spree.send "edit_admin_#{resource.object_name}_url", object, options
     end
+  end
 
-    def object_url(object = nil, options = {})
-      target = object ? object : @object
-      if parent_data.present?
-        spree.send "admin_#{model_name}_#{object_name}_url", parent, target, options
-      else
-        spree.send "admin_#{object_name}_url", target, options
-      end
+  def object_url(object = nil, options = {})
+    target = object ? object : @object
+    if parent_data.present?
+      spree.send "admin_#{resource.model_name}_#{resource.object_name}_url", parent, target, options
+    else
+      spree.send "admin_#{resource.object_name}_url", target, options
     end
+  end
 
-    def collection_url(options = {})
-      if parent_data.present?
-        spree.polymorphic_url([:admin, parent, model_class], options)
-      else
-        spree.polymorphic_url([:admin, model_class], options)
-      end
+  def collection_url(options = {})
+    if parent_data.present?
+      spree.polymorphic_url([:admin, parent, model_class], options)
+    else
+      spree.polymorphic_url([:admin, model_class], options)
     end
+  end
 
-    # Allow all attributes to be updatable.
-    #
-    # Other controllers can, should, override it to set custom logic
-    def permitted_resource_params
-      params[object_name].present? ? params.require(object_name).permit! : ActionController::Parameters.new
-    end
+  # Allow all attributes to be updatable.
+  #
+  # Other controllers can, should, override it to set custom logic
+  def permitted_resource_params
+    params[resource.object_name].present? ? params.require(resource.object_name).permit! : ActionController::Parameters.new
+  end
 
-    def collection_actions
-      [:index]
-    end
+  def collection_actions
+    [:index]
+  end
 
-    def member_action?
-      !collection_actions.include? action
-    end
+  def member_action?
+    !collection_actions.include? action
+  end
 
-    def new_actions
-      [:new, :create]
-    end
+  def new_actions
+    [:new, :create]
+  end
 end

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

@@ -0,0 +1,6 @@
+module Spree
+  module Admin
+    class RolesController < ResourceController
+    end
+  end
+end

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

@@ -9,28 +9,28 @@ module Spree
       # And then JSON building with something like Active Model Serializers
       def users
         if params[:ids]
-          @users = Spree.user_class.where(:id => params[:ids].split(','))
+          @users = Spree.user_class.where(id: params[:ids].split(',').flatten)
         else
           @users = Spree.user_class.ransack({
-            :m => 'or',
-            :email_start => params[:q],
-            :ship_address_firstname_start => params[:q],
-            :ship_address_lastname_start => params[:q],
-            :bill_address_firstname_start => params[:q],
-            :bill_address_lastname_start => params[:q]
+            m: 'or',
+            email_start: params[:q],
+            ship_address_firstname_start: params[:q],
+            ship_address_lastname_start: params[:q],
+            bill_address_firstname_start: params[:q],
+            bill_address_lastname_start: params[:q]
           }).result.limit(10)
         end
       end
 
       def products
         if params[:ids]
-          @products = Product.where(:id => params[:ids].split(","))
+          @products = Product.where(id: params[:ids].split(",").flatten)
         else
           @products = Product.ransack(params[:q]).result
         end
 
         @products = @products.distinct.page(params[:page]).per(params[:per_page])
-        expires_in 15.minutes, :public => true
+        expires_in 15.minutes, public: true
         headers['Surrogate-Control'] = "max-age=#{15.minutes}"
       end
     end

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

@@ -35,6 +35,10 @@ module Spree
       end
 
       def update
+        if params[:user][:password].blank? && params[:user][:password_confirmation].blank?
+          params[:user].delete(:password)
+          params[:user].delete(:password_confirmation)
+        end
 
         if @user.update_attributes(user_params)
           set_roles

data/app/helpers/spree/admin/base_helper.rb

@@ -135,6 +135,11 @@ module Spree
         dom_id(record, 'spree')
       end
 
+      I18N_PLURAL_MANY_COUNT = 2.1
+      def plural_resource_name(resource_class)
+        resource_class.model_name.human(count: I18N_PLURAL_MANY_COUNT)
+      end
+
       private
         def attribute_name_for(field_name)
           field_name.gsub(' ', '_').downcase

data/app/helpers/spree/admin/navigation_helper.rb

@@ -31,7 +31,7 @@ module Spree
         selected = if options[:match_path].is_a? Regexp
           request.fullpath =~ options[:match_path]
         elsif options[:match_path]
-          request.fullpath.starts_with?("#{admin_path}#{options[:match_path]}")
+          request.fullpath.starts_with?("#{spree.admin_path}#{options[:match_path]}")
         else
           args.include?(controller.controller_name.to_sym)
         end

data/app/models/spree/admin/resource.rb

@@ -0,0 +1,33 @@
+module Spree
+  module Admin
+    class Resource
+      def initialize(controller_path, controller_name, parent_model)
+        @controller_path = controller_path
+        @controller_name = controller_name
+        @parent_model = parent_model
+      end
+
+      def sub_namespace_parts
+        @controller_path.split('/')[2..-2]
+      end
+
+      def model_class
+        sub_namespace = sub_namespace_parts.map { |s| s.capitalize }.join('::')
+        sub_namespace = "#{sub_namespace}::" if sub_namespace.length > 0
+        "Spree::#{sub_namespace}#{@controller_name.classify}".constantize
+      end
+
+      def model_name
+        sub_namespace = sub_namespace_parts.join('/')
+        sub_namespace = "#{sub_namespace}/" if sub_namespace.length > 0
+        @parent_model.gsub("spree/#{sub_namespace}", '')
+      end
+
+      def object_name
+        sub_namespace = sub_namespace_parts.join('_')
+        sub_namespace = "#{sub_namespace}_" if sub_namespace.length > 0
+        "#{sub_namespace}#{@controller_name.singularize}"
+      end
+    end
+  end
+end

data/app/views/kaminari/_paginator.html.erb

@@ -6,16 +6,16 @@
     remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside
 -%>
-<%= paginator.render do -%>
+<%= paginator.render do %>
   <ul class="pagination pagination-sm">
     <%= prev_page_tag %>
-    <% each_page do |page| -%>
-      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+    <% each_page do |page| %>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? %>
         <%= page_tag page %>
-      <% elsif !page.was_truncated? -%>
+      <% elsif !page.was_truncated? %>
         <%= gap_tag %>
-      <% end -%>
-    <% end -%>
+      <% end %>
+    <% end %>
     <%= next_page_tag %>
   </ul>
-<% end -%>
+<% end %>

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -10,8 +10,8 @@
   <td class="text-center"><span class="label label-<%= adjustment.state %>"><%= adjustment.state %></td>
   <td class="actions actions-2 text-center">
     <% if adjustment.open? %>
-      <%= link_to_edit adjustment, no_text: true %>
-      <%= link_to_delete adjustment, no_text: true %>
+      <%= link_to_edit(adjustment, no_text: true) if can?(:edit, adjustment) %>
+      <%= link_to_delete(adjustment, no_text: true) if can?(:delete, adjustment) %>
     <% end %>
   </td>
 </tr>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -17,13 +17,15 @@
   </tbody>
 </table>
 
-<div class="panel-footer">
-  <div class="row text-center">
-    <div class="col-md-6">
-      <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :get, class: "btn btn-success" %>  
-    </div>
-    <div class="col-md-6">
-      <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :get, class: "btn btn-danger" %>
+<% if can?(:edit, Spree::Adjustment) %>
+  <div class="panel-footer">
+    <div class="row text-center">
+      <div class="col-md-6">
+        <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :get, class: "btn btn-success" %>
+      </div>
+      <div class="col-md-6">
+        <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :get, class: "btn btn-danger" %>
+      </div>
     </div>
   </div>
-</div>
+<% end %>

data/app/views/spree/admin/adjustments/edit.html.erb

@@ -13,7 +13,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:continue), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_adjustments_url(@order), icon: 'delete' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/adjustments/index.html.erb

@@ -1,20 +1,20 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: Spree.t(:adjustments)} %>
 
 <% content_for :page_title do %>
-   / <%= Spree::Adjustment.model_name.human(count: :many) %>
+   / <%= plural_resource_name(Spree::Adjustment) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), class: "btn-success", icon: 'add' %>
+  <%= button_link_to(Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), class: "btn-success", icon: 'add') if can? :create, Spree::Adjustment %>
 <% end %>
 
 <% if @adjustments.present? %>
-  <div class="panel panel-default">    
+  <div class="panel panel-default">
     <%= render :partial => 'adjustments_table' %>
   </div>
 <% else %>
   <div class="alert alert-warning">
-    <%= Spree.t(:no_resource_found, resource: Spree::Adjustment.model_name.human(count: :many)) %>
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Adjustment)) %>
   </div>
 <% end %>
 
@@ -27,8 +27,8 @@
   </div>
 <% end %>
 
-<%= javascript_tag do -%>
+<%= javascript_tag do %>
   var order_number = '<%= @order.number %>';
-<% end -%>
+<% end %>
 
 <%= render partial: 'spree/admin/shared/order_summary' %>

data/app/views/spree/admin/adjustments/new.html.erb

@@ -13,7 +13,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:continue), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_adjustments_url(@order), :icon => 'delete' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/countries/index.html.erb

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::Country.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::Country) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_country), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_country' } %>
-<% end %>
+<% end if can? :create, Spree::Country %>
 
 <table class="table" id='listing_countries' data-hook>
   <thead>
@@ -22,8 +22,8 @@
         <td><%= country.iso_name %></td>
         <td class="text-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit country, :no_text => true %>
-          <%= link_to_delete country, :no_text => true %>
+          <%= link_to_edit(country, :no_text => true) if can? :edit, country %>
+          <%= link_to_delete(country, :no_text => true) if can? :delete, country %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb

@@ -27,7 +27,7 @@
         <td><%= pretty_time(reimbursement.created_at) %></td>
         <td class="actions actions-1">
           <% if !reimbursement.reimbursed? %>
-            <%= link_to_edit_url url_for([:edit, :admin, @order, reimbursement]), title: "admin_edit_#{dom_id(reimbursement)}", no_text: true %>
+            <%= link_to_edit_url(url_for([:edit, :admin, @order, reimbursement]), title: "admin_edit_#{dom_id(reimbursement)}", no_text: true) if can?(:edit, reimbursement) %>
           <% end %>
         </td>
       </tr>

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -38,10 +38,10 @@
           <td class='actions actions-2'>
             <%= button_to [:admin, return_item], { class: 'icon icon-thumbs-up icon_link no-text with-tip display-inline', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
               Spree.t(:accept)
-            <% end %>
+            <% end if can?(:accept, return_item) %>
             <%= button_to [:admin, return_item], { class: 'icon icon-thumbs-down icon_link no-text with-tip display-inline', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
               Spree.t(:reject)
-            <% end %>
+            <% end if can?(:reject, return_item) %>
           </td>
         <% end %>
       </tr>

data/app/views/spree/admin/customer_returns/edit.html.erb

@@ -32,7 +32,7 @@
   </fieldset>
 <% end %>
 
-<% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? %>
+<% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? && can?(:create, Spree::Reimbursement) %>
   <fieldset data-hook="reimbursements" class="marginb">
     <% if @customer_return.completely_decided? %>
       <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
@@ -50,12 +50,12 @@
 <% end %>
 
 <fieldset data-hook="reimbursements">
-  <legend><%= Spree::Reimbursement.model_name.human(count: :many) %></legend>
+  <legend><%= plural_resource_name(Spree::Reimbursement) %></legend>
   <% if @customer_return.reimbursements.any? %>
     <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
   <% else %>
     <div class="alert alert-info no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: Spree::Reimbursement.model_name.human(count: :many)) %>
+      <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Reimbursement)) %>
     </div>
   <% end %>
 </fieldset>