zaikio-procurement 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2856740bc917a05fa3904e15fe94c75b7eab81479c097bbaa55244ffd10fe666
-  data.tar.gz: f42aca877f8b694fbe8da25e111bf1eb3fd835adff4ac9c20894a8fc322c7d86
+  metadata.gz: c253fd375c7d6ff7336b6a1d8e6b132086b32358e6a23c0c02aebc2f943293ec
+  data.tar.gz: ca0da2c26956697cae57124aca5d4f99e77d6eef155c3ad36ae25ace85c72213
 SHA512:
-  metadata.gz: c3dfb77634283e97bc734b225c58e9a742a1ecbcc1aa658391a92006dd3c38ac676b8a61429389f78b0350f2fb54df261d47d149299f19fe3cf5e758af9bb89e
-  data.tar.gz: b1ed3691699458b054b89827f3adc38866ef8c95e50a8efde78c33120a3bd2db3104a63d1df332b6342309868dbf182f2f3016f129ebf6b7bbec34116fcafc9e
+  metadata.gz: abe508a14342b486217890609ba9471feadc7c5547a6f963f47ee38ca27cc75b2bcdfb41d10e1abce8ca5c066c4198a86fa7b27c156327a5b7f601fea89b575e
+  data.tar.gz: 149171c40f18b812f824ab2812ed356ac6c30054079d8496bb3f8c6b184a0420b07bbce5e16696004124df7ccf60bfc8abe0cb1c3612d6651415fa7a637d22e1

data/README.md

@@ -68,6 +68,11 @@ Zaikio::Procurement.with_token(token) do
   variant = Zaikio::Procurement::Variant.find("845a4d7e-db5a-46a6-9d30-bf2e884cb393")
   variant.line_item_suggestion(amount: 10, unit: "sheet") # Returns a line item suggestion for a specifc variant
 
+  # in Supplier API one must provide a valid scope when using `Variant` or `Article`:
+  # https://docs.zaikio.com/api/procurement_suppliers/procurement.html#/Variants/get__article_type__variants__variant_id_
+  variant = Zaikio::Procurement::Variant.substrate.find("845a4d7e-db5a-46a6-9d30-bf2e884cb393")
+  variant.skus
+  
   # https://docs.zaikio.com/api/procurement_consumers/procurement.html#/LineItemSuggestions/post_suppliers__supplier_id__line_item_suggestions
   supplier = Zaikio::Procurement::Supplier.find("b5b14aa0-ae84-452b-9719-a38545365902")
   supplier.line_item_suggestions(
@@ -137,4 +142,4 @@ Zaikio::Directory.with_token(token) do
   Zaikio::Procurement::Article.with_fallback.find("7cbf51bd-35a8-47a1-84a2-57aa63140234") # => nil
   Zaikio::Procurement::Article.with_fallback.all # Automatically uses empty array as fallback
 end
-```
+```

data/lib/zaikio/procurement/article.rb

@@ -1,13 +1,16 @@
+require_relative "concern/article_type_scoped"
+
 module Zaikio
   module Procurement
     class Article < Base
+      include ArticleTypeScoped
       include_root_in_json :article
 
       # Class methods
       class << self
         # Spyke URI override
         def uri
-          Zaikio::Procurement.configuration.flavor == :supplier ? "substrate/articles(/:id)" : "articles(/:id)"
+          Zaikio::Procurement.configuration.flavor == :supplier ? ":type/articles(/:id)" : "articles(/:id)"
         end
 
         def list_by_article_type_or_supplier_slug(type_or_slug)
@@ -24,8 +27,8 @@ module Zaikio
                  :kind, :supplier_id, :created_at, :updated_at
 
       # Associations
-      has_one :supplier,  class_name: "Zaikio::Procurement::Supplier",
-                          uri: nil
+      has_one :supplier, class_name: "Zaikio::Procurement::Supplier",
+                         uri: nil
       # Manually build variants association to work for consumers and suppliers
       def variants
         self.class.request(:get, "#{uri}/variants").data.collect { |v| Zaikio::Procurement::Variant.new(v) }

data/lib/zaikio/procurement/concern/article_type_scoped.rb

@@ -0,0 +1,21 @@
+module Zaikio
+  module Procurement
+    module ArticleTypeScoped
+      extend ActiveSupport::Concern
+      included do
+        scope :substrate, -> { where(type: :substrate) }
+        scope :plate, -> { where(type: :plate) }
+      end
+      module ClassMethods
+        def find(id)
+          if Zaikio::Procurement.configuration.flavor == :supplier &&
+             (current_scope.nil? || current_scope.params[:type].blank?)
+            raise ArgumentError, "id and type are required for #{name.demodulize} in Supplier API"
+          end
+
+          super
+        end
+      end
+    end
+  end
+end

data/lib/zaikio/procurement/material_availability_check.rb

@@ -0,0 +1,14 @@
+module Zaikio
+  module Procurement
+    class MaterialAvailabilityCheck < Base
+      uri "material_availability_checks(/:id)"
+      include_root_in_json :material_availability_check
+
+      # Attributes
+      attributes :consumer_id, :variant_id, :environmental_certification,
+                 :unit, :amount, :currency, :required_at, :responded_at, :expires_at,
+                 :earliest_delivery_date, :stock_availability_amount, :confirmed_price,
+                 :created_at, :updated_at
+    end
+  end
+end

data/lib/zaikio/procurement/material_requirement.rb

@@ -15,6 +15,13 @@ module Zaikio
       has_one :supplier, class_name: "Zaikio::Procurement::Supplier", uri: nil
       has_one :variant, class_name: "Zaikio::Procurement::Variant", uri: nil
       has_many :order_line_items, class_name: "Zaikio::Procurement::OrderLineItem", uri: nil
+
+      def order(purchaser_id:)
+        result = self.class.request(:post, "material_requirements/#{id}/order",
+                                    order: { purchaser_id: purchaser_id })
+
+        Zaikio::Procurement::MaterialRequirement.new(result.data)
+      end
     end
   end
 end

data/lib/zaikio/procurement/sku.rb

@@ -15,13 +15,9 @@ module Zaikio
 
       # Manually build variant association to work for consumers and suppliers
       def variant
-        path = if Zaikio::Procurement.configuration.flavor == :supplier
-                 "substrate/variants/#{variant_id}"
-               else
-                 "variants/#{variant_id}"
-               end
-
-        Zaikio::Procurement::Variant.new(self.class.request(:get, path).data)
+        Zaikio::Procurement::Variant.new(
+          self.class.request(:get, attributes.dig("variant", "links", 0, "href")).data
+        )
       end
     end
   end

data/lib/zaikio/procurement/variant.rb

@@ -1,11 +1,14 @@
+require_relative "concern/article_type_scoped"
+
 module Zaikio
   module Procurement
     class Variant < Base
+      include ArticleTypeScoped
       include_root_in_json :variant
 
       # Spyke URI override
       def self.uri
-        Zaikio::Procurement.configuration.flavor == :supplier ? "substrate/variants(/:id)" : "variants(/:id)"
+        Zaikio::Procurement.configuration.flavor == :supplier ? ":type/variants(/:id)" : "variants(/:id)"
       end
 
       # Attributes
@@ -16,8 +19,8 @@ module Zaikio
       # Associations
       has_one :article, class_name: "Zaikio::Procurement::Article",
                         uri: nil
-      has_many :skus,   class_name: "Zaikio::Procurement::Sku",
-                        uri: "variants/:variant_id/skus"
+      has_many :skus, class_name: "Zaikio::Procurement::Sku",
+                      uri: "variants/:variant_id/skus"
 
       def line_item_suggestion(**attributes)
         self.class.request(

data/lib/zaikio/procurement/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module Procurement
-    VERSION = "0.1.1".freeze
+    VERSION = "0.3.0".freeze
   end
 end

data/lib/zaikio/procurement.rb

@@ -22,6 +22,8 @@ require "zaikio/procurement/delivery"
 require "zaikio/procurement/delivery_line_item"
 require "zaikio/procurement/current_supplier"
 require "zaikio/procurement/material_requirement"
+require "zaikio/procurement/material_availability_check"
+
 module Zaikio
   module Procurement
     class << self
@@ -38,10 +40,11 @@ module Zaikio
       end
 
       def with_token(token)
+        original_token = AuthorizationMiddleware.token
         AuthorizationMiddleware.token = token
         yield
       ensure
-        AuthorizationMiddleware.reset_token
+        AuthorizationMiddleware.token = original_token
       end
 
       def connection_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-procurement
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Zaikio GmbH
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -109,6 +109,7 @@ files:
 - lib/zaikio/procurement/article.rb
 - lib/zaikio/procurement/authorization_middleware.rb
 - lib/zaikio/procurement/base.rb
+- lib/zaikio/procurement/concern/article_type_scoped.rb
 - lib/zaikio/procurement/configuration.rb
 - lib/zaikio/procurement/contract.rb
 - lib/zaikio/procurement/contract_request.rb
@@ -116,6 +117,7 @@ files:
 - lib/zaikio/procurement/delivery.rb
 - lib/zaikio/procurement/delivery_line_item.rb
 - lib/zaikio/procurement/invoice.rb
+- lib/zaikio/procurement/material_availability_check.rb
 - lib/zaikio/procurement/material_requirement.rb
 - lib/zaikio/procurement/order.rb
 - lib/zaikio/procurement/order_line_item.rb
@@ -131,7 +133,7 @@ homepage: https://www.zaikio.com/
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/zaikio/zaikio-procurement-ruby/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/zaikio/zaikio-procurement-ruby/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/zaikio/zaikio-procurement-ruby
 post_install_message: 
 rdoc_options: []
@@ -148,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Ruby API Client for Zaikio's Procurement Platform