Merge pull request #4 from JuulLabs-OSS/alepore/default_values

Set default values as callables
JuulLabs-OSS · Sep 14, 2023 · a23797e · a23797e
2 parents 70d0a9d + 4541664
commit a23797e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    we_ship_client (1.1.0)
+    we_ship_client (1.1.1)
       activesupport
       dry-struct (~> 1.4)
       dry-types
@@ -94,6 +94,7 @@ GEM
     zeitwerk (2.6.9)
 
 PLATFORMS
+  arm64-darwin-21
   arm64-darwin-22
   x86_64-darwin-20
   x86_64-darwin-21

diff --git a/lib/we_ship_client/entities/order_item.rb b/lib/we_ship_client/entities/order_item.rb
@@ -8,7 +8,7 @@ module Entities
     class OrderItem < Base
       attribute :productName, Types::Strict::String
       attribute :productSKU, Types::Strict::String
-      attribute :productType, Types::Strict::String.default(ENV['WE_SHIP_DEFAULT_PRODUCT_TYPE'])
+      attribute :productType, Types::Strict::String.default { ENV['WE_SHIP_DEFAULT_PRODUCT_TYPE'] }
       attribute :quantity, Types::Strict::Integer
       attribute :weight, Types::Strict::String
     end

diff --git a/lib/we_ship_client/entities/process_orders_request.rb b/lib/we_ship_client/entities/process_orders_request.rb
@@ -15,9 +15,9 @@ class ProcessOrdersRequest < Base
       #       :description=>"Invalid content was found starting with element 'clientCode'. One of '{order}' is expected.",
       #       :status=>"Fail"
       #  }}}
-      attribute :formatVersion, Types::Strict::String.default(ENV['WE_SHIP_FORMAT_VERSION'])
-      attribute :clientCode, Types::Strict::String.default(ENV['WE_SHIP_CUSTOMER_CODE'])
-      attribute :allowDuplicates, Types::Strict::String.default(ENV['WE_SHIP_ALLOW_DUPLICATES'])
+      attribute :formatVersion, Types::Strict::String.default { ENV['WE_SHIP_FORMAT_VERSION'] }
+      attribute :clientCode, Types::Strict::String.default { ENV['WE_SHIP_CUSTOMER_CODE'] }
+      attribute :allowDuplicates, Types::Strict::String.default { ENV['WE_SHIP_ALLOW_DUPLICATES'] }
       attribute :order, Types::Strict::Array.of(Order)
     end
   end

diff --git a/lib/we_ship_client/version.rb b/lib/we_ship_client/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WeShipClient
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end