osm 1.2.18.dev.1 → 1.2.18.dev.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQ5NjZiNGQwODJlMGU1YzJhZDc4NzY3OGEyZGYyMmJiNTg4NmJlMg==
+    YzQ3YWVlNzUzYTIzZjUyYWZjMzM0YmE2MWI1NTUzNTk3NjEyZmVmZg==
   data.tar.gz: !binary |-
-    N2IxMjkxMjk0MWMwOTQ1YmFhNjcwZjAyMTQ1NzYxZTYzYmZjYzBiNQ==
+    NGNmNGM3YjVhYWM2NWViNTAzOWVmNDczMjhkYzEyODRjODUxZjQ4Ng==
 SHA512:
   metadata.gz: !binary |-
-    ZDVmNDVlNjBhYWNmZTY1YjgzMTY1MGRmMmE4YzFlMGU2OTc4NDQ2ZTJhMWE2
-    NTYwOGQzZjExMjQ5YmRhNDFkMDc5MWEzOWZiMTk5ODY0Y2Y4YWZjN2JkYWM0
-    MmM4ZmIzZjI0ZDQwNjBhYzY2NjZhMTZjZDdlNTlhZTRmYWUyMmU=
+    ZjQ2YmRiMzI5NmUyNjliOTcxMzE4OTY2OTE4MzZiNWZkYjgzNGUzODVjNjY5
+    N2I4NTk2NTM0MTUzYTZkNWY5YjQ3MmM1NDFhZDk4NDVkZmY4NzVmYWE5NzUx
+    NjM2M2ViMjFjNDI5ZDQ5YjAzMmIwMWU0ZGZmODM2NTJhMjg3NDE=
   data.tar.gz: !binary |-
-    NjJkNGIyOTAxNWZjNzI1YzQ4NjI5ZDk4MWNlNzdkYmM1OWU5OGM1YjhlZTRh
-    NTE2NTE3NjczODAzNThiMDg5M2E0ODIyYTYyZDRjNDNhZWY5OWEyZDdhOWY2
-    YmQ2MjI5NmM5YzUzY2RjZDAzMjkzMGE3NDJiZTQ3MzJjMzM0M2U=
+    NThkMTIyMTk1MDQ3NGYxZjI0MDgzZmMyZTZjNTUzOTViMzE4NzcwYzJiZWEw
+    ZTIyZDk4OWIwOTE5ZTQwOWY2YTcxYTIxNWNmMDJiMDQ0OTI4ZjE0NGI3YTJh
+    NWE5NGRmMGQ5NjdmMjdkN2I5MzhjNDZhNzlmODU3YzU2ZDAxM2Q=

data/.gitignore

@@ -5,6 +5,7 @@ Gemfile.lock
 # And because this is Ruby, ignore the following
 #  (source: https://github.com/github/gitignore/blob/master/Ruby.gitignore):
 
+todo.txt
 *.gem
 *.rbc
 .bundle

data/lib/osm/member.rb

@@ -158,7 +158,7 @@ module Osm
 
       custom_labels = {}
       structure.each do |gid, group|
-        columns = group['columns']
+        columns = group['columns'] || []
         columns.map!{ |c| [c['column_id'].to_i, c['label']] }
         columns.select!{ |a| (gid == GID_CUSTOM) || (a[0] > CORE_FIELD_IDS_FINISH_AT) }
         labels = DirtyHashy[ columns ]
@@ -206,7 +206,7 @@ module Osm
             receive_email_1: member_contact[CID_RECIEVE_EMAIL_1],
             receive_email_2: member_contact[CID_RECIEVE_EMAIL_2],
             custom: DirtyHashy[ item_data[GID_MEMBER_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] > CORE_FIELD_IDS_FINISH_AT } ],
-            custom_labels: custom_labels[GID_MEMBER_CONTACT],
+            custom_labels: custom_labels[GID_MEMBER_CONTACT] || DirtyHashy.new,
           ),
           :primary_contact => PrimaryContact.new(
             first_name: primary_contact[CID_FIRST_NAME],
@@ -225,7 +225,7 @@ module Osm
             receive_email_1: primary_contact[CID_RECIEVE_EMAIL_1],
             receive_email_2: primary_contact[CID_RECIEVE_EMAIL_2],
             custom: DirtyHashy[ item_data[GID_PRIMARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] > CORE_FIELD_IDS_FINISH_AT } ],
-            custom_labels: custom_labels[GID_PRIMARY_CONTACT],
+            custom_labels: custom_labels[GID_PRIMARY_CONTACT] || DirtyHashy.new,
           ),
           :secondary_contact => PrimaryContact.new(
             first_name: secondary_contact[CID_FIRST_NAME],
@@ -244,7 +244,7 @@ module Osm
             receive_email_1: secondary_contact[CID_RECIEVE_EMAIL_1],
             receive_email_2: secondary_contact[CID_RECIEVE_EMAIL_2],
             custom: DirtyHashy[ item_data[GID_SECONDARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] > CORE_FIELD_IDS_FINISH_AT } ],
-            custom_labels: custom_labels[GID_SECONDARY_CONTACT],
+            custom_labels: custom_labels[GID_SECONDARY_CONTACT] || DirtyHashy.new,
           ),
           :emergency_contact => EmergencyContact.new(
             first_name: emergency_contact[CID_FIRST_NAME],
@@ -259,7 +259,7 @@ module Osm
             email_1: emergency_contact[CID_EMAIL_1],
             email_2: emergency_contact[CID_EMAIL_2],
             custom: DirtyHashy[ item_data[GID_EMERGENCY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] > CORE_FIELD_IDS_FINISH_AT } ],
-            custom_labels: custom_labels[GID_EMERGENCY_CONTACT],
+            custom_labels: custom_labels[GID_EMERGENCY_CONTACT] || DirtyHashy.new,
           ),
           :doctor => DoctorContact.new(
             first_name: doctor_contact[CID_FIRST_NAME],
@@ -273,10 +273,10 @@ module Osm
             phone_1: doctor_contact[CID_PHONE_1],
             phone_2: doctor_contact[CID_PHONE_2],
             custom: DirtyHashy[ item_data[GID_DOCTOR_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] > CORE_FIELD_IDS_FINISH_AT } ],
-            custom_labels: custom_labels[GID_DOCTOR_CONTACT],
+            custom_labels: custom_labels[GID_DOCTOR_CONTACT] || DirtyHashy.new,
           ),
           custom: DirtyHashy[ item_data[GID_CUSTOM].map{ |k,v| [k.to_i, v] } ],
-          custom_labels: custom_labels[GID_CUSTOM],
+          custom_labels: custom_labels[GID_CUSTOM] || DirtyHashy.new,
         )
       end
 

data/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.18.dev.1
+  version: 1.2.18.dev.2
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport