osm 1.2.18.dev.3 → 1.2.18.dev.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDIwNmY3MDkyY2IxNWFkMmY5MGE2YTY1MjdhOTY3YjY2M2I2ZGYyMw==
+    NjNiMTE0Mzc1NGY0Njk2M2RlODNhOTQzN2M1ZWQxZTZiYWYzYWY5Ng==
   data.tar.gz: !binary |-
-    NjAyMWUwMGU4ZmQ1ODc3MmQ2MTQyN2RmZjA5OGE5NDNhZjk2NDE1ZQ==
+    MGYzNzkyM2EwMmE0MzUyMTdjN2ExMjNhMDQyOTU2ZTI2ODZmOTJjOA==
 SHA512:
   metadata.gz: !binary |-
-    ZGU5OGEyYzgyZDM3NDJmM2Y1ZjM3ZDk3MTdkZjg4Yzk4MGE1YzdlZDAzZmU2
-    MTBhNzMwNTUzMzYzMjdjNjcxNWJiOGJhMTEwZDlmYjUwMDY5OWE4NzE4ODcy
-    MGNkNzFlN2Q3NjUwM2M5ZmE5NmViMzdjOTM4NTA3NTlhN2RiMmU=
+    ZmM5YzYwZThmZmIwMjNjOGJhNjk5YjUxMzExODYyNmQ3M2MyNzQ3YTRmNDUw
+    M2E4YjRkNGU1ZDMyZmQ0Y2E3YWYzMWI4OGZjMjA4Y2FmZWNhODM2YTIwOTQx
+    N2JjYmY5NTQ4ZTcxMGZlMDgxNzQ2YWY1ZTZmNTg3M2QxN2U2Y2I=
   data.tar.gz: !binary |-
-    M2FkMWEyODQxZDFmZWYzYWZiNDEyMDUwNTlkNjlhNGE5NTc5NDc0NTFiZjIw
-    YjkyMGE0MTRlNmU0ZjM1OWEwNzMwNjFhMjBhMmNmNzk5MWE2ZDVlMGJmZWI1
-    MGVhNTZhNGMyNmJiNGY5MGQ4NGZlOWUxMDYyYTFhNjFjN2ZlNjI=
+    NzFjYzc0MjBhY2JhNmQ1ZGZmMjUxMDU0YzI2ZmJjN2YyNGNkOWU4Y2JkYmI1
+    ZjRhNmVlNjIwNDg5NzM3MDE5ZWI3OGY3OTM1ZmUwZDBmY2VmZDBhYjI1ODQx
+    MjdkODlmNjlhODU5YThlYTdlYzA4N2Q2ZDM2ZmNiOGQxNjRlYzI=

data/lib/osm/member.rb

@@ -585,6 +585,17 @@ module Osm
         [email_1, email_2].select{ |e| !e.blank? }
       end
 
+      # Get an array of all emails for the contact in a format which includes their name
+      # @return [Array<String>]
+      def all_emails_with_name
+        [email_1, email_2].select{ |e| !e.blank? }.map{ |e| "\"#{name}\" <#{e}>" }
+      end
+
+    end
+
+    module EnableableEmailableContact
+      include EmailableContact
+
       # Get an array of enabled emails for the contact
       # @return [Array<String>]
       def enabled_emails
@@ -594,12 +605,6 @@ module Osm
         emails.select{ |e| !e.blank? }
       end
 
-      # Get an array of all emails for the contact in a format which includes their name
-      # @return [Array<String>]
-      def all_emails_with_name
-        [email_1, email_2].select{ |e| !e.blank? }.map{ |e| "\"#{name}\" <#{e}>" }
-      end
-
       # Get an array of enabled emails for the contact in a format which includes their name
       # @return [Array<String>]
       def enabled_emails_with_name
@@ -610,7 +615,7 @@ module Osm
       end
     end
 
-    module PhoneableContact
+    module EnableablePhoneableContact
       # Get an array of enabled phone numbers for the contact
       def enabled_phones
         phones = []
@@ -682,8 +687,8 @@ module Osm
 
 
     class MemberContact < Osm::Member::Contact
-      include EmailableContact
-      include PhoneableContact
+      include EnableableEmailableContact
+      include EnableablePhoneableContact
       # @!attribute [rw] email_1
       #   @return [String] the primary email address for the member
       # @!attribute [rw] email_2
@@ -717,8 +722,8 @@ module Osm
 
 
     class PrimaryContact < Osm::Member::Contact
-      include EmailableContact
-      include PhoneableContact
+      include EnableableEmailableContact
+      include EnableablePhoneableContact
       # @!attribute [rw] email_1
       #   @return [String] the primary email address for the contact
       # @!attribute [rw] email_2
@@ -752,6 +757,7 @@ module Osm
 
 
     class EmergencyContact < Osm::Member::Contact
+      include EmailableContact
       # @!attribute [rw] email_1
       #   @return [String] the primary email address for the contact
       # @!attribute [rw] email_2

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.18.dev.3"
+  VERSION = "1.2.18.dev.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.18.dev.3
+  version: 1.2.18.dev.4
 platform: ruby
 authors:
 - Robert Gauld