osm 1.2.18.dev.2 → 1.2.18.dev.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQ3YWVlNzUzYTIzZjUyYWZjMzM0YmE2MWI1NTUzNTk3NjEyZmVmZg==
+    ZDIwNmY3MDkyY2IxNWFkMmY5MGE2YTY1MjdhOTY3YjY2M2I2ZGYyMw==
   data.tar.gz: !binary |-
-    NGNmNGM3YjVhYWM2NWViNTAzOWVmNDczMjhkYzEyODRjODUxZjQ4Ng==
+    NjAyMWUwMGU4ZmQ1ODc3MmQ2MTQyN2RmZjA5OGE5NDNhZjk2NDE1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjQ2YmRiMzI5NmUyNjliOTcxMzE4OTY2OTE4MzZiNWZkYjgzNGUzODVjNjY5
-    N2I4NTk2NTM0MTUzYTZkNWY5YjQ3MmM1NDFhZDk4NDVkZmY4NzVmYWE5NzUx
-    NjM2M2ViMjFjNDI5ZDQ5YjAzMmIwMWU0ZGZmODM2NTJhMjg3NDE=
+    ZGU5OGEyYzgyZDM3NDJmM2Y1ZjM3ZDk3MTdkZjg4Yzk4MGE1YzdlZDAzZmU2
+    MTBhNzMwNTUzMzYzMjdjNjcxNWJiOGJhMTEwZDlmYjUwMDY5OWE4NzE4ODcy
+    MGNkNzFlN2Q3NjUwM2M5ZmE5NmViMzdjOTM4NTA3NTlhN2RiMmU=
   data.tar.gz: !binary |-
-    NThkMTIyMTk1MDQ3NGYxZjI0MDgzZmMyZTZjNTUzOTViMzE4NzcwYzJiZWEw
-    ZTIyZDk4OWIwOTE5ZTQwOWY2YTcxYTIxNWNmMDJiMDQ0OTI4ZjE0NGI3YTJh
-    NWE5NGRmMGQ5NjdmMjdkN2I5MzhjNDZhNzlmODU3YzU2ZDAxM2Q=
+    M2FkMWEyODQxZDFmZWYzYWZiNDEyMDUwNTlkNjlhNGE5NTc5NDc0NTFiZjIw
+    YjkyMGE0MTRlNmU0ZjM1OWEwNzMwNjFhMjBhMmNmNzk5MWE2ZDVlMGJmZWI1
+    MGVhNTZhNGMyNmJiNGY5MGQ4NGZlOWUxMDYyYTFhNjFjN2ZlNjI=

data/lib/osm/member.rb

@@ -65,15 +65,15 @@ module Osm
     # @!attribute [rw] custom_labels
     #   @return [DirtyHashy] the labels for the custom data (key is OSM's variable name, value is the label)
     # @!attribute [rw] contact
-    #   @return [Osm::Member::MemberContact] the member's contact details
+    #   @return [Osm::Member::MemberContact, nil] the member's contact details (nil if hidden in OSM)
     # @!attribute [rw] primary_contact
-    #   @return [Osm::Member::PrimaryContact] the member's primary contact (primary contact 1 in OSM)
+    #   @return [Osm::Member::PrimaryContact, nil] the member's primary contact (primary contact 1 in OSM) (nil if hidden in OSM)
     # @!attribute [rw] secondary_contact
-    #   @return [Osm::Member::PrimaryContact] the member's secondary contact (primary contact 2 in OSM)
+    #   @return [Osm::Member::PrimaryContact, nil] the member's secondary contact (primary contact 2 in OSM) (nil if hidden in OSM)
     # @!attribute [rw] emergency_contact
-    #   @return [Osm::Member::EmergencyContact] the member's emergency contact
+    #   @return [Osm::Member::EmergencyContact, nil] the member's emergency contact (nil if hidden in OSM)
     # @!attribute [rw] doctor
-    #   @return [Osm::Member::DoctorContact] the member's doctor
+    #   @return [Osm::Member::DoctorContact, nil] the member's doctor (nil if hidden in OSM)
 
     attribute :id, :type => Integer
     attribute :section_id, :type => Integer
@@ -120,11 +120,11 @@ module Osm
     validates_presence_of :joined_movement
     validates_format_of :age, :with => /\A[0-9]{1,3} \/ (?:0?[0-9]|1[012])\Z/, :message => 'age is not in the correct format (yy / mm)', :allow_blank => true
     validates_inclusion_of :gender, :in => [:male, :female, :other, :unspecified], :allow_nil => true
-    validates :contact, :validity=>true
-    validates :primary_contact, :validity=>true
-    validates :secondary_contact, :validity=>true
-    validates :emergency_contact, :validity=>true
-    validates :doctor, :validity=>true
+    validates :contact, :validity=>{allow_nil: true}
+    validates :primary_contact, :validity=>{allow_nil: true}
+    validates :secondary_contact, :validity=>{allow_nil: true}
+    validates :emergency_contact, :validity=>{allow_nil: true}
+    validates :doctor, :validity=>{allow_nil: true}
 
 
     # Get members for a section
@@ -167,11 +167,11 @@ module Osm
 
       data.each do |item|
         item_data = Hash[ item['custom_data'].map{ |k,v| [k.to_i, v] } ]
-        member_contact = Hash[ item_data[GID_MEMBER_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
-        primary_contact = Hash[ item_data[GID_PRIMARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
-        secondary_contact = Hash[ item_data[GID_SECONDARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
-        emergency_contact = Hash[ item_data[GID_EMERGENCY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
-        doctor_contact = Hash[ item_data[GID_DOCTOR_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
+        member_contact = item_data[GID_MEMBER_CONTACT].nil? ? nil : Hash[ item_data[GID_MEMBER_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
+        primary_contact = item_data[GID_PRIMARY_CONTACT].nil? ? nil : Hash[ item_data[GID_PRIMARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
+        secondary_contact = item_data[GID_SECONDARY_CONTACT].nil? ? nil : Hash[ item_data[GID_SECONDARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
+        emergency_contact = item_data[GID_EMERGENCY_CONTACT].nil? ? nil : Hash[ item_data[GID_EMERGENCY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
+        doctor_contact = item_data[GID_DOCTOR_CONTACT].nil? ? nil : Hash[ item_data[GID_DOCTOR_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
         floating_data = Hash[ item_data[GID_FLOATING].map{ |k,v| [k.to_i, v] }.select{ |i| i[0] < CUSTOM_FIELD_IDS_START_AT } ]
 
         result.push Osm::Member.new(
@@ -189,7 +189,7 @@ module Osm
           :finished_section => Osm::parse_date(item['end_date']),
           :joined_movement => Osm::parse_date(item['started']),
           :gender => {'male'=>:male, 'female'=>:female, 'other'=>:other, 'unspecified'=>:unspecified}[(floating_data[CID_GENDER] || '').downcase],
-          :contact => MemberContact.new(
+          :contact => member_contact.nil? ? nil : MemberContact.new(
             first_name: item['first_name'],
             last_name: item['last_name'],
             address_1: member_contact[CID_ADDRESS_1],
@@ -208,7 +208,7 @@ module Osm
             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] || DirtyHashy.new,
           ),
-          :primary_contact => PrimaryContact.new(
+          :primary_contact => primary_contact.nil? ? nil : PrimaryContact.new(
             first_name: primary_contact[CID_FIRST_NAME],
             last_name: primary_contact[CID_LAST_NAME],
             address_1: primary_contact[CID_ADDRESS_1],
@@ -227,7 +227,7 @@ module Osm
             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] || DirtyHashy.new,
           ),
-          :secondary_contact => PrimaryContact.new(
+          :secondary_contact => secondary_contact.nil? ? nil : PrimaryContact.new(
             first_name: secondary_contact[CID_FIRST_NAME],
             last_name: secondary_contact[CID_LAST_NAME],
             address_1: secondary_contact[CID_ADDRESS_1],
@@ -246,7 +246,7 @@ module Osm
             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] || DirtyHashy.new,
           ),
-          :emergency_contact => EmergencyContact.new(
+          :emergency_contact => emergency_contact.nil? ? nil : EmergencyContact.new(
             first_name: emergency_contact[CID_FIRST_NAME],
             last_name: emergency_contact[CID_LAST_NAME],
             address_1: emergency_contact[CID_ADDRESS_1],
@@ -261,7 +261,7 @@ module Osm
             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] || DirtyHashy.new,
           ),
-          :doctor => DoctorContact.new(
+          :doctor => doctor_contact.nil? ? nil : DoctorContact.new(
             first_name: doctor_contact[CID_FIRST_NAME],
             last_name: doctor_contact[CID_LAST_NAME],
             surgery: doctor_contact[CID_SURGERY],

data/spec/osm/member_spec.rb

@@ -103,6 +103,7 @@ describe "Member" do
     Osm::Member.new(gender: nil).female?.should == false
   end
 
+
   describe "Tells if the member is currently in the section" do
     it "Today" do
       Osm::Member.new(started_section: Date.yesterday).current?.should == true
@@ -149,7 +150,7 @@ describe "Member" do
         'error' => nil,
         'data' => {
           '123' => {
-            'acive' => true,
+            'active' => true,
             'age' => '12 / 00',
             'date_of_birth' => '2000-03-08',
             'end_date' => '2010-06-03',
@@ -357,6 +358,60 @@ describe "Member" do
       member.valid?.should == true
     end
 
+    it "Get from OSM (handles disabled contacts)" do
+      body = {
+        'status' => true,
+        'error' => nil,
+        'data' => {
+          '123' => {
+            'active' => true,
+            'age' => '12 / 00',
+            'date_of_birth' => '2000-03-08',
+            'end_date' => '2010-06-03',
+            'first_name' => 'John',
+            'joined' => '2008-07-12',
+            'last_name' => 'Smith',
+            'member_id' => 123,
+            'patrol' => 'Leaders',
+            'patrol_id' => -2,
+            'patrol_role_level' => 1,
+            'patrol_role_level_label' => 'Assistant leader',
+            'section_id' => 1,
+            'started' => '2006-07-17',
+            'custom_data' => {
+              '5' => {'4848' => 'Data for 4848'},
+              '7' => {'34' => 'Unspecified'},
+            },
+          }
+        },
+        'meta' => {
+          'leader_count' => 20,
+          'member_count' => 30,
+          'status' => true,
+          'structure' => [
+            {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
+              {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+            ]},
+            {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
+              {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+            ]},
+          ],
+        },
+      }
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
+
+      members = Osm::Member.get_for_section(@api, 1, 2)
+      members.size.should == 1
+      member = members[0]
+      member.id.should == 123
+      member.contact.should == nil
+      member.primary_contact.should == nil
+      member.secondary_contact.should == nil
+      member.emergency_contact.should == nil
+      member.doctor.should == nil
+      member.valid?.should == true
+    end
+
     it "Get from OSM (handles an empty data array)" do
       body = {
         'status' => true,

data/spec/validity_validator_spec.rb

@@ -13,6 +13,16 @@ class TestModel
   attribute :item
   validates :item, :validity => true
 end
+class TestModelAllowNil
+  include ActiveAttr::Model
+  attribute :item
+  validates :item, :validity => {allow_nil: true}
+end
+class TestModelDisallowNil
+  include ActiveAttr::Model
+  attribute :item
+  validates :item, :validity => {allow_nil: false}
+end
 
 describe "validity validator" do
 
@@ -29,4 +39,20 @@ describe "validity validator" do
     model.errors.messages.should == {:item => ['must be valid', 'validity attribute is invalid: is not included in the list']}
   end
 
+  describe "Allow nil" do
+
+    it "Is true" do
+      TestModelAllowNil.new(item: TestItem.new(validity: true)).valid?.should == true
+      TestModelAllowNil.new(item: TestItem.new(validity: false)).valid?.should == false
+      TestModelAllowNil.new(item: nil).valid?.should == true
+    end
+
+    it "Is false" do
+      TestModelDisallowNil.new(item: TestItem.new(validity: true)).valid?.should == true
+      TestModelDisallowNil.new(item: TestItem.new(validity: false)).valid?.should == false
+      TestModelDisallowNil.new(item: nil).valid?.should == false
+    end
+
+  end
+
 end

data/version.rb

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

metadata

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