Move Paperclip into an extension

README.md

@@ -42,15 +42,13 @@ Try out Solidus with one-click on Heroku:
 
 Getting started
 ---------------
-
-Begin by making sure you have [Imagemagick](http://imagemagick.org/script/download.php) installed, which is required for Paperclip. (You can install it using [Homebrew](https://brew.sh) if you're on a Mac.)
-
 To add solidus, begin with a Rails 5 application and a database configured and created. Add the following to your
 Gemfile.
 
 ```ruby
 gem 'solidus'
 gem 'solidus_auth_devise'
+gem 'solidus_paperclip'
 ```
 
 Run the `bundle` command to install.

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

@@ -128,7 +128,7 @@ def product_scope
       end
 
       def variants_associations
-        [{ option_values: :option_type }, :default_price, :images]
+        [{ option_values: :option_type }, :default_price]
       end
 
       def product_includes

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

@@ -83,7 +83,7 @@ def variant_params
       end
 
       def include_list
-        [{ option_values: :option_type }, :product, :default_price, :images, { stock_items: :stock_location }]
+        [{ option_values: :option_type }, :product, :default_price, { stock_items: :stock_location }]
       end
     end
   end

api/app/helpers/spree/api/api_helpers.rb

@@ -7,7 +7,6 @@ module ApiHelpers
         :product_attributes,
         :product_property_attributes,
         :variant_attributes,
-        :image_attributes,
         :option_value_attributes,
         :order_attributes,
         :line_item_attributes,
@@ -69,11 +68,6 @@ def required_fields_for(model)
         :id, :property_id, :value, :property_name
       ]
 
-      @@image_attributes = [
-        :id, :position, :attachment_content_type, :attachment_file_name, :type,
-        :attachment_updated_at, :attachment_width, :attachment_height, :alt
-      ]
-
       @@option_value_attributes = [
         :id, :name, :presentation, :option_type_name, :option_type_id,
         :option_type_presentation

api/app/views/spree/api/line_items/_line_item.json.jbuilder

@@ -8,7 +8,7 @@ json.cache! [I18n.locale, line_item] do
   json.variant do
     json.partial!("spree/api/variants/small", variant: line_item.variant)
     json.(line_item.variant, :product_id)
-    json.images(line_item.variant.images) do |image|
+    json.images(line_item.variant.gallery) do |image|
       json.partial!("spree/api/images/image", image: image)
     end
   end

api/app/views/spree/api/shipments/_big.json.jbuilder

@@ -14,7 +14,7 @@ json.cache! [I18n.locale, shipment] do
     json.variant do
       json.partial!("spree/api/variants/small", variant: inventory_unit.variant)
       json.(inventory_unit.variant, :product_id)
-      json.images(inventory_unit.variant.images) do |image|
+      json.images(inventory_unit.variant.gallery) do |image|
         json.partial!("spree/api/images/image", image: image)
       end
     end

api/app/views/spree/api/variants/_small.json.jbuilder

@@ -17,7 +17,7 @@ json.cache! [I18n.locale, variant] do
   json.option_values(variant.option_values) do |option_value|
     json.(option_value, *option_value_attributes)
   end
-  json.images(variant.images) do |image|
+  json.images(variant.gallery) do |image|
     json.partial!("spree/api/images/image", image: image)
   end
 end

api/config/routes.rb

@@ -14,7 +14,6 @@
     resources :promotions, only: [:show]
 
     resources :products do
-      resources :images
       resources :variants
       resources :product_properties
     end
@@ -50,9 +49,7 @@
       end
     end
 
-    resources :variants do
-      resources :images
-    end
+    resources :variants
 
     resources :option_types do
       resources :option_values

api/lib/spree/api/testing_support/helpers.rb

@@ -32,14 +32,6 @@ def stub_authentication!
         def current_api_user
           @current_api_user ||= stub_model(Spree::LegacyUser, email: "spree@example.com", spree_roles: [])
         end
-
-        def image(filename)
-          File.open(Spree::Api::Engine.root + "spec/fixtures" + filename)
-        end
-
-        def upload_image(filename)
-          fixture_file_upload(image(filename).path, 'image/jpg')
-        end
       end
     end
   end

api/spec/requests/spree/api/orders_controller_spec.rb

@@ -598,14 +598,6 @@ module Spree
           expect(order.adjustments).to be_empty
         end
 
-        it "can list its line items with images" do
-          order.line_items.first.variant.images.create!(attachment: image("thinking-cat.jpg"))
-
-          get spree.api_order_path(order)
-
-          expect(json_response['line_items'].first['variant']).to have_attributes([:images])
-        end
-
         it "lists variants product id" do
           get spree.api_order_path(order)
 

api/spec/requests/spree/api/products_controller_spec.rb

@@ -125,9 +125,7 @@ module Spree
       end
 
       it "gets a single product" do
-        product.master.images.create!(attachment: image("thinking-cat.jpg"))
         product.variants.create!
-        product.variants.first.images.create!(attachment: image("thinking-cat.jpg"))
         product.set_property("spree", "rocks")
         product.taxons << create(:taxon)
 
@@ -137,18 +135,8 @@ module Spree
         expect(json_response['variants'].first).to have_attributes([:name,
                                                                     :is_master,
                                                                     :price,
-                                                                    :images,
                                                                     :in_stock])
 
-        expect(json_response['variants'].first['images'].first).to have_attributes([:attachment_file_name,
-                                                                                    :attachment_width,
-                                                                                    :attachment_height,
-                                                                                    :attachment_content_type,
-                                                                                    :mini_url,
-                                                                                    :small_url,
-                                                                                    :product_url,
-                                                                                    :large_url])
-
         expect(json_response["product_properties"].first).to have_attributes([:value,
                                                                               :product_id,
                                                                               :property_name])

api/spec/requests/spree/api/variants_controller_spec.rb

@@ -54,22 +54,6 @@ module Spree
                                                         :option_type_id])
       end
 
-      it "variants returned contain images data" do
-        variant.images.create!(attachment: image("thinking-cat.jpg"))
-
-        get spree.api_variants_path
-
-        expect(json_response["variants"].last).to have_attributes([:images])
-        expect(json_response['variants'].first['images'].first).to have_attributes([:attachment_file_name,
-                                                                                    :attachment_width,
-                                                                                    :attachment_height,
-                                                                                    :attachment_content_type,
-                                                                                    :mini_url,
-                                                                                    :small_url,
-                                                                                    :product_url,
-                                                                                    :large_url])
-      end
-
       # Regression test for https://github.com/spree/spree/issues/2141
       context "a deleted variant" do
         before do
@@ -209,19 +193,6 @@ module Spree
                                                         :option_type_id])
       end
 
-      it "can see a single variant with images" do
-        variant.images.create!(attachment: image("thinking-cat.jpg"))
-
-        subject
-
-        expect(json_response).to have_attributes(show_attributes + [:images])
-        option_values = json_response["option_values"]
-        expect(option_values.first).to have_attributes([:name,
-                                                        :presentation,
-                                                        :option_type_name,
-                                                        :option_type_id])
-      end
-
       context "variant doesn't have variant properties" do
         before { subject }
 

backend/app/assets/javascripts/spree/backend.js

@@ -35,8 +35,6 @@
 //= require spree/backend/flash
 //= require spree/backend/gateway
 //= require spree/backend/handlebars_extensions
-//= require spree/backend/images/index
-//= require spree/backend/images/upload
 //= require spree/backend/locale_selection
 //= require spree/backend/navigation
 //= require spree/backend/option_type_autocomplete

backend/app/assets/javascripts/spree/backend/models/index.js

@@ -1,4 +1,3 @@
-//= require spree/backend/models/image_upload
 //= require spree/backend/models/line_item
 //= require spree/backend/models/order
 //= require spree/backend/models/shipment

backend/app/assets/javascripts/spree/backend/templates/index.js

@@ -1,11 +1,9 @@
-//= require spree/backend/templates/_image
 //= require spree/backend/templates/orders/customer_details/autocomplete
 //= require spree/backend/templates/orders/details_adjustment_row
 //= require spree/backend/templates/orders/line_item
 //= require spree/backend/templates/orders/shipment_tracking
 //= require spree/backend/templates/orders/shipping_method
 //= require spree/backend/templates/products/sortable
-//= require spree/backend/templates/products/upload_progress
 //= require spree/backend/templates/promotions/calculators/fields/tiered_flat_rate
 //= require spree/backend/templates/promotions/calculators/fields/tiered_percent
 //= require spree/backend/templates/promotions/rules/option_values