magento 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c756e43ba125d24cfd2695f5b3b362acf6a489cb0ccc7b7abd853b8488164c
-  data.tar.gz: 103375f7ba57dae9d78e93d19e0cb95d6192365390b4d05005c465eea6737908
+  metadata.gz: 73c1f0ddb533c84f3cb909d31a6349fc51237965c2e60ff92f23bf30da582454
+  data.tar.gz: f269b8b2a89e8c7726782cbc2638cff88ab020495807baa5ed39f874283ea657
 SHA512:
-  metadata.gz: d839bf8cc47b2a7e639de881d2e8505cd8b3bb2d52428a1e8c58438e96e3bbf84392ccf22498b393a5ec60b812afca078e9f2cd33568f2475081501601f0c919
-  data.tar.gz: 3192fd700e6356b0a58039b26fe8c5b25ab577328d67cce6a4495465f84c4dc9f6aa48e37cacbaafc7068b61ac91a983fe7b41287ff4316920b09951079a0dcf
+  metadata.gz: d6efe97f07e753ef46abe67223d4503c605fbc4d060a0dfc0433f06134fa5b2e59088f7664b7f5e711598f46e801666b70912fcd9fdf38ea1760ef866b9edf76
+  data.tar.gz: 3c3b2c9b3f3d018665e9b0d2b47102a880194446bc8bb4423e002ead7ee345e42beda903f20843862987ad28751a5743a18ae77d100724c95d7884e772e8b9df

data/lib/magento.rb

@@ -5,6 +5,7 @@ require 'dry/inflector'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/keys'
 
+require_relative 'magento/configuration'
 require_relative 'magento/errors'
 require_relative 'magento/request'
 require_relative 'magento/model_mapper'
@@ -28,7 +29,9 @@ Dir[File.expand_path('magento/params/*.rb', __dir__)].map { |f| require f }
 
 module Magento
   class << self
-    attr_accessor :url, :open_timeout, :timeout, :token, :store
+    attr_writer :configuration
+
+    delegate :url=, :token=, :store=, :open_timeout=, :timeout=, to: :configuration
 
     def inflector
       @inflector ||= Dry::Inflector.new do |inflections|
@@ -37,26 +40,24 @@ module Magento
     end
   end
 
-  self.url            = ENV['MAGENTO_URL']
-  self.open_timeout   = 30
-  self.timeout        = 90
-  self.token          = ENV['MAGENTO_TOKEN']
-  self.store          = ENV['MAGENTO_STORE'] || :all
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
 
-  def self.with_config(url: Magento.url, token: Magento.token, store: Magento.store)
-    @old_url   = self.url
-    @old_token = self.token
-    @old_store = self.store
+  def self.reset
+    @configuration = Configuration.new
+  end
 
-    self.url   = url
-    self.token = token
-    self.store = store
+  def self.configure
+    yield(configuration)
+  end
 
+  def self.with_config(params)
+    @old_configuration = configuration
+    self.configuration = configuration.copy_with(**params)
     yield
   ensure
-    self.url   = @old_url
-    self.token = @old_token
-    self.store = @old_store
+    @configuration = @old_configuration
   end
 
   def self.production?

data/lib/magento/configuration.rb

@@ -0,0 +1,31 @@
+module Magento
+  class Configuration
+    attr_accessor :url, :open_timeout, :timeout, :token, :store, :product_image
+  
+    def initialize(url: nil, token: nil, store: nil)
+      self.url            = url || ENV['MAGENTO_URL']
+      self.open_timeout   = 30
+      self.timeout        = 90
+      self.token          = token || ENV['MAGENTO_TOKEN']
+      self.store          = store || ENV['MAGENTO_STORE'] || :all
+
+      self.product_image  = ProductImageConfiguration.new
+    end
+  
+    def copy_with(params = {})
+      clone.tap do |config|
+        params.each { |key, value| config.send("#{key}=", value) }
+      end
+    end
+  end
+
+  class ProductImageConfiguration
+    attr_accessor :small_size, :medium_size, :large_size
+
+    def initialize
+      self.small_size  = '200x200>'
+      self.medium_size = '400x400>'
+      self.large_size  = '800x800>'
+    end
+  end
+end

data/lib/magento/customer.rb

@@ -33,7 +33,7 @@ module Magento
       end
 
       def find_by_token(token)
-        user_request = Request.new(token: token)
+        user_request = Request.new(config: Magento.configuration.copy_with(token: token))
         customer_hash = user_request.get('customers/me').parse
         build(customer_hash)
       end

data/lib/magento/import.rb

@@ -1,13 +1,18 @@
+require_relative 'import/image_finder'
 require_relative 'import/csv_reader'
 require_relative 'import/category'
 require_relative 'import/product'
 
 module Magento
   module Import
-    def self.from_csv(file, image_path:, website_ids: [0])
+    def self.from_csv(file, images_folder: nil, website_ids: [0])
       products = CSVReader.new(file).get_products
       products = Category.new(products).associate
-      Product.new(image_path, website_ids).import(products)
+      Product.new(website_ids, images_folder).import(products)
+    end
+
+    def self.get_csv_template
+      File.open(__dir__ + '/import/template/products.csv')
     end
   end
 end

data/lib/magento/import/Image_finder.rb

@@ -0,0 +1,18 @@
+module Magento
+  module Import
+    class ImageFinder
+      EXTENTIONS = %w[jpg jpeg png webp gif].freeze
+
+      def initialize(images_folder)
+        @images_folder = images_folder
+      end
+
+      def find_by_name(name)
+        prefix = "#{@images_folder}/#{name}"
+
+        EXTENTIONS.map { |e| ["#{prefix}.#{e}", "#{prefix}.#{e.upcase}"] }.flatten
+                  .find { |file| File.exist?(file) }
+      end
+    end
+  end
+end

data/lib/magento/import/category.rb

@@ -41,7 +41,7 @@ module Magento
         params = Magento::Params::CreateCategoria.new(
           name: name,
           parent_id: parent.id,
-          url: "#{Magento.store}-#{parent.id}-#{name.parameterize}"
+          url: "#{Magento.configuration.store}-#{parent.id}-#{name.parameterize}"
         )
 
         Magento::Category.create(params.to_h).tap { |c| puts "Create: #{c.id} => #{c.name}" }

data/lib/magento/import/csv_reader.rb

@@ -10,18 +10,18 @@ module Magento
 
       def get_products
         @csv[1..].map do |row|
-          name, sku, ean, description, price, special_price, quantity, cat1, cat2, cat3 = row
           OpenStruct.new({
-            name: name,
-            sku: sku,
-            ean: ean,
-            description: description,
-            price: price,
-            special_price: special_price,
-            quantity: quantity,
-            cat1: cat1,
-            cat2: cat2,
-            cat3: cat3
+            name: row[0],
+            sku: row[1],
+            ean: row[2],
+            description: row[3],
+            price: row[4],
+            special_price: row[5],
+            quantity: row[6],
+            cat1: row[7],
+            cat2: row[8],
+            cat3: row[9],
+            main_image: row[10]
           })
         end
       end

data/lib/magento/import/product.rb

@@ -1,9 +1,11 @@
+require 'uri'
+
 module Magento
   module Import
     class Product
-      def initialize(images_path, website_ids)
-        @images_path = images_path
+      def initialize(website_ids, images_folder = nil)
         @website_ids = website_ids
+        @image_finder = images_folder ? ImageFinder.new(images_folder) : nil
       end
   
       def import(products)
@@ -36,7 +38,9 @@ module Magento
       private
   
       def images(product)
-        image = find_image(product)
+        return [] unless product.main_image.to_s =~ URI::regexp || @image_finder
+
+        image = product.main_image || @image_finder.find_by_name(product.sku)
         return [] unless image
   
         Magento::Params::CreateImage.new(
@@ -46,15 +50,7 @@ module Magento
           main: true
         ).variants
       end
-  
-      def find_image(product)
-        prefix = "#{@images_path}/#{product.sku}"
-  
-        extensions = %w[jpg jpeg png webp]
-        extensions.map { |e| ["#{prefix}.#{e}", "#{prefix}.#{e.upcase}"] }.flatten
-                  .find { |file| File.exist?(file) }
-      end
-  
+
       def numeric?(value)
         !!(value.to_s =~ /^[\d]+$/)
       end

data/lib/magento/import/template/products.csv

@@ -0,0 +1,2 @@
+name;sku;gtin;description;price;special price;quantity;category level 1;category level 2;category level 3;main image url
+Apple iPhone 11 Pro;iphone-11-pro;9999999999;"Description: New Apple iPhone 11 Pro Max 64/256/512GB Space Gray Midnight Green Silver Gold\nIncludes all new accessories\n\niPhone is unlocked to work on any GSM carrier!\n\nNo warranty - Warranty can be purchased through squaretrade\n\nShipping: We Normally Ship Out Same or Next Business Day Via USPS. \nDelivery Time Varies Especially During Holidays.\nWe Do NOT Ship Out On Saturday/Sunday\nWe Are Not Responsible For Late Packages, But We Will Find Out If There Are Any Issues.\nWe Only Ship To PayPal Confirmed Address.\nPick Up Also Available In Queens NY (Message For Details)\nPriority Mail USPS Free (1-4 Business Days; Not Guaranteed Service)\nExpress Overnight USPS $25 (Guaranteed By USPS Overnight To Most Places) \n\nAdditional return policy details: \nAs a leading seller of electronics, we want to guarantee that each transaction ends with a five star experience. That's why we offer a FREE no questions asked 30-day return policy. Please message us for more details.\n\nSales Tax:\nNew York orders will have a sales tax of 8.875% add to your cost";1099.99;999.00;45;Technology;Smartphone;Apple;"https://store.storeimages.cdn-apple.com/4982/as-images.apple.com/is/iphone-11-pro-select-2019-family?wid=882&hei=1058&fmt=jpeg&qlt=80&op_usm=0.5,0.5&.v=1586586488946"

data/lib/magento/params/create_image.rb

@@ -7,9 +7,9 @@ module Magento
   module Params
     class CreateImage < Dry::Struct
       VARIANTS = {
-        'large'  => { size: '800x800', type: :image },
-        'medium' => { size: '300x300', type: :small_image },
-        'small'  => { size: '100x100', type: :thumbnail }
+        'large'  => :image,
+        'medium' => :small_image,
+        'small'  => :thumbnail
       }.freeze
 
       attribute :title,    Type::String
@@ -30,7 +30,7 @@ module Magento
             "type": mini_type,
             "name": filename
           },
-          "types": main ? [VARIANTS[size][:type]] : []
+          "types": main ? [VARIANTS[size]] : []
         }
       end
 
@@ -48,10 +48,19 @@ module Magento
 
       def file
         @file ||= MiniMagick::Image.open(path).tap do |b|
-          b.resize VARIANTS[size][:size]
+          b.resize(Magento.configuration.product_image.send(size + '_size'))
+          bigger_side = b.dimensions.max
+          b.combine_options do |c|
+            c.background '#FFFFFF'
+            c.alpha 'remove'
+            c.gravity 'center'
+            c.extent "#{bigger_side}x#{bigger_side}"
+            c.strip
+          end
           b.format 'jpg'
-          b.strip
         end
+      rescue => e
+        raise "Erro ao ler imagem #{path}: #{e}"
       end
 
       def filename

data/lib/magento/request.rb

@@ -5,11 +5,10 @@ require 'http'
 
 module Magento
   class Request
-    attr_reader :token, :store
+    attr_reader :config
 
-    def initialize(token: Magento.token, store: Magento.store)
-      @token = token
-      @store = store
+    def initialize(config: Magento.configuration)
+      @config = config
     end
 
     def get(resource)
@@ -36,12 +35,13 @@ module Magento
     private
 
     def http_auth
-      HTTP.auth("Bearer #{token}")
+      HTTP.auth("Bearer #{config.token}")
+          .timeout(connect: config.timeout, read: config.open_timeout)
     end
 
     def base_url
-      url = Magento.url.to_s.sub(%r{/$}, '')
-      "#{url}/rest/#{store}/V1"
+      url = config.url.to_s.sub(%r{/$}, '')
+      "#{url}/rest/#{config.store}/V1"
     end
 
     def url(resource)
@@ -54,9 +54,7 @@ module Magento
       begin
         msg = resp.parse['message']
         errors = resp.parse['errors'] || resp.parse['parameters']
-        if resp.parse['parameters'].is_a? Hash
-          resp.parse['parameters'].each { |k, v| msg.sub! "%#{k}", v }
-        end
+        resp.parse['parameters'].each { |k, v| msg.sub! "%#{k}", v } if resp.parse['parameters'].is_a? Hash
       rescue StandardError
         msg = 'Failed access to the magento server'
         errors = []

data/lib/magento/version.rb

@@ -1,3 +1,3 @@
 module Magento
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magento
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Wallas Faria
@@ -92,14 +92,17 @@ files:
 - README.md
 - lib/magento.rb
 - lib/magento/category.rb
+- lib/magento/configuration.rb
 - lib/magento/country.rb
 - lib/magento/customer.rb
 - lib/magento/errors.rb
 - lib/magento/guest_cart.rb
 - lib/magento/import.rb
+- lib/magento/import/Image_finder.rb
 - lib/magento/import/category.rb
 - lib/magento/import/csv_reader.rb
 - lib/magento/import/product.rb
+- lib/magento/import/template/products.csv
 - lib/magento/invoice.rb
 - lib/magento/model.rb
 - lib/magento/model_mapper.rb