usps-support 0.2.58 → 0.2.59.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ed60e1b9f3220f40864fd2cd0f534f51fd3910faf657a0d5b735e425f669b12
-  data.tar.gz: a748625e90d6afa6b9320a7b0e26fdd1252059d9866ca54cc2ac842de5a8d0e0
+  metadata.gz: 806cef939766223cd49d93460bee3205c138998e763506d5f49db685b0ce40f1
+  data.tar.gz: 79cb098bc96df14d5f429b1bf6fa829d68240ec91e3c0d5d4e3f845012e67c39
 SHA512:
-  metadata.gz: 529f767a03f44b84d850aa443a1a9a1208320c67084f2220ea88abe4abf9a9de404d64ab3896fb40c7c195c5a3a53c0a0790956654d564e0bcc90db9c5049ac7
-  data.tar.gz: dd66212142fae87a11709751e3432db16f13e0cc63bd2993e1028bff15e51384a6e684e3de652f0656e12642603f67183ee714d9efc6a9d957eb2ea8cff4978a
+  metadata.gz: a7fb331df2513bcf2c7193f234e3411d06ce8e85897bbab581e2fbb47c11379862be4b59a5af0dc2ee7e8e41ec1c98b6b9c187cc23813bf55aa107bdd3929fae
+  data.tar.gz: c2f473b8f6f7f409396fac8b2ac65e08cd80e08aeae6c6239d24089236d30b4eb5118dac01e01a374de8f9dba927f4f3c33a508f1dbe0567c1edc63c6ae7d1f5

data/lib/usps/support/models/hq/squadrons/district.rb

@@ -32,7 +32,10 @@ module Usps::Support::Models::Hq::Squadrons
     )
 
     # Squadrons and Districts are both stored in the same table, along with various historical entries
-    default_scope { where("Name REGEXP '^D?[0-9]{2}$'").where.not(account: nil) }
+    default_scope { org_type_district.district_style_name }
+
+    # There is at least one non-district with `type="D"`
+    scope :district_style_name, -> { where("Name REGEXP '^D?[0-9]{2}$'") }
 
     # def self.lookup(number) = where("Name REGEXP '^D?0?#{number}$'").first
 

data/lib/usps/support/models/hq/squadrons/former_squadron.rb

@@ -12,7 +12,10 @@ module Usps::Support::Models::Hq::Squadrons
     )
 
     # Former Squadrons stored in the same table as current Squadrons
-    default_scope { where(account: 0).where('Name NOT REGEXP \'^[0-9]{2}\.$\'') }
+    default_scope { org_type_former.squadron_style_name }
+
+    # Former districts are also stored with `type="X"`
+    scope :squadron_style_name, -> { where.not("Name REGEXP '^[0-9]{2}[.]$'") }
 
     # When a squadron becomes "former", its account is moved into the `plat` column
     alias_attribute :account_number, :plat

data/lib/usps/support/models/hq/squadrons/squadron.rb

@@ -25,7 +25,7 @@ module Usps::Support::Models::Hq::Squadrons
       foreign_key: 'account', primary_key: 'account', inverse_of: :squadron
     )
 
-    default_scope { where.not("Name REGEXP '^D?[0-9]{2}$'").where.not(account: 0) }
+    default_scope { org_type_squadron }
 
     def name = self.Name.split(/ Sail (&|and)/)[0]
   end

data/lib/usps/support/models/hq/squadrons/website.rb

@@ -9,6 +9,9 @@ module Usps::Support::Models::Hq::Squadrons
     self.primary_key = :id
     ignore_type_column_sti!
 
+    # Non-Rails-style STI column
+    enum :type, { squadron: 'S', district: 'D', boc: 'B', former: 'X' }, prefix: :org_type
+
     # This is a default behavior, that is overwritten by FormerSquadron
     alias_attribute :account_number, :account
   end

data/lib/usps/support/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Support
-    VERSION = '0.2.58'
+    VERSION = '0.2.59-1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps-support
 version: !ruby/object:Gem::Version
-  version: 0.2.58
+  version: 0.2.59.pre.1
 platform: ruby
 authors:
 - Julian Fiander