From b9f7a98c46b6da23cbfa413208169aa7af79b7ef Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Thu, 6 Aug 2020 11:25:21 +0100 Subject: [PATCH] Bring image, asset and images_helper from spree_core --- app/helpers/spree/admin/images_helper.rb | 18 +++++++++ app/models/spree/asset.rb | 6 +++ app/models/spree/image.rb | 50 ++++++++++++++++++++++++ spec/models/asset_spec.rb | 16 ++++++++ spec/models/spree/asset_spec.rb | 16 ++++++++ 5 files changed, 106 insertions(+) create mode 100644 app/helpers/spree/admin/images_helper.rb create mode 100644 app/models/spree/asset.rb create mode 100644 app/models/spree/image.rb create mode 100644 spec/models/asset_spec.rb create mode 100644 spec/models/spree/asset_spec.rb diff --git a/app/helpers/spree/admin/images_helper.rb b/app/helpers/spree/admin/images_helper.rb new file mode 100644 index 0000000000..816972b08b --- /dev/null +++ b/app/helpers/spree/admin/images_helper.rb @@ -0,0 +1,18 @@ +module Spree + module Admin + module ImagesHelper + def options_text_for(image) + if image.viewable.is_a?(Spree::Variant) + if image.viewable.is_master? + Spree.t(:all) + else + image.viewable.options_text + end + else + Spree.t(:all) + end + end + end + end +end + diff --git a/app/models/spree/asset.rb b/app/models/spree/asset.rb new file mode 100644 index 0000000000..4e0f7d81f0 --- /dev/null +++ b/app/models/spree/asset.rb @@ -0,0 +1,6 @@ +module Spree + class Asset < ActiveRecord::Base + belongs_to :viewable, polymorphic: true, touch: true + acts_as_list scope: :viewable + end +end diff --git a/app/models/spree/image.rb b/app/models/spree/image.rb new file mode 100644 index 0000000000..945b1ef11f --- /dev/null +++ b/app/models/spree/image.rb @@ -0,0 +1,50 @@ +module Spree + class Image < Asset + validates_attachment_presence :attachment + validate :no_attachment_errors + + has_attached_file :attachment, + styles: { mini: '48x48>', small: '100x100>', product: '240x240>', large: '600x600>' }, + default_style: :product, + url: '/spree/products/:id/:style/:basename.:extension', + path: ':rails_root/public/spree/products/:id/:style/:basename.:extension', + convert_options: { all: '-strip -auto-orient -colorspace RGB' } + + # save the w,h of the original image (from which others can be calculated) + # we need to look at the write-queue for images which have not been saved yet + after_post_process :find_dimensions + + include Spree::Core::S3Support + supports_s3 :attachment + + Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys! + Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path] + Spree::Image.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url] + Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url] + Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style] + + #used by admin products autocomplete + def mini_url + attachment.url(:mini, false) + end + + def find_dimensions + temporary = attachment.queued_for_write[:original] + filename = temporary.path unless temporary.nil? + filename = attachment.path if filename.blank? + geometry = Paperclip::Geometry.from_file(filename) + self.attachment_width = geometry.width + self.attachment_height = geometry.height + end + + # if there are errors from the plugin, then add a more meaningful message + def no_attachment_errors + unless attachment.errors.empty? + # uncomment this to get rid of the less-than-useful interrim messages + # errors.clear + errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file." + false + end + end + end +end diff --git a/spec/models/asset_spec.rb b/spec/models/asset_spec.rb new file mode 100644 index 0000000000..b1415cd0de --- /dev/null +++ b/spec/models/asset_spec.rb @@ -0,0 +1,16 @@ +require 'spec_helper' + +describe Spree::Asset do + describe "#viewable" do + it "touches association" do + product = create(:custom_product) + asset = Spree::Asset.create! { |a| a.viewable = product.master } + + product.update_column(:updated_at, 1.day.ago) + + expect do + asset.touch + end.to change { product.reload.updated_at } + end + end +end diff --git a/spec/models/spree/asset_spec.rb b/spec/models/spree/asset_spec.rb new file mode 100644 index 0000000000..b1415cd0de --- /dev/null +++ b/spec/models/spree/asset_spec.rb @@ -0,0 +1,16 @@ +require 'spec_helper' + +describe Spree::Asset do + describe "#viewable" do + it "touches association" do + product = create(:custom_product) + asset = Spree::Asset.create! { |a| a.viewable = product.master } + + product.update_column(:updated_at, 1.day.ago) + + expect do + asset.touch + end.to change { product.reload.updated_at } + end + end +end