Merge pull request #185 from spree-contrib/fix/store_paperclip_attach…

…ment

Fix problem with Spree::Store logo attachment

app/models/spree/store_decorator.rb

@@ -15,13 +15,10 @@ module Spree
     has_attached_file :logo,
       styles: { mini: '48x48>', small: '100x100>', medium: '250x250>' },
       default_style: :medium,
-      url: 'stores/:id/:style/:basename.:extension',
-      path: 'stores/:id/:style/:basename.:extension',
+      url:  '/stores/:id/:style/:filename',
+      path: ':rails_root/public/stores/:id/:style/:filename',
       convert_options: { all: '-strip -auto-orient' }
 
-    if respond_to? :logo_file_name
-      validates_attachment_file_name :logo, matches: [/png\Z/i, /jpe?g\Z/i]
-    end
-
+    validates_attachment_file_name :logo, matches: [/png\Z/i, /jpe?g\Z/i], if: -> { logo.present? }
   end
 end

app/views/spree/admin/stores/_form.html.erb

@@ -52,7 +52,7 @@
 
     <div data-hook="admin_store_form_fields_right" class="col-md-6">
       <div data-hook="logo">
-        <%= image_tag @store.logo %>
+        <%= image_tag @store.logo.url %>
         <%= f.field_container :logo, class: ['form-group'] do %>
           <%= f.label :logo, Spree.t(:logo) %><br />
           <%= f.file_field :logo %>

spec/controllers/spree/admin/stores_controller_spec.rb

@@ -3,10 +3,22 @@
 describe Spree::Admin::StoresController do
   stub_authorization!
 
+  let!(:store)          { FactoryBot.create(:store) }
+  let(:image_file)      { Rack::Test::UploadedFile.new(SpreeMultiDomain::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg')) }
+  let(:store_with_logo) { FactoryBot.create(:store, logo: image_file) }
+
   describe "on :index" do
     it "renders index" do
       spree_get :index
       response.should be_success
     end
   end
+
+  context 'update' do
+    it 'can update logo' do
+      spree_put :update, id: store.to_param, store: { logo: image_file }
+
+      expect(store.reload.logo_file_name).to eq image_file.original_filename
+    end
+  end
 end