zaikio-procurement 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '016449cd994a32db26e9bc0045b4ede62213fe4e3fa4cd5621181d51a4d6a36a'
-  data.tar.gz: fd65209c17d5ecb34120b74d6592dfbd685771aec031139ed14ca5901f764c3f
+  metadata.gz: f514551c75276723f89ef84fe2888072c00dcb6f44d0237d54cc11821517507c
+  data.tar.gz: 3c3db09e362d8573b187a2e1821adacc0cb720415e09575dd4c27ffad22553c7
 SHA512:
-  metadata.gz: 1b32bae8614933368afd866da4b29463fbccf7ac8d0ae802b5247de2c2f58e8778680a0260c3608069175e29d97bb0c5a2952d2235ced7e320d35cc1511f19e1
-  data.tar.gz: 34f11708110b5db2ebfbdd89ebbb72749182e0dd0a79aaee6dceea45e6b93a407489eecea7ffe6ce8b8265b344ed8bc1a97577bd1af301d17a0dfda48d6eac77
+  metadata.gz: 4982b2fcf2cdf1ef0bb2c3d13d82636935eb455419f5252b8e49183f8bb57aef751af61ee6bb49d836b917c1763ec41829beb751d1303c9afcc946cb8f3593a4
+  data.tar.gz: 62eb46093fde1d29b43ebb3573882df0df1ab914968f44c693d113525c32ba114d43313e3e2f5739db19605841faa1a6db8c11a8e79d274be613e16ccab6146e

data/README.md

@@ -69,8 +69,8 @@ Zaikio::Procurement.with_token(token) do
   ### Create new resources
 
   # Create a ContractRequest
-  Zaikio::Procurement::ContractRequest.create(
-    supplier_id: "061c2b43-ae94-459d-8739-35b20684e47a",
+  supplier = Zaikio::Procurement::Supplier.find("5fd82941-ba2f-4d0b-971a-7050fbbafcef")
+  supplier.contract_requests.create(
     customer_number: "1968353479",
     contact_first_name: "Frank",
     contact_last_name: "Gallikanokus",

data/lib/zaikio/procurement/configuration.rb

@@ -2,38 +2,15 @@ require "logger"
 
 module Zaikio
   module Procurement
-    class Configuration
-      HOSTS = {
-        development: "https://procurement.zaikio.test/api/v2/",
-        test: "https://procurement.zaikio.test/api/v2/",
-        staging: "https://procurement.staging.zaikio.com/api/v2/",
-        sandbox: "https://procurement.sandbox.zaikio.com/api/v2/",
-        production: "https://procurement.zaikio.com/api/v2/"
-      }.freeze
-
-      attr_accessor :host
-      attr_reader :environment
-      attr_writer :logger
-
-      def initialize
-        @environment = :sandbox
-      end
-
-      def logger
-        @logger ||= Logger.new($stdout)
-      end
-
-      def environment=(env)
-        @environment = env.to_sym
-        @host = host_for(environment)
-      end
-
-      private
-
-      def host_for(environment)
-        HOSTS.fetch(environment) do
-          raise StandardError.new, "Invalid Zaikio::Procurement environment '#{environment}'"
-        end
+    class Configuration < Zaikio::Client::Helpers::Configuration
+      def self.hosts
+        {
+          development: "https://procurement.zaikio.test/api/v2/",
+          test: "https://procurement.zaikio.test/api/v2/",
+          staging: "https://procurement.staging.zaikio.com/api/v2/",
+          sandbox: "https://procurement.sandbox.zaikio.com/api/v2/",
+          production: "https://procurement.zaikio.com/api/v2/"
+        }.freeze
       end
     end
   end

data/lib/zaikio/procurement/contract_request.rb

@@ -4,11 +4,6 @@ module Zaikio
       uri "contract_requests(/:id)"
       include_root_in_json :contract_request
 
-      def self.create(supplier_id:, **attributes)
-        new(request(:post, "suppliers/#{supplier_id}/contract_requests",
-                    contract_request: attributes)&.body&.dig("data"))
-      end
-
       # Attributes
       attributes :contact_email, :contact_first_name, :contact_last_name,
                  :contact_phone, :customer_number, :declined_at, :declined_reason,

data/lib/zaikio/procurement/supplier.rb

@@ -10,6 +10,10 @@ module Zaikio
         result.collect { |s| Zaikio::Procurement::Supplier.new(s) }
       end
 
+      # Associations
+      has_many :contract_requests, class_name: "Zaikio::Procurement::ContractRequest",
+                                   uri: "suppliers/:supplier_id/contract_requests(/:id)"
+
       # Attributes
       attributes :slug, :name, :connected, :currency, :customer_number, :prices_updated_at,
                  :additional_pricing_agreements, :article_types, :automatically_accept_contract_requests,

data/lib/zaikio/procurement/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module Procurement
-    VERSION = "2.0.0".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/lib/zaikio/procurement.rb

@@ -2,7 +2,6 @@ require "faraday"
 require "spyke"
 require "zaikio-client-helpers"
 require "zaikio/procurement/configuration"
-require "zaikio/procurement/authorization_middleware"
 
 # Models
 require "zaikio/procurement/base"
@@ -40,24 +39,12 @@ module Zaikio
         Base.connection = create_connection
       end
 
-      def with_token(token)
-        original_token = AuthorizationMiddleware.token
-        AuthorizationMiddleware.token = token
-        yield
-      ensure
-        AuthorizationMiddleware.token = original_token
+      def with_token(token, &block)
+        Zaikio::Client.with_token(token, &block)
       end
 
       def create_connection
-        self.connection = Faraday.new(url: configuration.host,
-                                      ssl: { verify: configuration.environment != :test }) do |c|
-          c.request     :json
-          c.response    :logger, configuration&.logger, headers: false
-          c.use         Zaikio::Client::Helpers::Pagination::FaradayMiddleware
-          c.use         Zaikio::Client::Helpers::JSONParser
-          c.use         AuthorizationMiddleware
-          c.adapter     Faraday.default_adapter
-        end
+        self.connection = Zaikio::Client.create_connection(configuration)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-procurement
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Zaikio GmbH
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jwt
-  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: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: Ruby API Client for Zaikio's Procurement Platform
 email:
 - sw@zaikio.com
@@ -108,7 +94,6 @@ files:
 - lib/zaikio/procurement.rb
 - lib/zaikio/procurement/address.rb
 - lib/zaikio/procurement/article.rb
-- lib/zaikio/procurement/authorization_middleware.rb
 - lib/zaikio/procurement/availability.rb
 - lib/zaikio/procurement/base.rb
 - lib/zaikio/procurement/configuration.rb

data/lib/zaikio/procurement/authorization_middleware.rb

@@ -1,30 +0,0 @@
-require "faraday"
-require "jwt"
-require "concurrent"
-
-module Zaikio
-  module Procurement
-    class AuthorizationMiddleware < Faraday::Middleware
-      def self.token
-        @token ||= Concurrent::ThreadLocalVar.new { nil }
-        @token.value
-      end
-
-      def self.token=(value)
-        @token ||= Concurrent::ThreadLocalVar.new { nil }
-        @token.value = value
-      end
-
-      def self.reset_token
-        self.token = nil
-      end
-
-      def call(request_env)
-        request_env[:request_headers]["Authorization"] = "Bearer #{self.class.token}" if self.class.token
-
-        @app.call(request_env).on_complete do |response_env|
-        end
-      end
-    end
-  end
-end