osm 0.4.2 → 0.5.0

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,6 +1,26 @@
+## Version 0.5.0
+
+  * Code breaking changes to DueBadges:
+    * The by\_member attribute now uses scout\_id as the key
+    * Addition of member\_names attribute to allow fetching of members names (the old key for the by\_member attribute)
+    * descriptions attribute has been renamed to badge\_names for consistency
+  * Code breaking changes to Register and subclasses:
+    * Register:
+      * update\_attendance - :attendance option is now a Symbol not String (:yes, :unadvised\_absent or :advised\_absent)
+    * Register::Attendance:
+      * attendance attribute is now a Hash of Date to Symbol (instead of to String)
+  * Register::Attendance gains two helper methods:
+    * present\_on?(date)
+    * absent\_on?(date)
+  * Add allow\_booking attribute to Event
+  * Add myscout\_programme\_times attribute to Section
+  * Cost attribute of Event is now checked to be either "TBC" or formatted to /\\A\\d+\\.\\d{2}\\Z/
+  * Add cost\_tbc? method to Event
+  * Add cost\_free? method to Event
+
 ## Version 0.4.2
 
-  * Fix undefined variable "section_id" when fetching notepad from cache
+  * Fix undefined variable "section\_id" when fetching notepad from cache
 
 ## Version 0.4.1
 

data/README.md

@@ -3,7 +3,7 @@
 
 
 ##Build State
-This project uses continuous integration to help ensure that a quality product is delivered. It is tested using ruby 1.9.2 and 1.9.3 other versions may work but are not guarenteed (since they aren't tested).
+This project uses continuous integration to help ensure that a quality product is delivered.
 Travis CI monitors two branches (versions) of the code - Master (which is what gets released)
 and Staging (which is what is currently being debugged ready for moving to master).
 
@@ -12,6 +12,14 @@ Master [![Build Status](https://secure.travis-ci.org/robertgauld/osm.png?branch=
 Staging [![Build Status](https://secure.travis-ci.org/robertgauld/osm.png?branch=staging)](http://travis-ci.org/robertgauld/osm)
 
 
+## Ruby Versions
+This gem supports the following versions of ruby, it may work on other versions but is not tested against them so don't rely on it.
+
+  * 1.9.2
+  * 1.9.3
+  * 2.0.0
+
+
 ## OSM
 
 Use the [Online Scout Manager](https://www.onlinescoutmanager.co.uk) API.
@@ -24,7 +32,7 @@ Use the [Online Scout Manager](https://www.onlinescoutmanager.co.uk) API.
 Add to your Gemfile and run the `bundle` command to install it.
 
 ```ruby
-gem 'osm', '~> 0.3.0'
+gem 'osm', '~> 0.5.0'
 ```
 
 Configure the gem during the initalization of the app (e.g. if using rails then config/initializers/osm.rb would look like):

data/lib/osm/badges.rb

@@ -69,57 +69,66 @@ module Osm
       pending_raw = data['pending'] || {}
       descriptions_raw = data['description'] || {}
 
-      attributes = {
-        :by_member => {},
-        :descriptions => {}
-      }
-
+      by_member = {}
+      member_names = {}
+      badge_names = {}
       pending_raw.each do |key, members|
         members.each do |member|
-          name = "#{member['firstname']} #{member['lastname']}"
+          id = Osm.to_i_or_nil(member['scoutid'])
           description = descriptions_raw[key]['name'] + (descriptions_raw[key]['section'].eql?('staged') ? " (Level #{member['level']})" : '')
           description_key = key + (descriptions_raw[key]['section'].eql?('staged') ? "_#{member['level']}" : '_1')
-          attributes[:descriptions][description_key] = description
-          attributes[:by_member][name] ||= []
-          attributes[:by_member][name].push(description_key)
+          badge_names[description_key] = description
+          by_member[id] ||= []
+          by_member[id].push(description_key)
+          member_names[id] = "#{member['firstname']} #{member['lastname']}"
         end
       end
 
-      due_badges = Osm::Badges::DueBadges.new(attributes)
+      due_badges = Osm::Badges::DueBadges.new(
+        :by_member => by_member,
+        :member_names => member_names,
+        :badge_names => badge_names,
+      )
       Osm::Model.cache_write(api, cache_key, due_badges)
       return due_badges
     end
 
 
     class DueBadges < Osm::Model
-      # @!attribute [rw] descriptions
-      #   @return [Hash] descriptions for each of the badges
+      # @!attribute [rw] badge_names
+      #   @return [Hash] name to display for each of the badges
       # @!attribute [rw] by_member
       #   @return [Hash] the due badges grouped by member
+      # @!attribute [rw] member_names
+      #   @return [Hash] the name to display for each member
 
-      attribute :descriptions, :default => {}
+      attribute :badge_names, :default => {}
       attribute :by_member, :default => {}
+      attribute :member_names, :default => {}
 
-      attr_accessible :descriptions, :by_member
+      attr_accessible :badge_names, :by_member, :member_names
 
-      validates :descriptions, :hash => {:key_type => String, :value_type => String}
+      validates :badge_names, :hash => {:key_type => String, :value_type => String}
+      validates :member_names, :hash => {:key_type => Fixnum, :value_type => String}
 
       validates_each :by_member do |record, attr, value|
-        desc_keys = record.descriptions.keys
+        badge_names_keys = record.badge_names.keys
+        member_names_keys = record.member_names.keys
         record.errors.add(attr, 'must be a Hash') unless value.is_a?(Hash)
         value.each do |k, v|
-          record.errors.add(attr, 'keys must be String') unless k.is_a?(String)
+          record.errors.add(attr, 'keys must be Fixnum') unless k.is_a?(Fixnum)
+          record.errors.add(attr, 'keys must exist as a key in :member_names') unless member_names_keys.include?(k)
           record.errors.add(attr, 'values must be Arrays') unless v.is_a?(Array)
           v.each do |vv|
             record.errors.add(attr, 'internal values must be Strings') unless vv.is_a?(String)
-            record.errors.add(attr, 'internal values must exist as a key in :descriptions') unless desc_keys.include?(vv)
+            record.errors.add(attr, 'internal values must exist as a key in :badge_names') unless badge_names_keys.include?(vv)
           end
         end
       end
 
 
       # @!method initialize
-      #   Initialize a new Term
+      #   Initialize a new DueBadges
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
 
@@ -133,8 +142,8 @@ module Osm
       # @return [Hash] the total number of each badge which is due
       def totals()
         totals = {}
-        by_member.keys.each do |member_name|
-          by_member[member_name].each do |badge|
+        by_member.each do |member_name, badges|
+          badges.each do |badge|
             totals[badge] ||= 0
             totals[badge] += 1
           end

data/lib/osm/event.rb

@@ -14,7 +14,7 @@ module Osm
     # @!attribute [rw] finish
     #   @return [DateTime] when the event ends
     # @!attribute [rw] cost
-    #   @return [String] the cost of the event
+    #   @return [String] the cost of the event (formatted to \d+\.\d{2}) or "TBC"
     # @!attribute [rw] location
     #   @return [String] where the event is
     # @!attribute [rw] notes
@@ -37,13 +37,15 @@ module Osm
     #   @return [Fixnum] the maximum number of people who can attend the event (0 = no limit)
     # @!attendance [rw] attendance_limit_includes_leaders
     #   @return [Boolean] whether the attendance limit includes leaders
+    # @!attribute [rw] allow_booking
+    #   @return [Boolean] whether booking is allowed through My.SCOUT
 
     attribute :id, :type => Integer
     attribute :section_id, :type => Integer
     attribute :name, :type => String
     attribute :start, :type => DateTime
     attribute :finish, :type => DateTime
-    attribute :cost, :type => String, :default => ''
+    attribute :cost, :type => String, :default => 'TBC'
     attribute :location, :type => String, :default => ''
     attribute :notes, :type => String, :default => ''
     attribute :archived, :type => Boolean, :default => false
@@ -55,10 +57,11 @@ module Osm
     attribute :reminders, :type => Boolean, :default => true
     attribute :attendance_limit, :type => Integer, :default => 0
     attribute :attendance_limit_includes_leaders, :type => Boolean, :default => false
+    attribute :allow_booking, :type => Boolean, :default => true
 
     attr_accessible :id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived,
                     :fields, :columns, :notepad, :public_notepad, :confirm_by_date, :allow_changes,
-                    :reminders, :attendance_limit, :attendance_limit_includes_leaders
+                    :reminders, :attendance_limit, :attendance_limit_includes_leaders, :allow_booking
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :allow_nil => true
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -68,6 +71,8 @@ module Osm
     validates_inclusion_of :allow_changes, :in => [true, false]
     validates_inclusion_of :reminders, :in => [true, false]
     validates_inclusion_of :attendance_limit_includes_leaders, :in => [true, false]
+    validates_inclusion_of :allow_booking, :in => [true, false]
+    validates_format_of :cost, :with => /\A(?:\d+\.\d{2}|TBC)\Z/
 
 
     # @!method initialize
@@ -149,7 +154,7 @@ module Osm
         'location' => event.location,
         'startdate' => event.start? ? event.start.strftime(Osm::OSM_DATE_FORMAT) : '',
         'enddate' => event.finish? ? event.finish.strftime(Osm::OSM_DATE_FORMAT) : '',
-        'cost' => event.cost,
+        'cost' => event.cost_tbc? ? '-1' : event.cost,
         'notes' => event.notes,
         'starttime' => event.start? ? event.start.strftime(Osm::OSM_TIME_FORMAT) : '',
         'endtime' => event.finish? ? event.finish.strftime(Osm::OSM_TIME_FORMAT) : '',
@@ -157,7 +162,8 @@ module Osm
         'allowChanges' => event.allow_changes ? 'true' : 'false',
         'disablereminders' => !event.reminders ? 'true' : 'false',
         'attendancelimit' => event.attendance_limit,
-        'limitincludesleaders' => event.attendance_limit_includes_leaders,
+        'limitincludesleaders' => event.attendance_limit_includes_leaders ? 'true' : 'false',
+        'allowbooking' => event.allow_booking ? 'true' : 'false',
       })
 
       # The cached events for the section will be out of date - remove them
@@ -186,7 +192,7 @@ module Osm
         'location' => location,
         'startdate' => start? ? start.strftime(Osm::OSM_DATE_FORMAT) : '',
         'enddate' => finish? ? finish.strftime(Osm::OSM_DATE_FORMAT) : '',
-        'cost' => cost,
+        'cost' => cost_tbc? ? '-1' : cost,
         'notes' => notes,
         'starttime' => start? ? start.strftime(Osm::OSM_TIME_FORMAT) : '',
         'endtime' => finish? ? finish.strftime(Osm::OSM_TIME_FORMAT) : '',
@@ -194,7 +200,8 @@ module Osm
         'allowChanges' => allow_changes ? 'true' : 'false',
         'disablereminders' => !reminders ? 'true' : 'false',
         'attendancelimit' => attendance_limit,
-        'limitincludesleaders' => attendance_limit_includes_leaders,
+        'limitincludesleaders' => attendance_limit_includes_leaders ? 'true' : 'false',
+        'allowbooking' => allow_booking ? 'true' : 'false',
       })
 
       api.perform_query("events.php?action=saveNotepad&sectionid=#{section_id}", {
@@ -333,6 +340,18 @@ module Osm
       return attendance_limit - attendees(api)
     end
 
+    # Whether the cost is to be confirmed
+    # @return [Boolean] whether the cost is TBC
+    def cost_tbc?
+      cost.eql?('TBC')
+    end
+
+    # Whether the cost is zero
+    # @return [Boolean] whether the cost is zero
+    def cost_free?
+      cost.eql?('0.00')
+    end
+
     # Compare Event based on start, name then id
     def <=>(another)
       return 0 if self.id == another.try(:id)
@@ -359,7 +378,7 @@ module Osm
         :name => event_data['name'],
         :start => Osm::make_datetime(event_data['startdate'], event_data['starttime']),
         :finish => Osm::make_datetime(event_data['enddate'], event_data['endtime']),
-        :cost => event_data['cost'],
+        :cost => event_data['cost'].eql?('-1') ? 'TBC' : event_data['cost'],
         :location => event_data['location'],
         :notes => event_data['notes'],
         :archived => event_data['archived'].eql?('1'),
@@ -370,6 +389,7 @@ module Osm
         :reminders => !event_data['disablereminders'].eql?('1'),
         :attendance_limit => event_data['attendancelimit'].to_i,
         :attendance_limit_includes_leaders => event_data['limitincludesleaders'].eql?('1'),
+        :allow_booking => event_data['allowbooking'].eql?('1'),
       )
 
       columns = []

data/lib/osm/register.rb

@@ -56,6 +56,7 @@ module Osm
       end
 
       data = api.perform_query("users.php?action=register&sectionid=#{section_id}&termid=#{term_id}")
+      dates = get_structure(api, section, term, options).map{ |f| f.id }.select{ |f| f.match(Osm::OSM_DATE_REGEX) }
 
       to_return = []
       if data.is_a?(Hash) && data['items'].is_a?(Array)
@@ -63,6 +64,15 @@ module Osm
         data.each do |item|
           if item.is_a?(Hash)
             unless item['scoutid'].to_i < 0  # It's a total row
+              attendance = {}
+              dates.each do |date|
+                item_attendance = item[date]
+                date = Date.strptime(date, Osm::OSM_DATE_FORMAT)
+                attendance[date] = :unadvised_absent
+                attendance[date] = :yes if item_attendance.eql?('Yes')
+                attendance[date] = :advised_absent if item_attendance.eql?('No')
+              end
+              item.select{}
               to_return.push Osm::Register::Attendance.new(
                 :member_id => Osm::to_i_or_nil(item['scoutid']),
                 :grouping_id => Osm::to_i_or_nil(item ['patrolid']),
@@ -70,8 +80,7 @@ module Osm
                 :first_name => item['firstname'],
                 :last_name => item['lastname'],
                 :total => item['total'].to_i,
-                :attendance => item.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 },
+                :attendance => attendance,
               )
             end
           end
@@ -87,7 +96,7 @@ module Osm
     # @option data [Osm::Section] :section the section to update the register for
     # @option data [Osm::Term, #to_i, nil] :term The term (or its ID) to get the register for, passing nil causes the current term to be used
     # @option data [Osm::Evening, DateTime, Date] :evening the evening to update the register on
-    # @option data [String] :attendance what to mark the attendance as, one of "Yes", "No" or "Absent"
+    # @option data [Symbol] :attendance what to mark the attendance as, one of :yes, :unadvised_absent or :advised_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] whether the update succedded
@@ -97,7 +106,7 @@ module Osm
     # @raise [Osm::ArgumentIsInvalid] If data[:members] is missing
     # @raise [Osm::ArgumentIsInvalid] If data[:api] is missing
     def self.update_attendance(data={})
-      raise Osm::ArgumentIsInvalid, ':attendance is invalid' unless ['Yes', 'No', 'Absent'].include?(data[:attendance])
+      raise Osm::ArgumentIsInvalid, ':attendance is invalid' unless [:yes, :unadvised_absent, :advised_absent].include?(data[:attendance])
       raise Osm::ArgumentIsInvalid, ':section is missing' if data[:section].nil?
       raise Osm::ArgumentIsInvalid, ':evening is missing' if data[:evening].nil?
       raise Osm::ArgumentIsInvalid, ':members is missing' if data[:members].nil?
@@ -112,7 +121,7 @@ module Osm
       response = api.perform_query("users.php?action=registerUpdate&sectionid=#{data[:section].id}&termid=#{term_id}", {
         'scouts' => data[:members].inspect,
         'selectedDate' => data[:evening].strftime(Osm::OSM_DATE_FORMAT),
-        'present' => data[:attendance],
+        'present' => {:yes => 'Yes', :unadvised_absent => nil, :advised_absent => 'No'}[data[:attendance]],
         'section' => data[:section].type,
         'sectionid' => data[:section].id,
         'completedBadges' => (data[:completed_badge_requirements] || []).to_json
@@ -171,7 +180,7 @@ module Osm
       # @!attribute [rw] total
       #   @return [FixNum] Total
       # @!attribute [rw] attendance
-      #   @return [Hash] The data for each field - keys are the date, values one of 'Yes' (present), 'No' (known absence) or nil (absent)
+      #   @return [Hash] The data for each field - keys are the date, values one of :yes, :unadvised_absent or :advised_absent
 
       attribute :member_id, :type => Integer
       attribute :grouping_id, :type => Integer
@@ -190,7 +199,7 @@ module Osm
       validates_presence_of :first_name
       validates_presence_of :last_name
 
-      validates :attendance, :hash => {:key_type => Date, :value_in => ['Yes', 'No', nil]}
+      validates :attendance, :hash => {:key_type => Date, :value_in => [:yes, :unadvised_absent, :advised_absent]}
 
 
       # @!method initialize
@@ -198,6 +207,21 @@ module Osm
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
 
+      # Find out if the member was present on a date
+      # @param [Date] date The date to check attendance for
+      # @return [Boolean] whether the member was presnt on the given date
+      def present_on?(date)
+        attendance[date] == :yes
+      end
+
+      # Find out if the member was absent on a date
+      # @param [Date] date The date to check attendance for
+      # @return [Boolean] whether the member was absent on the given date
+      def absent_on?(date)
+        attendance[date] != :yes
+      end
+
+
       # Compare Attendance based on section_id, grouping_id, last_name then first_name
       def <=>(another)
         result = self.section_id <=> another.try(:section_id)

data/lib/osm/section.rb

@@ -51,6 +51,8 @@ module Osm
     #   @return [Boolean] Wether parents can see partially completed badges
     # @!attribute [rw] myscout_programme_summary
     #   @return [Boolean] Wether parents can see summary of programme items
+    # @!attribute [rw] myscout_programme_times
+    #   @return [Boolean] Wether parents can see times of programme items
     # @!attribute [rw] myscout_event_reminder_count
     #   @return [Fixnum] How many event reminders to send to parents who haven't responded
     # @!attribute [rw] myscout_event_reminder_frequency
@@ -85,6 +87,7 @@ module Osm
     attribute :myscout_email_address_copy, :type => String, :default => ''
     attribute :myscout_badges_partial, :type => Boolean
     attribute :myscout_programme_summary, :type => Boolean
+    attribute :myscout_programme_times, :type => Boolean
     attribute :myscout_event_reminder_count, :type => Integer
     attribute :myscout_event_reminder_frequency, :type => Integer
     attribute :myscout_payment_reminder_count, :type => Integer
@@ -96,7 +99,7 @@ module Osm
                     :myscout_programme_expires, :myscout_events, :myscout_badges,
                     :myscout_programme, :myscout_payments, :myscout_emails,
                     :myscout_email_address_from, :myscout_email_address_copy,
-                    :myscout_badges_partial, :myscout_programme_summary,
+                    :myscout_badges_partial, :myscout_programme_summary, :myscout_programme_times,
                     :myscout_event_reminder_count, :myscout_event_reminder_frequency,
                     :myscout_payment_reminder_count, :myscout_payment_reminder_frequency
 
@@ -126,6 +129,7 @@ module Osm
     validates_inclusion_of :myscout_payments, :in => [true, false]
     validates_inclusion_of :myscout_badges_partial, :in => [true, false]
     validates_inclusion_of :myscout_programme_summary, :in => [true, false]
+    validates_inclusion_of :myscout_programme_times, :in => [true, false]
 
     validates :column_names, :hash => {:key_type => Symbol, :value_type => String}
     validates :fields, :hash => {:key_type => Symbol, :value_in => [true, false]}
@@ -207,6 +211,7 @@ module Osm
             :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_programme_times => myscout_data['programmeTimes'] == 1,
             :myscout_event_reminder_count => myscout_data['eventRemindCount'].to_i,
             :myscout_event_reminder_frequency => myscout_data['eventRemindFrequency'].to_i,
             :myscout_payment_reminder_count => myscout_data['paymentRemindCount'].to_i,

data/spec/osm/badges_spec.rb

@@ -19,13 +19,13 @@ describe "Badges" do
             }
           ],
           'staged_staged_participation' => [{
-              'sid' => '2',
+              'scoutid' => '2',
               'firstname' => 'Jane',
               'lastname' => 'Doe',
               'level' => '2',
               'extra' => 'Lvl 2'
             }, {
-              'sid' => '1',
+              'scoutid' => '1',
               'firstname' => 'John',
               'lastname' => 'Doe',
               'level' => '2',
@@ -33,7 +33,6 @@ describe "Badges" do
             }
           ]
         },
-
         'description' => {
           'badge_name' => {
             'name' => 'Badge Name',
@@ -53,8 +52,9 @@ describe "Badges" do
 
       db = Osm::Badges.get_due_badges(@api, Osm::Section.new(:id => 1, :type => :cubs), 2)
       db.empty?.should == false
-      db.descriptions.should == {'badge_name_1'=>'Badge Name', 'staged_staged_participation_2'=>'Participation (Level 2)'}
-      db.by_member.should == {'John Doe'=>['badge_name_1', 'staged_staged_participation_2'], 'Jane Doe'=>['staged_staged_participation_2']}
+      db.badge_names.should == {'badge_name_1'=>'Badge Name', 'staged_staged_participation_2'=>'Participation (Level 2)'}
+      db.by_member.should == {1=>['badge_name_1', 'staged_staged_participation_2'], 2=>['staged_staged_participation_2']}
+      db.member_names.should == {1 => 'John Doe', 2 => 'Jane Doe'}
       db.totals.should == {'staged_staged_participation_2'=>2, 'badge_name_1'=>1}
       db.valid?.should be_true
     end

data/spec/osm/event_spec.rb

@@ -11,7 +11,7 @@ describe "Event" do
       :name => 'Event name',
       :start => DateTime.new(2001, 1, 2, 12 ,0 ,0),
       :finish => nil,
-      :cost => 'Free',
+      :cost => '1.23',
       :location => 'Somewhere',
       :notes => 'None',
       :archived => '0',
@@ -23,6 +23,7 @@ describe "Event" do
       :reminders => false,
       :attendance_limit => 3,
       :attendance_limit_includes_leaders => true,
+      :allow_booking => false,
     }
     event = Osm::Event.new(data)
 
@@ -31,7 +32,7 @@ describe "Event" do
     event.name.should == 'Event name'
     event.start.should == DateTime.new(2001, 1, 2, 12, 0, 0)
     event.finish.should == nil
-    event.cost.should == 'Free'
+    event.cost.should == '1.23'
     event.location.should == 'Somewhere'
     event.notes.should == 'None'
     event.archived.should be_false
@@ -43,14 +44,26 @@ describe "Event" do
     event.reminders.should == false
     event.attendance_limit.should == 3
     event.attendance_limit_includes_leaders.should == true
+    event.allow_booking.should be_false
     event.valid?.should be_true
   end
 
-  it "Correctly tells if attendance is limited" do
+  it "Tells if attendance is limited" do
     Osm::Event.new(:attendance_limit => 0).limited_attendance?.should be_false
     Osm::Event.new(:attendance_limit => 1).limited_attendance?.should be_true
   end
 
+  it "Tells if the cost is TBC" do
+    Osm::Event.new(:cost => 'TBC').cost_tbc?.should be_true
+    Osm::Event.new(:cost => '1.23').cost_tbc?.should be_false
+  end
+
+  it "Tells if the cost is free" do
+    Osm::Event.new(:cost => 'TBC').cost_free?.should be_false
+    Osm::Event.new(:cost => '1.23').cost_free?.should be_false
+    Osm::Event.new(:cost => '0.00').cost_free?.should be_true
+  end
+
   it "Sorts by start, name then ID (unless IDs are equal)" do
     e1 = Osm::Event.new(:start => '2000-01-01 01:00:00', :name => 'An event', :id => 1)
     e2 = Osm::Event.new(:start => '2000-01-02 01:00:00', :name => 'An event', :id => 2)
@@ -105,7 +118,7 @@ describe "Event" do
   describe "Using the API" do
 
     before :each do
-      events_body = {
+      @events_body = {
         'identifier' => 'eventid',
         'label' => 'name',
         'items' => [{
@@ -126,10 +139,11 @@ describe "Event" do
           'disablereminders' => '1',
           'attendancelimit' => '3',
           'limitincludesleaders' => '1',
+          'allowbooking' => '1',
         }]
       }
 
-      event_body = {
+      @event_body = {
         'eventid' => '2',
         'name' => 'An Event',
         'startdate' => '2001-01-02',
@@ -152,10 +166,11 @@ describe "Event" do
         'structure' => [],
         'attendancelimit' => '3',
         'limitincludesleaders' => '1',
+        'allowbooking' => '1',
       }
 
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => events_body.to_json)
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=2", :body => event_body.to_json)
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => @events_body.to_json)
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=2", :body => @event_body.to_json)
 
       Osm::Model.stub(:get_user_permissions) { {:events => [:read, :write]} }
     end
@@ -181,12 +196,22 @@ describe "Event" do
         event.reminders.should == false
         event.attendance_limit.should == 3
         event.attendance_limit_includes_leaders.should == true
+        event.allow_booking.should == true
         event.columns[0].id.should == 'f_1'
         event.columns[0].name.should == 'Name'
         event.columns[0].label.should == 'Label'
         event.valid?.should be_true
       end
 
+      it 'Handles cost of "-1" for TBC' do
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=2", :body => @event_body.merge({'cost' => '-1'}).to_json)
+
+        events = Osm::Event.get_for_section(@api, 1)
+        event = events[0]
+        event.cost.should == 'TBC'
+        event.valid?.should be_true
+      end
+
       it "From cache" do
         events = Osm::Event.get_for_section(@api, 1)
         HTTParty.should_not_receive(:post)
@@ -349,50 +374,104 @@ describe "Event" do
 
     end
 
-    it "Create (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
-      post_data = {
-        'apiid' => @CONFIGURATION[:api][:osm][:id],
-        'token' => @CONFIGURATION[:api][:osm][:token],
-        'userid' => 'user_id',
-        'secret' => 'secret',
-        'name' => 'Test event',
-        'startdate' => '2000-01-02',
-        'enddate' => '2001-02-03',
-        'starttime' => '03:04:05',
-        'endtime' => '04:05:06',
-        'cost' => '1.23',
-        'location' => 'Somewhere',
-        'notes' => 'none',
-        'confdate' => '2000-01-01',
-        'allowChanges' => 'true',
-        'disablereminders' => 'false',
-        'attendancelimit' => 3,
-        'limitincludesleaders' => true,
-      }
+    describe "Create (succeded)" do
 
-      Osm::Event.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
+      it "Normal" do
+        url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
+        post_data = {
+          'apiid' => @CONFIGURATION[:api][:osm][:id],
+          'token' => @CONFIGURATION[:api][:osm][:token],
+          'userid' => 'user_id',
+          'secret' => 'secret',
+          'name' => 'Test event',
+          'startdate' => '2000-01-02',
+          'enddate' => '2001-02-03',
+          'starttime' => '03:04:05',
+          'endtime' => '04:05:06',
+          'cost' => '1.23',
+          'location' => 'Somewhere',
+          'notes' => 'none',
+          'confdate' => '2000-01-01',
+          'allowChanges' => 'true',
+          'disablereminders' => 'false',
+          'attendancelimit' => 3,
+          'limitincludesleaders' => 'true',
+          'allowbooking' => 'true',
+        }
+
+        Osm::Event.stub(:get_for_section) { [] }
+        HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
+
+        event = Osm::Event.create(@api, {
+          :section_id => 1,
+          :name => 'Test event',
+          :start => DateTime.new(2000, 1, 2, 3, 4, 5),
+          :finish => DateTime.new(2001, 2, 3, 4, 5, 6),
+          :cost => '1.23',
+          :location => 'Somewhere',
+          :notes => 'none',
+          :columns => [],
+          :notepad => '',
+          :public_notepad => '',
+          :confirm_by_date => Date.new(2000, 1, 1),
+          :allow_changes => true,
+          :reminders => true,
+          :attendance_limit => 3,
+          :attendance_limit_includes_leaders => true,
+          :allow_booking => true,
+        })
+        event.should_not be_nil
+        event.id.should == 2
+      end
+
+      it "TBC cost" do
+        url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
+        post_data = {
+          'apiid' => @CONFIGURATION[:api][:osm][:id],
+          'token' => @CONFIGURATION[:api][:osm][:token],
+          'userid' => 'user_id',
+          'secret' => 'secret',
+          'name' => 'Test event',
+          'startdate' => '2000-01-02',
+          'enddate' => '2001-02-03',
+          'starttime' => '03:04:05',
+          'endtime' => '04:05:06',
+          'cost' => '-1',
+          'location' => 'Somewhere',
+          'notes' => 'none',
+          'confdate' => '2000-01-01',
+          'allowChanges' => 'true',
+          'disablereminders' => 'false',
+          'attendancelimit' => 3,
+          'limitincludesleaders' => 'true',
+          'allowbooking' => 'true',
+        }
+
+        Osm::Event.stub(:get_for_section) { [] }
+        HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
+
+        event = Osm::Event.create(@api, {
+          :section_id => 1,
+          :name => 'Test event',
+          :start => DateTime.new(2000, 1, 2, 3, 4, 5),
+          :finish => DateTime.new(2001, 2, 3, 4, 5, 6),
+          :cost => 'TBC',
+          :location => 'Somewhere',
+          :notes => 'none',
+          :columns => [],
+          :notepad => '',
+          :public_notepad => '',
+          :confirm_by_date => Date.new(2000, 1, 1),
+          :allow_changes => true,
+          :reminders => true,
+          :attendance_limit => 3,
+          :attendance_limit_includes_leaders => true,
+          :allow_booking => true,
+        })
+        event.should_not be_nil
+        event.id.should == 2
+      end
 
-      event = Osm::Event.create(@api, {
-        :section_id => 1,
-        :name => 'Test event',
-        :start => DateTime.new(2000, 1, 2, 3, 4, 5),
-        :finish => DateTime.new(2001, 2, 3, 4, 5, 6),
-        :cost => '1.23',
-        :location => 'Somewhere',
-        :notes => 'none',
-        :columns => [],
-        :notepad => '',
-        :public_notepad => '',
-        :confirm_by_date => Date.new(2000, 1, 1),
-        :allow_changes => true,
-        :reminders => true,
-        :attendance_limit => 3,
-        :attendance_limit_includes_leaders => true,
-      })
-      event.should_not be_nil
-      event.id.should == 2
     end
 
     it "Create (failed)" do
@@ -418,53 +497,107 @@ describe "Event" do
     end
 
 
-    it "Update (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
-      post_data = {
-        'apiid' => @CONFIGURATION[:api][:osm][:id],
-        'token' => @CONFIGURATION[:api][:osm][:token],
-        'userid' => 'user_id',
-        'secret' => 'secret',
-        'name' => 'Test event',
-        'startdate' => '2000-01-02',
-        'enddate' => '2001-02-03',
-        'starttime' => '03:04:05',
-        'endtime' => '04:05:06',
-        'cost' => '1.23',
-        'location' => 'Somewhere',
-        'notes' => 'none',
-        'eventid' => 2,
-        'confdate' => '',
-        'allowChanges' => 'true',
-        'disablereminders' => 'false',
-        'attendancelimit' => 3,
-        'limitincludesleaders' => true,
-      }
+    describe "Update (succeded)" do
 
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
-      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/events.php?action=saveNotepad&sectionid=1', {:body=>{"eventid"=>2, "notepad"=>"notepad", "userid"=>"user_id", "secret"=>"secret", "apiid"=>"1", "token"=>"API TOKEN"}}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
-      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/events.php?action=saveNotepad&sectionid=1', {:body=>{"eventid"=>2, "pnnotepad"=>"public notepad", "userid"=>"user_id", "secret"=>"secret", "apiid"=>"1", "token"=>"API TOKEN"}}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      it "Normal" do
+        url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
+        post_data = {
+          'apiid' => @CONFIGURATION[:api][:osm][:id],
+          'token' => @CONFIGURATION[:api][:osm][:token],
+          'userid' => 'user_id',
+          'secret' => 'secret',
+          'name' => 'Test event',
+          'startdate' => '2000-01-02',
+          'enddate' => '2001-02-03',
+          'starttime' => '03:04:05',
+          'endtime' => '04:05:06',
+          'cost' => '1.23',
+          'location' => 'Somewhere',
+          'notes' => 'none',
+          'eventid' => 2,
+          'confdate' => '',
+          'allowChanges' => 'true',
+          'disablereminders' => 'false',
+          'attendancelimit' => 3,
+          'limitincludesleaders' => 'true',
+          'allowbooking' => 'true',
+        }
+
+        HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/events.php?action=saveNotepad&sectionid=1', {:body=>{"eventid"=>2, "notepad"=>"notepad", "userid"=>"user_id", "secret"=>"secret", "apiid"=>"1", "token"=>"API TOKEN"}}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/events.php?action=saveNotepad&sectionid=1', {:body=>{"eventid"=>2, "pnnotepad"=>"public notepad", "userid"=>"user_id", "secret"=>"secret", "apiid"=>"1", "token"=>"API TOKEN"}}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+
+        event = Osm::Event.new(
+          :section_id => 1,
+          :name => 'Test event',
+          :start => DateTime.new(2000, 01, 02, 03, 04, 05),
+          :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
+          :cost => '1.23',
+          :location => 'Somewhere',
+          :notes => 'none',
+          :id => 2,
+          :confirm_by_date => nil,
+          :allow_changes => true,
+          :reminders => true,
+          :notepad => '',
+          :public_notepad => '',
+          :attendance_limit => 3,
+          :attendance_limit_includes_leaders => true,
+          :allow_booking => true,
+        )
+        event.notepad = 'notepad'
+        event.public_notepad = 'public notepad'
+        event.update(@api).should be_true
+      end
+
+      it "TBC cost" do
+        url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
+        post_data = {
+          'apiid' => @CONFIGURATION[:api][:osm][:id],
+          'token' => @CONFIGURATION[:api][:osm][:token],
+          'userid' => 'user_id',
+          'secret' => 'secret',
+          'name' => 'Test event',
+          'startdate' => '2000-01-02',
+          'enddate' => '2001-02-03',
+          'starttime' => '03:04:05',
+          'endtime' => '04:05:06',
+          'cost' => '-1',
+          'location' => 'Somewhere',
+          'notes' => 'none',
+          'eventid' => 2,
+          'confdate' => '',
+          'allowChanges' => 'true',
+          'disablereminders' => 'false',
+          'attendancelimit' => 3,
+          'limitincludesleaders' => 'true',
+          'allowbooking' => 'true',
+        }
+
+        HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
+
+        event = Osm::Event.new(
+          :section_id => 1,
+          :name => 'Test event',
+          :start => DateTime.new(2000, 01, 02, 03, 04, 05),
+          :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
+          :cost => '1.23',
+          :location => 'Somewhere',
+          :notes => 'none',
+          :id => 2,
+          :confirm_by_date => nil,
+          :allow_changes => true,
+          :reminders => true,
+          :notepad => '',
+          :public_notepad => '',
+          :attendance_limit => 3,
+          :attendance_limit_includes_leaders => true,
+          :allow_booking => true,
+        )
+        event.cost = 'TBC'
+        event.update(@api).should be_true
+      end
 
-      event = Osm::Event.new(
-        :section_id => 1,
-        :name => 'Test event',
-        :start => DateTime.new(2000, 01, 02, 03, 04, 05),
-        :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
-        :cost => '1.23',
-        :location => 'Somewhere',
-        :notes => 'none',
-        :id => 2,
-        :confirm_by_date => nil,
-        :allow_changes => true,
-        :reminders => true,
-        :notepad => '',
-        :public_notepad => '',
-        :attendance_limit => 3,
-        :attendance_limit_includes_leaders => true,
-      )
-      event.notepad = 'notepad'
-      event.public_notepad = 'public notepad'
-      event.update(@api).should be_true
     end
 
     it "Update (failed)" do

data/spec/osm/register_spec.rb

@@ -36,8 +36,8 @@ describe "Register" do
       :grouping_id => '3',
       :total => 4,
       :attendance => {
-        Date.new(2012, 1, 10) => 'Yes',
-        Date.new(2012, 1, 24) => 'No',
+        Date.new(2012, 1, 10) => :yes,
+        Date.new(2012, 1, 24) => :unadvised_absent,
       }
     )
 
@@ -48,8 +48,8 @@ describe "Register" do
     rd.last_name.should == 'B'
     rd.total.should == 4
     rd.attendance.should == {
-      Date.new(2012, 01, 10) => 'Yes',
-      Date.new(2012, 01, 24) => 'No'
+      Date.new(2012, 01, 10) => :yes,
+      Date.new(2012, 01, 24) => :unadvised_absent
     }
     rd.valid?.should be_true
   end
@@ -65,6 +65,20 @@ describe "Register" do
     data.sort.should == [d1, d2, d3, d4, d5]
   end
 
+  it "Reports if a member was present on a date" do
+    date = Date.new(2000, 1, 1)
+    Osm::Register::Attendance.new(:attendance => {date => :yes}).present_on?(date).should be_true
+    Osm::Register::Attendance.new(:attendance => {date => :known_absent}).present_on?(date).should be_false
+    Osm::Register::Attendance.new(:attendance => {date => :unknown_absent}).present_on?(date).should be_false
+  end
+
+  it "Reports if a member was absent on a date" do
+    date = Date.new(2000, 1, 1)
+    Osm::Register::Attendance.new(:attendance => {date => :yes}).absent_on?(date).should be_false
+    Osm::Register::Attendance.new(:attendance => {date => :known_absent}).absent_on?(date).should be_true
+    Osm::Register::Attendance.new(:attendance => {date => :unknown_absent}).absent_on?(date).should be_true
+  end
+
 
   describe "Using the API" do
 
@@ -96,14 +110,20 @@ describe "Register" do
         ]
       }
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=register&sectionid=1&termid=2", :body => data.to_json)
+      Osm::Register.stub(:get_structure) { [
+        Osm::Register::Field.new(:id => '2000-01-01', :name => 'Name', :tooltip => 'Tooltip'),
+        Osm::Register::Field.new(:id => '2000-01-02', :name => 'Name', :tooltip => 'Tooltip'),
+        Osm::Register::Field.new(:id => '2000-01-03', :name => 'Name', :tooltip => 'Tooltip'),
+      ] }
 
       register = Osm::Register.get_attendance(@api, 1, 2)
       register.is_a?(Array).should be_true
       register.size.should == 1
       reg = register[0]
       reg.attendance.should == {
-        Date.new(2000, 1, 1) => 'Yes',
-        Date.new(2000, 1, 2) => 'No'
+        Date.new(2000, 1, 1) => :yes,
+        Date.new(2000, 1, 2) => :advised_absent,
+        Date.new(2000, 1, 3) => :unadvised_absent,
       }
       reg.first_name.should == 'First'
       reg.last_name.should == 'Last'
@@ -135,7 +155,7 @@ describe "Register" do
         :section => Osm::Section.new(:id=>1, :type=>:cubs),
         :term => 2,
         :evening => Date.new(2000, 1, 2),
-        :attendance => 'Yes',
+        :attendance => :yes,
         :members => 3,
         :completed_badge_requirements => [{'a'=>'A'}, {'b'=>'B'}]
       }).should be_true
@@ -163,6 +183,7 @@ describe "Register" do
         ]
       }
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=register&sectionid=1&termid=2", :body => data.to_json)
+      Osm::Register.stub(:get_structure) { [] }
 
       register = Osm::Register.get_attendance(@api, 1, 2)
       register.is_a?(Array).should be_true
@@ -172,7 +193,7 @@ describe "Register" do
       reg.last_name.should == 'Last'
     end
 
-    it "Handles no data" do
+    it "Handles no data getting structure" do
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=registerStructure&sectionid=1&termid=2", :body => '')
       register_structure = Osm::Register.get_structure(@api, 1, 2)
       register_structure.is_a?(Array).should be_true

data/spec/osm/section_spec.rb

@@ -33,6 +33,7 @@ describe "Section" do
       :myscout_email_address_copy => '',
       :myscout_badges_partial => true,
       :myscout_programme_summary => true,
+      :myscout_programme_times => true,
       :myscout_event_reminder_count => 4,
       :myscout_event_reminder_frequency => 5,
       :myscout_payment_reminder_count => 6,
@@ -69,6 +70,7 @@ describe "Section" do
     section.myscout_email_address_copy.should == ''
     section.myscout_badges_partial.should == true
     section.myscout_programme_summary.should == true
+    section.myscout_programme_times.should == true
     section.myscout_event_reminder_count.should == 4
     section.myscout_event_reminder_frequency.should == 5
     section.myscout_payment_reminder_count.should == 6
@@ -97,7 +99,7 @@ describe "Section" do
 
     before :each do
       body = [
-        {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Flexi Record 1\",\"extraid\":\"111\"}],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true},\"gocardless\":\"true\",\"portal\":{\"paymentRemindFrequency\":\"7\",\"paymentRemindCount\":\"6\",\"eventRemindFrequency\":\"5\",\"eventRemindCount\":\"4\",\"badgesPartial\":1,\"programmeSummary\":1,\"emailAddress\":\"send_from@example.com\",\"emailAddressCopy\":null,\"payments\":1,\"badges\":1,\"emails\":{\"email1\":\"true\",\"email2\":\"false\"},\"events\":1,\"programme\":1},\"portalExpires\":{\"events\":\"2013-01-06\",\"eventsA\":1,\"badges\":\"2013-01-07\",\"badgesA\":1,\"programme\":\"2013-01-08\",\"programmeA\":1}}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>10, "member"=>20, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
+        {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Flexi Record 1\",\"extraid\":\"111\"}],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true},\"gocardless\":\"true\",\"portal\":{\"paymentRemindFrequency\":\"7\",\"paymentRemindCount\":\"6\",\"eventRemindFrequency\":\"5\",\"eventRemindCount\":\"4\",\"badgesPartial\":1,\"programmeTimes\":1,\"programmeSummary\":1,\"emailAddress\":\"send_from@example.com\",\"emailAddressCopy\":null,\"payments\":1,\"badges\":1,\"emails\":{\"email1\":\"true\",\"email2\":\"false\"},\"events\":1,\"programme\":1},\"portalExpires\":{\"events\":\"2013-01-06\",\"eventsA\":1,\"badges\":\"2013-01-07\",\"badgesA\":1,\"programme\":\"2013-01-08\",\"programmeA\":1}}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>10, "member"=>20, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
         {"sectionConfig"=>"{\"subscription_level\":3,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"cubs\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member's Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member's Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[],\"wizard\":\"false\",\"fields\":{\"email1\":true,\"email2\":true,\"email3\":true,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":true,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":true,\"saved\":true},\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false}}", "groupname"=>"1st Somewhere", "groupid"=>"1", "groupNormalised"=>"1", "sectionid"=>"2", "sectionname"=>"Section 2", "section"=>"cubs", "isDefault"=>"0", "permissions"=>{"badge"=>100, "member"=>100, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}}
       ]
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
@@ -136,6 +138,7 @@ describe "Section" do
         section.myscout_email_address_copy.should == ''
         section.myscout_badges_partial.should == true
         section.myscout_programme_summary.should == true
+        section.myscout_programme_times.should == true
         section.myscout_event_reminder_count.should == 4
         section.myscout_event_reminder_frequency.should == 5
         section.myscout_payment_reminder_count.should == 6

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport