zaikio-procurement 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2ae2dfa3fbc15ead8ce35fb7a1ef18a151f5f4cd511f5ae134492f1f5e2bb9
-  data.tar.gz: 34f6bb97e672561ccc499770d42a8af980f7e60ca7111f351db33c195a0bcac3
+  metadata.gz: 9801ec4f74a47abc8bf08a21be94d5a46604a64d9e695966bf8a3d477e863b47
+  data.tar.gz: f575819922ae1b608395f1e2ef0d7bb0c2f809fd9fb0cdbe3580de82c0acd55d
 SHA512:
-  metadata.gz: e6b98fd8b8e0f7d122aa9005c84ed5d2d950b91811080aef5a646d8c55740ad9fa5480364731d897448ffe9a8cbee5a3b6f8e514485002b127762558e8019b4d
-  data.tar.gz: a73991801a999d5799304cf67a74c9483dd56c718d96a0679226adfb92e9183d922c3d33aadb64ec4219819a59061370fdfbb0be00b36bfee06681d33e10349f
+  metadata.gz: 91cb81d7e99d9d2f65b78b49d509eea1d561ef06f2611ea46af91565d131690d99ff13b7264cab982dad9e2fd764b8ff41da2128c33e4c474488e6699765b626
+  data.tar.gz: a8311d1754d9c5b11dd8163e628a48177fdcfd43d04249fa52da5dc273aaea90c7f7284900d471c4bb1ef58db0e589e522ddb14a309bbf5eaac13a215476e7bf

data/README.md

@@ -70,7 +70,7 @@ Zaikio::Procurement.with_token(token) do
 
   # Create a ContractRequest
   supplier = Zaikio::Procurement::Supplier.find("5fd82941-ba2f-4d0b-971a-7050fbbafcef")
-  supplier.create_contract_request(
+  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/line_item.rb

@@ -0,0 +1,8 @@
+module Zaikio
+  module Procurement
+    class LineItem < Base
+      # Attributes
+      attributes :sku_id, :amount, :unit, :palletized, :order_number
+    end
+  end
+end

data/lib/zaikio/procurement/material_requirement.rb

@@ -17,6 +17,7 @@ module Zaikio
       has_one :quantity, class_name: "Zaikio::Procurement::Quantity", uri: nil
       has_one :job, class_name: "Zaikio::Procurement::Job", uri: nil
       has_one :creator, class_name: "Zaikio::Procurement::Person", uri: nil
+      has_many :line_items, class_name: "Zaikio::Procurement::LineItem", uri: nil
 
       def archive
         Zaikio::Procurement::MaterialRequirement.new(

data/lib/zaikio/procurement/supplier.rb

@@ -10,15 +10,15 @@ 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,
                  :brand_color, :cancelation_policy, :logo_url, :maximum_days_until_delivery,
                  :minimum_days_before_delivery, :supports_split_delivery, :maximum_order_size, :created_at, :updated_at
-
-      def create_contract_request(attributes = {})
-        self.class.request(:post, "#{uri}/contract_requests", contract_request: attributes)&.body&.dig("data")
-      end
     end
   end
 end

data/lib/zaikio/procurement/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module Procurement
-    VERSION = "2.0.1".freeze
+    VERSION = "2.1.1".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"
@@ -17,6 +16,7 @@ require "zaikio/procurement/order"
 require "zaikio/procurement/order_line_item"
 require "zaikio/procurement/delivery"
 require "zaikio/procurement/material_requirement"
+require "zaikio/procurement/line_item"
 require "zaikio/procurement/material"
 require "zaikio/procurement/pricing"
 require "zaikio/procurement/site"
@@ -40,24 +40,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.1
+  version: 2.1.1
 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-09-09 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,13 +94,13 @@ 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
 - lib/zaikio/procurement/contract_request.rb
 - lib/zaikio/procurement/delivery.rb
 - lib/zaikio/procurement/job.rb
+- lib/zaikio/procurement/line_item.rb
 - lib/zaikio/procurement/material.rb
 - lib/zaikio/procurement/material_requirement.rb
 - lib/zaikio/procurement/order.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