Merge pull request #22 from nebulab/mm/fix-import

Fix product/variant processors according to Shopify Product CSVs

lib/solidus_importer/processors/product.rb

@@ -23,21 +23,20 @@ def check_data
       end
 
       def prepare_product
-        Spree::Product.find_or_initialize_by(slug: @data['Handle']) do |product|
+        Spree::Product.find_or_initialize_by(slug: @data['Handle'])
+      end
+
+      def process_product
+        prepare_product.tap do |product|
           product.slug = @data['Handle']
           product.price = options[:price]
           product.shipping_category = options[:shipping_category]
-        end.tap do |product|
+
           # Apply the row attributes
           product.name = @data['Title'] unless @data['Title'].nil?
-        end
-      end
 
-      def process_product
-        if @data['Variant SKU'].present?
-          Spree::Product.find_by!(slug: @data['Handle'])
-        else
-          prepare_product.tap(&:save!)
+          # Save the product
+          product.save!
         end
       end
     end

lib/solidus_importer/processors/variant.rb

@@ -3,32 +3,47 @@
 module SolidusImporter
   module Processors
     class Variant < Base
+      attr_accessor :product
+
       def call(context)
         @data = context.fetch(:data)
-        return unless variant?
+        self.product = context.fetch(:product) || raise(ArgumentError, 'missing :product in context')
 
-        product = context.fetch(:product)
-        variant = process_variant(product)
-        context.merge!(variant: variant)
+        context.merge!(variant: process_variant)
       end
 
       private
 
-      def prepare_variant(product)
-        Spree::Variant.find_or_initialize_by(sku: @data['Variant SKU']) do |variant|
+      def prepare_variant
+        return product.master if master_variant?
+
+        @prepare_variant ||= Spree::Variant.find_or_initialize_by(sku: sku) do |variant|
           variant.product = product
-        end.tap do |variant|
+        end
+      end
+
+      def process_variant
+        prepare_variant.tap do |variant|
           # Apply the row attributes
           variant.weight = @data['Variant Weight'] unless @data['Variant Weight'].nil?
+
+          # Save the product
+          variant.save!
         end
       end
 
-      def process_variant(product)
-        prepare_variant(product).tap(&:save!)
+      def master_variant?
+        ov1 = @data['Option1 Value']
+        ov1.blank? || ov1 == 'Default Title'
+      end
+
+      def sku
+        @data['Variant SKU'] || generate_sku
       end
 
-      def variant?
-        @variant ||= @data['Variant SKU'].present?
+      def generate_sku
+        variant_part = @data['Option1 Value'].parameterize
+        "#{product.slug}-#{variant_part}"
       end
     end
   end

spec/features/solidus_importer/import_spec.rb

@@ -66,6 +66,61 @@
     end
   end
 
+  context 'with Shopify Product CSVs' do
+    before do
+      allow(URI).to receive(:open)
+    end
+
+    context 'with the export from Shopify Product CSVs - Apparel' do
+      let(:import_file) { solidus_importer_fixture_path('apparel.csv') }
+      let(:import_type) { :products }
+      let!(:shipping_category) { create(:shipping_category) }
+
+      it 'imports a some products and a blue shirt with no variants' do
+        expect { import }.to change(Spree::Product, :count).from(0)
+        expect(import.state).to eq('completed')
+
+        product = Spree::Product.find_by(slug: 'ocean-blue-shirt')
+
+        expect(product.variants.count).to be_zero
+      end
+    end
+
+    context 'with the export from Shopify Product CSVs - Jewelry' do
+      let(:import_file) { solidus_importer_fixture_path('jewelery.csv') }
+      let(:import_type) { :products }
+      let!(:shipping_category) { create(:shipping_category) }
+
+      it 'imports a some products and a clay pot with two variants' do
+        expect { import }.to change(Spree::Product, :count).from(0)
+        expect(import.state).to eq('completed')
+
+        product = Spree::Product.find_by(slug: 'gemstone')
+
+        expect(product.variants.count).to eq 2
+        expect(product.variants.find_by(sku: 'gemstone-blue')).to be_present
+        expect(product.variants.find_by(sku: 'gemstone-purple')).to be_present
+      end
+    end
+
+    context 'with the export from Shopify Product CSVs - Home and Garden' do
+      let(:import_file) { solidus_importer_fixture_path('home-and-garden.csv') }
+      let(:import_type) { :products }
+      let!(:shipping_category) { create(:shipping_category) }
+
+      it 'imports a some products' do
+        expect { import }.to change(Spree::Product, :count).from(0)
+        expect(import.state).to eq('completed')
+
+        product = Spree::Product.find_by(slug: 'clay-plant-pot')
+
+        expect(product.variants.count).to eq 2
+        expect(product.variants.find_by(sku: 'clay-plant-pot-large')).to be_present
+        expect(product.variants.find_by(sku: 'clay-plant-pot-regular')).to be_present
+      end
+    end
+  end
+
   context 'with a orders file' do
     let(:import_file) { solidus_importer_fixture_path('orders.csv') }
     let(:import_type) { :orders }

spec/fixtures/solidus_importer/apparel.csv

@@ -0,0 +1,23 @@
+Handle,Title,Body (HTML),Vendor,Type,Tags,Published,Option1 Name,Option1 Value,Option2 Name,Option2 Value,Option3 Name,Option3 Value,Variant SKU,Variant Grams,Variant Inventory Tracker,Variant Inventory Qty,Variant Inventory Policy,Variant Fulfillment Service,Variant Price,Variant Compare At Price,Variant Requires Shipping,Variant Taxable,Variant Barcode,Image Src,Image Position,Image Alt Text,Gift Card,SEO Title,SEO Description,Google Shopping / Google Product Category,Google Shopping / Gender,Google Shopping / Age Group,Google Shopping / MPN,Google Shopping / AdWords Grouping,Google Shopping / AdWords Labels,Google Shopping / Condition,Google Shopping / Custom Product,Google Shopping / Custom Label 0,Google Shopping / Custom Label 1,Google Shopping / Custom Label 2,Google Shopping / Custom Label 3,Google Shopping / Custom Label 4,Variant Image,Variant Weight Unit,Variant Tax Code
+ocean-blue-shirt,Ocean Blue Shirt,Ocean blue cotton shirt with a narrow collar and buttons down the front and long sleeves. Comfortable fit and tiled kalidoscope patterns. ,partners-demo,,men,true,Title,Default Title,,,,,,0,,1,deny,manual,50,,true,true,,https://burst.shopifycdn.com/photos/young-man-in-bright-fashion_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+classic-varsity-top,Classic Varsity Top,"Womens casual varsity top, This grey and black buttoned top is a sport-inspired piece complete with an embroidered letter. ",partners-demo,,women,true,Size,Small,,,,,,0,,1,deny,manual,60,,true,true,,https://burst.shopifycdn.com/photos/casual-fashion-woman_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+classic-varsity-top,,,,,,,,Medium,,,,,,0,,1,deny,manual,60,,true,true,,,,,,,,,,,,,,,,,,,,,,kg,
+classic-varsity-top,,,,,,,,Large,,,,,,0,,1,deny,manual,60,,true,true,,,,,,,,,,,,,,,,,,,,,,kg,
+yellow-wool-jumper,Yellow Wool Jumper,Knitted jumper in a soft wool blend with low dropped shoulders and wide sleeves and think cuffs. Perfect for keeping warm during Fall. ,partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,80,,true,true,,https://burst.shopifycdn.com/photos/autumn-photographer-taking-picture_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+floral-white-top,Floral White Top,Stylish sleeveless white top with a floral pattern. ,partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,75,,true,true,,https://burst.shopifycdn.com/photos/city-woman-fashion_925x@2x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+striped-silk-blouse,Striped Silk Blouse,Ultra-stylish black and red striped silk blouse with buckle collar and matching button pants. ,partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,50,,true,true,,https://burst.shopifycdn.com/photos/striped-blouse-fashion_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+classic-leather-jacket,Classic Leather Jacket,"Womans zipped leather jacket. Adjustable belt for a comfortable fit, complete with shoulder pads and front zip pocket. ",partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,80,,true,true,,https://burst.shopifycdn.com/photos/leather-jacket-and-tea_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+dark-denim-top,Dark Denim Top,"Classic dark denim top with chest pockets, long sleeves with buttoned cuffs, and a ripped hem effect.",partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,60,,true,true,,https://burst.shopifycdn.com/photos/young-female-models-denim_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+navy-sport-jacket,Navy Sports Jacket,"Long-sleeved navy waterproof jacket in thin, polyester fabric with a soft mesh inside. The durable water-repellent finish means you'll be kept comfortable and protected when out in all weathers.",partners-demo,,men,true,Title,Default Title,,,,,,0,,1,deny,manual,60,,true,true,,https://burst.shopifycdn.com/photos/mens-fall-fashion-jacket_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+dark-winter-jacket,Soft Winter Jacket,"Thick black winter jacket, with soft fleece lining. Perfect for those cold weather days.",partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,50,,true,true,,https://burst.shopifycdn.com/photos/smiling-woman-on-snowy-afternoon_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+black-leather-bag,Black Leather Bag,"Womens black leather bag, with ample space. Can be worn over the shoulder, or remove straps to carry in your hand. ",partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,30,,true,true,,https://burst.shopifycdn.com/photos/black-bag-over-the-shoulder_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+zipped-jacket,Zipped Jacket,Dark navy and light blue men's zipped waterproof jacket with an outer zipped chestpocket for easy storeage.,partners-demo,,men,true,Title,Default Title,,,,,,0,,1,deny,manual,65,,true,true,,https://burst.shopifycdn.com/photos/menswear-blue-zip-up-jacket_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+silk-summer-top,Silk Summer Top,Silk womens top with short sleeves and number pattern.,partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,70,,true,true,,https://burst.shopifycdn.com/photos/young-hip-woman-at-carnival_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+longsleeve-cotton-top,Long Sleeve Cotton Top,"Black cotton womens top, with long sleeves, no collar and a thick hem. ",partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,50,,true,true,,https://burst.shopifycdn.com/photos/woman-outside-brownstone_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+chequered-red-shirt,Chequered Red Shirt,"Classic mens plaid flannel shirt with long sleeves, in chequered style, with two chest pockets.",partners-demo,,men,true,Title,Default Title,,,,,,0,,1,deny,manual,50,,true,true,,https://burst.shopifycdn.com/photos/red-plaid-shirt_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+white-cotton-shirt,White Cotton Shirt,Plain white cotton long sleeved shirt with loose collar. Small buttons and front pocket. ,partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,30,,true,true,,https://burst.shopifycdn.com/photos/smiling-woman-poses_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+olive-green-jacket,Olive Green Jacket,Loose fitting olive green jacket with buttons and large pockets. Multicoloured pattern on the front of the shoulders.,partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,65,,true,true,,https://burst.shopifycdn.com/photos/urban-fashion_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+blue-silk-tuxedo,Blue Silk Tuxedo,Blue silk tuxedo with marbled aquatic pattern and dark lining. Sleeves are complete with rounded hem and black buttons.,partners-demo,,men,true,Title,Default Title,,,,,,0,,1,deny,manual,70,,true,true,,https://burst.shopifycdn.com/photos/man-adjusts-blue-tuxedo-bowtie_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+red-sports-tee,Red Sports Tee,Women's red sporty t-shirt with colorful details on the sleeves and a small white pocket.,partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,50,,true,true,,https://burst.shopifycdn.com/photos/womens-red-t-shirt_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+striped-skirt-and-top,Striped Skirt and Top,Black cotton top with matching striped skirt. ,partners-demo,,women,true,Title,Default Title,,,,,,0,,1,deny,manual,50,,true,true,,https://burst.shopifycdn.com/photos/woman-in-the-city_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,
+led-high-tops,LED High Tops,"Black high top shoes with green LED lights in the sole, tied up with laces and a buckle. ",partners-demo,,men,true,Title,Default Title,,,,,,0,,1,deny,manual,80,,true,true,,https://burst.shopifycdn.com/photos/putting-on-your-shoes_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,

spec/fixtures/solidus_importer/home-and-garden.csv

@@ -0,0 +1,22 @@
+Handle,Title,Body (HTML),Vendor,Type,Tags,Published,Option1 Name,Option1 Value,Option2 Name,Option2 Value,Option3 Name,Option3 Value,Variant SKU,Variant Grams,Variant Inventory Tracker,Variant Inventory Qty,Variant Inventory Policy,Variant Fulfillment Service,Variant Price,Variant Compare At Price,Variant Requires Shipping,Variant Taxable,Variant Barcode,Image Src,Image Position,Image Alt Text,Gift Card,SEO Title,SEO Description,Google Shopping / Google Product Category,Google Shopping / Gender,Google Shopping / Age Group,Google Shopping / MPN,Google Shopping / AdWords Grouping,Google Shopping / AdWords Labels,Google Shopping / Condition,Google Shopping / Custom Product,Google Shopping / Custom Label 0,Google Shopping / Custom Label 1,Google Shopping / Custom Label 2,Google Shopping / Custom Label 3,Google Shopping / Custom Label 4,Variant Image,Variant Weight Unit,Variant Tax Code,Cost per item
+clay-plant-pot,Clay Plant Pot,<p>Classic blown clay pot for plants</p>,Company 123,Outdoor,"Pot, Plants",true,Size,Regular,,,,,,0,,1,deny,manual,9.99,,true,true,,https://burst.shopifycdn.com/photos/single-sprout-in-a-pot_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+clay-plant-pot,,,,,,,,Large,,,,,,0,,3,deny,manual,15.99,,true,true,,https://burst.shopifycdn.com/photos/pot-with-a-single-sprout_925x.jpg,2,,,,,,,,,,,,,,,,,,,kg,,
+copper-light,Copper Light,<p>Stylish copper bedside light</p>,Company 123,Indoor,"Copper, Bedroom",true,Title,Default Title,,,,,,0,,2,deny,manual,59.99,75,true,true,,https://burst.shopifycdn.com/photos/copper-light-in-bedroom_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+cream-sofa,Cream Sofa,<p>Comfortable cream sofa with wooden base</p>,Company 123,Indoor,"Couch, Wood",true,Title,Default Title,,,,,,0,,4,deny,manual,500,750,true,true,,https://burst.shopifycdn.com/photos/condominium-interior-livingroom_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+antique-drawers,Antique Drawers,<p>Antique wooden chest of drawers</p>,Company 123,Indoor,"Antique, Bedroom",true,Title,Default Title,,,,,,0,,2,deny,manual,250,300,true,true,,https://burst.shopifycdn.com/photos/babys-room_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+white-bed-clothes,White Bed Clothes,<p>Sleek white bed clothes</p>,Company 123,Indoor,Bed,true,Title,Default Title,,,,,,0,,1,deny,manual,29.99,35,true,true,,https://burst.shopifycdn.com/photos/bright-hotel-room-bed_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+pink-armchair,Pink Armchair,<p>Stylish pink armchair</p>,Company 123,Indoor,Chair,true,Title,Default Title,,,,,,0,,0,deny,manual,750,,true,true,,https://burst.shopifycdn.com/photos/soft-pink-cushioned-armchair-in-stately-salon_925x.jpg,,,false,,,,,,,,,,,,,,,,,kg,,
+wooden-outdoor-table,Wooden Outdoor Table,<p>Chic wooden outdoor garden table</p>,Rustic LTD,Outdoor,"Wood, Garden",true,Title,Default Title,,,,,,0,,3,deny,manual,99.99,,true,true,,https://burst.shopifycdn.com/photos/cafe-patio_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+brown-throw-pillows,Brown Throw Pillows,<p>Stylish brown throw pillows</p>,Rustic LTD,Indoor,Pillows,true,Title,Default Title,,,,,,0,,5,deny,manual,19.99,25.99,true,true,,https://burst.shopifycdn.com/photos/bedroom-bed-with-brown-throw-pillows_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+white-ceramic-pot,White Ceramic Pot,<p>Homemade white ceramic flower pot</p>,Rustic LTD,Indoor,"Pot, Plants",true,Title,Default Title,,,,,,0,,1,deny,manual,15.99,30,true,true,,https://burst.shopifycdn.com/photos/house-plant-in-white-pot_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+yellow-watering-can,Yellow watering can,<p>Vintage vibrant watering can</p>,Rustic LTD,Outdoor,Plants,true,Title,Default Title,,,,,,0,,4,deny,manual,40.99,50,true,true,,https://burst.shopifycdn.com/photos/flowers-in-yellow-watering-can_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+gardening-hand-trowel,Gardening hand trowel,<p>Metal gardening hand trowel with wooden handle</p>,Rustic LTD,Outdoor,Plants,true,Title,Default Title,,,,,,0,,2,deny,manual,10.99,25,true,true,,https://burst.shopifycdn.com/photos/spring-gardening-set-up_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+biodegradable-cardboard-pots,Biodegradable cardboard pots,<p>Biodegradable outdoor cardboard pots</p>,Rustic LTD,Outdoor,"Garden, Plants",true,Title,Default Title,,,,,,0,shopify,8,deny,manual,10,,true,true,,https://burst.shopifycdn.com/photos/potted-seeds_925x.jpg,,,false,,,,,,,,,,,,,,,,,kg,,
+grey-sofa,Grey Sofa,<p>Large four seater grey sofa</p>,Rustic LTD,Indoor,Sofa,true,Title,Default Title,,,,,,0,,6,deny,manual,29.99,35,true,true,,https://burst.shopifycdn.com/photos/large-grey-sofa-by-brick-wall_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+wooden-outdoor-slats,Wooden outdoor slats,<p>Wooden outdoor fencing slats</p>,Rustic LTD,Outdoor,"Wood, Garden",true,Title,Default Title,,,,,,0,,0,deny,manual,25.99,35,true,true,,https://burst.shopifycdn.com/photos/house-plant-on-wooden-slat-wall_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+wooden-fence,Wooden Fence,<p>Wooden garden fence</p>,Rustic LTD,Outdoor,"Garden, Wood",true,Title,Default Title,,,,,,0,,5,deny,manual,200,300,true,true,,https://burst.shopifycdn.com/photos/picket-fence-flowers_925x.jpg,,,false,,,,,,,,,,,,,,,,,kg,,
+yellow-sofa,Yellow Sofa,<p>Two seater yellow sofa with wooden legs</p>,Home Sweet Home,Indoor,Sofa,true,Title,Default Title,,,,,,0,,5,deny,manual,99.99,150,true,true,,https://burst.shopifycdn.com/photos/yellow-couch-by-black-and-white-mural_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+knitted-throw-pillows,Knitted Throw Pillows,<p>Homemade knitted throw pillows in a variety of colors</p>,Home Sweet Home,Indoor,Pillows,true,Title,Default Title,,,,,,0,,1,deny,manual,19.99,25.99,true,true,,https://burst.shopifycdn.com/photos/yellow-sofa-with-throw-pillows_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+vanilla-candle,Vanilla candle,<p>Vanilla scent candle in jar</p>,Home Sweet Home,Indoor,Candle,true,Title,Default Title,,,,,,0,,5,deny,manual,15.99,30,true,true,,https://burst.shopifycdn.com/photos/diy-organic-candle_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+black-bean-bag,Black Beanbag,<p>Black leather beanbag</p>,Company 123,Indoor,"Black, Leather",true,Title,Default Title,,,,,,0,,6,deny,manual,69.99,80,true,true,,https://burst.shopifycdn.com/photos/comfortable-living-room-cat_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,
+bedside-table,Bedside Table,<p>Wooden bedside table</p>,Company 123,Indoor,"Wood, Bedroom",true,Title,Default Title,,,,,,0,,1,deny,manual,69.99,85,true,true,,https://burst.shopifycdn.com/photos/dark-wall-bedside-table_925x.jpg,1,,false,,,,,,,,,,,,,,,,,kg,,