zaikio-warehouse 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84d3b3d618cda393f386f9839345d2b428a94a704a0dafa4d22aacb25fe7a064
-  data.tar.gz: 1ff3543a8c05517cbfbe94eb54425c78240b24379fbe4a004db6cb8942724138
+  metadata.gz: c8e6cd14f506a06aa4f2f6dcfe43452144f0c2ece0063350f55f3c77589b30d8
+  data.tar.gz: 85e0ec8568a905739541b005cd56cf394276eb8812ca06c09bc204f79983eeb9
 SHA512:
-  metadata.gz: 2baf20da780caf3cca93770b1ef48672261304a06d5170c2c9dcdb2d1222d7cb408a200a19d42edc8f4ba3d80750f0040b3a69062ff1323286a46fb614f42720
-  data.tar.gz: ff8d7c8b8ca34cc26239195714e6b3de857cc83c58fb6974f74335a97b554f138718439d88e33a8b8b9e584d3d0a3da6a24341dbcf5d3f2fe0f3bc0930dee5a9
+  metadata.gz: bac9ee55ef8d820f8adf4154298ce96b9dbcd06164f92d6bea42c1a9b95da58167b42639566dc294dfde74d550a0d039f4eab809166b5a0f8e3b7c60d8209f01
+  data.tar.gz: 94c2dfd23e36e72a6231ba1c75e449a171c0624388dd87e4beb677da5bb144ae2829560327b75c36c915f37b0af61bf3fdd55ac6a9647dd1126bdd8a51d2ffb6

data/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.4] - 2023-03-27
+
+- Add `Material#merge(id)` method to support merging
+
+## [0.2.3] - 2023-03-20
+
+- Add an optional `person_id` attribute for `MaterialReservationCancelation`
+
 ## [0.2.2] - 2023-03-16
 
 - Add endpoint to `#material_requests` association for `Material`
@@ -30,7 +38,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update and reuse `zaikio-client-helpers` logic to support `Zaikio::Client.with_token`
 - Initial release
 
-[Unreleased]: https://github.com/zaikio/zaikio-warehouse-ruby/compare/v0.2.1..HEAD
+[Unreleased]: https://github.com/zaikio/zaikio-warehouse-ruby/compare/v0.2.4..HEAD
+[0.2.4]: https://github.com/zaikio/zaikio-warehouse-ruby/compare/v0.2.3..v0.2.4
+[0.2.3]: https://github.com/zaikio/zaikio-warehouse-ruby/compare/v0.2.2..v0.2.3
+[0.2.2]: https://github.com/zaikio/zaikio-warehouse-ruby/compare/v0.2.1..v0.2.2
 [0.2.1]: https://github.com/zaikio/zaikio-warehouse-ruby/compare/v0.2.0..v0.2.1
 [0.2.0]: https://github.com/zaikio/zaikio-warehouse-ruby/compare/v0.1.0..v0.2.0
 [0.1.0]: https://github.com/zaikio/zaikio-hub-models/compare/c96ae1302a6ec5b90cfc445116fc83af16579e01..v0.1.0

data/lib/zaikio/warehouse/material.rb

@@ -22,6 +22,16 @@ module Zaikio
       has_many :material_reservations,
                uri: "materials/:material_id/material_reservations",
                class_name: "Zaikio::Warehouse::MaterialReservation"
+
+      def merge(into_material_or_material_id)
+        self.class.request(:post, "#{collection_name}/#{id}/merge_into/#{into_material_or_material_id.to_param}")
+      end
+
+      private
+
+      def collection_name
+        self.class.name.demodulize.underscore.pluralize
+      end
     end
   end
 end

data/lib/zaikio/warehouse/material_reservation_cancelation.rb

@@ -9,7 +9,7 @@ module Zaikio
       uri "material_reservation_cancelations(/:id)"
 
       attributes :material_reservation_id, :cancelation_reference, :cancelation_reference_link,
-                 :cancelation_client, :cancelation_subject, :amount, :reason, :created_at, :updated_at
+                 :cancelation_client, :cancelation_subject, :person_id, :amount, :reason, :created_at, :updated_at
 
       has_one :material, uri: nil, class_name: "Zaikio::Warehouse::Material"
       has_one :warehouse, uri: nil, class_name: "Zaikio::Warehouse::Warehouse"

data/lib/zaikio/warehouse/version.rb

@@ -2,6 +2,6 @@
 
 module Zaikio
   module Warehouse
-    VERSION = "0.2.2"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-warehouse
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Zaikio GmbH
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport