erp_integration 0.53.0 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7719f3eaa455812be74cbdb4448118217e8294c90e742bb9d4074fad423a10ab
-  data.tar.gz: 35e221932e9c229957951869daa324c7f40549bf1cdfe21d7c56dc3202741832
+  metadata.gz: 015dee8d29c0a8bcd763966f25c24b77efb9cd2e7ac4a1555aa104e9a708c2ec
+  data.tar.gz: 92f5a27785677904bd7b0cd60fc5a033195ed99d64d9c16941fbb4d942db8b31
 SHA512:
-  metadata.gz: e9835ef2f7400c112999ac8ca0135d7f11be0c69129bd4403f5620042b06394e09a6ec62c225d9d82d41d66b7d6290a602edf525d48fe910e92ab48562456711
-  data.tar.gz: 4a39d845dda9398b971334392fb58539a3cc208896a19e608c2207ddc040331b9e2a27ffef6ff1bcdc1ab56df4ba4a5de1a6da85399d37ca53a3b795f762771f
+  metadata.gz: 526e86fb610c85d0b5c69f36e2cf1b1c396ff36e6f74c2db6d9764eae9eb1f076d9ed7771b5347ac3060bbdbd047777c1901c427351a280bcb26bf49b6edb269
+  data.tar.gz: f876d9874077923090353f7e2c9d6766cae725fe1558345ba98f4d5cfc07495bb272f451205f04c6a957402fdf10bc756d69ad8792a55405c91a07ce856d5e4e

data/README.md

@@ -26,7 +26,7 @@ To configure the gem, create an initializer and add the following lines:
 # config/initializers/erp_integration.rb
 ErpIntegration.configure do |config|
   config.fulfil_api_keys = '<your-api-key>'
-  config.fulfil_merchant_id = '<your-merchant-id>'
+  config.fulfil_base_url = '<your-base-url>'
 end
 ```
 
@@ -35,7 +35,7 @@ You can configure multiple API keys, to enable rotation mechanism (see ["API key
 # config/initializers/erp_integration.rb
 ErpIntegration.configure do |config|
   config.fulfil_api_keys = ['<your-api-key1>', '<your-api-key2>']
-  config.fulfil_merchant_id = '<your-merchant-id>'
+  config.fulfil_base_url = '<your-base-url>'
 end
 ```
 

data/lib/erp_integration/configuration.rb

@@ -14,13 +14,13 @@ module ErpIntegration
   class Configuration
     # The `fulfil_api_keys` sets a single or a list of API keys to use
     # in the `FulfilClient` to authorize the requests to the Fulfil API endpoints.
-    # @return [Array<Atring>] The API keys for Fulfil.
+    # @return [Array<String>] The API keys for Fulfil.
     attr_accessor :fulfil_api_keys
 
-    # The `fulfil_merchant_id` is used by the `FulfilClient` to connect to
+    # The `fulfil_base_url` is used by the `FulfilClient` to connect to
     # the right Fulfil API endpoints.
-    # @return [String] The merchant ID for Fulfil.
-    attr_accessor :fulfil_merchant_id
+    # @return [String] The base URL for Fulfil.
+    attr_accessor :fulfil_base_url
 
     # Allows configuring an adapter for the `BillOfMaterial` resource. When
     # none is configured, it will default to Fulfil.

data/lib/erp_integration/fulfil/api_resource.rb

@@ -28,7 +28,7 @@ module ErpIntegration
       def self.client
         Client.new(
           api_keys_pool: api_keys_pool,
-          merchant_id: config.fulfil_merchant_id,
+          base_url: config.fulfil_base_url,
           logger: config.logger
         )
       end
@@ -72,16 +72,19 @@ module ErpIntegration
       # be executed and the results will be fetched.
       # @return [Array] An enumerable collection object with all API results.
       def all
-        client.put(
-          api_resource_path,
-          Query.new(
-            fields: selected_fields,
-            filters: where_clauses,
-            alternative_filters: or_clauses,
-            limit: limit_value,
-            offset: calculated_offset
-          )
-        ).map { |item| resource_klass.new(item) }
+        return @results if defined?(@results)
+
+        @results =
+          client.put(
+            api_resource_path,
+            Query.new(
+              fields: selected_fields,
+              filters: where_clauses,
+              alternative_filters: or_clauses,
+              limit: limit_value,
+              offset: calculated_offset
+            )
+          ).map { |item| resource_klass.new(item) }
       end
 
       # As with the `all` method, the `query methods` lazyly build a search/read
@@ -90,14 +93,17 @@ module ErpIntegration
       # the result will be fetched
       # @return [Integer] The count of records that match with the query in Fulfil
       def count
-        client.put(
-          "model/#{model_name}/search_count",
-          Query.new(
-            fields: nil,
-            filters: where_clauses,
-            alternative_filters: or_clauses
-          ).to_h.except(:fields)
-        )
+        return @count if defined?(@count)
+
+        @count =
+          client.put(
+            "model/#{model_name}/search_count",
+            Query.new(
+              fields: nil,
+              filters: where_clauses,
+              alternative_filters: or_clauses
+            ).to_h.except(:fields)
+          )
       end
 
       # The `each` method turns the `ApiResource` instance into an enumerable object.

data/lib/erp_integration/fulfil/client.rb

@@ -3,21 +3,15 @@
 module ErpIntegration
   module Fulfil
     class Client
-      attr_reader :api_keys_pool, :merchant_id
+      attr_reader :api_keys_pool, :base_url
       attr_writer :connection, :faraday_adapter, :rotate_statuses
 
-      def initialize(api_keys_pool:, merchant_id:, logger: nil)
+      def initialize(api_keys_pool:, base_url:, logger: nil)
         @api_keys_pool = api_keys_pool
-        @merchant_id = merchant_id
+        @base_url = base_url.strip
         @logger = logger
       end
 
-      # Generates the url prefix for the Faraday connection client.
-      # @return [String] The base url for the Fulfil HTTP client
-      def base_url
-        "https://#{merchant_id}.fulfil.io/"
-      end
-
       # Sets the default adapter for the Faraday Connection.
       # @return [Symbol] The default Faraday adapter
       def faraday_adapter
@@ -50,8 +44,8 @@ module ErpIntegration
 
       %i[delete get patch put post].each do |action_name|
         define_method(action_name) do |path, options = {}|
-          if api_key.nil? || merchant_id.nil?
-            raise ErpIntegration::Error, 'The Fulfil API key and/or Merchant ID are missing.'
+          if api_key.nil? || base_url.nil?
+            raise ErpIntegration::Error, 'The Fulfil API key and/or base URL are missing.'
           end
 
           connection.public_send(action_name, "api/#{version}/#{path}", options).body

data/lib/erp_integration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ErpIntegration
-  VERSION = '0.53.0'
+  VERSION = '0.54.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erp_integration
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.0
 platform: ruby
 authors:
 - Stefan Vermaas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Connects Mejuri with third-party ERP vendors