osm 0.1.11 → 0.1.12

data/lib/osm/grouping.rb

@@ -9,7 +9,7 @@ module Osm
     # @!attribute [rw] name
     #   @return [String] the name of the grouping
     # @!attribute [rw] active
-    #   @return [Boolean] wether the grouping is active
+    #   @return [Boolean] whether the grouping is active
     # @!attribute [rw] points
     #   @return [Fixnum] the points awarded to the grouping
 

data/lib/osm/member.rb

@@ -73,7 +73,7 @@ module Osm
     # @!attribute [rw] grouping_id
     #   @return [Fixnum] the grouping within the section that the member belongs to
     # @!attribute [rw] grouping_leader
-    #   @return [Fixnum] wether the member is the grouping leader (0=no, 1=seconder/APL, 2=sixer/PL)
+    #   @return [Fixnum] whether the member is the grouping leader (0=no, 1=seconder/APL, 2=sixer/PL)
     # @!attribute [rw] joined
     #   @return [Date] when the member joined the section
     # @!attribute [rw] age
@@ -127,12 +127,12 @@ module Osm
                     :custom1, :custom2, :custom3, :custom4, :custom5, :custom6, :custom7, :custom8, :custom9,
                     :grouping_id, :grouping_leader, :joined, :age, :joined_years
 
-    validates_numericality_of :id, :only_integer=>true, :greater_than=>0
+    validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :grouping_id, :only_integer=>true, :greater_than_or_equal_to=>-2
     validates_numericality_of :grouping_leader, :only_integer=>true, :greater_than_or_equal_to=>0, :less_than_or_equal_to=>2
-    validates_numericality_of :joined_years, :only_integer=>true, :greater_than_or_equal_to=>-1
-    validates_numericality_of :joining_in_years, :only_integer=>true, :greater_than_or_equal_to=>0
+    validates_numericality_of :joined_years, :only_integer=>true, :greater_than_or_equal_to=>-1, :allow_nil=>true
+    validates_numericality_of :joining_in_years, :only_integer=>true, :greater_than_or_equal_to=>0, :allow_nil=>true
     validates_presence_of :first_name
     validates_presence_of :last_name
     validates_presence_of :date_of_birth
@@ -199,7 +199,7 @@ module Osm
           :grouping_id => Osm::to_i_or_nil(item['patrolid']),
           :grouping_leader => Osm::to_i_or_nil(item['patrolleader']),
           :joined => Osm::parse_date(item['joined']),
-          :age => item['age'],
+          :age => item['age'].gsub(' ', ''),
           :joined_years => item['yrs'].to_i,
         )
       end
@@ -210,10 +210,122 @@ module Osm
 
 
     # @!method initialize
-    #   Initialize a new Term
+    #   Initialize a new Member
     #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
 
+    # Create the user in OSM
+    # @param [Osm::Api] api The api to use to make the request
+    # @return [Boolan] whether the member was successfully added or not
+    def create(api)
+      raise ObjectIsInvalid, 'member is invalid' unless valid?
+      raise Error, 'the member already exists in OSM' unless id.nil?
+
+      data = api.perform_query("users.php?action=newMember", {
+        'firstname' => first_name,
+        'lastname' => last_name,
+        'dob' => date_of_birth.strftime(Osm::OSM_DATE_FORMAT),
+        'started' => started.strftime(Osm::OSM_DATE_FORMAT),
+        'startedsection' => joined.strftime(Osm::OSM_DATE_FORMAT),
+        'patrolid' => grouping_id,
+        'patrolleader' => grouping_leader,
+        'sectionid' => section_id,
+        'email1' => email1,
+        'email2' => email2,
+        'email3' => email3,
+        'email4' => email4,
+        'phone1' => phone1,
+        'phone2' => phone2,
+        'phone3' => phone3,
+        'phone4' => phone4,
+        'address' => address,
+        'address2' => address2,
+        'parents' => parents,
+        'notes' => notes,
+        'medical' => medical,
+        'religion' => religion,
+        'school' => school,
+        'ethnicity' => ethnicity,
+        'subs' => subs,
+        'custom1' => custom1,
+        'custom2' => custom2,
+        'custom3' => custom3,
+        'custom4' => custom4,
+        'custom5' => custom5,
+        'custom6' => custom6,
+        'custom7' => custom7,
+        'custom8' => custom8,
+        'custom9' => custom9,
+      })
+
+      if (data.is_a?(Hash) && (data['result'] == 'ok') && (data['scoutid'].to_i > 0))
+        self.id = data['scoutid'].to_i
+        # The cached members for the section will be out of date - remove them
+        Osm::Term.get_for_section(api, section_id).each do |term|
+          cache_delete(api, ['members', section_id, term.id])
+        end
+        return true
+      else
+        return false
+      end
+    end
+
+    # Update the user in OSM
+    # @param [Osm::Api] api The api to use to make the request
+    # @return [Boolan] whether the member was successfully updated or not
+    def update(api)
+      raise ObjectIsInvalid, 'member is invalid' unless valid?
+
+      values = {
+        'firstname' => first_name,
+        'lastname' => last_name,
+        'dob' => date_of_birth.strftime(Osm::OSM_DATE_FORMAT),
+        'started' => started.strftime(Osm::OSM_DATE_FORMAT),
+        'startedsection' => joined.strftime(Osm::OSM_DATE_FORMAT),
+        'patrolid' => grouping_id,
+        'patrolleader' => grouping_leader,
+        'email1' => email1,
+        'email2' => email2,
+        'email3' => email3,
+        'email4' => email4,
+        'phone1' => phone1,
+        'phone2' => phone2,
+        'phone3' => phone3,
+        'phone4' => phone4,
+        'address' => address,
+        'address2' => address2,
+        'parents' => parents,
+        'notes' => notes,
+        'medical' => medical,
+        'religion' => religion,
+        'school' => school,
+        'ethnicity' => ethnicity,
+        'subs' => subs,
+        'custom1' => custom1,
+        'custom2' => custom2,
+        'custom3' => custom3,
+        'custom4' => custom4,
+        'custom5' => custom5,
+        'custom6' => custom6,
+        'custom7' => custom7,
+        'custom8' => custom8,
+        'custom9' => custom9,
+      }
+
+      result = true
+      values.each do |column, value|
+        data = api.perform_query("users.php?action=updateMember&dateFormat=generic", {
+          'scoutid' => self.id,
+          'column' => column,
+          'value' => value,
+          'sectionid' => section_id,
+        })
+        result &= (data[column] == value.to_s)
+      end
+
+      return result
+    end
+
     # Get the years element of this scout's age
     # @return [Fixnum] the number of years this scout has been alive
     def age_years

data/lib/osm/register.rb

@@ -80,7 +80,7 @@ module Osm
     # @option data [String] :attendance what to mark the attendance as, one of "Yes", "No" or "Absent"
     # @option data [Fixnum, Array<Fixnum>, Osm::Member, Array<Osm::Member>] :members the members (or their ids) to update
     # @option data [Array<Hash>] :completed_badge_requirements (optional) the badge requirements to mark as completed, selected from the Hash returned by the get_badge_requirements_for_evening method
-    # @return [Boolean] wether the update succedded
+    # @return [Boolean] whether the update succedded
     def self.update_attendance(data={})
       raise ArgumentIsInvalid, ':attendance is invalid' unless ['Yes', 'No', 'Absent'].include?(data[:attendance])
       raise ArgumentIsInvalid, ':section is missing' if data[:section].nil?

data/lib/osm/section.rb

@@ -45,8 +45,8 @@ module Osm
     #   @return [Boolean] whether the section uses the Payments part of My.SCOUT
     # @!attribute [rw] myscout_emails
     #   @return [Hash of Symbol to Boolean] which email addresses are linked to MyScout for each Member
-    # @!attribute [rw] myscout_email_address_send
-    #   @return [String] which email address to send My.SCOUT emails as
+    # @!attribute [rw] myscout_email_address_from
+    #   @return [String] which email address to send My.SCOUT emails as coming from
     # @!attribute [rw] myscout_email_address_copy
     #   @return [String] which email address to send copys of My.SCOUT emails to
     # @!attribute [rw] myscout_badges_partial
@@ -82,9 +82,9 @@ module Osm
     attribute :myscout_badges, :type => Boolean
     attribute :myscout_programme, :type => Boolean
     attribute :myscout_payments, :type => Boolean
-    attribute :myscout_emails, :default => {}# (Hash of Symbol to Boolean)
-    attribute :myscout_email_address_send, :type => String#, blank OK)
-    attribute :myscout_email_address_copy, :type => String#, blank OK)
+    attribute :myscout_emails, :default => {}
+    attribute :myscout_email_address_from, :type => String, :default => ''
+    attribute :myscout_email_address_copy, :type => String, :default => ''
     attribute :myscout_badges_partial, :type => Boolean
     attribute :myscout_programme_summary, :type => Boolean
     attribute :myscout_event_reminder_count, :type => Integer
@@ -97,7 +97,7 @@ module Osm
                     :gocardless, :myscout_events_expires, :myscout_badges_expires,
                     :myscout_programme_expires, :myscout_events, :myscout_badges,
                     :myscout_programme, :myscout_payments, :myscout_emails,
-                    :myscout_email_address_send, :myscout_email_address_copy,
+                    :myscout_email_address_from, :myscout_email_address_copy,
                     :myscout_badges_partial, :myscout_programme_summary,
                     :myscout_event_reminder_count, :myscout_event_reminder_frequency,
                     :myscout_payment_reminder_count, :myscout_payment_reminder_frequency
@@ -205,8 +205,8 @@ module Osm
             :myscout_programme => myscout_data['programme'] == 1,
             :myscout_payments => myscout_data['payments'] == 1,
             :myscout_emails => (myscout_data['emails'] || {}).inject({}) { |n,(k,v)| n[k.to_sym] = v.eql?('true'); n},
-            :myscout_email_address_send => myscout_data['emailAddress'],
-            :myscout_email_address_copy => myscout_data['emailAddressCopy'],
+            :myscout_email_address_from => myscout_data['emailAddress'] ? myscout_data['emailAddress'] : '',
+            :myscout_email_address_copy => myscout_data['emailAddressCopy'] ? myscout_data['emailAddressCopy'] : '',
             :myscout_badges_partial => myscout_data['badgesPartial'] == 1,
             :myscout_programme_summary => myscout_data['programmeSummary'] == 1,
             :myscout_event_reminder_count => myscout_data['eventRemindCount'].to_i,

data/osm.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Osm::VERSION
   s.authors     = ['Robert Gauld']
   s.email       = ['robert@robertgauld.co.uk']
-  s.homepage    = ''
+  s.homepage    = 'https://github.com/robertgauld/osm'
   s.summary     = %q{Use the Online Scout Manager API}
   s.description = %q{Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk) to retrieve and save data.}
 

data/spec/osm/activity_spec.rb

@@ -93,4 +93,29 @@ describe "Using The API" do
     activity.valid?.should be_true
   end
 
+
+    it "Add activity to programme (succeded)" do
+      url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=addActivityToProgramme'
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'meetingdate' => '2000-01-02',
+        'sectionid' => 1,
+        'activityid' => 2,
+        'notes' => 'Notes',
+      }
+
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
+      activity = Osm::Activity.new(:id => 2)
+      activity.add_to_programme(@api, 1, Date.new(2000, 1, 2), 'Notes').should be_true
+    end
+
+    it "Add activity to programme (failed)" do
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
+      activity = Osm::Activity.new(:id => 2)
+      activity.add_to_programme(@api, 1, Date.new(2000, 1, 2), 'Notes').should be_false
+    end
+
 end

data/spec/osm/evening_spec.rb

@@ -88,14 +88,37 @@ describe "Evening" do
         'meetingdate' => '2000-01-02',
         'sectionid' => 1,
         'activityid' => -1,
+        'start' => '2000-01-02',
+        'starttime' => '11:11',
+        'endtime' => '22:22',
+        'title' => 'Title',
       }
 
       Osm::Term.stub(:get_for_section) { [] }
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
-      Osm::Evening.create(@api, 1, Date.new(2000, 1, 2)).should be_true
+      Osm::Evening.create(@api, {
+        :section_id => 1,
+        :meeting_date => Date.new(2000, 1, 2),
+        :start_time => '11:11',
+        :finish_time => '22:22',
+        :title => 'Title',
+      }).should be_true
     end
 
     it "Create an evening (failed)" do
+      Osm::Term.stub(:get_for_section) { [] }
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
+      Osm::Evening.create(@api, {
+        :section_id => 1,
+        :meeting_date => Date.new(2000, 1, 2),
+        :start_time => '11:11',
+        :finish_time => '22:22',
+        :title => 'Title',
+      }).should be_false
+    end
+
+
+    it "Add activity to evening (succeded)" do
       url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=addActivityToProgramme'
       post_data = {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
@@ -104,12 +127,23 @@ describe "Evening" do
         'secret' => 'secret',
         'meetingdate' => '2000-01-02',
         'sectionid' => 1,
-        'activityid' => -1,
+        'activityid' => 2,
+        'notes' => 'Notes',
       }
 
       Osm::Term.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
-      Osm::Evening.create(@api, 1, Date.new(2000, 1, 2)).should be_false
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
+      activity = Osm::Activity.new(:id => 2, :title => 'Title')
+      evening = Osm::Evening.new(:section_id => 1, :meeting_date => Date.new(2000, 1, 2))
+      evening.add_activity(@api, activity, 'Notes').should be_true
+      evening.activities[0].activity_id.should == 2
+    end
+
+    it "Add activity to evening (failed)" do
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
+      activity = Osm::Activity.new(:id => 2, :title => 'Title')
+      evening = Osm::Evening.new(:section_id => 1, :meeting_date => Date.new(2000, 1, 2))
+      evening.add_activity(@api, activity, 'Notes').should be_false
     end
 
 
@@ -154,5 +188,21 @@ describe "Evening" do
       expect{ evening.update(@api) }.to raise_error(Osm::ObjectIsInvalid)
     end
 
+
+    it "Delete an evening" do
+      url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=deleteEvening&eveningid=1&sectionid=2'
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+      }
+      Osm::Term.stub(:get_for_section) { [] }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>''}) }
+
+      evening = Osm::Evening.new(:id=>1, :section_id=>2)
+      evening.delete(@api).should be_true
+    end
+
   end
 end

data/spec/osm/event_spec.rb

@@ -134,7 +134,7 @@ describe "Event" do
       event.reminders.should == false
       event.columns[0].id.should == 'f_1'
       event.columns[0].name.should == 'Name'
-      event.columns[0].parent_label.should == 'Label'
+      event.columns[0].label.should == 'Label'
       event.valid?.should be_true
     end
 
@@ -434,7 +434,10 @@ describe "Event" do
       event = Osm::Event.new(:id => 2, :section_id => 1)
       event.should_not be_nil
       event.add_column(@api, 'Test name', 'Test label').should be_true
-      event.columns.should == [Osm::Event::Column.new(:id=>'f_1', :name=>'Test name', :parent_label=>'Test label')]
+      column = event.columns[0]
+      column.id.should == 'f_1'
+      column.name.should == 'Test name'
+      column.label.should == 'Test label'
     end
 
     it "Add column (failed)" do
@@ -445,6 +448,77 @@ describe "Event" do
       event.add_column(@api, 'Test name', 'Test label').should be_false
     end
 
+
+    it "Update column (succeded)" do
+      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=renameColumn&sectionid=1&eventid=2'
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'columnId' => 'f_1',
+        'columnName' => 'New name',
+        'pL' => 'New label',
+      }
+      body = {
+        'eventid' => '2',
+        'config' => '[{"id":"f_1","name":"New name","pL":"New label"}]'
+      }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>body.to_json}) }
+
+      event = Osm::Event.new(:id => 2, :section_id => 1)
+      event.columns = [Osm::Event::Column.new(:id => 'f_1', :event => event)]
+      column = event.columns[0]
+      column.name = 'New name'
+      column.label = 'New label'
+
+      column.update(@api).should be_true
+
+      column.name.should == 'New name'
+      column.label.should == 'New label'
+      event.columns[0].name.should == 'New name'
+      event.columns[0].label.should == 'New label'
+    end
+
+    it "Update column (failed)" do
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[]"}'}) }
+
+      event = Osm::Event.new(:id => 2, :section_id => 1)
+      column = Osm::Event::Column.new(:id => 'f_1', :event => event)
+      event.columns = [column]
+      column.update(@api).should be_false
+    end
+
+
+    it "Delete column (succeded)" do
+      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=deleteColumn&sectionid=1&eventid=2'
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'columnId' => 'f_1'
+      }
+
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"eventid":"2","config":"[]"}'}) }
+
+      event = Osm::Event.new(:id => 2, :section_id => 1)
+      column = Osm::Event::Column.new(:id => 'f_1', :event => event)
+      event.columns = [column]
+
+      column.delete(@api).should be_true
+      event.columns.should == []
+    end
+
+    it "Delete column (failed)" do
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[{\"id\":\"f_1\"}]"}'}) }
+
+      event = Osm::Event.new(:id => 2, :section_id => 1)
+      column = Osm::Event::Column.new(:id => 'f_1', :event => event)
+      event.columns = [column]
+      column.delete(@api).should be_false
+    end
+
   end
 
 

data/spec/osm/flexi_record_spec.rb

@@ -85,6 +85,190 @@ describe "Flexi Record" do
       fields[3].id.should == 'f_2'
     end
 
+    it "Add field (success)" do
+      url = "https://www.onlinescoutmanager.co.uk/extras.php?action=addColumn&sectionid=1&extraid=2"
+
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'columnName' => 'name',
+      }
+
+      data = {
+        "extraid" => "2",
+        "sectionid" => "1",
+        "name" => "A Flexi Record",
+        "config" => "[{\"id\":\"f_1\",\"name\":\"name\",\"width\":\"150\"}]",
+        "total" => "none",
+        "extrafields" => "[]",
+        "structure" => [
+          {
+            "rows" => [
+              {"name" => "First name","field" => "firstname","width" => "150px"},
+              {"name" => "Last name","field" => "lastname","width" => "150px"},
+            ],
+            "noscroll" => true
+          },
+          {"rows" => [
+            {"name" => "name","field" => "f_1","width" => "150px","editable" => true},
+          ]}
+        ]
+      }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      Osm::FlexiRecord.add_field(@api, 1, 2, 'name').should be_true
+    end
+
+    it "Add field (failure)" do
+      data = {
+        "extraid" => "2",
+        "sectionid" => "1",
+        "name" => "A Flexi Record",
+        "config" => "[]",
+        "total" => "none",
+        "extrafields" => "[]",
+        "structure" => [
+          {
+            "rows" => [
+              {"name" => "First name","field" => "firstname","width" => "150px"},
+              {"name" => "Last name","field" => "lastname","width" => "150px"},
+            ],
+            "noscroll" => true
+          },
+          {"rows" => [
+          ]}
+        ]
+      }
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      Osm::FlexiRecord.add_field(@api, 1, 2, 'name').should be_false
+    end
+
+    it "Update field (success)" do
+      url = "https://www.onlinescoutmanager.co.uk/extras.php?action=renameColumn&sectionid=1&extraid=2"
+
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'columnId' => 'f_1',
+        'columnName' => 'name',
+      }
+
+      data = {
+        "extraid" => "2",
+        "sectionid" => "1",
+        "name" => "A Flexi Record",
+        "config" => "[{\"id\":\"f_1\",\"name\":\"name\",\"width\":\"150\"}]",
+        "total" => "none",
+        "extrafields" => "[]",
+        "structure" => [
+          {
+            "rows" => [
+              {"name" => "First name","field" => "firstname","width" => "150px"},
+              {"name" => "Last name","field" => "lastname","width" => "150px"},
+            ],
+            "noscroll" => true
+          },
+          {"rows" => [
+            {"name" => "name","field" => "f_1","width" => "150px","editable" => true},
+          ]}
+        ]
+      }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      Osm::FlexiRecord.update_field(@api, 1, 2, 'f_1', 'name').should be_true
+    end
+
+    it "Update field (failure)" do
+      data = {
+        "extraid" => "2",
+        "sectionid" => "1",
+        "name" => "A Flexi Record",
+        "config" => "[]",
+        "total" => "none",
+        "extrafields" => "[]",
+        "structure" => [
+          {
+            "rows" => [
+              {"name" => "First name","field" => "firstname","width" => "150px"},
+              {"name" => "Last name","field" => "lastname","width" => "150px"},
+            ],
+            "noscroll" => true
+          },
+          {"rows" => [
+          ]}
+        ]
+      }
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      Osm::FlexiRecord.update_field(@api, 1, 2, 'f_1', 'name').should be_false
+    end
+
+
+    it "Delete field (success)" do
+      url = "https://www.onlinescoutmanager.co.uk/extras.php?action=deleteColumn&sectionid=1&extraid=2"
+
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'columnId' => 'f_1',
+      }
+
+      data = {
+        "extraid" => "2",
+        "sectionid" => "1",
+        "name" => "A Flexi Record",
+        "config" => "[]",
+        "total" => "none",
+        "extrafields" => "[]",
+        "structure" => [
+          {
+            "rows" => [
+              {"name" => "First name","field" => "firstname","width" => "150px"},
+              {"name" => "Last name","field" => "lastname","width" => "150px"},
+            ],
+            "noscroll" => true
+          },
+          {"rows" => []}
+        ]
+      }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      Osm::FlexiRecord.delete_field(@api, 1, 2, 'f_1').should be_true
+    end
+
+    it "Delete field (failure)" do
+      data = {
+        "extraid" => "2",
+        "sectionid" => "1",
+        "name" => "A Flexi Record",
+        "config" => "[{\"id\":\"f_1\",\"name\":\"name\",\"width\":\"150\"}]",
+        "total" => "none",
+        "extrafields" => "[]",
+        "structure" => [
+          {
+            "rows" => [
+              {"name" => "First name","field" => "firstname","width" => "150px"},
+              {"name" => "Last name","field" => "lastname","width" => "150px"},
+            ],
+            "noscroll" => true
+          },
+          {"rows" => [
+          ]}
+        ]
+      }
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      Osm::FlexiRecord.delete_field(@api, 1, 2, 'f_1').should be_false
+    end
+
+
     it "Fetch Data" do
       data = {
         'identifier' => 'scoutid',
@@ -125,6 +309,47 @@ describe "Flexi Record" do
     end
 
 
+    it "Update data (success)" do
+      url = "https://www.onlinescoutmanager.co.uk/extras.php?action=updateScout"
+
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'termid' => 1,
+        'scoutid' => 2,
+        'column' => 'f_1',
+        'value' => 'value',
+        'sectionid' => 3,
+        'extraid' => 4,
+      }
+
+      data = {
+        'items' => [
+          {'f_1' => 'value', 'scoutid' => '2'},
+        ]
+      }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+      Osm::Term.stub(:get_current_term_for_section) { Osm::Term.new(:id => 1) }
+
+      Osm::FlexiRecord.update_data(@api, 3, 4, 2, 'f_1', 'value').should be_true
+    end
+
+    it "Update data (failed)" do
+      data = {
+        'items' => [
+          {'f_1' => 'old value', 'scoutid' => '2'},
+        ]
+      }
+
+      HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+      Osm::Term.stub(:get_current_term_for_section) { Osm::Term.new(:id => 1) }
+
+      Osm::FlexiRecord.update_data(@api, 3, 4, 2, 'f_1', 'value').should be_false
+    end
+
+
     it "Handles the total row" do
       data = {
         'identifier' => 'scoutid',