usps-support 0.1.14 → 0.1.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3df82f638b4d958ed2fde1bc568ed9b43e686e1b8d6ebc2006763b8c69a59b3b
4
- data.tar.gz: 9549b6b1976a691519337cfc9f87dbc8ac0b8a291ee026bf2ae90ff8a8df420d
3
+ metadata.gz: a3004655fc0ad62bfa6576b333df7704ae4017729e57ec6af48e1588331928a2
4
+ data.tar.gz: 750225d963d7fff7416d06144fe9ed0b910c3c4fd8b571fb18bc2664c48d7cb4
5
5
  SHA512:
6
- metadata.gz: df4cd4ece5dd61541deb917b0fc0792b96235ad44c3ae76f2d2fb2f4f17e6f1d1232b96673df0f0e9fd09233e9b18a6788bff1290922a435a42b419e451bece3
7
- data.tar.gz: 1c393ed20de200207975fed9ed808ac0f34111c5206b059c0202b10293673afd647e9e993dd7b3764e9eb661dd40142788a6e318652f205f463d9f92049f8a55
6
+ metadata.gz: 4c24d2914dd079845272284ab644d2f7ab46cb9e5f6ab5059f68d51a4b9c7748a138b961e7677cbfcfe321c581ce52fc0e2ad53d38be983089905ff0895df167
7
+ data.tar.gz: abe16dcce7e2b7cdf1c80f5ddfce91f3f7410bd16b3fe6246f83d3163d8a1e61b22f911d221f01f2bd214fc085fa7be01314cb1978ec6c8b7840a64941339d54
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- usps-support (0.1.14)
4
+ usps-support (0.1.16)
5
5
  sassc-rails
6
6
  usps-imis-api (~> 0.10.4)
7
7
  usps-jwt_auth (~> 1.0.0)
@@ -23,11 +23,21 @@ module Usps::Support::Models::Hq::Members
23
23
  foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :district_jobs
24
24
  )
25
25
 
26
+ validate :enforce_account
27
+
26
28
  def acting? = acting == 'Y'
27
29
 
28
30
  def description
29
31
  desc = district_job_description.jdesc
30
32
  acting? ? "#{desc} (Acting)" : desc
31
33
  end
34
+
35
+ private
36
+
37
+ def enforce_account
38
+ return if account.present? && account.to_i.positive?
39
+
40
+ errors.add(:account, 'must be present')
41
+ end
32
42
  end
33
43
  end
@@ -9,7 +9,8 @@ module Usps::Support::Models::Hq::Members
9
9
 
10
10
  belongs_to(
11
11
  :squadron,
12
- class_name: '::Squadrons::Squadron', foreign_key: 'account', primary_key: 'account', inverse_of: :squadron_jobs
12
+ class_name: '::Squadrons::Squadron',
13
+ foreign_key: 'account', primary_key: 'account', inverse_of: :squadron_jobs
13
14
  )
14
15
  belongs_to(
15
16
  :member,
@@ -22,11 +23,21 @@ module Usps::Support::Models::Hq::Members
22
23
  foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :squadron_jobs
23
24
  )
24
25
 
26
+ validate :enforce_account
27
+
25
28
  def acting? = acting == 'Y'
26
29
 
27
30
  def description
28
31
  desc = squadron_job_description.jdesc
29
32
  acting? ? "#{desc} (Acting)" : desc
30
33
  end
34
+
35
+ private
36
+
37
+ def enforce_account
38
+ return if account.present? && account.to_i.positive?
39
+
40
+ errors.add(:account, 'must be present')
41
+ end
31
42
  end
32
43
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Usps
4
4
  module Support
5
- VERSION = '0.1.14'
5
+ VERSION = '0.1.16'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: usps-support
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.14
4
+ version: 0.1.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julian Fiander