Merge remote-tracking branch 'upstream/master'

Author: gersanco

.env.template

@@ -0,0 +1,3 @@
+CLIENT_ID=""
+CLIENT_SECRET=""
+SHOP_URL=""

.rubocop.yml

@@ -0,0 +1,35 @@
+require:
+  - rubocop-ordered_methods
+  - rubocop-rspec
+
+AllCops:
+  Exclude:
+    - spec/**/*.rb
+  NewCops: enable
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Metrics/AbcSize:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Layout/LineLength:
+  IgnoredPatterns: ['(\A|\s)#']
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/SymbolArray:
+  EnforcedStyle: brackets

CHANGELOG.md

@@ -1,7 +1,23 @@
+### v0.19.0.pre
+
+* features
+  * Upload multiple images for products and variations
+
+### v0.18.2.pre
+
+* bug-fixes
+  * Move `#products.update_reserve_stock` from `POST` to `PUT`.
+
+* enhancements
+  * Update how `api_url` is set on `BeyondApi::Session`.
+
+* features
+  * Install, configure and fix most of the Rubocop issues.
+
 ### v0.18.1.pre
 
 * bug-fixes
-  * Prevent logging `code` and `refresh_token` on `/api/token` calls
+  * Prevent logging `code` and `refresh_token` on `/api/token` calls.
 
 ### v0.18.0.pre
 

Gemfile

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in beyond_api.gemspec
 gemspec
 
 gem "pry"
+
+group :test do
+  gem "factory_bot"
+end

Gemfile.lock

@@ -1,28 +1,61 @@
 PATH
   remote: .
   specs:
-    beyond_api (0.18.1.pre)
-      faraday (~> 0.15)
+    beyond_api (0.19.0.pre)
+      faraday (~> 1.8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     dotenv (2.7.6)
-    faker (2.18.0)
+    factory_bot (6.2.0)
+      activesupport (>= 5.0.0)
+    faker (2.19.0)
       i18n (>= 1.6, < 2)
-    faraday (0.17.4)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    i18n (1.8.10)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
+    minitest (5.14.4)
     multipart-post (2.1.1)
+    parallel (1.21.0)
+    parser (3.0.3.1)
+      ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    rainbow (3.0.0)
     rake (10.5.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -35,8 +68,31 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    yard (0.9.26)
+    rspec-support (3.10.3)
+    rubocop (1.23.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.13.0)
+      parser (>= 3.0.1.1)
+    rubocop-ordered_methods (0.9)
+      rubocop (>= 1.0)
+    rubocop-rspec (2.6.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -45,11 +101,15 @@ DEPENDENCIES
   beyond_api!
   bundler (~> 2.0)
   dotenv (~> 2.7)
+  factory_bot
   faker (~> 2.2)
   pry
   rake (~> 10.0)
   rspec (~> 3.0)
+  rubocop (~> 1.20)
+  rubocop-ordered_methods (~> 0.9)
+  rubocop-rspec (~> 2.4)
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.2.26
+   2.2.31

Rakefile

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "yard"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 YARD::Rake::YardocTask.new do |t|
- t.files   = ['lib/**/*.rb']
+  t.files = ["lib/**/*.rb"]
 end

beyond_api.gemspec

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "beyond_api/version"
 
@@ -11,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Ruby client to access the Beyond API"
   spec.homepage      = "https://github.com/ePages-de/beyond_api-ruby_client"
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -20,12 +21,15 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5.1"
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake",    "~> 10.0"
-  spec.add_development_dependency "rspec",   "~> 3.0"
-  spec.add_development_dependency "yard",    "~> 0.9"
-  spec.add_development_dependency "faker",   "~> 2.2"
-  spec.add_development_dependency "dotenv",  "~> 2.7"
+  spec.add_development_dependency "bundler",                 "~> 2.0"
+  spec.add_development_dependency "dotenv",                  "~> 2.7"
+  spec.add_development_dependency "faker",                   "~> 2.2"
+  spec.add_development_dependency "rake",                    "~> 10.0"
+  spec.add_development_dependency "rspec",                   "~> 3.0"
+  spec.add_development_dependency "rubocop",                 "~> 1.20"
+  spec.add_development_dependency "rubocop-ordered_methods", "~> 0.9"
+  spec.add_development_dependency "rubocop-rspec",           "~> 2.4"
+  spec.add_development_dependency "yard",                    "~> 0.9"
 
-  spec.add_dependency "faraday", "~> 0.15"
+  spec.add_dependency "faraday", "~> 1.8.0"
 end

bin/console

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "dotenv/load"
 require "beyond_api"
 
-unless ENV["CLIENT_ID"].nil? and ENV["CLIENT_SECRET"].nil?
+unless ENV["CLIENT_ID"].nil? && ENV["CLIENT_SECRET"].nil?
   BeyondApi.setup do |config|
     config.client_id = ENV["CLIENT_ID"]
     config.client_secret = ENV["CLIENT_SECRET"]

lib/beyond_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "beyond_api/version"
 
 require "logger"
@@ -25,7 +27,7 @@ def self.setup
   end
 
   class Configuration
-    attr_accessor :client_id, :client_secret, :open_timeout, :timeout,  :remove_response_links,
+    attr_accessor :client_id, :client_secret, :open_timeout, :timeout, :remove_response_links,
                   :remove_response_key_underscores, :object_struct_responses, :raise_error_requests,
                   :log_headers, :log_bodies, :log_level, :all_pagination_size
 

lib/beyond_api/connection.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'faraday'
+require "faraday"
 
 module BeyondApi
   class Connection
@@ -13,8 +13,8 @@ def self.default
         faraday.options[:timeout] = BeyondApi.configuration.timeout.to_i
         faraday.response :logger, LOGGER, { headers: BeyondApi.configuration.log_headers,
                                             bodies: BeyondApi.configuration.log_bodies }
-        faraday.headers['Accept'] = 'application/json'
-        faraday.headers['Content-Type'] = 'application/json'
+        faraday.headers["Accept"] = "application/json"
+        faraday.headers["Content-Type"] = "application/json"
         faraday.request(:multipart)
         faraday.request(:url_encoded)
         faraday.adapter(:net_http)
@@ -32,8 +32,16 @@ def self.token
         end
         faraday.headers['Accept'] = 'application/json'
         faraday.adapter(:net_http)
-        faraday.basic_auth(BeyondApi.configuration.client_id,
-                           BeyondApi.configuration.client_secret)
+        faraday.request :basic_auth, BeyondApi.configuration.client_id, BeyondApi.configuration.client_secret
+      end
+    end
+
+    def self.multipart
+      Faraday.new(ssl: { verify: true }) do |faraday|
+        faraday.options[:open_timeout] = BeyondApi.configuration.open_timeout.to_i
+        faraday.options[:timeout] = BeyondApi.configuration.timeout.to_i
+        faraday.request :multipart, { flat_encode: true }
+        faraday.adapter Faraday.default_adapter
       end
     end
   end