solidus_datashift 0.1.0 → 1.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362e80b8d0ea07c573738550a300be1713b011a0
-  data.tar.gz: 21a44f9932e482f9277062ec0d426e8ab4742070
+  metadata.gz: f14fbdd695b3d332226f2fe075e282f6d29e07f5
+  data.tar.gz: ead11b53fb4445a9cab2aadb12aa557aafb999e8
 SHA512:
-  metadata.gz: bb83494d03a0ea9858e36aae66de692e6927d8034ba5eb642eb522ec919d9c14083ead17c6c42265b98303ba4729f5f97bb5db76ee6cc779da98653ca68a21b5
-  data.tar.gz: 9e6b9ef668bb7d268acce2c83bfe26569cb0862e19b14acdf618893aa7d0d037c07bebf80b0600ca369149f0763b39e43e6a4307ead43c2bed16eda4066cf511
+  metadata.gz: 890fbf3a9b74de7f2f0c15d3d5c6901bacca6d41e3f5e00d60258a1cb7a72eda4701f4b549f85c8b0e0aae33608bcf28c1d9d552ec4f39e5bd228e76a011abf4
+  data.tar.gz: 05d7b3f468c4ec7e02bf2620f588f0f6f4b7b82faf56673b7d2ef1a97bebcc497fae297b78332c18807dfce8e2fc2eeb46552a5b35e1a546316de842326200a9

data/.gitignore

@@ -14,3 +14,4 @@ pkg
 *.swp
 spec/dummy
 log
+*#

data/.rubocop.yml

@@ -160,6 +160,11 @@ Lint/HandleExceptions:
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+    - '*.gemspec'
+
 Metrics/BlockNesting:
   Enabled: false
 

data/.travis.yml

@@ -18,6 +18,7 @@ env:
     - SOLIDUS_BRANCH=v2.2 DB=postgres
     - SOLIDUS_BRANCH=v2.3 DB=postgres
     - SOLIDUS_BRANCH=v2.4 DB=postgres
+    - SOLIDUS_BRANCH=v2.5 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.0 DB=mysql
     - SOLIDUS_BRANCH=v1.1 DB=mysql
@@ -29,4 +30,5 @@ env:
     - SOLIDUS_BRANCH=v2.2 DB=mysql
     - SOLIDUS_BRANCH=v2.3 DB=mysql
     - SOLIDUS_BRANCH=v2.4 DB=mysql
+    - SOLIDUS_BRANCH=v2.5 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/Gemfile

@@ -7,6 +7,6 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-gem 'datashift', github: 'ccarruitero/datashift', branch: 'fix_delegator_2.4'
-
 gemspec
+
+gem 'solidus_multi_domain', github: 'solidusio/solidus_multi_domain'

data/README.md

@@ -1,7 +1,7 @@
 SolidusDatashift
 ================
 
-Introduction goes here.
+Allow import data to your solidus store
 
 Installation
 ------------
@@ -12,28 +12,28 @@ Add solidus_datashift to your Gemfile:
 gem 'solidus_datashift'
 ```
 
-Bundle your dependencies and run the installation generator:
+Bundle your dependencies
 
 ```shell
 bundle
-bundle exec rails g solidus_datashift:install
 ```
 
-Testing
--------
+Usage
+-----
 
-First bundle your dependencies, then run `rake`. `rake` will default to building the dummy app if it does not exist, then it will run specs, and [Rubocop](https://github.com/bbatsov/rubocop) static code analysis. The dummy app can be regenerated by using `rake test_app`.
+This gem include some rake tasks, namespaced into `solidus_datashift`, that let
+you import data to your project.
+
+For example for import products you should use the following command
 
-```shell
-bundle
-bundle exec rake
+```
+rake solidus_datashift:product_import[your_file_name]
 ```
 
-When testing your applications integration with this extension you may use it's factories.
-Simply add this require statement to your spec_helper:
+You can check all available importer tasks by running
 
-```ruby
-require 'solidus_datashift/factories'
+```
+rake -T
 ```
 
 Copyright (c) 2018 [César Carruitero](https://github.com/ccarruitero), released under MIT License

data/lib/solidus_datashift.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 require 'solidus_core'
+require 'datashift'
 require 'solidus_datashift/engine'
-require 'solidus_datashift/product_importer'
+
+Dir[File.join(File.dirname(__FILE__), 'solidus_datashift/importer/*.rb')].each { |f| require f }

data/lib/solidus_datashift/importer.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module SolidusDataShift
+  class Importer
+    def initialize(file_name)
+      # TODO: allow receive StringIO
+      @file_name = file_name
+      @datashift_loader = DataShift::Loader::Factory.get_loader(file_name)
+    end
+
+    def importer_populator; end
+
+    def inclusion_columns; end
+
+    def run
+      DataShift::PopulatorFactory.global_populator_class = importer_populator if importer_populator
+      DataShift::Configuration.call.force_inclusion_of_columns = inclusion_columns if inclusion_columns
+      @datashift_loader.run(@file_name, importer_model)
+    end
+  end
+end

data/lib/solidus_datashift/importer/product.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'solidus_datashift/importer'
+require 'solidus_datashift/populator/product'
+
+module SolidusDataShift
+  class Importer::Product < Importer
+    def inclusion_columns
+      %w[ cost_price images price shipping_category sku stock_items
+          count_on_hand taxons]
+    end
+
+    def importer_model
+      Spree::Product
+    end
+
+    def importer_populator
+      Populator::Product
+    end
+  end
+end

data/lib/solidus_datashift/importer/variant.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'solidus_datashift/importer'
+require 'solidus_datashift/populator/variant'
+
+module SolidusDataShift
+  class Importer::Variant < Importer
+    def inclusion_columns
+      %w[product_sku price count_on_hand]
+    end
+
+    def importer_model
+      Spree::Variant
+    end
+
+    def importer_populator
+      Populator::Variant
+    end
+  end
+end

data/lib/solidus_datashift/populator.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'solidus_datashift/utils'
+
+module SolidusDataShift
+  class Populator < DataShift::Populator
+    include SolidusDataShift::Utils
+  end
+end

data/lib/solidus_datashift/populator/product.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'solidus_datashift/populator'
+
+module SolidusDataShift
+  class Populator::Product < Populator
+    def prepare_and_assign_method_binding(method_binding, record, data)
+      prepare_data(method_binding, data)
+      if method_binding.operator?('count_on_hand')
+        setup_stock(record, data)
+      elsif method_binding.operator?('product_properties')
+        setup_product_properties(record, data)
+      elsif method_binding.operator?('taxons')
+        setup_taxons(record, data)
+      elsif method_binding.operator?('stores')
+        setup_stores(record, data)
+      elsif method_binding.operator?('option_types')
+        setup_option_types(record, data)
+      elsif method_binding.operator?('images')
+        setup_images(record.master, data)
+      else
+        assign(method_binding, record)
+      end
+    end
+
+    private
+
+    # Expect taxon's names separated by `|`. Also, could define taxon's childs
+    # separeted by `>`.
+    # Ex: name|other_name>child>child|an_other_name
+    def setup_taxons(record, data)
+      taxon_list = split_data(data)
+
+      taxon_list.each do |taxon_str|
+        taxon_names = taxon_str.split(/\s*>\s*/)
+        taxonomy = Spree::Taxonomy.find_or_create_by(name: taxon_names.shift)
+        parent = taxonomy.root
+        associate_to_product(record, 'taxons', parent)
+
+        taxon_names.each do |taxon_name|
+          taxon = Spree::Taxon.find_or_create_by(name: taxon_name,
+                                                 taxonomy: taxonomy,
+                                                 parent: parent)
+          associate_to_product(record, 'taxons', taxon)
+          parent = taxon
+        end
+      end
+    end
+
+    def setup_stores(record, data)
+      if record.respond_to?('stores')
+        store_names = split_data(data)
+        store_names.each do |store_name|
+          store = Spree::Store.find_or_create_by(name: store_name) do |obj|
+            obj.code = store_name
+            obj.url = "#{store_name}.example.com"
+            obj.mail_from_address = 'mail@example.com'
+          end
+
+          associate_to_product(record, 'stores', store)
+        end
+      end
+    end
+
+    def setup_product_properties(record, data)
+      properties_names = split_data(data)
+
+      properties_names.each do |property_name|
+        property = Spree::Property.find_or_create_by(name: property_name) do |obj|
+          obj.presentation = property_name
+        end
+
+        associate_to_product(record, 'properties', property)
+      end
+    end
+
+    def setup_option_types(record, data)
+      type_list = split_data(data)
+
+      type_list.each do |type_str|
+        name, values = type_str.split(':')
+        option_type = Spree::OptionType.find_or_create_by(name: name) do |obj|
+          obj.presentation = name
+        end
+
+        values.split(',').map(&:strip).each do |value|
+          option_type.option_values.find_or_create_by(name: value) do |obj|
+            obj.presentation = value
+          end
+        end
+
+        associate_to_product(record, 'option_types', option_type)
+      end
+    end
+
+    def associate_to_product(product, association_name, item)
+      association = product.send(association_name)
+      association << item unless association.include?(item)
+    end
+  end
+end

data/lib/solidus_datashift/populator/variant.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'solidus_datashift/populator'
+
+module SolidusDataShift
+  class Populator::Variant < Populator
+    def prepare_and_assign_method_binding(method_binding, record, data)
+      prepare_data(method_binding, data)
+      if method_binding.operator?('product_sku')
+        setup_product(method_binding, record, data)
+      elsif method_binding.operator?('count_on_hand')
+        setup_stock(record, data)
+      elsif method_binding.operator?('images')
+        setup_images(record, data)
+      else
+        assign(method_binding, record)
+      end
+    end
+
+    private
+
+    def setup_product(method_binding, record, data)
+      return unless method_binding.operator?('product_sku') && data.present?
+
+      master = Spree::Variant.find_by(sku: data)
+      record.product = master.product
+    end
+  end
+end

data/lib/solidus_datashift/utils.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'mechanize'
+
+module SolidusDataShift
+  module Utils
+    # for count_on_hand we expect two kind of values:
+    # * An integer (Ex: 30)
+    #   In this case all stock locations are populated with the received value
+    #
+    # * A list of stock locations with stock values
+    #   (Ex: foo_warehouse:20|bar_warehouse:10)
+    #   In this case we attempt to find a stock location by name and populate
+    #   with the asociated value
+    def setup_stock(record, data)
+      inventory = split_data(data)
+
+      if inventory.size > 1
+        inventory.each do |stock_hash|
+          name, stock = stock_hash.split(':')
+          stock_location = Spree::StockLocation.where('name LIKE ?', name)
+            .first_or_create(name: name)
+          populate_stock(stock_location, record, stock)
+        end
+      else
+        Spree::StockLocation.all.each do |stock_location|
+          populate_stock(stock_location, record, inventory.first)
+        end
+      end
+    end
+
+    def setup_images(record, data)
+      images = split_data(data)
+      images.each do |image_url|
+        agent = Mechanize.new
+        image_file = agent.get(image_url)
+        name, extension = image_file.filename.split('.')
+        temp_file = Tempfile.new([name, ".#{extension}"], encoding: 'ascii-8bit')
+        begin
+          temp_file.write image_file.body_io.string
+          temp_file.rewind
+          image = Spree::Image.create(attachment: temp_file)
+          record.images << image
+        ensure
+          temp_file.close
+          temp_file.unlink
+        end
+      end
+    end
+
+    def populate_stock(stock_location, variant, count)
+      variant.save unless variant.persisted?
+      stock_item = Spree::StockItem.find_or_create_by(
+        stock_location_id: stock_location.id,
+        variant_id: variant.id
+      )
+      stock_item.set_count_on_hand(count)
+    end
+
+    def split_data(data)
+      data.to_s.split('|')
+    end
+  end
+end

data/lib/solidus_datashift/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusDatashift
-  VERSION = '0.1.0'
+  VERSION = '1.0.0-alpha'
 end

data/lib/tasks/solidus_datashift.rake

@@ -3,6 +3,11 @@
 namespace :solidus_datashift do
   desc 'import product to Solidus'
   task :product_import, [:file] => :environment do |_t, args|
-    SolidusDatashift::ProductImporter.new(args[:file]).run
+    SolidusDataShift::Importer::Product.new(args[:file]).run
+  end
+
+  desc 'import variants to Solidus'
+  task :variant_import, [:file] => :environment do |_t, args|
+    SolidusDataShift::Importer::Variant.new(args[:file]).run
   end
 end

data/solidus_datashift.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$:.push File.expand_path('../lib', __FILE__)
+$:.push File.expand_path('lib', __dir__)
 require 'solidus_datashift/version'
 
 Gem::Specification.new do |s|
@@ -18,11 +18,13 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.add_dependency 'datashift', '~> 0.40'
+  s.add_dependency 'mechanize'
   s.add_dependency 'solidus_core'
   s.add_dependency 'solidus_support'
 
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'pg'
@@ -31,5 +33,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'solidus_multi_domain'
   s.add_development_dependency 'sqlite3'
 end

data/spec/fixtures/spree_products.csv

@@ -1,4 +1,4 @@
-SKU,Name,Description,Available On,     Price,cost_price,      ShippingCategory,product_properties,Taxons,OptionTypes,Variants,count_on_hand
-DEMO_001,Demo Product for AR Loader,blah blah,2011-02-14,399.99,320.00,small,test_pp_001,Paintings|WaterColour,,"mime_type:jpeg,PDF,PNG",12|6|7
-DEMO_002,Demo Excel Load via Jruby,less blah,2011-05-14,100.00,30.00,small,test_pp_003,Paintings|Oils|Paintings>Nature>Seascape,"mime_type:jpeg, PDF,PNG",,5|4|2
-DEMO_003,Demo third row in future,more blah blah,2012-07-01,50.34,23.34,:name => “Small”,test_pp_002|test_pp_003:Example free value|yet_another_property,Drawings|Paintings>Landscape,,"mime_type:jpeg,PDF,PNG|print_type:black_white,colour",12|4|7|12|18
+SKU,Name,Description,Available On,     Price,cost_price,      ShippingCategory,product_properties,Taxons,OptionTypes,count_on_hand,stores,images
+DEMO_001,Demo Product for AR Loader,blah blah,2011-02-14,399.99,320,small,test_pp_001,Paintings|WaterColour,"mime_type:jpeg,PDF,PNG",foo:12|bar:6|baz:7,default,http://rubyonrails.org/images/imagine.png
+DEMO_002,Demo Excel Load via Jruby,less blah,2011-05-14,100,30,small,test_pp_003,Paintings|Oils|Paintings>Nature>Seascape,"mime_type:jpeg, PDF,PNG",foo:5|bar:4|baz:2,default|new_store,
+DEMO_003,Demo third row in future,more blah blah,2012-07-01,50.34,23.34,:name => “Small”,test_pp_002|test_pp_003:Example free value|yet_another_property,Drawings|Paintings>Landscape,"mime_type:jpeg,PDF,PNG|print_type:black_white,colour",10,,

data/spec/fixtures/spree_variants.csv

@@ -0,0 +1,3 @@
+product_sku,sku,     Price,count_on_hand
+FPT02390,FPT02919,430,3
+FPT02390,FPT05979,450,5

data/spec/fixtures/spree_variants_multiple_locations.csv

@@ -0,0 +1,3 @@
+product_sku,sku,     Price,count_on_hand
+FPT02390,FPT02919,430,ny_warehouse:5|ca_warehouse:15
+FPT02390,FPT05979,450,5

data/spec/solidus_datashift/product_importer_spec.rb

@@ -2,16 +2,77 @@
 
 require 'spec_helper'
 
-describe SolidusDatashift::ProductImporter do
+describe SolidusDataShift::Importer::Product do
   context 'with csv file' do
     let(:importer) { described_class.new(fixture_file('spree_products.csv')) }
 
     it 'should successfull upload products' do
       expect { importer.run }.to change { Spree::Product.count }.by(3)
     end
+
+    context 'after run importer' do
+      before do
+        importer.run
+        @product = Spree::Product.first
+      end
+
+      it 'has correct name' do
+        expect(@product.name).to eq('Demo Product for AR Loader')
+      end
+
+      it 'has correct sku' do
+        expect(@product.sku).to eq('DEMO_001')
+      end
+
+      it 'has correct price' do
+        expect(@product.price.to_s).to eq('399.99')
+      end
+
+      it 'has correct cost_price' do
+        expect(@product.cost_price.to_s).to eq('320.0')
+      end
+
+      it 'has correct shipping_category' do
+        expect(@product.shipping_category.name).to eq('small')
+      end
+
+      it 'has correct taxons' do
+        expect(@product.taxons.count).to eq(2)
+        expect(@product.taxons.pluck(:name)).to eq(['Paintings', 'WaterColour'])
+      end
+
+      it 'has correct product properties' do
+        expect(@product.product_properties.count).to eq(1)
+        first_property = @product.product_properties.first.property
+        expect(first_property.name).to eq('test_pp_001')
+      end
+
+      it 'has correct option types' do
+        expect(@product.option_types.count).to eq(1)
+
+        option_type = @product.option_types.first
+        expect(option_type.option_values.count).to eq(3)
+      end
+
+      it 'has correct count_on_hand' do
+        expect(Spree::StockLocation.count).to eq(3)
+        first_location = Spree::StockLocation.first
+        first_stock_item = @product.stock_items.first
+        expect(first_stock_item.stock_location).to eq(first_location)
+        expect(first_stock_item.count_on_hand).to eq(12)
+      end
+
+      it 'allow associate stores to product' do
+        expect(@product.stores.count).to eq(1) if @product.respond_to?('stores')
+      end
+
+      it 'allow image' do
+        expect(@product.images.count).to eq(1)
+      end
+    end
   end
 
-  context 'with xlc file' do
+  context 'with xls file' do
     let(:importer) { described_class.new(fixture_file('spree_products.xls')) }
 
     it 'should successfull upload products' do

data/spec/solidus_datashift/variant_importer_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe SolidusDataShift::Importer::Variant do
+  context 'with csv file' do
+    let(:importer) { described_class.new(fixture_file('spree_variants.csv')) }
+    let(:product) { create(:product) }
+
+    before do
+      @variant_data = CSV.read(fixture_file('spree_variants.csv'))[1]
+      master_sku = @variant_data[0]
+      product.master.update(sku: master_sku)
+    end
+
+    it 'should upload variants' do
+      expect { importer.run }.to change { Spree::Variant.count }.by(2)
+    end
+
+    it 'should associate variant with product' do
+      expect { importer.run }.to change { product.variants.count }.by(2)
+    end
+
+    it 'should store data price correctly' do
+      importer.run
+      variant = product.variants.find_by(sku: @variant_data[1])
+      expect(variant.price.to_f).to eq(@variant_data[2].to_f)
+    end
+
+    it 'should populate stock item' do
+      importer.run
+      variant = product.variants.find_by(sku: @variant_data[1])
+      expect(variant.stock_items.first.count_on_hand).to eq(@variant_data[3].to_i)
+    end
+
+    context 'with multiple stock locations' do
+      let!(:stock_location) { create(:stock_location, name: 'CA Warehouse') }
+
+      context 'with count_on_hand like integer' do
+        it 'should populate stock item in all stock locations' do
+          importer.run
+          variant = product.variants.find_by(sku: @variant_data[1])
+          expect(variant.stock_items.count).to eq(2)
+
+          variant.stock_items.each do |stock_item|
+            expect(stock_item.count_on_hand).to eq(@variant_data[3].to_i)
+          end
+        end
+      end
+
+      context 'with stock_locations list' do
+        let(:stock_importer) { described_class.new(fixture_file('spree_variants_multiple_locations.csv')) }
+
+        before do
+          @variant_stock_data = CSV.read(fixture_file('spree_variants_multiple_locations.csv'))[1]
+          master_sku = @variant_stock_data[0]
+          product.master.update(sku: master_sku)
+          stock_importer.run
+        end
+
+        it 'should associate variant with product' do
+          expect(product.variants.count).to eq(2)
+        end
+
+        it 'should populate stock item accordingly' do
+          variant = product.variants.find_by(sku: @variant_stock_data[1])
+          ny_location = Spree::StockLocation.find_by(name: 'NY Warehouse')
+          ny_item = Spree::StockItem.find_by(variant_id: variant.id, stock_location_id: ny_location.id)
+          expect(ny_item.count_on_hand).to eq(5)
+
+          ca_location = Spree::StockLocation.find_by(name: 'CA Warehouse')
+          ca_item = Spree::StockItem.find_by(variant_id: variant.id, stock_location_id: ca_location.id)
+          expect(ca_item.count_on_hand).to eq(15)
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ end
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path('../dummy/config/environment.rb', __FILE__)
+require File.expand_path('dummy/config/environment.rb', __dir__)
 
 require 'rspec/rails'
 require 'database_cleaner'
@@ -31,6 +31,7 @@ require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/capybara_ext'
 require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/url_helpers'
+require 'spree/testing_support/factories'
 
 RSpec.configure do |config|
   # Infer an example group's spec type from the file location.
@@ -42,6 +43,7 @@ RSpec.configure do |config|
   #
   # visit spree.admin_path
   # current_path.should eql(spree.products_path)
+  config.include FactoryBot::Syntax::Methods
   config.include Spree::TestingSupport::UrlHelpers
   config.include FileHelpers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_datashift
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0.pre.alpha
 platform: ruby
 authors:
 - César Carruitero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datashift
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.40'
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solidus_multi_domain
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -225,13 +267,22 @@ files:
 - config/locales/en.yml
 - lib/solidus_datashift.rb
 - lib/solidus_datashift/engine.rb
-- lib/solidus_datashift/product_importer.rb
+- lib/solidus_datashift/importer.rb
+- lib/solidus_datashift/importer/product.rb
+- lib/solidus_datashift/importer/variant.rb
+- lib/solidus_datashift/populator.rb
+- lib/solidus_datashift/populator/product.rb
+- lib/solidus_datashift/populator/variant.rb
+- lib/solidus_datashift/utils.rb
 - lib/solidus_datashift/version.rb
 - lib/tasks/solidus_datashift.rake
 - solidus_datashift.gemspec
 - spec/fixtures/spree_products.csv
 - spec/fixtures/spree_products.xls
+- spec/fixtures/spree_variants.csv
+- spec/fixtures/spree_variants_multiple_locations.csv
 - spec/solidus_datashift/product_importer_spec.rb
+- spec/solidus_datashift/variant_importer_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_helpers.rb
 homepage: https://github.com/ccarruitero/solidus_datashift
@@ -249,9 +300,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13

data/lib/solidus_datashift/product_importer.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'datashift'
-
-module SolidusDatashift
-  class ProductImporter
-    def initialize(file_name)
-      @file_name = file_name
-      @datashift_loader = DataShift::Loader::Factory.get_loader(file_name)
-    end
-
-    def inclusion_columns
-      %w[ cost_price images price shipping_category sku stock_items variant_sku
-          variant_cost_price variant_price variant_images]
-    end
-
-    def run
-      DataShift::Configuration.call.force_inclusion_of_columns = inclusion_columns
-      @datashift_loader.run(@file_name, Spree::Product)
-    end
-  end
-end