osm 1.2.18.dev.9 → 1.2.18.dev.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWZhOTg0ZjAwNzk1YjE3ZmY0YTJlNjI0ZWRjZmFiMWFkMTc5YTk1OQ==
+    NjE5NjExMzM1NDIwMDc5OWQxYjRkNmM2MWE3YzBkZTNlOGE4ZGQ4Nw==
   data.tar.gz: !binary |-
-    MGQ3M2MyNTk0MWRlNjNkMmYwNWU2OTc4MjBhYjAxMmQ4OGUxZjE1Nw==
+    MWU4NzAwZDE0ZjVkYzhmOGYyNDQwZmZjNGE3MTVlYThlNzFmYzIzMA==
 SHA512:
   metadata.gz: !binary |-
-    ZDkwMjA5NTYyYTRiMTEzMGNiMzNhNzFiM2E2MTEwZmQwNDc1NjE3NDcyYjM2
-    ZTcxNGQwOTE5YjFhMTU5ZmMyMWQxODNmMTExN2MyNDNjMWIwY2ExMjYxNDdh
-    OTM3ZmQ3NWEyOWJlMmUxMGMyM2QzMmE4MmE1M2FhNjc1NDIzYzM=
+    MmZkZDQ4YjFmMmVkNWY4NGQ0MzFlNzAyZGE0NGRhOTVlYjhkMDdhYjVlNzVh
+    NmE2YjYzYWY1ZDYyMzUzNzY2ZTcwODg2MzIzZDU5ZjM5YWViMWJiN2Q4ZTA1
+    ZGQ2ZGFiYzFmOWViZDE4MDJkMGRhMWI0NDJkM2FkNzI2ODE5NWY=
   data.tar.gz: !binary |-
-    YzhjNDRkZWVlNjdlZjljYWU2ODkyNDZjODliODllYzcyZmI4Y2RiYTBhNTQx
-    MGRiZWM5YzMyMWI4NzJmYTJhYzc1YzgzNTMxZWMwZmIxM2MzNTcwNGNiNGFk
-    MDc2OWMzMDFiNTIxNmUwYjE3YTQzMGM4ODQ2YTc4MWUwZmI1ZDc=
+    ZWVlN2YyZDRhY2U4OTJiNzcwNzgxZDRlN2RmOWYwODkzYTI3NDA0Yzc4YmE0
+    NjBiZWUxNDQzMDQ0ZWY1NjRlYTRkM2VhZmNhZjlhOGY5NjY2NDdmOTI0M2Yy
+    MTM3MzQ3YTkwZmM1OTA4MDBhOWMzY2I4ZGE0N2IzYmEzMmUyNmI=

data/CHANGELOG.md

@@ -14,6 +14,7 @@
       * grouping_leader
       * age
     * Addition of attibutes:
+      * title (String)
       * gender (Symbol - :male, :female, :other or :unspecified)
       * finished_section (Date, nil)
       * additional_information (DirtyHashy) - The customisable data part from OSM

data/lib/osm/member.rb

@@ -11,9 +11,7 @@ module Osm
     GID_FLOATING = 7
 
     # Constants for column id
-    CUSTOM_FIELD_IDS_START_AT = 55
-    CORE_FIELD_IDS_FINISH_AT = CUSTOM_FIELD_IDS_START_AT - 1
-    CORE_FIELD_IDS = (1..54).to_a
+    CID_TITLE = 1
     CID_FIRST_NAME = 2
     CID_LAST_NAME = 3
     CID_ADDRESS_1 = 7
@@ -31,12 +29,15 @@ module Osm
     CID_RECIEVE_PHONE_2 = 21
     CID_GENDER = 34
     CID_SURGERY = 54
+    CORE_FIELD_IDS = (1..21).to_a + [34, 54]
 
 
     # @!attribute [rw] id
     #   @return [Fixnum] the id for the member
     # @!attribute [rw] section_id
     #   @return [Fixnum] the section the member belongs to
+    # @!attribute [rw] title
+    #   @return [String] the member's title (Mr, Mrs etc.)
     # @!attribute [rw] first_name
     #   @return [String] the member's first name
     # @!attribute [rw] last_name
@@ -78,6 +79,7 @@ module Osm
 
     attribute :id, :type => Integer
     attribute :section_id, :type => Integer
+    attribute :title, :type => String
     attribute :first_name, :type => String
     attribute :last_name, :type => String
     attribute :grouping_id, :type => Integer
@@ -99,7 +101,8 @@ module Osm
     attribute :doctor, :type => Object
 
     if ActiveModel::VERSION::MAJOR < 4
-      attr_accessible :id, :section_id, :first_name, :last_name, :grouping_id, :grouping_leader,
+      attr_accessible :id, :section_id, :title, :first_name, :last_name,
+                      :grouping_id, :grouping_leader,
                       :date_of_birth, :started_section, :finished_section, :joined_movement, :age,
                       :grouping_label, :grouping_leader_label, :gender,
                       :additional_information, :additional_information_labels,
@@ -162,29 +165,29 @@ module Osm
       var_names = {}
       structure.each do |gid, group|
         columns = group['columns'] || []
-        columns.select!{ |a| (gid == GID_CUSTOM) || (a['column_id'].to_i > CORE_FIELD_IDS_FINISH_AT) }
-        custom_labels[gid.to_i] = Hash[ columns.map{ |c| [c['varname'], c['label']] } ]
+        custom_labels[gid.to_i] = Hash[ columns.map.select{ |a| gid.eql?(GID_CUSTOM) || !CORE_FIELD_IDS.include?(a['column_id'].to_i) }.map{ |c| [c['varname'], c['label']] } ]
         var_names[gid.to_i] = DirtyHashy[ columns.map{ |c| [c['column_id'].to_i, c['varname']] } ]
       end
 
       data.each do |item|
         item_data = Hash[ item['custom_data'].map{ |k,v| [k.to_i, v] } ]
-        member_contact = item_data[GID_MEMBER_CONTACT].nil? ? nil : Hash[ item_data[GID_MEMBER_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| k < CUSTOM_FIELD_IDS_START_AT } ]
-        member_custom = item_data[GID_MEMBER_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_MEMBER_CONTACT].select{ |k,v| k.to_i >= CUSTOM_FIELD_IDS_START_AT }.map{ |k,v| [var_names[GID_MEMBER_CONTACT][k.to_i], v] } ]
-        primary_contact = item_data[GID_PRIMARY_CONTACT].nil? ? nil : Hash[ item_data[GID_PRIMARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| k < CUSTOM_FIELD_IDS_START_AT } ]
-        primary_custom = item_data[GID_PRIMARY_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_PRIMARY_CONTACT].select{ |k,v| k.to_i >= CUSTOM_FIELD_IDS_START_AT }.map{ |k,v| [var_names[GID_PRIMARY_CONTACT][k.to_i], v] } ]
-        secondary_contact = item_data[GID_SECONDARY_CONTACT].nil? ? nil : Hash[ item_data[GID_SECONDARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| k < CUSTOM_FIELD_IDS_START_AT } ]
-        secondary_custom = item_data[GID_SECONDARY_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_SECONDARY_CONTACT].select{ |k,v| k.to_i >= CUSTOM_FIELD_IDS_START_AT }.map{ |k,v| [var_names[GID_SECONDARY_CONTACT][k.to_i], v] } ]
-        emergency_contact = item_data[GID_EMERGENCY_CONTACT].nil? ? nil : Hash[ item_data[GID_EMERGENCY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| k < CUSTOM_FIELD_IDS_START_AT } ]
-        emergency_custom = item_data[GID_EMERGENCY_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_EMERGENCY_CONTACT].select{ |k,v| k.to_i >= CUSTOM_FIELD_IDS_START_AT }.map{ |k,v| [var_names[GID_EMERGENCY_CONTACT][k.to_i], v] } ]
-        doctor_contact = item_data[GID_DOCTOR_CONTACT].nil? ? nil : Hash[ item_data[GID_DOCTOR_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| k < CUSTOM_FIELD_IDS_START_AT } ]
-        doctor_custom = item_data[GID_DOCTOR_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_DOCTOR_CONTACT].select{ |k,v| k.to_i >= CUSTOM_FIELD_IDS_START_AT }.map{ |k,v| [var_names[GID_DOCTOR_CONTACT][k.to_i], v] } ]
-        floating_data = item_data[GID_FLOATING].nil? ? {} : Hash[ item_data[GID_FLOATING].map{ |k,v| [k.to_i, v] }.select{ |k,v| k < 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{ |k,v| CORE_FIELD_IDS.include?(k) } ]
+        member_custom = item_data[GID_MEMBER_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_MEMBER_CONTACT].select{ |k,v| !(CORE_FIELD_IDS - [CID_TITLE]).include?(k.to_i) }.map{ |k,v| [var_names[GID_MEMBER_CONTACT][k.to_i], v] } ]
+        primary_contact = item_data[GID_PRIMARY_CONTACT].nil? ? nil : Hash[ item_data[GID_PRIMARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| CORE_FIELD_IDS.include?(k) } ]
+        primary_custom = item_data[GID_PRIMARY_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_PRIMARY_CONTACT].select{ |k,v| !CORE_FIELD_IDS.include?(k.to_i) }.map{ |k,v| [var_names[GID_PRIMARY_CONTACT][k.to_i], v] } ]
+        secondary_contact = item_data[GID_SECONDARY_CONTACT].nil? ? nil : Hash[ item_data[GID_SECONDARY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| CORE_FIELD_IDS.include?(k) } ]
+        secondary_custom = item_data[GID_SECONDARY_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_SECONDARY_CONTACT].select{ |k,v| !CORE_FIELD_IDS.include?(k.to_i) }.map{ |k,v| [var_names[GID_SECONDARY_CONTACT][k.to_i], v] } ]
+        emergency_contact = item_data[GID_EMERGENCY_CONTACT].nil? ? nil : Hash[ item_data[GID_EMERGENCY_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| CORE_FIELD_IDS.include?(k) } ]
+        emergency_custom = item_data[GID_EMERGENCY_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_EMERGENCY_CONTACT].select{ |k,v| !CORE_FIELD_IDS.include?(k.to_i) }.map{ |k,v| [var_names[GID_EMERGENCY_CONTACT][k.to_i], v] } ]
+        doctor_contact = item_data[GID_DOCTOR_CONTACT].nil? ? nil : Hash[ item_data[GID_DOCTOR_CONTACT].map{ |k,v| [k.to_i, v] }.select{ |k,v| CORE_FIELD_IDS.include?(k) } ]
+        doctor_custom = item_data[GID_DOCTOR_CONTACT].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_DOCTOR_CONTACT].select{ |k,v| !CORE_FIELD_IDS.include?(k.to_i) }.map{ |k,v| [var_names[GID_DOCTOR_CONTACT][k.to_i], v] } ]
+        floating_data = item_data[GID_FLOATING].nil? ? {} : Hash[ item_data[GID_FLOATING].map{ |k,v| [k.to_i, v] }.select{ |k,v| CORE_FIELD_IDS.include?(k) } ]
         custom_data = item_data[GID_CUSTOM].nil? ? DirtyHashy.new : DirtyHashy[ item_data[GID_CUSTOM].map{ |k,v| [var_names[GID_CUSTOM][k.to_i], v] } ]
 
         result.push Osm::Member.new(
           :id => Osm::to_i_or_nil(item['member_id']),
           :section_id => Osm::to_i_or_nil(item['section_id']),
+          :title => custom_data['title'],
           :first_name => item['first_name'],
           :last_name => item['last_name'],
           :grouping_id => Osm::to_i_or_nil(item['patrol_id']),
@@ -198,6 +201,7 @@ module Osm
           :joined_movement => Osm::parse_date(item['started']),
           :gender => {'male'=>:male, 'female'=>:female, 'other'=>:other, 'unspecified'=>:unspecified}[(floating_data[CID_GENDER] || '').downcase],
           :contact => member_contact.nil? ? nil : MemberContact.new(
+            title: member_contact[CID_TITLE],
             first_name: item['first_name'],
             last_name: item['last_name'],
             address_1: member_contact[CID_ADDRESS_1],
@@ -217,6 +221,7 @@ module Osm
             additional_information_labels: custom_labels[GID_MEMBER_CONTACT],
           ),
           :primary_contact => primary_contact.nil? ? nil : PrimaryContact.new(
+            title: primary_contact[CID_TITLE],
             first_name: primary_contact[CID_FIRST_NAME],
             last_name: primary_contact[CID_LAST_NAME],
             address_1: primary_contact[CID_ADDRESS_1],
@@ -236,6 +241,7 @@ module Osm
             additional_information_labels: custom_labels[GID_PRIMARY_CONTACT],
           ),
           :secondary_contact => secondary_contact.nil? ? nil : SecondaryContact.new(
+            title: secondary_contact[CID_TITLE],
             first_name: secondary_contact[CID_FIRST_NAME],
             last_name: secondary_contact[CID_LAST_NAME],
             address_1: secondary_contact[CID_ADDRESS_1],
@@ -255,6 +261,7 @@ module Osm
             additional_information_labels: custom_labels[GID_SECONDARY_CONTACT],
           ),
           :emergency_contact => emergency_contact.nil? ? nil : EmergencyContact.new(
+            title: emergency_contact[CID_TITLE],
             first_name: emergency_contact[CID_FIRST_NAME],
             last_name: emergency_contact[CID_LAST_NAME],
             address_1: emergency_contact[CID_ADDRESS_1],
@@ -270,6 +277,7 @@ module Osm
             additional_information_labels: custom_labels[GID_EMERGENCY_CONTACT],
           ),
           :doctor => doctor_contact.nil? ? nil : DoctorContact.new(
+            title: doctor_contact[CID_TITLE],
             first_name: doctor_contact[CID_FIRST_NAME],
             last_name: doctor_contact[CID_LAST_NAME],
             surgery: doctor_contact[CID_SURGERY],
@@ -280,11 +288,11 @@ module Osm
             postcode: doctor_contact[CID_POSTCODE],
             phone_1: doctor_contact[CID_PHONE_1],
             phone_2: doctor_contact[CID_PHONE_2],
-            additional_information:doctor_custom,
+            additional_information: doctor_custom,
             additional_information_labels: custom_labels[GID_DOCTOR_CONTACT],
           ),
-          additional_information: custom_data,
-          additional_information_labels: custom_labels[GID_CUSTOM],
+          additional_information: custom_data.select{ |k,v| ! ['title'].include?(k) },
+          additional_information_labels: custom_labels[GID_CUSTOM].select{ |k,v| ! ['title'].include?(k) },
         )
       end
 
@@ -362,6 +370,20 @@ module Osm
         updated = updated && data.is_a?(Hash) && data['ok'].eql?(true)
       end # each attr to update
 
+      # Do title attribute
+      if force || changed_attributes.include?('title')
+        data = api.perform_query("ext/members/contact/?action=update", {
+          'associated_id' => self.id,
+          'associated_type' => 'member',
+          'value' => title,
+          'column_id' => CID_TITLE,
+          'group_id' => GID_CUSTOM,
+          'context' => 'members',
+        })
+        updated = updated && data.is_a?(Hash) && data['data'].is_a?(Hash) && data['data']['value'].eql?(title)
+      end
+
+
       # Do 'floating' attributes
       if force || changed_attributes.include?('gender')
         new_value = {male: 'Male', female: 'Female', other: 'Other'}[gender] || 'Unspecified'
@@ -422,10 +444,10 @@ module Osm
     end
 
     # Get the full name
-    # @param [String] seperator What to split the scout's first name and last name with
+    # @param [String] seperator What to split the member's title, first name and last name with
     # @return [String] this scout's full name seperated by the optional seperator
     def name(seperator=' ')
-      return "#{first_name}#{seperator.to_s}#{last_name}"
+      return [(title? ? "#{title}." : nil), first_name, last_name].select{ |i| !i.blank? }.join(seperator)
     end
 
     # Check if the member is in the leaders grouping
@@ -613,6 +635,8 @@ module Osm
 
 
     class Contact < Osm::Model
+      # @!attribute [rw] title
+      #   @return [String] the contact's title (Mr, Ms, Dr etc.)
       # @!attribute [rw] first_name
       #   @return [String] the contact's first name
       # @!attribute [rw] last_name
@@ -636,6 +660,7 @@ module Osm
       # @!attribute [rw] additional_information_labels
       #   @return [DirtyHashy] the labels for the additional information (key is OSM's variable name, value is the label)
 
+      attribute :title, :type => String
       attribute :first_name, :type => String
       attribute :last_name, :type => String
       attribute :address_1, :type => String
@@ -649,7 +674,8 @@ module Osm
       attribute :additional_information_labels, :type => Object, :default => DirtyHashy.new
 
       if ActiveModel::VERSION::MAJOR < 4
-        attr_accessible :first_name, :last_name, :address_1, :address_2, :address_3, :address_4,
+        attr_accessible :title, :first_name, :last_name,
+                        :address_1, :address_2, :address_3, :address_4,
                         :postcode, :phone_1, :phone_2,
                         :additional_information, :additional_information_labels
       end
@@ -659,10 +685,10 @@ module Osm
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
       # Get the full name
-      # @param [String] seperator What to split the scout's first name and last name with
+      # @param [String] seperator What to split the contact's title, first name and last name with
       # @return [String] this scout's full name seperated by the optional seperator
       def name(seperator=' ')
-        return "#{first_name}#{seperator.to_s}#{last_name}"
+        return [(title? ? "#{title}." : nil), first_name, last_name].select{ |i| !i.blank? }.join(seperator)
       end
 
       # Get an array of all phone numbers for the contact
@@ -682,6 +708,7 @@ module Osm
         require_ability_to(api, :write, :member, member.section_id)
 
         attribute_map = {
+          'title' => 'data[title]',
           'first_name' => 'data[firstname]',
           'last_name' => 'data[lastname]',
           'surgery' => 'data[surgery]',
@@ -828,39 +855,21 @@ module Osm
         attr_accessible :email_1, :email_2
       end
 
-      # Get the full name
-      # @param [String] seperator What to split the scout's first name and last name with
-      # @return [String] this scout's full name seperated by the optional seperator
-      def name(seperator=' ')
-        return "#{first_name}#{seperator.to_s}#{last_name}"
-      end
     end # class EmergencyContact
 
 
     class DoctorContact < Osm::Member::Contact
       GROUP_ID = Osm::Member::GID_DOCTOR_CONTACT
 
-      # @!attribute [rw] first_name
-      #   @return [String] the contact's first name
-      # @!attribute [rw] last_name
-      #   @return [String] the contact's last name
       # @!attribute [rw] surgery
       #   @return [String] the surgery name
 
-      attribute :first_name, :type => String
-      attribute :last_name, :type => String
       attribute :surgery, :type => String
 
       if ActiveModel::VERSION::MAJOR < 4
-        attr_accessible :first_name, :last_name, :surgery
+        attr_accessible :surgery
       end
 
-      # Get the full name
-      # @param [String] seperator What to split the scout's first name and last name with
-      # @return [String] this scout's full name seperated by the optional seperator
-      def name(seperator=' ')
-        return "Dr. #{first_name}#{seperator.to_s}#{last_name}"
-      end
     end # class DoctorContact
 
   end # Class Member

data/spec/osm/member_spec.rb

@@ -7,6 +7,7 @@ describe "Member" do
     attributes = {
       :id => 1,
       :section_id => 2,
+      :title => 'Title',
       :first_name => 'First',
       :last_name => 'Last',
       :date_of_birth => '2000-01-02',
@@ -31,6 +32,7 @@ describe "Member" do
 
     member.id.should == 1
     member.section_id.should == 2
+    member.title.should == 'Title'
     member.first_name.should == 'First'
     member.last_name.should == 'Last'
     member.date_of_birth.should == Date.new(2000, 1, 2)
@@ -54,17 +56,25 @@ describe "Member" do
   end
 
 
-  it "Provides member's full name" do
-    data = {
-      :first_name => 'First',
-      :last_name => 'Last',
-    }
-    member = Osm::Member.new(data)
+  describe "Provides full name" do
+
+    it "Member" do
+      Osm::Member.new(first_name: 'First').name.should == 'First'
+      Osm::Member.new(first_name: 'First', last_name: 'Last').name.should == 'First Last'
+      Osm::Member.new(title: 'Mr', first_name: 'First', last_name: 'Last').name.should == 'Mr. First Last'
+      Osm::Member.new(title: 'Mr', first_name: 'First', last_name: 'Last').name('*').should == 'Mr.*First*Last'
+    end
+
+    it "Contact" do
+      Osm::Member::Contact.new(first_name: 'First').name.should == 'First'
+      Osm::Member::Contact.new(first_name: 'First', last_name: 'Last').name.should == 'First Last'
+      Osm::Member::Contact.new(title: 'Mr', first_name: 'First', last_name: 'Last').name.should == 'Mr. First Last'
+      Osm::Member::Contact.new(title: 'Mr', first_name: 'First', last_name: 'Last').name('*').should == 'Mr.*First*Last'
+    end
 
-    member.name.should == 'First Last'
-    member.name('_').should == 'First_Last'
   end
 
+
   it "Tells if member is a leader" do
     Osm::Member.new(grouping_id: -2).leader?.should == true  # In the leader grouping
     Osm::Member.new(grouping_id: 2).leader?.should == false  # In a youth grouping
@@ -167,11 +177,11 @@ describe "Member" do
               'section_id' => 1,
               'started' => '2006-07-17',
               'custom_data' => {
-                '1' => {'2' => 'Primary', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'primary@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8441' => 'Data for 8441'},
+                '1' => {'1' => 'Mrs', '2' => 'Primary', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'primary@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8441' => 'Data for 8441'},
                 '2' => {'2' => 'Secondary', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'secondary@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8442' => 'Data for 8442'},
                 '3' => {'2' => 'Emergency', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'emergency@example.com', '14' => '', '18' => '01234 567890', '20' => '0987 654321', '21' => '', '8443' => 'Data for 8443'},
-                '4' => {'2' => 'Doctor', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '18' => '01234 567890', '20' => '0987 654321', '21' => '', '54' => 'Surgery', '8444' => 'Data for 8444'},
-                '5' => {'4848' => 'Data for 4848'},
+                '4' => {'1' => 'Dr', '2' => 'Doctor', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '18' => '01234 567890', '20' => '0987 654321', '21' => '', '54' => 'Surgery', '8444' => 'Data for 8444'},
+                '5' => {'1' => 'Mr', '4848' => 'Data for 4848'},
                 '6' => {'7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'member@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8446' => 'Data for 8446'},
                 '7' => {'34' => 'Unspecified'},
               },
@@ -252,6 +262,7 @@ describe "Member" do
                 {'column_id' => 8446, 'group_column_id' => '6_8446', 'label' => 'Label for 8446', 'varname' => 'label_for_8446', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
               ]},
               {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
+                {'column_id' => 1, 'group_column_id' => '5_1', 'label' => 'Title', 'varname' => 'title', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
                 {'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' => [
@@ -267,6 +278,7 @@ describe "Member" do
         member = members[0]
         member.id.should == 123
         member.section_id.should == 1
+        member.title.should == 'Mr'
         member.first_name.should == 'John'
         member.last_name.should == 'Smith'
         member.date_of_birth.should == Date.new(2000, 3, 8)
@@ -298,6 +310,7 @@ describe "Member" do
         member.contact.receive_email_2.should == false
         member.contact.additional_information.should == {"label_for_8446"=>"Data for 8446"}
         member.contact.additional_information_labels.should == {"label_for_8446"=>"Label for 8446"}
+        member.primary_contact.title.should == 'Mrs'
         member.primary_contact.first_name.should == 'Primary'
         member.primary_contact.last_name.should == 'Contact'
         member.primary_contact.address_1.should == 'Address 1'
@@ -345,6 +358,7 @@ describe "Member" do
         member.emergency_contact.email_2.should == ''
         member.emergency_contact.additional_information.should == {"label_for_8443"=>"Data for 8443"}
         member.emergency_contact.additional_information_labels.should == {"label_for_8443"=>"Label for 8443"}
+        member.doctor.title.should == 'Dr'
         member.doctor.first_name.should == 'Doctor'
         member.doctor.last_name.should == 'Contact'
         member.doctor.surgery.should == 'Surgery'
@@ -532,6 +546,7 @@ describe "Member" do
       before :each do
         attributes = {
           :section_id => 2,
+          :title => 'Title',
           :first_name => 'First',
           :last_name => 'Last',
           :date_of_birth => '2000-01-02',
@@ -619,6 +634,7 @@ describe "Member" do
         attributes = {
           :id => 1,
           :section_id => 2,
+          :title => 'Title',
           :first_name => 'First',
           :last_name => 'Last',
           :date_of_birth => '2000-01-02',
@@ -805,6 +821,7 @@ describe "Member" do
             "associated_type" => "member",
             "associated_id" => 1,
             "group_id" => group_id,
+            "data[title]" => nil,
             "data[firstname]" => nil,
             "data[lastname]" => nil,
             "data[address1]" => nil,
@@ -832,6 +849,7 @@ describe "Member" do
           "associated_type" => "member",
           "associated_id" => 1,
           "group_id" => 3,
+          "data[title]" => nil,
           "data[firstname]" => nil,
           "data[lastname]" => nil,
           "data[address1]" => nil,
@@ -854,6 +872,7 @@ describe "Member" do
           "associated_type" => "member",
           "associated_id" => 1,
           "group_id" => 4,
+          "data[title]" => nil,
           "data[firstname]" => nil,
           "data[lastname]" => nil,
           "data[surgery]" => nil,
@@ -867,6 +886,19 @@ describe "Member" do
           "data[test_var]" => "This is a test",
         }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"status":true}'}) }
 
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/members/contact/?action=update', {:body => {
+          "apiid" => "1",
+          "token" => "API TOKEN",
+          "userid" => "user_id",
+          "secret" => "secret",
+          "context" => "members",
+          "associated_type" => "member",
+          "associated_id" => 1,
+          "group_id" => 5,
+          "column_id" => 1,
+          "value" => "Title",
+        }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"data":{"value":"Title"}}'}) }
+
         Osm::Term.stub(:get_for_section) { [] }
 
         @member.update(@api, true).should == true

data/version.rb

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

metadata

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