osm 0.1.10 → 0.1.11

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+## Version 0.0.11
+
+  * Fix "can't convert Hash into String" occuring when some section's config is a Hash not a JSON encoded Hash
+  * Remove num\_scouts attribute from Section (OSM always sets this to 999)
+  * Add My.SCOUT related attributes to Section:
+    * gocardless (Boolean) - does the section use gocardless
+    * myscout\_events\_expires (Date) - when the subscription to Events in My.SCOUT expires
+    * myscout\_badges\_expires (Date) - when the subscription to Badges in My.SCOUT expires
+    * myscout\_programme\_expires (Date) - when the subscription to Badges in My.SCOUT expires
+    * myscout\_events (Boolean) - whether the section uses the Events part of My.SCOUT
+    * myscout\_badges (Boolean) - whether the section uses the Badges part of My.SCOUT
+    * myscout\_programme (Boolean) - whether the section uses the Programme part of My.SCOUT
+    * myscout\_payments (Boolean) - whether the section uses the Payments part of My.SCOUT
+    * myscout\_emails (Hash of Symbol to Boolean) - which email addresses are linked to MyScout for each Member
+    * myscout\_email\_address\_send (String, blank OK) - which email address to send My.SCOUT emails as
+    * myscout\_email\_address\_copy (String, blank OK) - which email address to send copys of My.SCOUT emails to
+    * myscout\_badges\_partial (Boolean) - Wether parents can see partially completed badges
+    * myscout\_programme\_summary (Boolean) - Wether parents can see the summary of programme items
+    * myscout\_event\_reminder\_count (Integer) - How many event reminders to send to parents who haven't responded
+    * myscout\_event\_reminder\_frequency (Integer) - How many days to leave between event reminder emails
+    * myscout\_payment\_reminder\_count (Integer) - How many payment reminders to send to parents who haven't paid yet
+    * myscout\_payment\_reminder\_frequency (Integer) - How many days to leave between payment reminder emails
+  * Add new OSM attributes to Event:
+    * notepad - the notepad shown in OSM
+    * public\_notepad - the notepad shown on My.SCOUT
+    * confirm\_by\_date - the last day that parents can change their child's attendance details
+    * allow\_changes - wether parents can change their child's attendance details
+    * reminders - wether reminder emails are sent
+  * Osm::Event
+    * Mark fields attribute as depricated
+    * Add columns attribute returning an array of column details
+
 ## Version 0.1.10
 
   * Fix 'undefined variable' when getting an event's attendance without passing a term.

data/README.md

@@ -118,6 +118,9 @@ however it should be noted that when the OSM API adds a feature it can be diffic
 
 ## Parts of the OSM API currently NOT supported:
 
+  * Event Fields:
+    * Delete [issue 45]
+    * Rename [issue 46]
   * Badges:
     * Which requirements each member has met:
       * Retreive [issue 21]
@@ -137,3 +140,4 @@ however it should be noted that when the OSM API adds a feature it can be diffic
   * SMS:
     * Retreival of delivery reports
     * Sending a message
+  * MyScout

data/lib/osm/event.rb

@@ -1,6 +1,7 @@
 module Osm
 
   class Event < Osm::Model
+    class Column; end # Ensure the constant exists for the validators
 
     # @!attribute [rw] id
     #   @return [Fixnum] the id for the event
@@ -21,7 +22,20 @@ module Osm
     # @!attribute [rw] archived
     #   @return [Boolean] if the event has been archived
     # @!attribute [rw] fields
+    #   @deprecated use columns instead
     #   @return [Hash] Keys are the field's id, values are the field names
+    # @!attribute [rw] columns
+    #   @return [Array<Osm::Event::Column>] the custom columns for the event
+    # @!attribute [rw] notepad
+    #   @return [String] notepad for the event
+    # @!attribute [rw] public_notepad
+    #   @return [String] public notepad (shown in My.SCOUT) for the event
+    # @!attribute [rw] confirm_by_date
+    #   @return [Date] the date parents can no longer add/change their child's details
+    # @!attribute [rw] allow_changes
+    #   @return [Boolean] wether parent's can change their child's details
+    # @!attribute [rw] reminders
+    #   @return [Boolean] wether email reminders are sent for the event
 
     attribute :id, :type => Integer
     attribute :section_id, :type => Integer
@@ -32,18 +46,27 @@ module Osm
     attribute :location, :type => String, :default => ''
     attribute :notes, :type => String, :default => ''
     attribute :archived, :type => Boolean, :default => false
-    attribute :fields, :default => {}
+    attribute :columns, :default => []
+    attribute :notepad, :type => String, :default => ''
+    attribute :public_notepad, :type => String, :default => ''
+    attribute :confirm_by_date, :type => Date
+    attribute :allow_changes, :type => Boolean, :default => false
+    attribute :reminders, :type => Boolean, :default => true
 
-    attr_accessible :id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived, :fields
+    attr_accessible :id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived,
+                    :fields, :columns, :notepad, :public_notepad,
+                    :confirm_by_date, :allow_changes, :reminders
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :allow_nil => true
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
     validates_presence_of :name
-    validates :fields, :hash => {:key_type => String, :value_type => String}
+    validates :columns, :array_of => {:item_type => Osm::Event::Column, :item_valid => true}
+    validates_inclusion_of :allow_changes, :in => [true, false]
+    validates_inclusion_of :reminders, :in => [true, false]
 
 
     # @!method initialize
-    #   Initialize a new Term
+    #   Initialize a new Event
     #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
 
@@ -66,26 +89,9 @@ module Osm
 
       events = Array.new
       unless data['items'].nil?
-        data['items'].each do |item|
-          event_id = Osm::to_i_or_nil(item['eventid'])
-          fields_data = api.perform_query("events.php?action=getEvent&sectionid=#{section_id}&eventid=#{event_id}")
-          fields = {}
-          ActiveSupport::JSON.decode(fields_data['config']).each do |field|
-            fields[field['id']] = field['name']
-          end
-
-          event = Osm::Event.new(
-            :id => event_id,
-            :section_id => Osm::to_i_or_nil(item['sectionid']),
-            :name => item['name'],
-            :start => Osm::make_datetime(item['startdate'], item['starttime']),
-            :finish => Osm::make_datetime(item['enddate'], item['endtime']),
-            :cost => item['cost'],
-            :location => item['location'],
-            :notes => item['notes'],
-            :archived => item['archived'].eql?('1'),
-            :fields => fields,
-          )
+        data['items'].map { |i| i['eventid'].to_i }.each do |event_id|
+          event_data = api.perform_query("events.php?action=getEvent&sectionid=#{section_id}&eventid=#{event_id}")
+          event = self.new_event_from_data(event_data)
           events.push event
           cache_write(api, ['event', event.id], event)
         end
@@ -113,14 +119,8 @@ module Osm
         return cache_read(api, cache_key)
       end
 
-      events = get_for_section(api, section, options)
-      return nil unless events.is_a? Array
-
-      events.each do |event|
-        return event if event.id == event_id
-      end
-
-      return nil
+      event_data = api.perform_query("events.php?action=getEvent&sectionid=#{section_id}&eventid=#{event_id}")
+      return self.new_event_from_data(event_data)
     end
 
 
@@ -141,6 +141,9 @@ module Osm
         'notes' => event.notes,
         'starttime' => event.start? ? event.start.strftime(Osm::OSM_TIME_FORMAT) : '',
         'endtime' => event.finish? ? event.finish.strftime(Osm::OSM_TIME_FORMAT) : '',
+        'confdate' => event.confirm_by_date? ? event.confirm_by_date.strftime(Osm::OSM_DATE_FORMAT) : '',
+        'allowChanges' => event.allow_changes ? 'true' : 'false',
+        'disablereminders' => !event.reminders ? 'true' : 'false',
       })
 
       # The cached events for the section will be out of date - remove them
@@ -171,6 +174,17 @@ module Osm
         'notes' => notes,
         'starttime' => start? ? start.strftime(Osm::OSM_TIME_FORMAT) : '',
         'endtime' => finish? ? finish.strftime(Osm::OSM_TIME_FORMAT) : '',
+        'confdate' => confirm_by_date? ? confirm_by_date.strftime(Osm::OSM_DATE_FORMAT) : '',
+        'allowChanges' => allow_changes ? 'true' : 'false',
+        'disablereminders' => !reminders ? 'true' : 'false',
+      })
+      api.perform_query("events.php?action=saveNotepad&sectionid=#{section_id}", {
+        'eventid' => id,
+        'notepad' => notepad,
+      })
+      api.perform_query("events.php?action=saveNotepad&sectionid=#{section_id}", {
+        'eventid' => id,
+        'pnnotepad' => public_notepad,
       })
 
       # The cached events for the section will be out of date - remove them
@@ -236,16 +250,44 @@ module Osm
     end
 
 
+    # Add a column to the event in OSM
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [String] label the label for the field in OSM
+    # @param [String] name the label for the field in My.SCOUT (if this is blank then parents can't edit it)
+    # @return [Boolean] wether the update succedded
+    def add_column(api, name, label='')
+      raise ArgumentIsInvalid, 'name is invalid' if name.blank?
+      raise Forbidden, 'you do not have permission to write to events for this section' unless get_user_permission(api, section_id, :events).include?(:write)
+
+      data = api.perform_query("events.php?action=addColumn&sectionid=#{section_id}&eventid=#{id}", {
+        'columnName' => name,
+        'parentLabel' => label
+      })
+
+      # The cached events for the section will be out of date - remove them
+      cache_delete(api, ['events', section_id])
+      cache_delete(api, ['event', id])
+      cache_delete(api, ['event_attendance', id])
+
+      self.columns = self.class.new_event_from_data(data).columns
+
+      return data.is_a?(Hash) && (data['eventid'].to_i == id)
+    end
+
     # Add a field in OSM
+    # @deprecated use add_column instead
     # @param [Osm::Api] api The api to use to make the request
     # @param [String] field_label the label for the field to add
     # @return [Boolean] wether the update succedded
+    # TODO - Remove this method when upping the version
     def add_field(api, label)
+      warn "[DEPRECATION OF METHOD] this method is being depreiated, use add_column instead"
       raise ArgumentIsInvalid, 'label is invalid' if label.blank?
       raise Forbidden, 'you do not have permission to write to events for this section' unless get_user_permission(api, section_id, :events).include?(:write)
 
       data = api.perform_query("events.php?action=addColumn&sectionid=#{section_id}&eventid=#{id}", {
-        'columnName' => label
+        'columnName' => label,
+        'parentLabel' => ''
       })
 
       # The cached events for the section will be out of date - remove them
@@ -257,6 +299,70 @@ module Osm
     end
 
 
+    # TODO - Remove this attribute when upping the version
+    def fields
+      warn "[DEPRECATION OF ATTRIBUTE] this attribute is being depreiated, in favor of returning an array of Field objects."
+      return columns.inject({}){ |h,(c)| h[c.id] = c.name; h}
+    end
+    def fields=(value)
+      raise "[DEPRECATION OF ATTRIBUTE] this attribute is being depreiated, in favor of returning an array of Field objects."
+    end
+
+
+    private
+    def self.new_event_from_data(event_data)
+      columns = []
+      ActiveSupport::JSON.decode(event_data['config']).each do |field|
+        columns.push Column.new(:id => field['id'], :name => field['name'], :parent_label => field['pL'])
+      end
+
+      event = Osm::Event.new(
+        :id => Osm::to_i_or_nil(event_data['eventid']),
+        :section_id => Osm::to_i_or_nil(event_data['sectionid']),
+        :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'],
+        :location => event_data['location'],
+        :notes => event_data['notes'],
+        :archived => event_data['archived'].eql?('1'),
+        :columns => columns,
+        :notepad => event_data['notepad'],
+        :public_notepad => event_data['publicnotes'],
+        :confirm_by_date => Osm::parse_date(event_data['confdate']),
+        :allow_changes => event_data['allowchanges'].eql?('1'),
+        :reminders => !event_data['disablereminders'].eql?('1'),
+      )
+    end
+
+
+    class Column
+      include ::ActiveAttr::MassAssignmentSecurity
+      include ::ActiveAttr::Model
+  
+      # @!attribute [rw] id
+      #   @return [String] OSM id for the column
+      # @!attribute [rw] name
+      #   @return [String] name for the column (displayed in OSM)
+      # @!attribute [rw] parent_label
+      #   @return [String] label to display in My.SCOUT ("" prevents display in My.SCOUT)
+
+      attribute :id, :type => String
+      attribute :name, :type => String
+      attribute :parent_label, :type => String, :default => ''
+
+      attr_accessible :id, :name, :parent_label
+
+      validates_presence_of :id
+      validates_presence_of :name
+
+
+      # @!method initialize
+      #   Initialize a new Column
+      #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+
+    end # class Column
+
 
     class Attendance
       include ::ActiveAttr::MassAssignmentSecurity
@@ -289,7 +395,7 @@ module Osm
 
   
       # @!method initialize
-      #   Initialize a new FlexiRecordData
+      #   Initialize a new Attendance
       #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
 

data/lib/osm/section.rb

@@ -17,8 +17,6 @@ module Osm
     #   @return [Date] when the section's subscription to OSM expires
     # @!attribute [rw] type
     #   @return [Symbol] the section type (:beavers, :cubs, :scouts, :exporers, :adults, :waiting, :unknown)
-    # @!attribute [rw] num_scouts
-    #   @return [Fixnum] how many members the section has
     # @!attribute [rw] column_names
     #   @return [Hash] custom names to use for the data columns
     # @!attribute [rw] fields
@@ -29,6 +27,40 @@ module Osm
     #   @return [Hash] which columns are shown in the OSM mobile app
     # @!attribute [rw] flexi_records
     #   @return [Array<FlexiRecord>] list of the extra records the section has
+    # @!attribute [rw] gocardless
+    #   @return [Boolean] does the section use gocardless
+    # @!attribute [rw] myscout_events_expires
+    #   @return [Date] when the subscription to Events in My.SCOUT expires
+    # @!attribute [rw] myscout_badges_expires
+    #   @return [Date] when the subscription to Badges in My.SCOUT expires
+    # @!attribute [rw] myscout_programme_expires
+    #   @return [Date] when the subscription to Badges in My.SCOUT expires
+    # @!attribute [rw] myscout_events
+    #   @return [Boolean] whether the section uses the Events part of My.SCOUT
+    # @!attribute [rw] myscout_badges
+    #   @return [Boolean] whether the section uses the Badges part of My.SCOUT
+    # @!attribute [rw] myscout_programme
+    #   @return [Boolean] whether the section uses the Programme part of My.SCOUT
+    # @!attribute [rw] myscout_payments
+    #   @return [Boolean] whether the section uses the Payments part of My.SCOUT
+    # @!attribute [rw] myscout_emails
+    #   @return [Hash of Symbol to Boolean] which email addresses are linked to MyScout for each Member
+    # @!attribute [rw] myscout_email_address_send
+    #   @return [String] which email address to send My.SCOUT emails as
+    # @!attribute [rw] myscout_email_address_copy
+    #   @return [String] which email address to send copys of My.SCOUT emails to
+    # @!attribute [rw] myscout_badges_partial
+    #   @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_event_reminder_count
+    #   @return [Fixnum] How many event reminders to send to parents who haven't responded
+    # @!attribute [rw] myscout_event_reminder_frequency
+    #   @return [Fixnum] How many days to leave between event reminder emails
+    # @!attribute [rw] myscout_payment_reminder_count
+    #   @return [Fixnum] How many payment reminders to send to parents who haven't paid yet
+    # @!attribute [rw] myscout_payment_reminder_frequency
+    #   @return [Fixnum] How many days to leave between payment reminder emails
 
     attribute :id, :type => Integer
     attribute :name, :type => String
@@ -37,19 +69,46 @@ module Osm
     attribute :subscription_level, :default => :unknown
     attribute :subscription_expires, :type => Date
     attribute :type, :default => :unknown
-    attribute :num_scouts, :type => Integer
     attribute :column_names, :default => {}
     attribute :fields, :default => {}
     attribute :intouch_fields, :default => {}
     attribute :mobile_fields, :default => {}
     attribute :flexi_records, :default => []
-
-    attr_accessible :id, :name, :group_id, :group_name, :subscription_level, :subscription_expires, :type,
-                    :num_scouts, :column_names, :fields, :intouch_fields, :mobile_fields, :flexi_records
+    attribute :gocardless, :type => Boolean
+    attribute :myscout_events_expires, :type => Date
+    attribute :myscout_badges_expires, :type => Date
+    attribute :myscout_programme_expires, :type => Date
+    attribute :myscout_events, :type => Boolean
+    attribute :myscout_badges, :type => Boolean
+    attribute :myscout_programme, :type => Boolean
+    attribute :myscout_payments, :type => Boolean
+    attribute :myscout_emails, :default => {}# (Hash of Symbol to Boolean)
+    attribute :myscout_email_address_send, :type => String#, blank OK)
+    attribute :myscout_email_address_copy, :type => String#, blank OK)
+    attribute :myscout_badges_partial, :type => Boolean
+    attribute :myscout_programme_summary, :type => Boolean
+    attribute :myscout_event_reminder_count, :type => Integer
+    attribute :myscout_event_reminder_frequency, :type => Integer
+    attribute :myscout_payment_reminder_count, :type => Integer
+    attribute :myscout_payment_reminder_frequency, :type => Integer
+
+    attr_accessible :id, :name, :group_id, :group_name, :subscription_level, :subscription_expires,
+                    :type, :column_names, :fields, :intouch_fields, :mobile_fields, :flexi_records,
+                    :gocardless, :myscout_events_expires, :myscout_badges_expires,
+                    :myscout_programme_expires, :myscout_events, :myscout_badges,
+                    :myscout_programme, :myscout_payments, :myscout_emails,
+                    :myscout_email_address_send, :myscout_email_address_copy,
+                    :myscout_badges_partial, :myscout_programme_summary,
+                    :myscout_event_reminder_count, :myscout_event_reminder_frequency,
+                    :myscout_payment_reminder_count, :myscout_payment_reminder_frequency
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :allow_nil => true
     validates_numericality_of :group_id, :only_integer=>true, :greater_than=>0, :allow_nil => true
-    validates_numericality_of :num_scouts, :only_integer=>true, :greater_than_or_equal_to=>0
+    validates_numericality_of :myscout_event_reminder_count, :only_integer=>true, :greater_than_or_equal_to=>-1
+    validates_numericality_of :myscout_event_reminder_frequency, :only_integer=>true, :greater_than_or_equal_to=>-1
+    validates_numericality_of :myscout_payment_reminder_count, :only_integer=>true, :greater_than_or_equal_to=>-1
+    validates_numericality_of :myscout_payment_reminder_frequency, :only_integer=>true, :greater_than_or_equal_to=>-1
+
     validates_presence_of :name
     validates_presence_of :group_name
     validates_presence_of :subscription_level
@@ -62,11 +121,19 @@ module Osm
     validates_presence_of :flexi_records, :unless => Proc.new { |a| a.flexi_records == [] }
 
     validates_inclusion_of :subscription_level, :in => [:bronze, :silver, :gold, :unknown], :message => 'is not a valid level'
+    validates_inclusion_of :gocardless, :in => [true, false]
+    validates_inclusion_of :myscout_events, :in => [true, false]
+    validates_inclusion_of :myscout_badges, :in => [true, false]
+    validates_inclusion_of :myscout_programme, :in => [true, false]
+    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 :column_names, :hash => {:key_type => Symbol, :value_type => String}
     validates :fields, :hash => {:key_type => Symbol, :value_in => [true, false]}
     validates :intouch_fields, :hash => {:key_type => Symbol, :value_in => [true, false]}
     validates :mobile_fields, :hash => {:key_type => Symbol, :value_in => [true, false]}
+    validates :myscout_emails, :hash => {:key_in => [:email1, :email2, :email3, :email4], :value_in => [true, false]}
 
 
     # @!method initialize
@@ -96,7 +163,9 @@ module Osm
       permissions = Hash.new
       data.each do |role_data|
         unless role_data['section'].eql?('discount')  # It's not an actual section
-          section_data = ActiveSupport::JSON.decode(role_data['sectionConfig'])
+          section_data = role_data['sectionConfig'].is_a?(String) ? ActiveSupport::JSON.decode(role_data['sectionConfig']) : role_data['sectionConfig']
+          myscout_data = section_data['portal'] || {}
+          section_data['portalExpires'] ||= {}
 
           # Make sense of flexi records
           fr_data = []
@@ -127,6 +196,23 @@ module Osm
             :flexi_records => flexi_records.sort,
             :group_id => role_data['groupid'],
             :group_name => role_data['groupname'],
+            :gocardless => (section_data['gocardless'] || 'false').downcase.eql?('true'),
+            :myscout_events_expires => Osm::parse_date(section_data['portalExpires']['events']),
+            :myscout_badges_expires => Osm::parse_date(section_data['portalExpires']['badges']),
+            :myscout_programme_expires => Osm::parse_date(section_data['portalExpires']['programme']),
+            :myscout_events => myscout_data['events'] == 1,
+            :myscout_badges => myscout_data['badges'] == 1,
+            :myscout_programme => myscout_data['programme'] == 1,
+            :myscout_payments => myscout_data['payments'] == 1,
+            :myscout_emails => (myscout_data['emails'] || {}).inject({}) { |n,(k,v)| n[k.to_sym] = v.eql?('true'); n},
+            :myscout_email_address_send => myscout_data['emailAddress'],
+            :myscout_email_address_copy => myscout_data['emailAddressCopy'],
+            :myscout_badges_partial => myscout_data['badgesPartial'] == 1,
+            :myscout_programme_summary => myscout_data['programmeSummary'] == 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,
+            :myscout_payment_reminder_frequency => myscout_data['paymentRemindFrequency'].to_i,
           )
 
           result.push section

data/spec/osm/event_spec.rb

@@ -15,7 +15,12 @@ describe "Event" do
       :location => 'Somewhere',
       :notes => 'None',
       :archived => '0',
-      :fields => {},
+      :columns => [],
+      :notepad => 'notepad',
+      :public_notepad => 'public notepad',
+      :confirm_by_date => Date.new(2002, 1, 2),
+      :allow_changes => true,
+      :reminders => false,
     }
     event = Osm::Event.new(data)
 
@@ -28,7 +33,12 @@ describe "Event" do
     event.location.should == 'Somewhere'
     event.notes.should == 'None'
     event.archived.should be_false
-    event.fields.should == {}
+    event.columns.should == []
+    event.notepad.should == 'notepad'
+    event.public_notepad.should == 'public notepad'
+    event.confirm_by_date.should == Date.new(2002, 1, 2)
+    event.allow_changes.should == true
+    event.reminders.should == false
     event.valid?.should be_true
   end
 
@@ -37,8 +47,8 @@ describe "Event" do
       :member_id => 1,
       :grouping_id => 2,
       :row => 3,
-      :fields => {},
-      :event => Osm::Event.new(:id => 1, :section_id => 1, :name => 'Name', :fields => {})
+      :columns => [],
+      :event => Osm::Event.new(:id => 1, :section_id => 1, :name => 'Name', :columns => [])
     }
 
     ea = Osm::Event::Attendance.new(data)  
@@ -68,16 +78,38 @@ describe "Event" do
           'notes' => 'Notes',
           'sectionid' => 1,
           'googlecalendar' => nil,
-          'archived' => '0'
+          'archived' => '0',
+          'confdate' => nil,
+          'allowchanges' => '1',
+          'disablereminders' => '1'
         }]
       }
 
-      fields_body = {
-        'config' => '[{"id":"f_1","name":"Field 1"}]'
+      event_body = {
+        'eventid' => '2',
+        'name' => 'An Event',
+        'startdate' => '2001-01-02',
+        'enddate' => '2001-02-05',
+        'starttime' => '00:00:00',
+        'endtime' => '12:00:00',
+        'cost' => '0.00',
+        'location' => 'Somewhere',
+        'notes' => 'Notes',
+        'notepad' => 'notepad',
+        'publicnotes' => 'public notepad',
+        'config' => '[{"id":"f_1","name":"Name","pL":"Label"}]',
+        'sectionid' => '1',
+        'googlecalendar' => nil,
+        'archived' => '0',
+        'confdate' => '2002-01-02',
+        'allowchanges' => '1',
+        'disablereminders' => '1',
+        'pnnotepad' => '',
+        'structure' => []
       }
 
       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 => fields_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
@@ -89,12 +121,20 @@ describe "Event" do
       event.id.should == 2
       event.section_id.should == 1
       event.name.should == 'An Event'
-      event.start.should == Date.new(2001, 2, 3)
+      event.start.should == Date.new(2001, 1, 2)
       event.finish.should == DateTime.new(2001, 2, 5, 12, 0, 0)
       event.cost.should == '0.00'
       event.location.should == 'Somewhere'
       event.notes.should == 'Notes'
       event.archived.should be_false
+      event.notepad.should == 'notepad'
+      event.public_notepad.should == 'public notepad'
+      event.confirm_by_date.should == Date.new(2002, 1, 2)
+      event.allow_changes.should == true
+      event.reminders.should == false
+      event.columns[0].id.should == 'f_1'
+      event.columns[0].name.should == 'Name'
+      event.columns[0].parent_label.should == 'Label'
       event.valid?.should be_true
     end
 
@@ -132,10 +172,15 @@ describe "Event" do
       }
 
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => body.to_json)
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=1", :body => {'config' => '[]'}.to_json)
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=2", :body => {'config' => '[]'}.to_json)
-      Osm::Event.get_for_section(@api, 1).size.should == 1
-      Osm::Event.get_for_section(@api, 1, {:include_archived => true}).size.should == 2
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=1", :body => {'config' => '[]', 'archived' => '0', 'eventid' => '1'}.to_json)
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=2", :body => {'config' => '[]', 'archived' => '1', 'eventid' => '2'}.to_json)
+
+      events = Osm::Event.get_for_section(@api, 1)
+      all_events = Osm::Event.get_for_section(@api, 1, {:include_archived => true})
+
+      events.size.should == 1
+      events[0].id == 1
+      all_events.size.should == 2
     end
 
     it "Get event" do
@@ -159,7 +204,10 @@ describe "Event" do
         'endtime' => '04:05:06',
         'cost' => '1.23',
         'location' => 'Somewhere',
-        'notes' => 'none'
+        'notes' => 'none',
+        'confdate' => '2000-01-01',
+        'allowChanges' => 'true',
+        'disablereminders' => 'false',
       }
 
       Osm::Event.stub(:get_for_section) { [] }
@@ -168,12 +216,17 @@ describe "Event" do
       event = Osm::Event.create(@api, {
         :section_id => 1,
         :name => 'Test event',
-        :start => DateTime.new(2000, 01, 02, 03, 04, 05),
-        :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
+        :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',
-        :fields => {},
+        :columns => [],
+        :notepad => '',
+        :public_notepad => '',
+        :confirm_by_date => Date.new(2000, 1, 1),
+        :allow_changes => true,
+        :reminders => true,
       })
       event.should_not be_nil
       event.id.should == 2
@@ -191,7 +244,12 @@ describe "Event" do
         :cost => '1.23',
         :location => 'Somewhere',
         :notes => 'none',
-        :fields => {},
+        :columns => [],
+        :notepad => '',
+        :public_notepad => '',
+        :confirm_by_date => nil,
+        :allow_changes => true,
+        :reminders => true,
       })
       event.should be_nil
     end
@@ -212,10 +270,15 @@ describe "Event" do
         'cost' => '1.23',
         'location' => 'Somewhere',
         'notes' => 'none',
-        'eventid' => 2
+        'eventid' => 2,
+        'confdate' => '',
+        'allowChanges' => 'true',
+        'disablereminders' => 'false',
       }
 
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { 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"}}) { 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"}}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
 
       event = Osm::Event.new(
         :section_id => 1,
@@ -225,13 +288,18 @@ describe "Event" do
         :cost => '1.23',
         :location => 'Somewhere',
         :notes => 'none',
-        :id => 2
+        :id => 2,
+        :confirm_by_date => nil,
+        :allow_changes => true,
+        :reminders => true,
+        :notepad => 'notepad',
+        :public_notepad => 'public notepad',
       )
       event.update(@api).should be_true
     end
 
     it "Update (failed)" do
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      HTTParty.should_receive(:post).exactly(3).times { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
 
       event = Osm::Event.new(
         :section_id => 1,
@@ -347,28 +415,34 @@ describe "Event" do
     end
 
 
-    it "Add field (succeded)" do
+    it "Add column (succeded)" do
       url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addColumn&sectionid=1&eventid=2'
       post_data = {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
         'token' => @CONFIGURATION[:api][:osm][:token],
         'userid' => 'user_id',
         'secret' => 'secret',
-        'columnName' => 'Test field',
+        'columnName' => 'Test name',
+        'parentLabel' => 'Test label',
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"eventid":"2"}'}) }
+      body = {
+        'eventid' => '2',
+        'config' => '[{"id":"f_1","name":"Test name","pL":"Test label"}]'
+      }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>body.to_json}) }
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       event.should_not be_nil
-      event.add_field(@api, 'Test field').should be_true
+      event.add_column(@api, 'Test name', 'Test label').should be_true
+      event.columns.should == [Osm::Event::Column.new(:id=>'f_1', :name=>'Test name', :parent_label=>'Test label')]
     end
 
-    it "Add field (failed)" do
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+    it "Add column (failed)" do
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"config":"[]"}'}) }
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       event.should_not be_nil
-      event.add_field(@api, 'Test field').should be_false
+      event.add_column(@api, 'Test name', 'Test label').should be_false
     end
 
   end

data/spec/osm/section_spec.rb

@@ -12,7 +12,6 @@ describe "Section" do
       :subscription_level => :silver,
       :subscription_expires => (Date.today + 60).strftime('%Y-%m-%d'),
       :type => :cubs,
-      :num_scouts => 10,
       :wizard => false,
       :column_names => {:column_names => 'names'},
       :fields => {:fields => true},
@@ -20,7 +19,24 @@ describe "Section" do
       :mobile_fields => {:mobile_fields => true},
       :flexi_records => [],
       :group_id => 3,
-      :group_name => '3rd Somewhere'
+      :group_name => '3rd Somewhere',
+      :gocardless => true,
+      :myscout_events_expires => (Date.today + 61).strftime('%Y-%m-%d'),
+      :myscout_badges_expires => (Date.today + 62).strftime('%Y-%m-%d'),
+      :myscout_programme_expires => (Date.today + 63).strftime('%Y-%m-%d'),
+      :myscout_events => true,
+      :myscout_badges => true,
+      :myscout_programme => true,
+      :myscout_payments => true,
+      :myscout_emails => {:email1 => true, :email2 => false},
+      :myscout_email_address_send => 'send_from@example.com',
+      :myscout_email_address_copy => '',
+      :myscout_badges_partial => true,
+      :myscout_programme_summary => true,
+      :myscout_event_reminder_count => 4,
+      :myscout_event_reminder_frequency => 5,
+      :myscout_payment_reminder_count => 6,
+      :myscout_payment_reminder_frequency => 7
     }
   end
 
@@ -33,7 +49,6 @@ describe "Section" do
     section.subscription_level.should == :silver
     section.subscription_expires.should == Date.today + 60
     section.type.should == :cubs
-    section.num_scouts.should == 10
     section.column_names.should == {:column_names => 'names'}
     section.fields.should == {:fields => true}
     section.intouch_fields.should == {:intouch_fields => true}
@@ -41,6 +56,23 @@ describe "Section" do
     section.group_id.should == 3
     section.group_name.should == '3rd Somewhere'
     section.flexi_records.should == []
+    section.gocardless.should == true
+    section.myscout_events_expires.should == Date.today + 61
+    section.myscout_badges_expires.should == Date.today + 62
+    section.myscout_programme_expires.should == Date.today + 63
+    section.myscout_events.should == true
+    section.myscout_badges.should == true
+    section.myscout_programme.should == true
+    section.myscout_payments.should == true
+    section.myscout_emails.should == {:email1 => true, :email2 => false}
+    section.myscout_email_address_send.should == 'send_from@example.com'
+    section.myscout_email_address_copy.should == ''
+    section.myscout_badges_partial.should == true
+    section.myscout_programme_summary.should == true
+    section.myscout_event_reminder_count.should == 4
+    section.myscout_event_reminder_frequency.should == 5
+    section.myscout_payment_reminder_count.should == 6
+    section.myscout_payment_reminder_frequency.should == 7
     section.valid?.should be_true
   end
 
@@ -51,7 +83,6 @@ describe "Section" do
     section.subscription_level.should == :unknown
     section.subscription_expires.should == nil
     section.type.should == :unknown
-    section.num_scouts.should == nil
     section.column_names.should == {}
     section.fields.should == {}
     section.intouch_fields.should == {}
@@ -64,7 +95,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}}", "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,\"programmeSummary\":1,\"emailAddress\":\"send_from@example.com\",\"emailAddressCopy\":\"\",\"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)
@@ -80,7 +111,6 @@ describe "Section" do
       section.subscription_level.should == :bronze
       section.subscription_expires.should == Date.new(2013, 1, 5)
       section.type.should == :beavers
-      section.num_scouts.should == 10
       section.column_names.should == {:column_names => 'names'}
       section.fields.should == {:fields => true}
       section.intouch_fields.should == {:intouch_fields => true}
@@ -90,12 +120,30 @@ describe "Section" do
       section.flexi_records.size.should == 1
       section.flexi_records[0].id.should == 111
       section.flexi_records[0].name.should == 'Flexi Record 1'
+      section.gocardless.should == true
+      section.myscout_events_expires.should == Date.new(2013, 1, 6)
+      section.myscout_badges_expires.should == Date.new(2013, 1, 7)
+      section.myscout_programme_expires.should == Date.new(2013, 1, 8)
+      section.myscout_events.should == true
+      section.myscout_badges.should == true
+      section.myscout_programme.should == true
+      section.myscout_payments.should == true
+      section.myscout_emails.should == {:email1 => true, :email2 => false}
+      section.myscout_email_address_send.should == 'send_from@example.com'
+      section.myscout_email_address_copy.should == ''
+      section.myscout_badges_partial.should == true
+      section.myscout_programme_summary.should == true
+      section.myscout_event_reminder_count.should == 4
+      section.myscout_event_reminder_frequency.should == 5
+      section.myscout_payment_reminder_count.should == 6
+      section.myscout_payment_reminder_frequency.should == 7
     end
   
     it "Gets a section" do
       section = Osm::Section.get(@api, 1)
       section.should_not be_nil
       section.id.should == 1
+      section.valid?.should be_true
     end
 
     it "Fetches user's permissions" do
@@ -295,7 +343,7 @@ describe "Online Scout Manager API Strangeness" do
     section.get_notepad(@api).should == ''
   end
 
-  it "handles skipping of a 'discount' section" do
+  it "skips a 'discount' section" do
     body = [
       {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"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"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>100, "member"=>100, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
       {"sectionConfig"=>"{\"code\":1,\"districts\":[\"Loddon\",\"Kennet\"]}","groupname"=>"Berkshire","groupid"=>"2","groupNormalised"=>"1","sectionid"=>"3","sectionname"=>"County Admin","section"=>"discount","isDefault"=>"0","permissions"=>{"districts"=>["Loddon"]}}
@@ -309,4 +357,17 @@ describe "Online Scout Manager API Strangeness" do
     section.id.should == 1
   end
 
+  it "handles section config being either a Hash or a JSON encoded Hash" 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}}", "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)
+
+    sections = Osm::Section.get_all(@api)
+    sections.size.should == 2
+    sections[0].should_not be_nil
+    sections[1].should_not be_nil
+  end
+
 end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000Z
+date: 2013-01-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &83131290 !ruby/object:Gem::Requirement
+  requirement: &79244120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83131290
+  version_requirements: *79244120
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &83130640 !ruby/object:Gem::Requirement
+  requirement: &79243800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *83130640
+  version_requirements: *79243800
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &83129610 !ruby/object:Gem::Requirement
+  requirement: &79243500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *83129610
+  version_requirements: *79243500
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &83129230 !ruby/object:Gem::Requirement
+  requirement: &79243020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83129230
+  version_requirements: *79243020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &83128550 !ruby/object:Gem::Requirement
+  requirement: &79242470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *83128550
+  version_requirements: *79242470
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83128100 !ruby/object:Gem::Requirement
+  requirement: &79242200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *83128100
+  version_requirements: *79242200
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &83127500 !ruby/object:Gem::Requirement
+  requirement: &79241900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *83127500
+  version_requirements: *79241900
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -149,18 +149,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 624159517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 624159517
 requirements: []
 rubyforge_project: osm
 rubygems_version: 1.8.10
@@ -168,3 +162,4 @@ signing_key:
 specification_version: 3
 summary: Use the Online Scout Manager API
 test_files: []
+has_rdoc: