osm 0.0.19 → 0.0.20

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Version 0.0.20
+
+  * Start deprecation of api\_data option in Api methods (raise a warning and adjust documentation)
+  * Hide sesitive information when printing data sent to OSM in debug mode
+  * Add archived attribute to Event
+  * Add :include\_archived option to Api.get\_events method
+  * Add retreival of Flexi Records
+  * Make set\_user method of Api public
+
 ## Version 0.0.19
 
   * Fix caching error in Api.get\_register\_data

data/README.md

@@ -73,12 +73,14 @@ however it should be noted that when the OSM API adds a feature it can be diffic
   * API Access for our app
   * Due Badges
   * Events
+  * Flexi Record Data
+  * Flexi Record Structure
   * Groupings (e.g. Sixes, Patrols)
   * Members
   * Notepad
   * Notepads
   * Programme
-  * Register
+  * Register Data
   * Register Structure
   * Roles
   * Section
@@ -93,4 +95,32 @@ however it should be noted that when the OSM API adds a feature it can be diffic
   * Evening
 
 ### Actions
-  * Authorise an app to use the API on a user's behalf
+  * Authorise an app to use the API on a user's behalf
+
+
+## Parts of the OSM API currently NOT supported:
+
+  * Retreival of leader access
+  * Terms:
+    * Create
+    * Update
+  * Register - Update attendance
+  * Flexi Record - Update data
+  * Events:
+    * Attendance (everything)
+    * Create
+    * Update
+  * Member:
+    * Update
+    * Add
+  * Badges:
+    * Which requirements each member has met:
+      * Retreive
+      * Update
+    * Retrieve details for each badge (stock, short column names etc.)
+  * Update Activity
+  * Gift aid (everything)
+  * Finances (Everything)
+  * SMS:
+    * Retreival of delivery reports
+    * Sending a message

data/lib/osm.rb

@@ -6,6 +6,7 @@ module Osm
   OSM_DATE_FORMAT = '%Y-%m-%d'
   OSM_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
   OSM_TIME_REGEX = /\A(?:[0-1][0-9]|2[0-3]):[0-5][0-9]\Z/
+  OSM_DATE_REGEX = /\A\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])\Z/
 end
 
 require File.join(File.dirname(__FILE__), '..', 'version')

data/lib/osm/api.rb

@@ -3,7 +3,7 @@
 #   @option options [Boolean] :no_cache (optional) if true then the data will be retreived from OSM not the cache
 
 # @!macro [new] options_api_data
-#   @param [Hash] api_data
+#   @param [Hash] api_data - DEPRECATED (DO NOT USE THIS OPTION)
 #   @option api_data [String] 'userid' (optional) the OSM userid to make the request as
 #   @option api_data [String] 'secret' (optional) the OSM secret belonging to the above user
 
@@ -102,14 +102,25 @@ module Osm
       return data
     end
 
+    # Set the OSM user to make future requests as
+    # @param [String] userid the OSM userid to use (get this using the authorize method)
+    # @param [String] secret the OSM secret to use (get this using the authorize method)
+    def set_user(userid, secret)
+      @userid = userid
+      @secret = secret
+    end
+
+
     # Get the user's roles
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Osm::Role>]
     def get_roles(options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
+      cache_key = "roles-#{api_data[:userid] || @userid}"
 
-      if !options[:no_cache] && cache_exist?("roles-#{api_data[:userid] || @userid}")
-        return cache_read("roles-#{api_data[:userid] || @userid}")
+      if !options[:no_cache] && cache_exist?(cache_key)
+        return cache_read(cache_key)
       end
 
       data = perform_query('api.php?action=getUserRoles', api_data)
@@ -121,7 +132,7 @@ module Osm
         cache_write("section-#{role.section.id}", role.section, :expires_in => @@default_cache_ttl*2)
         self.user_can_access :section, role.section.id, api_data
       end
-      cache_write("roles-#{api_data[:userid] || @userid}", result, :expires_in => @@default_cache_ttl*2)
+      cache_write(cache_key, result, :expires_in => @@default_cache_ttl*2)
 
       return result
     end
@@ -131,8 +142,11 @@ module Osm
     # @!macro options_api_data
     # @return [Hash] a hash (keys are section IDs, values are a string)
     def get_notepads(options={}, api_data={})
-      if !options[:no_cache] && cache_exist?("notepads-#{api_data[:userid] || @userid}")
-        return cache_read("notepads-#{api_data[:userid] || @userid}")
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
+      cache_key = "notepads-#{api_data[:userid] || @userid}"
+
+      if !options[:no_cache] && cache_exist?(cache_key)
+        return cache_read(cache_key)
       end
 
       notepads = perform_query('api.php?action=getNotepads', api_data)
@@ -144,7 +158,7 @@ module Osm
         cache_write("notepad-#{key}", value, :expires_in => @@default_cache_ttl*2)
       end
 
-      cache_write("notepads-#{api_data[:userid] || @userid}", data, :expires_in => @@default_cache_ttl*2)
+      cache_write(cache_key, data, :expires_in => @@default_cache_ttl*2)
       return data
     end
 
@@ -155,10 +169,12 @@ module Osm
     # @return nil if an error occured or the user does not have access to that section
     # @return [String] the content of the notepad otherwise
     def get_notepad(section, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
+      cache_key = "notepad-#{section_id}"
 
-      if !options[:no_cache] && cache_exist?("notepad-#{section_id}") && self.user_can_access?(:section, section_id, api_data)
-        return cache_read("notepad-#{section_id}")
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:section, section_id, api_data)
+        return cache_read(cache_key)
       end
 
       notepads = get_notepads(options, api_data)
@@ -178,8 +194,11 @@ module Osm
     # @return nil if an error occured or the user does not have access to that section
     # @return [Osm::Section]
     def get_section(section_id, options={}, api_data={})
-      if !options[:no_cache] && cache_exist?("section-#{section_id}") && self.user_can_access?(:section, section_id, api_data)
-        return cache_read("section-#{section_id}")
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
+      cache_key = "section-#{section_id}"
+
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:section, section_id, api_data)
+        return cache_read(cache_key)
       end
 
       roles = get_roles(options, api_data)
@@ -198,10 +217,12 @@ module Osm
     # @!macro options_api_data
     # @return [Array<Osm::Grouping>]
     def get_groupings(section, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
+      cache_key = "groupings-#{section_id}"
 
-      if !options[:no_cache] && cache_exist?("groupings-#{section_id}") && self.user_can_access?(:section, section_id, api_data)
-        return cache_read("groupings-#{section_id}")
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:section, section_id, api_data)
+        return cache_read(cache_key)
       end
 
       data = perform_query("users.php?action=getPatrols&sectionid=#{section_id}", api_data)
@@ -210,10 +231,9 @@ module Osm
       data['patrols'].each do |item|
         grouping = Osm::Grouping.from_api(item)
         result.push grouping
-        cache_write("grouping-#{grouping.id}", grouping, :expires_in => @@default_cache_ttl*2)
         self.user_can_access :grouping, grouping.id, api_data
       end
-      cache_write("groupings-#{section_id}", result, :expires_in => @@default_cache_ttl*2)
+      cache_write(cache_key, result, :expires_in => @@default_cache_ttl*2)
 
       return result
     end
@@ -223,8 +243,11 @@ module Osm
     # @!macro options_api_data
     # @return [Array<Osm::Term>]
     def get_terms(options={}, api_data={})
-      if !options[:no_cache] && cache_exist?("terms-#{api_data[:userid] || @userid}")
-        return cache_read("terms-#{api_data[:userid] || @userid}")
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
+      cache_key = "terms-#{api_data[:userid] || @userid}"
+
+      if !options[:no_cache] && cache_exist?(cache_key)
+        return cache_read(cache_key)
       end
 
       data = perform_query('api.php?action=getTerms', api_data)
@@ -239,7 +262,7 @@ module Osm
         end
       end
 
-      cache_write("terms-#{api_data[:userid] || @userid}", result, :expires_in => @@default_cache_ttl*2)
+      cache_write(cache_key, result, :expires_in => @@default_cache_ttl*2)
       return result
     end
 
@@ -250,8 +273,11 @@ module Osm
     # @return nil if an error occured or the user does not have access to that term
     # @return [Osm::Term]
     def get_term(term_id, options={}, api_data={})
-      if !options[:no_cache] && cache_exist?("term-#{term_id}") && self.user_can_access?(:term, term_id, api_data)
-        return cache_read("term-#{term_id}")
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
+      cache_key = "term-#{term_id}"
+
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:term, term_id, api_data)
+        return cache_read(cache_key)
       end
 
       terms = get_terms(options)
@@ -271,11 +297,13 @@ module Osm
     # @!macro options_api_data
     # @return [Array<Osm::Evening>]
     def get_programme(section, term, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
       term_id = id_for_term(term, section, api_data)
+      cache_key = "programme-#{section_id}-#{term_id}"
 
-      if !options[:no_cache] && cache_exist?("programme-#{section_id}-#{term_id}") && self.user_can_access?(:programme, section_id, api_data)
-        return cache_read("programme-#{section_id}-#{term_id}")
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:programme, section_id, api_data)
+        return cache_read(cache_key)
       end
 
       data = perform_query("programme.php?action=getProgramme&sectionid=#{section_id}&termid=#{term_id}", api_data)
@@ -294,7 +322,7 @@ module Osm
         end
       end
 
-      cache_write("programme-#{section_id}-#{term_id}", result, :expires_in => @@default_cache_ttl)
+      cache_write(cache_key, result, :expires_in => @@default_cache_ttl)
       return result
     end
 
@@ -305,8 +333,11 @@ module Osm
     # @!macro options_api_data
     # @return [Osm::Activity]
     def get_activity(activity_id, version=nil, options={}, api_data={})
-      if !options[:no_cache] && cache_exist?("activity-#{activity_id}-#{version}") && self.user_can_access?(:activity, activity_id, api_data)
-        return cache_read("activity-#{activity_id}-#{version}")
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
+      cache_key = "activity-#{activity_id}-"
+
+      if !options[:no_cache] && cache_exist?("#{cache_key}-#{version}") && self.user_can_access?(:activity, activity_id, api_data)
+        return cache_read("#{cache_key}-#{version}")
       end
 
       data = nil
@@ -317,8 +348,8 @@ module Osm
       end
 
       activity = Osm::Activity.from_api(data)
-      cache_write("activity-#{activity_id}-#{nil}", activity, :expires_in => @@default_cache_ttl*2) if version.nil?
-      cache_write("activity-#{activity_id}-#{activity.version}", activity, :expires_in => @@default_cache_ttl/2)
+      cache_write("#{cache_key}-#{nil}", activity, :expires_in => @@default_cache_ttl*2) if version.nil?
+      cache_write("#{cache_key}-#{activity.version}", activity, :expires_in => @@default_cache_ttl/2)
       self.user_can_access :activity, activity.id, api_data
 
       return activity
@@ -331,11 +362,13 @@ module Osm
     # @!macro options_api_data
     # @return [Array<Osm::Member>]
     def get_members(section, term=nil, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
       term_id = id_for_term(term, section, api_data)
+      cache_key = "members-#{section_id}-#{term_id}"
 
-      if !options[:no_cache] && cache_exist?("members-#{section_id}-#{term_id}") && self.user_can_access?(:member, section_id, api_data)
-        return cache_read("members-#{section_id}-#{term_id}")
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:member, section_id, api_data)
+        return cache_read(cache_key)
       end
 
       data = perform_query("users.php?action=getUserDetails&sectionid=#{section_id}&termid=#{term_id}", api_data)
@@ -345,7 +378,7 @@ module Osm
         result.push Osm::Member.from_api(item)
       end
       self.user_can_access :member, section_id, api_data
-      cache_write("members-#{section_id}-#{term_id}", result, :expires_in => @@default_cache_ttl)
+      cache_write(cache_key, result, :expires_in => @@default_cache_ttl)
 
       return result
     end
@@ -356,10 +389,12 @@ module Osm
     # @!macro options_api_data
     # @return [Array<Osm::ApiAccess>]
     def get_api_access(section, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
+      cache_key = "api_access-#{api_data['userid'] || @userid}-#{section_id}"
 
-      if !options[:no_cache] && cache_exist?("api_access-#{api_data['userid'] || @userid}-#{section_id}")
-        return cache_read("api_access-#{api_data['userid'] || @userid}-#{section_id}")
+      if !options[:no_cache] && cache_exist?(cache_key)
+        return cache_read(cache_key)
       end
 
       data = perform_query("users.php?action=getAPIAccess&sectionid=#{section_id}", api_data)
@@ -371,8 +406,9 @@ module Osm
         self.user_can_access(:programme, section_id, api_data) if this_item.can_read?(:programme)
         self.user_can_access(:member, section_id, api_data) if this_item.can_read?(:member)
         self.user_can_access(:badge, section_id, api_data) if this_item.can_read?(:badge)
-        cache_write("api_access-#{api_data['userid'] || @userid}-#{section_id}-#{this_item.id}", this_item, :expires_in => @@default_cache_ttl*2)
+        cache_write("#{cache_key}-#{this_item.id}", this_item, :expires_in => @@default_cache_ttl*2)
       end
+      cache_write(cache_key, result, :expires_in => @@default_cache_ttl*2)
 
       return result
     end
@@ -383,10 +419,12 @@ module Osm
     # @!macro options_api_data
     # @return [Osm::ApiAccess]
     def get_our_api_access(section, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
+      cache_key = "api_access-#{api_data['userid'] || @userid}-#{section_id}-#{Osm::Api.api_id}"
 
-      if !options[:no_cache] && cache_exist?("api_access-#{api_data['userid'] || @userid}-#{section_id}-#{Osm::Api.api_id}")
-        return cache_read("api_access-#{api_data['userid'] || @userid}-#{section_id}-#{Osm::Api.api_id}")
+      if !options[:no_cache] && cache_exist?(cache_key)
+        return cache_read(cache_key)
       end
 
       data = get_api_access(section_id, options)
@@ -401,27 +439,35 @@ module Osm
     # Get events
     # @param [Osm:Section, Fixnum] section the section (or its ID) to get the events for
     # @!macro options_get
+    # @option options [Boolean] :include_archived (optional) if true then archived activities will also be returned
     # @!macro options_api_data
     # @return [Array<Osm::Event>]
     def get_events(section, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
+      cache_key = "events-#{section_id}"
+      events = nil
 
-      if !options[:no_cache] && cache_exist?("events-#{section_id}") && self.user_can_access?(:programme, section_id, api_data)
-        return cache_read("events-#{section_id}")
-      end
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:programme, section_id, api_data)
+        events = cache_read(cache_key)
+      else
 
-      data = perform_query("events.php?action=getEvents&sectionid=#{section_id}", api_data)
+        data = perform_query("events.php?action=getEvents&sectionid=#{section_id}&showArchived=true", api_data)
 
-      result = Array.new
-      unless data['items'].nil?
-        data['items'].each do |item|
-          result.push Osm::Event.from_api(item)
+        events = Array.new
+        unless data['items'].nil?
+          data['items'].each do |item|
+            events.push Osm::Event.from_api(item)
+          end
         end
+        self.user_can_access :programme, section_id, api_data
+        cache_write(cache_key, events, :expires_in => @@default_cache_ttl)
       end
-      self.user_can_access :programme, section_id, api_data
-      cache_write("events-#{section_id}", result, :expires_in => @@default_cache_ttl)
 
-      return result
+      return events if options[:include_archived]
+      return events.reject do |event|
+        event.archived?
+      end
     end
 
     # Get due badges
@@ -430,19 +476,21 @@ module Osm
     # @!macro options_api_data
     # @return [Osm::DueBadges]
     def get_due_badges(section, term=nil, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
+      section_type = type_for_section(section, api_data)
       term_id = id_for_term(term, section, api_data)
+      cache_key = "due_badges-#{section_id}-#{term_id}"
 
-      if !options[:no_cache] && cache_exist?("due_badges-#{section_id}-#{term_id}") && self.user_can_access?(:badge, section_id, api_data)
-        return cache_read("due_badges-#{section_id}-#{term_id}")
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:badge, section_id, api_data)
+        return cache_read(cache_key)
       end
 
-      section_type = get_section(section_id, api_data).type.to_s
       data = perform_query("challenges.php?action=outstandingBadges&section=#{section_type}&sectionid=#{section_id}&termid=#{term_id}", api_data)
 
       data = Osm::DueBadges.from_api(data)
       self.user_can_access :badge, section_id, api_data
-      cache_write("due_badges-#{section_id}-#{term_id}", data, :expires_in => @@default_cache_ttl*2)
+      cache_write(cache_key, data, :expires_in => @@default_cache_ttl*2)
 
       return data
     end
@@ -454,11 +502,13 @@ module Osm
     # @!macro options_api_data
     # @return [Array<Osm::RegisterField>] representing the fields of the register
     def get_register_structure(section, term=nil, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
       term_id = id_for_term(term, section, api_data)
+      cache_key = "register_structure-#{section_id}-#{term_id}"
 
-      if !options[:no_cache] && cache_exist?("register_structure-#{section_id}-#{term_id}") && self.user_can_access?(:register, section_id, api_data)
-        return cache_read("register_structure-#{section_id}-#{term_id}")
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:register, section_id, api_data)
+        return cache_read(cache_key)
       end
 
       data = perform_query("users.php?action=registerStructure&sectionid=#{section_id}&termid=#{term_id}", api_data)
@@ -470,7 +520,7 @@ module Osm
         end
       end
       self.user_can_access :register, section_id, api_data
-      cache_write("register_structure-#{section_id}-#{term_id}", structure, :expires_in => @@default_cache_ttl/2)
+      cache_write(cache_key, structure, :expires_in => @@default_cache_ttl/2)
 
       return structure
     end
@@ -482,11 +532,13 @@ module Osm
     # @!macro options_api_data
     # @return [Array<RegisterData>] representing the attendance of each member
     def get_register_data(section, term=nil, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
       term_id = id_for_term(term, section, api_data)
+      cache_key = "register-#{section_id}-#{term_id}"
 
-      if !options[:no_cache] && cache_exist?("register-#{section_id}-#{term_id}") && self.user_can_access?(:register, section_id, api_data)
-        return cache_read("register-#{section_id}-#{term_id}")
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:register, section_id, api_data)
+        return cache_read(cache_key)
       end
 
       data = perform_query("users.php?action=register&sectionid=#{section_id}&termid=#{term_id}", api_data)
@@ -497,7 +549,65 @@ module Osm
         to_return.push Osm::RegisterData.from_api(item)
       end
       self.user_can_access :register, section_id, api_data
-      cache_write("register-#{section_id}-#{term_id}", to_return, :expires_in => @@default_cache_ttl/2)
+      cache_write(cache_key, to_return, :expires_in => @@default_cache_ttl/2)
+      return to_return
+    end
+
+    # Get flexirecord structure
+    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the structure for
+    # @param [Fixnum] the id of the Flexi Record
+    # @!macro options_get
+    # @!macro options_api_data
+    # @return [Array<Osm::FlexiRecordField>] representing the fields of the flexi record
+    def get_flexi_record_fields(section, id, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
+      section_id = id_for_section(section)
+      cache_key = "flexi_record_structure-#{section_id}-#{id}"
+
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:flexi, section_id, api_data)
+        return cache_read(cache_key)
+      end
+
+      data = perform_query("extras.php?action=getExtra&sectionid=#{section_id}&extraid=#{id}", api_data)
+
+      structure = []
+      data['structure'].each do |item|
+        item['rows'].each do |row|
+          structure.push Osm::FlexiRecordField.from_api(row)
+        end
+      end
+      self.user_can_access :flexi, section_id, api_data
+      cache_write(cache_key, structure, :expires_in => @@default_cache_ttl/2)
+
+      return structure
+    end
+
+    # Get flexi record data
+    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the register for
+    # @param [Fixnum] the id of the Flexi Record
+    # @param [Osm:Term, Fixnum] section the term (or its ID) to get the register for, passing nil causes the current term to be used
+    # @!macro options_get
+    # @!macro options_api_data
+    # @return [Array<FlexiRecordData>]
+    def get_flexi_record_data(section, id, term=nil, options={}, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
+      section_id = id_for_section(section)
+      section_type = type_for_section(section, api_data)
+      term_id = id_for_term(term, section, api_data)
+      cache_key = "flexi_record_data-#{section_id}-#{term_id}-#{id}"
+
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:flexi, section_id, api_data)
+        return cache_read(cache_key)
+      end
+
+      data = perform_query("extras.php?action=getExtraRecords&sectionid=#{section_id}&extraid=#{id}&termid=#{term_id}&section=#{section_type}", api_data)
+
+      to_return = []
+      data['items'].each do |item|
+        to_return.push Osm::FlexiRecordData.from_api(item)
+      end
+      self.user_can_access :flexi, section_id, api_data
+      cache_write(cache_key, to_return, :expires_in => @@default_cache_ttl/2)
       return to_return
     end
 
@@ -507,6 +617,7 @@ module Osm
     # @!macro options_api_data
     # @return [Boolean] if the operation suceeded or not
     def create_evening(section, meeting_date, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       section_id = id_for_section(section)
       evening_api_data = {
         'meetingdate' => meeting_date.strftime(Osm::OSM_DATE_FORMAT),
@@ -529,6 +640,7 @@ module Osm
     # @!macro options_api_data
     # @return [Boolean] if the operation suceeded or not
     def update_evening(evening, api_data={})
+      warn "[DEPRECATION OF OPTION] use of the api_data option is deprecated." unless api_data == {}
       raise ArgumentIsInvalid, 'evening is invalid' unless evening.valid?
       response = perform_query("programme.php?action=editEvening", api_data.merge(evening.to_api))
 
@@ -577,17 +689,11 @@ module Osm
 
 
     private
-    # Set the OSM user to make future requests as
-    # @param [String] userid the OSM userid to use (get this using the authorize method)
-    # @param [String] secret the OSM secret to use (get this using the authorize method)
-    def set_user(userid, secret)
-      @userid = userid
-      @secret = secret
-    end
-
     # Make the query to the OSM API
     # @param [String] url the script on the remote server to invoke
     # @param [Hash] api_data a hash containing the values to be sent to the server
+    #   @option api_data [String] 'userid' (optional) the OSM userid to make the request as
+    #   @option api_data [String] 'secret' (optional) the OSM secret belonging to the above user
     # @return [Hash, Array, String] the parsed JSON returned by OSM
     def perform_query(url, api_data={})
       api_data['apiid'] = @@api_id
@@ -602,7 +708,9 @@ module Osm
 
       if @@debug
         puts "Making OSM API request to #{url}"
-        puts api_data.to_s
+        hide_values_for = ['secret', 'token']
+        api_data_as_string = api_data.sort.map{ |key, value| "#{key} => #{hide_values_for.include?(key) ? 'PRESENT' : value.inspect}" }.join(', ')
+        puts "{#{api_data_as_string}}"
       end
 
       begin
@@ -676,6 +784,11 @@ module Osm
     def id_for_section(section)
       id_for(Osm::Section, section, 'section')
     end
+
+    def type_for_section(section, api_data)
+      (section.is_a?(Osm::Section) ? section : get_section(section, api_data)).type.to_s
+    end
+
     def id_for_term(term, section, api_data)
       return term.nil? ? Osm::find_current_term_id(self, id_for_section(section), api_data) : id_for(Osm::Term, term, 'term')
     end

data/lib/osm/event.rb

@@ -4,22 +4,23 @@ module Osm
     include ::ActiveAttr::MassAssignmentSecurity
     include ::ActiveAttr::Model
 
-    # @!attribute [r] id
+    # @!attribute [rw] id
     #   @return [Fixnum] the id for the event
-    # @!attribute [r] section_id
+    # @!attribute [rw] section_id
     #   @return [Fixnum] the id for the section
-    # @!attribute [r] name
+    # @!attribute [rw] name
     #   @return [String] the name of the event
-    # @!attribute [r] start
+    # @!attribute [rw] start
     #   @return [DateTime] when the event starts
-    # @!attribute [r] finish
+    # @!attribute [rw] finish
     #   @return [DateTime] when the event ends
-    # @!attribute [r] cost
+    # @!attribute [rw] cost
     #   @return [String] the cost of the event
-    # @!attribute [r] location
+    # @!attribute [rw] location
     #   @return [String] where the event is
-    # @!attribute [r] notes
+    # @!attribute [rw] notes
     #   @return [String] notes about the event
+    # @!attribute [rw] archived
 
     attribute :id, :type => Integer
     attribute :section_id, :type => Integer
@@ -29,8 +30,9 @@ module Osm
     attribute :cost, :type => String, :default => ''
     attribute :location, :type => String, :default => ''
     attribute :notes, :type => String, :default => ''
+    attribute :archived, :type => Boolean, :default => false
 
-    attr_accessible :id, :section_id, :name, :start, :finish, :cost, :location, :notes
+    attr_accessible :id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -53,6 +55,7 @@ module Osm
         :cost => data['cost'],
         :location => data['location'],
         :notes => data['notes'],
+        :archived => data['archived'].eql?('1')
       })
     end
 

data/lib/osm/flexi_record_data.rb

@@ -0,0 +1,68 @@
+module Osm
+
+  class FlexiRecordData
+    include ::ActiveAttr::MassAssignmentSecurity
+    include ::ActiveAttr::Model
+
+    # @!attribute [rw] member_id
+    #   @return [Fixnum] OSM id for the member
+    # @!attribute [rw] first_name
+    #   @return [String] Member's first name
+    # @!attribute [rw] last_name
+    #   @return [String] Member's last name
+    # @!attribute [rw] grouping__id
+    #   @return [Fixnum] OSM id for the grouping the member is in
+    # @!attribute [rw] fields
+    #   @return [Hash] Keys are the field'd id, values are the field values
+    # @!attribute [rw] total
+    #   @return [Fixnum, nil] The total of the field values, nil if the flexi record does not have this column type
+    # @!attribute [rw] completed
+    #   @return [Fixnum, nil] The count of completed fields, nil if the flexi record does not have this column type
+    # @!attribute [rw] date_of_birth
+    #   @return [Date, nil] The member's date of birth, nil if the flexi record does not have this column type
+    # @!attribute [rw] age
+    #   @return [String, nil] The member's age (yy/mm), nil if the flexi record does not have this column type
+
+    attribute :member_id, :type => Integer
+    attribute :first_name, :type => String
+    attribute :last_name, :type => String
+    attribute :grouping_id, :type => Integer
+    attribute :date_of_birth, :type => Date
+    attribute :total, :type => Integer
+    attribute :completed, :type => Integer
+    attribute :age, :type => String
+    attribute :fields, :default => {}
+
+    attr_accessible :member_id, :first_name, :last_name, :date_of_birth, :grouping_id, :total, :completed, :age, :fields
+
+    validates_presence_of :first_name
+    validates_presence_of :last_name
+    validates_numericality_of :grouping_id, :only_integer=>true, :greater_than_or_equal_to=>-2
+    validates_format_of :age, :with => /\A[0-9]{2}\/(0[0-9]|1[012])\Z/, :message => 'age is not in the correct format (yy/mm)', :allow_nil => true
+    validates :fields, :hash => {:key_type => String, :value_type => String}
+
+
+    # @!method initialize
+    #   Initialize a new FlexiRecordData
+    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+
+
+    # Initialize a new FlexiRecordData from api data
+    # @param [Hash] data the hash of data provided by the API
+    def self.from_api(data)
+      new({
+        :member_id => Osm::to_i_or_nil(data['scoutid']),
+        :first_name => data['firstname'],
+        :last_name => data['lastname'],
+        :grouping_id => Osm::to_i_or_nil(data['patrolid'].eql?('') ? nil : data['patrolid']),
+        :date_of_birth => data['dob'].nil? ? nil : Osm::parse_date(data['dob'], :ignore_epoch => true),
+        :total => Osm::to_i_or_nil(data['total'].eql?('') ? nil : data['total']),
+        :completed => Osm::to_i_or_nil(data['completed'].eql?('') ? nil : data['completed']),
+        :age => data['age'].eql?('') ? nil : data['age'],
+        :fields => data.select { |key, value| key.to_s.match(/^f_\d+/) }
+      })
+    end
+
+  end # Class FlexiRecordData
+
+end # Module

data/lib/osm/flexi_record_field.rb

@@ -0,0 +1,41 @@
+module Osm
+
+  class FlexiRecordField
+    include ::ActiveAttr::MassAssignmentSecurity
+    include ::ActiveAttr::Model
+
+    # @!attribute [rw] id
+    #   @return [String] OSM identifier for the field. Special ones are 'dob', 'total', 'completed', 'age', 'firstname' and 'lastname', user ones are of the format 'f\_NUMBER'
+    # @!attribute [rw] name
+    #   @return [String] Human readable name for the field
+    # @!attribute [rw] editable
+    #   @return [Boolean] Wether the field can be edited
+
+    attribute :id, :type => String
+    attribute :name, :type => String
+    attribute :editable, :type => Boolean, :default => false
+
+    attr_accessible :id, :name, :editable
+
+    validates_presence_of :id
+    validates_presence_of :name
+
+
+    # @!method initialize
+    #   Initialize a new FlexiRecordField
+    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+
+
+    # Initialize a new FlexiRecordField from api data
+    # @param [Hash] data the hash of data provided by the API
+    def self.from_api(data)
+      new({
+        :id => data['field'],
+        :name => data['name'],
+        :editable => data['editable'],
+      })
+    end
+
+  end # Class FlexiRecordField
+
+end # Module

data/lib/osm/register_data.rb

@@ -47,20 +47,16 @@ module Osm
     # Initialize a new RegisterData from api data
     # @param [Hash] data the hash of data provided by the API
     def self.from_api(data)
-      attributes = {}
-      attributes[:member_id] = Osm::to_i_or_nil(data['scoutid'])
-      attributes[:grouping_id] = Osm::to_i_or_nil(data['patrolid'])
-      attributes[:section_id] = Osm::to_i_or_nil(data['sectionid'])
-      attributes[:first_name] = data['firstname']
-      attributes[:last_name] = data['lastname']
-      attributes[:total] = data['total'].to_i
-
-      attributes[:attendance] = {}
-      data.except('scoutid', 'patrolid', 'sectionid', 'firstname', 'lastname', 'total').keys.each do |key|
-        attributes[:attendance][Date.strptime(key, Osm::OSM_DATE_FORMAT)] = data[key]
-      end
-
-      new(attributes)
+      new(
+        :member_id => Osm::to_i_or_nil(data['scoutid']),
+        :grouping_id => Osm::to_i_or_nil(data['patrolid']),
+        :section_id => Osm::to_i_or_nil(data['sectionid']),
+        :first_name => data['firstname'],
+        :last_name => data['lastname'],
+        :total => data['total'].to_i,
+        :attendance => data.select { |key, value| key.to_s.match(Osm::OSM_DATE_REGEX) }.
+                            inject({}){ |new_hash,(date, attendance)| new_hash[Date.strptime(date, Osm::OSM_DATE_FORMAT)] = attendance; new_hash },
+      )
     end
 
   end # Class RegisterData

data/lib/osm/role.rb

@@ -111,7 +111,7 @@ module Osm
     end
 
     def inspect
-      attribute_descriptions = attributes.merge('section' => section.inspect_without_role(self))
+      attribute_descriptions = attributes.merge('section' => (section.nil? ? nil : section.inspect_without_role(self)))
       return_inspect(attribute_descriptions)
     end
 

data/lib/osm/section.rb

@@ -96,7 +96,10 @@ module Osm
       }
 
       # Populate arrays
-      (data['extraRecords'].is_a?(Array) ? data['extraRecords'] : []).each do |record_data|
+      fr = []
+      fr = data['extraRecords'] if data['extraRecords'].is_a?(Array)
+      fr = data['extraRecords'].values if data['extraRecords'].is_a?(Hash)
+      fr.each do |record_data|
         attributes[:flexi_records].push FlexiRecord.from_api(record_data)
       end
 
@@ -151,7 +154,7 @@ module Osm
     end
     
     def inspect
-      attribute_descriptions = attributes.merge('role' => role.inspect_without_section(self))
+      attribute_descriptions = attributes.merge('role' => (role.nil? ? nil : role.inspect_without_section(self)))
       return_inspect(attribute_descriptions)
     end
 

data/spec/osm/api_spec.rb

@@ -85,6 +85,18 @@ describe "API" do
     Osm::Api.new.authorize(user_email, user_password).should == {'userid' => 'id', 'secret' => 'secret'}
   end
 
+  it "sets a new API user" do
+    api = Osm::Api.new
+    api.set_user('1', '2')
+
+    HTTParty.should_receive(:post).with("https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", {:body => {
+      'apiid' => @api_config[:api_id],
+      'token' => @api_config[:api_token],
+      'userid' => '1',
+      'secret' => '2',
+    }}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
+    api.get_roles
+  end
 
 
   describe "Using the API:" do
@@ -325,14 +337,53 @@ describe "API" do
           'location' => '',
           'notes' => '',
           'sectionid' => 1,
-          'googlecalendar' => nil
+          'googlecalendar' => nil,
+          'archived' => '0'
         }]
       }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1", :body => body.to_json)
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => body.to_json)
       events = Osm::Api.new('1', '2').get_events(1)
       events[0].id.should == 1
     end
 
+    it "Fetch events for a section honoring archived option" do
+      body = {
+        'identifier' => 'eventid',
+        'label' => 'name',
+        'items' => [{
+          'eventid' => '1',
+          'name' => 'An Event',
+          'startdate' => '2001-02-03',
+          'enddate' => nil,
+          'starttime' => '00:00:00',
+          'endtime' => '00:00:00',
+          'cost' => '0.00',
+          'location' => '',
+          'notes' => '',
+          'sectionid' => 1,
+          'googlecalendar' => nil,
+          'archived' => '0'
+        },{
+          'eventid' => '2',
+          'name' => 'An Archived Event',
+          'startdate' => '2001-02-03',
+          'enddate' => nil,
+          'starttime' => '00:00:00',
+          'endtime' => '00:00:00',
+          'cost' => '0.00',
+          'location' => '',
+          'notes' => '',
+          'sectionid' => 1,
+          'googlecalendar' => nil,
+          'archived' => '1'
+        }]
+      }
+
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => body.to_json)
+      Osm::Api.new('1', '2').get_events(1).size.should == 1
+      Osm::Api.new('1', '2').get_events(1, {:include_archived => true}).size.should == 2
+    end
+
 
     it "Fetch due badges for a section" do
       badges_body = []
@@ -374,6 +425,58 @@ describe "API" do
     end
 
 
+    it "Fetch the flexi record fields for a section" do
+      data = {
+        "extraid" => "2",
+        "sectionid" => "1",
+        "name" => "A Flexi Record",
+        "config" => "[{\"id\":\"f_1\",\"name\":\"Field 1\",\"width\":\"150\"},{\"id\":\"f_2\",\"name\":\"Field 2\",\"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" => "Field 1","field" => "f_1","width" => "150px","editable" => true},
+            {"name" => "Filed 2","field" => "f_2","width" => "150px","editable" => true},
+          ]}
+        ]
+      }
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/extras.php?action=getExtra&sectionid=1&extraid=2", :body => data.to_json)
+
+      fields = Osm::Api.new('1', '2').get_flexi_record_fields(1, 2)
+      fields.is_a?(Array).should be_true
+    end
+
+    it "Fetch the flexi record data for a section" do
+      data = {
+        'identifier' => 'scoutid',
+        'label' => "name",
+        'items' => [{
+          "scoutid" => "1",
+          "firstname" => "First",
+          "lastname" => "Last",
+          "dob" => "",
+          "patrolid" => "2",
+          "total" => "",
+          "completed" => "",
+          "f_1" => "A",
+          "f_2" => "B",
+          "age" => "",
+          "patrol" => "Green"
+        }]
+      }
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/extras.php?action=getExtraRecords&sectionid=1&extraid=2&termid=3&section=cubs", :body => data.to_json)
+
+      records = Osm::Api.new('1', '2').get_flexi_record_data(Osm::Section.new(:id => 1, :type => :cubs), 2, 3)
+      records.is_a?(Array).should be_true
+    end
+
 
     it "Create an evening (succeded)" do
       url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=addActivityToProgramme'
@@ -479,9 +582,12 @@ describe "API" do
         'userid' => 'user',
         'secret' => 'secret',
       }
+      api = Osm::Api.new('1', '2')
 
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"1":"Section 1"}'}) }
-      Osm::Api.new('1', '2').get_notepads({}, {'userid'=>'user', 'secret'=>'secret'}).should == {1 => 'Section 1'}
+      api.should_receive(:warn).with('[DEPRECATION OF OPTION] use of the api_data option is deprecated.')
+
+      api.get_notepads({}, {'userid'=>'user', 'secret'=>'secret'}).should == {1 => 'Section 1'}
     end
   end
 

data/spec/osm/api_strangeness_spec.rb

@@ -40,7 +40,7 @@ describe "Online Scout Manager API Strangeness" do
 
   it "handles a non existant array when no events" do
     data = '{"identifier":"eventid","label":"name"}'
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1", :body => data)
+    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => data)
 
     @api.get_events(1).should == []
   end
@@ -51,6 +51,33 @@ describe "Online Scout Manager API Strangeness" do
     FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body)
 
     @api.get_section(1).fields.should == {}
+  end
+
+
+  it "handles a section's flexi records being a hash" do
+    data = {
+      'subscription_level' => '3',
+      'subscription_expires' => (Date.today + 60).strftime('%Y-%m-%d'),
+      'sectionType' => 'cubs',
+      'numscouts' => 10,
+      'columnNames' => {},
+      'fields' => {},
+      'intouch' => {},
+      'mobFields' => {},
+      'extraRecords' => {
+        '1' => {
+          'name' => 'Name 1',
+          'extraid' => 1
+        },
+        '2' => {
+          'name' => 'Name 2',
+          'extraid' => 2
+        }
+      }
+    }
+    section = Osm::Section.from_api(1, 'Name', data, nil)
+    section.flexi_records.size.should == 2
 
   end
+
 end

data/spec/osm/event_spec.rb

@@ -15,7 +15,8 @@ describe "Event" do
       'endtime' => '',
       'cost' => 'Free',
       'location' => 'Somewhere',
-      'notes' => 'None'
+      'notes' => 'None',
+      'archived' => '0'
     }
     event = Osm::Event.from_api(data)
 
@@ -27,6 +28,7 @@ describe "Event" do
     event.cost.should == 'Free'
     event.location.should == 'Somewhere'
     event.notes.should == 'None'
+    event.archived.should be_false
     event.valid?.should be_true
   end
 

data/spec/osm/flexi_record_data_spec.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'date'
+
+
+describe "Flexi Record Data" do
+
+  it "Create from API data" do
+    data = {
+      "scoutid" => "1",
+      "firstname" => "First",
+      "lastname" => "Last",
+      "dob" => "1899-11-30",
+      "patrolid" => "2",
+      "total" => "3",
+      "completed" => "",
+      "f_1" => "a",
+      "f_2" => "b",
+      "age" => "",
+      "patrol" => "Green"
+    }
+
+    rd = Osm::FlexiRecordData.from_api(data)
+
+    rd.member_id.should == 1
+    rd.grouping_id.should == 2
+    rd.first_name.should == 'First'
+    rd.last_name.should == 'Last'
+    rd.total.should == 3
+    rd.completed.nil?.should be_true
+    rd.age.nil?.should be_true
+    rd.date_of_birth.should == Date.new(1899, 11, 30)
+    rd.fields.should == {
+      'f_1' => 'a',
+      'f_2' => 'b',
+    }
+    rd.valid?.should be_true
+  end
+
+end

data/spec/osm/flexi_record_field_spec.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+require 'spec_helper'
+
+
+describe "Flexi Record Field" do
+
+  it "Create from API data" do
+    data = {
+      "field" => "f_1",
+      "name" => "Field Name",
+      "width" => "150",
+      "editable" => true
+    }
+
+    field = Osm::FlexiRecordField.from_api(data)
+
+    field.id.should == 'f_1'
+    field.name.should == 'Field Name'
+    field.editable.should be_true
+    field.valid?.should be_true
+  end
+
+end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000Z
+date: 2012-09-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &80296550 !ruby/object:Gem::Requirement
+  requirement: &80777240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *80296550
+  version_requirements: *80777240
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &80296180 !ruby/object:Gem::Requirement
+  requirement: &80776920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80296180
+  version_requirements: *80776920
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &80295520 !ruby/object:Gem::Requirement
+  requirement: &80776570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80295520
+  version_requirements: *80776570
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &80295180 !ruby/object:Gem::Requirement
+  requirement: &80776260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80295180
+  version_requirements: *80776260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &80294690 !ruby/object:Gem::Requirement
+  requirement: &80775920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80294690
+  version_requirements: *80775920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80294360 !ruby/object:Gem::Requirement
+  requirement: &80775540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80294360
+  version_requirements: *80775540
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &80294040 !ruby/object:Gem::Requirement
+  requirement: &80775080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80294040
+  version_requirements: *80775080
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -113,6 +113,8 @@ files:
 - lib/osm/due_badges.rb
 - lib/osm/evening.rb
 - lib/osm/event.rb
+- lib/osm/flexi_record_data.rb
+- lib/osm/flexi_record_field.rb
 - lib/osm/grouping.rb
 - lib/osm/member.rb
 - lib/osm/register_data.rb
@@ -128,6 +130,8 @@ files:
 - spec/osm/due_badges_spec.rb
 - spec/osm/evening_spec.rb
 - spec/osm/event_spec.rb
+- spec/osm/flexi_record_data_spec.rb
+- spec/osm/flexi_record_field_spec.rb
 - spec/osm/grouping_spec.rb
 - spec/osm/member_spec.rb
 - spec/osm/osm_spec.rb