usps-imis-api 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cb3b6691433ac4025d4754b093d3843620e13396cdd61995cce7b8b0c330da5
-  data.tar.gz: a46f9929ea1dd7eabf47eb6364768014807129cf495f84748e6cb8d2cb95aa72
+  metadata.gz: f44d99329182eff27d60dff25449d91f8d14084f786c5168f93e8e3b672ce6b1
+  data.tar.gz: 4a0442ea2b9d0e48315d18eae15185d0e77a213eb4a85f7893e986726012226b
 SHA512:
-  metadata.gz: 2cf22b22ca0e4c99e450e5805a58a841d462e86fd0b61f54c8ec62abb04d7cd875808f80fb078933490af9db7082b8bc6b88a4f3a1855e266c1aefbd76479516
-  data.tar.gz: b666bb26b1ffd36d48fd968c6eeb20a137d91abdf807013716b297c3a2ccb1a8166bf2b1968b4dd9a85dbf5a9114212d521f4235c050948c907b300227cc4444
+  metadata.gz: 7526619b51b50993ad53b46322d8fedd345058bf0dec8b6ec77dca6794ea8cc5468122f98dda9b93b0bb1049fe75e835ed1cceb35c8f6b7f6507ba64d8c81148
+  data.tar.gz: 850744a918e3a273c952d40e4ce8cb6cdfdb18d6c5cca3fd13ba903821b378ab94bf1302fa14e9d7dfe4bf63b3c0899205feb10630d6ceeb4d564c4cc9c6ae2a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps-imis-api (0.6.5)
+    usps-imis-api (0.6.7)
       activesupport (~> 8.0)
 
 GEM

data/lib/usps/imis/panel/base_panel.rb

@@ -92,34 +92,9 @@ module Usps
           }
         end
 
-        def identity_type
-          'System.Collections.ObjectModel.Collection`1[[System.String, mscorlib]], mscorlib'
-        end
-
-        def properties(data, &)
-          @properties = []
-
-          instance_eval(&)
+        def identity_type = 'System.Collections.ObjectModel.Collection`1[[System.String, mscorlib]], mscorlib'
 
-          payload_header(data).merge(
-            'Properties' => {
-              '$type' => 'Asi.Soa.Core.DataContracts.GenericPropertyDataCollection, Asi.Contracts',
-              '$values' => @properties
-            }
-          )
-        ensure
-          remove_instance_variable(:@properties)
-        end
-
-        def property(name, value)
-          raise Error::ApiError, 'Must be called within a `properties` block' unless defined?(@properties)
-
-          @properties << {
-            '$type' => 'Asi.Soa.Core.DataContracts.GenericPropertyData, Asi.Contracts',
-            'Name' => name,
-            'Value' => value
-          }
-        end
+        def build_payload(data, &) = payload_header(data).merge(PanelProperties.build(&))
       end
     end
   end

data/lib/usps/imis/panel/education.rb

@@ -13,18 +13,18 @@ module Usps
         end
 
         def payload(data)
-          properties(data) do
-            property 'ID', api.imis_id
-            property 'Ordinal', { '$type' => 'System.Int32', '$value' => data[:ordinal] } if data[:ordinal]
-            property 'ABC_EDUC_THRU_DATE', data[:thru_date] || '0001-01-01T00:00:00'
-            property 'ABC_ECertificate', data[:certificate]
-            property 'ABC_Educ_Description', data[:description]
-            property 'ABC_Educ_Effective_Date', data[:effective_date]
-            property 'ABC_Educ_Source_System', data[:source]
-            property 'ABC_Educ_Transaction_Date', Time.now.strftime('%Y-%m-%dT%H:%I:%S')
-            property 'ABC_Other_Code', data[:code]
-            property 'ABC_Product_Code', data[:type_code]
-            property 'ABC_TYPE', data[:abc_type_code] || 'EDUC'
+          build_payload(data) do |props|
+            props.add 'ID', api.imis_id
+            props.add 'Ordinal', data[:ordinal] if data[:ordinal]
+            props.add 'ABC_EDUC_THRU_DATE', data[:thru_date] || '0001-01-01T00:00:00'
+            props.add 'ABC_ECertificate', data[:certificate]
+            props.add 'ABC_Educ_Description', data[:description]
+            props.add 'ABC_Educ_Effective_Date', data[:effective_date]
+            props.add 'ABC_Educ_Source_System', data[:source]
+            props.add 'ABC_Educ_Transaction_Date', Time.now
+            props.add 'ABC_Other_Code', data[:code]
+            props.add 'ABC_Product_Code', data[:type_code]
+            props.add 'ABC_TYPE', data[:abc_type_code] || 'EDUC'
           end
         end
       end

data/lib/usps/imis/panel/panel_properties.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Usps
+  module Imis
+    module Panel
+      # Constructor for the Properties field for Panel requests
+      #
+      class PanelProperties
+        # Build a new Properties field
+        #
+        def self.build(&) = new.build(&)
+
+        # Build the Properties field
+        #
+        def build
+          yield(self)
+
+          {
+            'Properties' => {
+              '$type' => 'Asi.Soa.Core.DataContracts.GenericPropertyDataCollection, Asi.Contracts',
+              '$values' => @properties
+            }
+          }
+        end
+
+        # Add an individual property to the field
+        #
+        def add(name, value)
+          @properties ||= []
+          @properties << {
+            '$type' => 'Asi.Soa.Core.DataContracts.GenericPropertyData, Asi.Contracts',
+            'Name' => name,
+            'Value' => property_value(value)
+          }
+        end
+
+      private
+
+        def property_value(value)
+          case value
+          when String then value
+          when Time, DateTime then value.strftime('%Y-%m-%dT%H:%I:%S')
+          when Integer then { '$type' => 'System.Int32', '$value' => value }
+          when true, false then { '$type' => 'System.Boolean', '$value' => value }
+          else
+            raise Error::ApiError, "Unexpected property type: #{value.inspect}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usps/imis/panel/vsc.rb

@@ -13,17 +13,17 @@ module Usps
         end
 
         def payload(data)
-          properties(data) do
-            property 'ID', api.imis_id
-            property 'Ordinal', { '$type' => 'System.Int32', '$value' => data[:ordinal] } if data[:ordinal]
-            property 'Source_System', 'Manual ITCom Entry'
-            property 'ABC_ECertificate', data[:certificate]
-            property 'Activity_Type', 'VSC'
-            property 'Description', 'Vessel Safety Checks'
-            property 'Effective_Date', "#{data[:year]}-12-01T00:00:00"
-            property 'Quantity', { '$type' => 'System.Int32', '$value' => data[:count] }
-            property 'Thru_Date', "#{data[:year]}-12-31T00:00:00"
-            property 'Transaction_Date', Time.now.strftime('%Y-%m-%dT%H:%M:%S')
+          build_payload(data) do |props|
+            props.add 'ID', api.imis_id
+            props.add 'Ordinal', data[:ordinal] if data[:ordinal]
+            props.add 'Source_System', 'Manual ITCom Entry'
+            props.add 'ABC_ECertificate', data[:certificate]
+            props.add 'Activity_Type', 'VSC'
+            props.add 'Description', 'Vessel Safety Checks'
+            props.add 'Effective_Date', "#{data[:year]}-12-01T00:00:00"
+            props.add 'Quantity', data[:count]
+            props.add 'Thru_Date', "#{data[:year]}-12-31T00:00:00"
+            props.add 'Transaction_Date', Time.now
           end
         end
       end

data/lib/usps/imis/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Imis
-    VERSION = '0.6.5'
+    VERSION = '0.6.7'
   end
 end

data/lib/usps/imis.rb

@@ -23,6 +23,7 @@ require_relative 'imis/business_object'
 require_relative 'imis/api'
 require_relative 'imis/mapper'
 require_relative 'imis/panel/base_panel'
+require_relative 'imis/panel/panel_properties'
 require_relative 'imis/panel/vsc'
 require_relative 'imis/panel/education'
 

data/spec/lib/usps/imis/panel/base_panel_spec.rb

@@ -29,10 +29,4 @@ describe Usps::Imis::Panel::BasePanel do
       'Usps::Imis::Panel::InvalidPanelWithBusinessObject must implement #payload(data)'
     )
   end
-
-  it 'does not allow calling property outside of a properties block' do
-    expect { described_class.new.send(:property, 'name', 'value') }.to raise_error(
-      Usps::Imis::Error::ApiError, 'Must be called within a `properties` block'
-    )
-  end
 end

data/spec/lib/usps/imis/panel/panel_properties_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Usps::Imis::Panel::PanelProperties do
+  let(:builder) { described_class.new }
+
+  it 'handles boolean property values' do
+    expect(builder.send(:property_value, true)).to eq(
+      '$type' => 'System.Boolean', '$value' => true
+    )
+  end
+
+  it 'raises an error for unexpected property types' do
+    expect { builder.send(:property_value, {}) }.to raise_error(
+      Usps::Imis::Error::ApiError, 'Unexpected property type: {}'
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps-imis-api
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - Julian Fiander
@@ -52,6 +52,7 @@ files:
 - lib/usps/imis/mapper.rb
 - lib/usps/imis/panel/base_panel.rb
 - lib/usps/imis/panel/education.rb
+- lib/usps/imis/panel/panel_properties.rb
 - lib/usps/imis/panel/vsc.rb
 - lib/usps/imis/requests.rb
 - lib/usps/imis/version.rb
@@ -63,6 +64,7 @@ files:
 - spec/lib/usps/imis/mapper_spec.rb
 - spec/lib/usps/imis/panel/base_panel_spec.rb
 - spec/lib/usps/imis/panel/education_spec.rb
+- spec/lib/usps/imis/panel/panel_properties_spec.rb
 - spec/lib/usps/imis/panel/vsc_spec.rb
 - spec/lib/usps/imis_spec.rb
 - spec/spec_helper.rb