osm 1.2.10 → 1.2.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWU5MjViOTkxMDVjZDlkYjkwM2EzZDNkNDg1YzRiZjk4OGQxMmU2Mg==
+    NzVhNDE1ZTEwZGVlNDJkNjYzNjFlY2JjMGVmOThlNzExZDc0NWU1NA==
   data.tar.gz: !binary |-
-    YjkzMjgzNGQyMjA2NjFkN2RhOTU1YjFkYzY1MzhkMzFlZTI5YTJjMA==
+    ZjI1YmNmOTEyMjFkMjJkYzUzZjI1YzUyNTUxYzRlN2E1ZmFlMzY0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ODRiY2RiNjE2NjUxMGJhY2U2MDZhYzI2ZjAwYzQxOWFiNjYxN2ZjNzI1NzUy
-    ZWI0NGFlNjk3Zjc4NTE3MTlkZmVhNzVkYzAxMDkzNDE0YmRiZjc1MGExM2U3
-    YzhmNjhlYTJjOWRmZmE5ZmFkNjI4NGU4YWRiMTA2NjE3YTk2NzU=
+    ZGJhZjk3MDAyZTNhOTg0MjNkMTczMWE0MTc3ZDJlNmU4MDdkM2IyOTM2YTBi
+    MGIzNDllMDU2MzViNjQzMzcwYzEyN2ZmZmM1NmM4MjVkNmE0ZDZhZGRmY2Q3
+    MjkxNzE5ZDQwZTZlMzM0ZWU5NTIzZmRmNTA1N2RkZWUxN2JjYjA=
   data.tar.gz: !binary |-
-    YTUxNzMzMTlhOTRhMDViNzNhYjU2MDNiYzM1YzQ2NjY4ZjFiMzQzMTRlYjc0
-    NDY1ZmU3MDRjMjI3ZTc2ODNhNjg2OWZkZjk1YmEzYWUyMWE3NGRlYmRiYjQw
-    ZWYwMjcxODcyYjY0ZGVhOTZhZWZjMTM3ZTg4YWE1YWQzNDA3ZTg=
+    MzcyMjU0OTczNjc3YmVmNmVjODA4YjI1N2ViZTcwMmU0MTQwYzg1YTMxMjcz
+    MDJhMjJkOTBlMDBmNTRkOTRkZWI4M2MwOGZiMzBmN2UyMzYzMDM1OTk4MWE3
+    NjgzNTk3YTg3N2I5YTA4MGI5YmZhYmQxZDYyODA2NmVhNWVjY2I=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Version 1.2.11
+
+ * Fix handling blank event config from OSM (JSON parse error)
+ * Add retrieving of badge links to events
+ * When creating an event in OSM badge links are also added
+ * When updating an event in OSM badge links are also updated
+ * Add get\_list method to Event (get basic event details, should cutout the need to get all events all the time)
+
 ## Version 1.2.10
 
  * Update levels for Hikes and Nights away staged badges (released April 2014)

data/lib/osm/api.rb

@@ -264,6 +264,7 @@ module Osm
     # @return [String] the error message
     def self.get_osm_error(data)
       return false unless data.is_a?(Hash)
+      return false if data['ok']
       to_return = data['error'] || data['err'] || false
       to_return = false if to_return.blank?
       return to_return

data/lib/osm/event.rb

@@ -1,8 +1,12 @@
 module Osm
 
   class Event < Osm::Model
+    class BadgeLink < Osm::Model; end # Ensure the constant exists for the validators
     class Column < Osm::Model; end # Ensure the constant exists for the validators
 
+    LIST_ATTRIBUTES = [:id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived, :public_notepad, :confirm_by_date, :allow_changes, :reminders, :attendance_limit, :attendance_limit_includes_leaders, :attendance_reminder, :allow_booking]
+    EXTRA_ATTRIBUTES = [:notepad, :columns, :badges]
+
     # @!attribute [rw] id
     #   @return [Fixnum] the id for the event
     # @!attribute [rw] section_id
@@ -21,6 +25,8 @@ module Osm
     #   @return [String] notes about the event
     # @!attribute [rw] archived
     #   @return [Boolean] if the event has been archived
+    # @!attribute [rw] badges
+    #   @return [Array<Osm::Event::BadgeLink>] the badge links for the event
     # @!attribute [rw] columns
     #   @return [Array<Osm::Event::Column>] the custom columns for the event
     # @!attribute [rw] notepad
@@ -51,6 +57,7 @@ module Osm
     attribute :location, :type => String, :default => ''
     attribute :notes, :type => String, :default => ''
     attribute :archived, :type => Boolean, :default => false
+    attribute :badges, :default => []
     attribute :columns, :default => []
     attribute :notepad, :type => String, :default => ''
     attribute :public_notepad, :type => String, :default => ''
@@ -64,7 +71,7 @@ module Osm
 
     if ActiveModel::VERSION::MAJOR < 4
       attr_accessible :id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived,
-                      :fields, :columns, :notepad, :public_notepad, :confirm_by_date, :allow_changes,
+                      :fields, :badges, :columns, :notepad, :public_notepad, :confirm_by_date, :allow_changes,
                       :reminders, :attendance_limit, :attendance_limit_includes_leaders,
                       :attendance_reminder, :allow_booking
     end
@@ -73,6 +80,7 @@ module Osm
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :attendance_limit, :only_integer=>true, :greater_than_or_equal_to=>0
     validates_presence_of :name
+    validates :badges, :array_of => {:item_type => Osm::Event::BadgeLink, :item_valid => true}
     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]
@@ -126,6 +134,52 @@ module Osm
       end
     end
 
+    # Get event list for a section (not all details for each event)
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Osm::Section, Fixnum, #to_i] section The section (or its ID) to get the events for
+    # @!macro options_get
+    # @return [Array<Hash>]
+    def self.get_list(api, section, options={})
+      require_ability_to(api, :read, :events, section, options)
+      section_id = section.to_i
+      cache_key = ['events_list', section_id]
+      events_cache_key = ['events', section_id]
+      events = nil
+
+      unless options[:no_cache]
+
+        # Try getting from cache
+        if cache_exist?(api, cache_key)
+          return cache_read(api, cache_key)
+        end
+  
+        # Try generating from cached events
+        if cache_exist?(api, events_cache_key)
+          ids = cache_read(api, events_cache_key)
+          events = get_from_ids(api, ids, 'event', section, options, :get_for_section).map do |e|
+            e.attributes.symbolize_keys.select do |k,v|
+              LIST_ATTRIBUTES.include?(k)
+            end
+          end
+        end
+
+      end
+
+      # Fetch from OSM
+      if events.nil?
+        data = api.perform_query("events.php?action=getEvents&sectionid=#{section_id}&showArchived=true")
+        events = Array.new
+        unless data['items'].nil?
+          data['items'].map do |event_data|
+            events.push(attributes_from_data(event_data))
+          end
+        end
+      end
+
+      cache_write(api, cache_key, events)
+      return events
+    end
+
     # Get an event
     # @param [Osm::Api] api The api to use to make the request
     # @param [Osm::Section, Fixnum, #to_i] section The section (or its ID) to get the events for
@@ -148,6 +202,7 @@ module Osm
 
 
     # Create an event in OSM
+    # If something goes wrong adding badges to OSM then the event returned will have been read from OSM
     # @param [Osm::Api] api The api to use to make the request
     # @return [Osm::Event, nil] the created event, nil if failed
     # @raise [Osm::ObjectIsInvalid] If the Event is invalid
@@ -174,13 +229,33 @@ module Osm
         'allowbooking' => event.allow_booking ? 'true' : 'false',
       })
 
-      # The cached events for the section will be out of date - remove them
-      cache_delete(api, ['events', event.section_id])
-      cache_write(api, ['event', event.id], event)
-
       if (data.is_a?(Hash) && data.has_key?('id'))
         event.id = data['id'].to_i
-        return event
+
+        # The cached events for the section will be out of date - remove them
+        cache_delete(api, ['events', event.section_id])
+        cache_write(api, ['event', event.id], event)
+
+        # Add badge links to OSM
+        badges_created = true
+        event.badges.each do |badge|
+          badge_data = data = api.perform_query("ext/events/event/index.php?action=badgeAddToEvent&sectionid=#{event.section_id}&eventid=#{event.id}", {
+            'section' => badge.badge_section,
+            'badgetype' => badge.badge_type,
+            'badge' => badge.badge_key,
+            'columnname' => badge.requirement_key,
+            'data' => badge.data,
+            'newcolumnname' => badge.label,
+          })
+          badges_created = false unless badge_data.is_a?(Hash) && badge_data['ok']
+        end
+
+        if badges_created
+          return event
+        else
+          # Someting went wrong adding badges so return what OSM has
+          return get(api, event.section_id, event.id)
+        end
       else
         return nil
       end
@@ -188,42 +263,107 @@ module Osm
 
     # Update event in OSM
     # @param [Osm::Api] api The api to use to make the request
-    # @return [Boolean] whether the update succedded
+    # @return [Boolean] whether the update succedded (will return true if no updates needed to be made)
     def update(api)
       require_ability_to(api, :write, :events, section_id)
+       updated = true
+
+      # Update main attributes
+      update_main_attributes = false
+      %w{ id name location start finish cost cost_tbc notes confirm_by_date allow_changes reminders attendance_limit attendance_limit_includes_leaders allow_booking }.each do |a|
+        if changed_attributes.include?(a)
+          update_main_attributes = true
+          break # no use checking the others
+        end
+      end
+      if update_main_attributes
+        data = api.perform_query("events.php?action=addEvent&sectionid=#{section_id}", {
+          'eventid' => id,
+          'name' => name,
+          'location' => location,
+          'startdate' => start? ? start.strftime(Osm::OSM_DATE_FORMAT) : '',
+          'enddate' => finish? ? finish.strftime(Osm::OSM_DATE_FORMAT) : '',
+          'cost' => cost_tbc? ? '-1' : cost,
+          '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',
+          'attendancelimit' => attendance_limit,
+          'attendancereminder' => attendance_reminder,
+          'limitincludesleaders' => attendance_limit_includes_leaders ? 'true' : 'false',
+          'allowbooking' => allow_booking ? 'true' : 'false',
+        })
+        updated &= data.is_a?(Hash) && (data['id'].to_i == id)
+      end
 
-      to_update = changed_attributes
-
-      data = api.perform_query("events.php?action=addEvent&sectionid=#{section_id}", {
-        'eventid' => id,
-        'name' => name,
-        'location' => location,
-        'startdate' => start? ? start.strftime(Osm::OSM_DATE_FORMAT) : '',
-        'enddate' => finish? ? finish.strftime(Osm::OSM_DATE_FORMAT) : '',
-        'cost' => cost_tbc? ? '-1' : cost,
-        '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',
-        'attendancelimit' => attendance_limit,
-        'attendancereminder' => attendance_reminder,
-        'limitincludesleaders' => attendance_limit_includes_leaders ? 'true' : 'false',
-        'allowbooking' => allow_booking ? 'true' : 'false',
-      })
+      # Private notepad
+      if changed_attributes.include?('notepad')
+        data = api.perform_query("events.php?action=saveNotepad&sectionid=#{section_id}", {
+          'eventid' => id,
+          'notepad' => notepad,
+        })
+        updated &= data.is_a?(Hash)
+      end
 
-      api.perform_query("events.php?action=saveNotepad&sectionid=#{section_id}", {
-        'eventid' => id,
-        'notepad' => notepad,
-      }) if to_update.include?('notepad')
+      # MySCOUT notepad
+      if changed_attributes.include?('public_notepad')
+        data = api.perform_query("events.php?action=saveNotepad&sectionid=#{section_id}", {
+          'eventid' => id,
+          'pnnotepad' => public_notepad,
+        })
+        updated &= data.is_a?(Hash)
+      end
+
+      # Badges
+      if changed_attributes.include?('badges')
+        original_badges = @original_attributes['badges'] || []
+
+        # Deleted badges
+        badges_to_delete = []
+        original_badges.each do |badge|
+          unless badges.include?(badge)
+            badges_to_delete.push({
+              'section' => badge.badge_section,
+              'badge' => badge.badge_key,
+              'columnname' => badge.requirement_key,
+              'data' => badge.data,
+              'newcolumnname' => badge.label,
+              'badgetype' => badge.badge_type,
+            })
+          end
+        end
+        unless badges_to_delete.empty?
+          data = api.perform_query("ext/events/event/index.php?action=badgeDeleteFromEvent&sectionid=#{section_id}&eventid=#{id}", {
+            'badgelinks' => badges_to_delete,
+          })
+          updated &= data.is_a?(Hash) && data['ok']
+        end
 
-      api.perform_query("events.php?action=saveNotepad&sectionid=#{section_id}", {
-        'eventid' => id,
-        'pnnotepad' => public_notepad,
-      }) if to_update.include?('public_notepad')
+        # Added badges
+        badges_to_add = []
+        badges.each do |badge|
+          unless original_badges.include?(badge)
+            badges_to_add.push({
+              'section' => badge.badge_section,
+              'badge' => badge.badge_key,
+              'columnname' => badge.requirement_key,
+              'data' => badge.data,
+              'newcolumnname' => badge.label,
+              'badgetype' => badge.badge_type,
+            })
+          end
+        end
+        unless badges_to_add.empty?
+          data = api.perform_query("ext/events/event/index.php?action=badgeAddToEvent&sectionid=#{section_id}&eventid=#{id}", {
+            'badgelinks' => badges_to_add,
+          })
+          updated &= data.is_a?(Hash) && data['ok']
+        end
+      end # includes badges
 
-      if data.is_a?(Hash) && (data['id'].to_i == id)
+      if updated
         reset_changed_attributes
         # The cached event will be out of date - remove it
         cache_delete(api, ['event', id])
@@ -383,8 +523,8 @@ module Osm
       return attendees
     end
 
-    def self.new_event_from_data(event_data)
-      event = Osm::Event.new(
+    def self.attributes_from_data(event_data)
+      {
         :id => Osm::to_i_or_nil(event_data['eventid']),
         :section_id => Osm::to_i_or_nil(event_data['sectionid']),
         :name => event_data['name'],
@@ -394,7 +534,6 @@ module Osm
         :location => event_data['location'],
         :notes => event_data['notes'],
         :archived => event_data['archived'].eql?('1'),
-        :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'),
@@ -403,19 +542,87 @@ module Osm
         :attendance_limit_includes_leaders => event_data['limitincludesleaders'].eql?('1'),
         :attendance_reminder => event_data['attendancereminder'].to_i,
         :allow_booking => event_data['allowbooking'].eql?('1'),
-      )
+      }
+    end
+
+    def self.new_event_from_data(event_data)
+      event = Osm::Event.new(attributes_from_data(event_data))
+      event.notepad = event_data['notepad']
 
       columns = []
-      column_data = ActiveSupport::JSON.decode(event_data['config'] || '[]')
+      config_raw = event_data['config']
+      config_raw = '[]' if config_raw.blank?
+      column_data = ActiveSupport::JSON.decode(config_raw)
       column_data = [] unless column_data.is_a?(Array)
       column_data.each do |field|
         columns.push Column.new(:id => field['id'], :name => field['name'], :label => field['pL'], :parent_required => field['pR'].to_s.eql?('1'), :event => event)
       end
       event.columns = columns
+
+      badges = []
+      badges_data = event_data['badgelinks']
+      badges_data = [] unless badges_data.is_a?(Array)
+      badges_data.each do |field|
+        badges.push BadgeLink.new(badge_key: field['badge'], badge_type: field['badgetype'].to_sym, badge_section: field['section'].to_sym, requirement_key: field['columnname'], label: field['columnnameLongName'], data: field['data'])
+      end
+      event.badges = badges
+
       return event
     end
 
 
+    # When creating a BadgeLink for an existing column in a hikes/nights badge the label is optional
+    # When creating a BadgeLink for a new column in a hikes/nights badge the requirement_key MUST be blank
+# TODO : Add validation for above statements
+    class BadgeLink
+      include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
+      include ActiveAttr::Model
+
+      # @!attribute [rw] badge_key
+      #   @return [String] the badge being done
+      # @!attribute [rw] badge_type
+      #   @return [Symbol] the type of badge
+      # @!attribute [rw] requirement_key
+      #   @return [String] the requirement being done
+      # @!attribute [rw] badge_section
+      #   @return [Symbol] the section type that the badge belongs to
+      # @!attribute [rw] label
+      #   @return [String] human firendly label for the badge and requirement
+      # @!attribute [rw] data
+      #   @return [String] what to put in the column when the badge records are updated
+
+      attribute :badge_key, :type => String
+      attribute :badge_type, :type => Object
+      attribute :requirement_key, :type => String
+      attribute :badge_section, :type => Object
+      attribute :label, :type => String
+      attribute :data, :type => String
+
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :badge_key, :badge_type, :requirement_key, :badge_section, :label, :data
+      end
+
+      validates_presence_of :badge_key
+      validates_format_of :requirement_key, :with => /\A(?:[a-z]_\d{2})|(?:custom_\d+)\Z/, :allow_blank => true, :message => 'is not in the correct format (e.g. "a_01")'
+      validates_inclusion_of :badge_section, :in => [:beavers, :cubs, :scouts, :explorers, :staged]
+      validates_inclusion_of :badge_type, :in => [:core, :staged, :activity, :challenge]
+
+      # @!method initialize
+      #   Initialize a new Meeting::Activity
+      #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+
+      # Compare BadgeLink based on section, type, key, requirement, data
+      def <=>(another)
+        [:badge_section, :badge_type, :badge_key, :requirement_key].each do |attribute|
+          result = self.try(:data) <=> another.try(:data)
+          return result unless result == 0
+        end
+        return self.try(:data) <=> another.try(:data)
+      end
+
+    end # Class Event::BadgeLink
+
+
     class Column < Osm::Model
       # @!attribute [rw] id
       #   @return [String] OSM id for the column

data/lib/osm/meeting.rb

@@ -377,7 +377,7 @@ module Osm
 
       validates_presence_of :badge_key
       validates_format_of :requirement_key, :with => /\A[a-z]_\d{2}\Z/, :message => 'is not in the correct format (e.g. "a_01")'
-      validates_inclusion_of :badge_section, :in => [:beavers, :cubs, :scouts, :explorers]
+      validates_inclusion_of :badge_section, :in => [:beavers, :cubs, :scouts, :explorers, :staged]
       validates_inclusion_of :badge_type, :in => [:core, :staged, :activity, :challenge]
 
       # @!method initialize

data/lib/osm/model.rb

@@ -74,7 +74,11 @@ module Osm
 
     # Reset the list of attributes which have changed
     def reset_changed_attributes
-      @original_attributes = attributes
+      classes_to_clone = [Array, Hash]
+      attributes_now = attributes.map do |k,v|
+        [k, (classes_to_clone.include?(v.class) ? v.clone : v)]
+      end # Deep(ish) clone
+      @original_attributes = Hash[attributes_now]
     end
 
 
@@ -82,7 +86,7 @@ module Osm
     old_initialize = instance_method(:initialize)
     define_method :initialize do |*args|
       ret_val = old_initialize.bind(self).call(*args)
-      @original_attributes = attributes
+      reset_changed_attributes
       return ret_val
     end
 
@@ -252,7 +256,7 @@ module Osm
     # @param [Symbol] get_all_method The method to get all items (either :get_all or :get_for_section)
     # @return [Array] An array of the items
     def self.get_from_ids(api, ids, key, arguments=[], options, get_all_method)
-      raise ArgumentError, "get_al_method is invalid" unless [:get_all, :get_for_section].include?(get_all_method)
+      raise ArgumentError, "get_all_method is invalid" unless [:get_all, :get_for_section].include?(get_all_method)
       items = Array.new
       ids.each do |id|
         if cache_exist?(api, [key, id])

data/spec/osm/event_spec.rb

@@ -15,6 +15,7 @@ describe "Event" do
       :location => 'Somewhere',
       :notes => 'None',
       :archived => '0',
+      :badges => [],
       :columns => [],
       :notepad => 'notepad',
       :public_notepad => 'public notepad',
@@ -37,6 +38,7 @@ describe "Event" do
     event.location.should == 'Somewhere'
     event.notes.should == 'None'
     event.archived.should be_false
+    event.badges.should == []
     event.columns.should == []
     event.notepad.should == 'notepad'
     event.public_notepad.should == 'public notepad'
@@ -114,7 +116,30 @@ describe "Event" do
 
       event_attendances.sort.should == [ea1, ea2, ea3]
     end
+  
+  end
 
+  describe "Event::BadgeLink" do
+  
+    it "Create" do
+      bl = Osm::Event::BadgeLink.new(
+        :badge_key => 'artist',
+        :badge_type => :activity,
+        :requirement_key => 'a_01',
+        :badge_section => :cubs,
+        :label => 'Cubs Artist Activity - A: Poster',
+        :data => 'abc'
+      )
+  
+      bl.badge_key.should == 'artist'
+      bl.badge_type.should == :activity
+      bl.requirement_key.should == 'a_01'
+      bl.badge_section.should == :cubs
+      bl.label.should == 'Cubs Artist Activity - A: Poster'
+      bl.data.should == 'abc'
+      bl.valid?.should be_true
+    end
+  
   end
 
   describe "Using the API" do
@@ -159,6 +184,10 @@ describe "Event" do
         'notepad' => 'notepad',
         'publicnotes' => 'public notepad',
         'config' => '[{"id":"f_1","name":"Name","pL":"Label","pR":"1"}]',
+        'badgelinks' => [
+          {"section"=>"cubs", "badgetype"=>"activity", "badge"=>"athletics", "columnname"=>"b_06", "data"=>"", "badgeLongName"=>"Athletics", "columnnameLongName"=>"B: Run", "sectionLongName"=>"Cubs", "badgetypeLongName"=>"Activity"},
+          {"section"=>"staged", "badgetype"=>"staged", "badge"=>"hikes", "columnname"=>"custom_69153", "data"=>"1", "badgeLongName"=>"Hikes", "columnnameLongName"=>"C: Hike name = 1", "sectionLongName"=>"Staged", "badgetypeLongName"=>"Staged"},
+        ],
         'sectionid' => '1',
         'googlecalendar' => nil,
         'archived' => '0',
@@ -206,9 +235,27 @@ describe "Event" do
         event.columns[0].name.should == 'Name'
         event.columns[0].label.should == 'Label'
         event.columns[0].parent_required.should be_true
+        event.badges[0].badge_key.should == 'athletics'
+        event.badges[0].badge_section.should == :cubs
+        event.badges[0].badge_type.should == :activity
+        event.badges[0].requirement_key.should == 'b_06'
+        event.badges[0].data.should == ''
+        event.badges[0].label.should == 'B: Run'
+        event.badges[1].badge_key.should == 'hikes'
+        event.badges[1].badge_section.should == :staged
+        event.badges[1].badge_type.should == :staged
+        event.badges[1].requirement_key.should == 'custom_69153'
+        event.badges[1].data.should == '1'
         event.valid?.should be_true
       end
 
+      it "Handles a blank config" do
+        @event_body['config'] = ''
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvent&sectionid=1&eventid=2", :body => @event_body.to_json,:content_type => 'application/json')
+        expect { @event = Osm::Event.get(@api, 1, 2) }.to_not raise_error
+        @event.columns.should == []
+      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, :content_type => 'application/json')
 
@@ -271,6 +318,28 @@ describe "Event" do
       end
     end
 
+    describe "Get events list for section" do
+      it "From OSM" do
+        events = Osm::Event.get_list(@api, 1)
+        events.map{ |e| e[:id]}.should == [2]
+      end
+
+      it "From cache" do
+        events = Osm::Event.get_list(@api, 1)
+        HTTParty.should_not_receive(:post)
+        Osm::Event.get_list(@api, 1).should == events
+      end
+
+      it "From cached events" do
+        Osm::Event.get_for_section(@api, 1)
+        HTTParty.should_not_receive(:post)
+        events = Osm::Event.get_list(@api, 1)
+        events.map{ |e| e[:id]}.should == [2]
+      end
+
+    end
+
+
     it "Get event" do
       event = Osm::Event.get(@api, 1, 2)
       event.should_not be_nil
@@ -417,6 +486,7 @@ describe "Event" do
           :cost => '1.23',
           :location => 'Somewhere',
           :notes => 'none',
+          :badges => [],
           :columns => [],
           :notepad => '',
           :public_notepad => '',
@@ -467,6 +537,7 @@ describe "Event" do
           :cost => 'TBC',
           :location => 'Somewhere',
           :notes => 'none',
+          :badges => [],
           :columns => [],
           :notepad => '',
           :public_notepad => '',
@@ -481,6 +552,144 @@ describe "Event" do
         event.id.should == 2
       end
 
+      describe "With badges" do
+
+        before :each 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',
+            'attendancereminder' => 1,
+          }
+
+          Osm::Event.stub(:get_for_section) { [] }
+          HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
+
+          @attributes = {
+            :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',
+            :badges => [],
+            :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,
+            :attendance_reminder => 1,
+            :allow_booking => true,
+          }
+          @badge_url = 'https://www.onlinescoutmanager.co.uk/ext/events/event/index.php?action=badgeAddToEvent&sectionid=1&eventid=2'
+        end
+
+        it "'Normal badge'" do
+          post_data = {
+            'apiid' => @CONFIGURATION[:api][:osm][:id],
+            'token' => @CONFIGURATION[:api][:osm][:token],
+            'userid' => 'user_id',
+            'secret' => 'secret',
+            'section' => :beavers,
+            'badgetype' => :activity,
+            'badge' => 'test',
+            'columnname' => 'a_01',
+            'data' => '',
+            'newcolumnname' => '',
+          }
+          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
+
+          @attributes[:badges] = [Osm::Event::BadgeLink.new(
+            badge_key: 'test',
+            badge_type: :activity,
+            requirement_key: 'a_01',
+            badge_section: :beavers,
+            label: '',
+            data: '',
+          )]
+          event = Osm::Event.create(@api, @attributes)
+          event.should_not be_nil
+          event.id.should == 2
+        end
+
+        it "Add a hikes column" do
+          post_data = {
+            'apiid' => @CONFIGURATION[:api][:osm][:id],
+            'token' => @CONFIGURATION[:api][:osm][:token],
+            'userid' => 'user_id',
+            'secret' => 'secret',
+            'section' => :staged,
+            'badgetype' => :staged,
+            'badge' => 'hikes',
+            'columnname' => '',
+            'data' => '1',
+            'newcolumnname' => 'Label for added column',
+          }
+          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
+
+          @attributes[:badges] = [Osm::Event::BadgeLink.new(
+            badge_key: 'hikes',
+            badge_type: :staged,
+            requirement_key: '',
+            badge_section: :staged,
+            label: 'Label for added column',
+            data: '1',
+          )]
+          event = Osm::Event.create(@api, @attributes)
+          event.should_not be_nil
+          event.id.should == 2
+        end
+
+        it "Existing nights away column" do
+          post_data = {
+            'apiid' => @CONFIGURATION[:api][:osm][:id],
+            'token' => @CONFIGURATION[:api][:osm][:token],
+            'userid' => 'user_id',
+            'secret' => 'secret',
+            'section' => :staged,
+            'badgetype' => :staged,
+            'badge' => 'nights',
+            'columnname' => 'custom_01234',
+            'data' => '2',
+            'newcolumnname' => '',
+          }
+          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
+
+          @attributes[:badges] = [Osm::Event::BadgeLink.new(
+            badge_key: 'nights',
+            badge_type: :staged,
+            requirement_key: 'custom_01234',
+            badge_section: :staged,
+            label: '',
+            data: '2',
+          )]
+          event = Osm::Event.create(@api, @attributes)
+          event.should_not be_nil
+          event.id.should == 2
+        end
+
+      end
+
     end
 
     it "Create (failed)" do
@@ -539,7 +748,7 @@ describe "Event" do
 
         event = Osm::Event.new(
           :section_id => 1,
-          :name => 'Test event',
+          :name => '',
           :start => DateTime.new(2000, 01, 02, 03, 04, 05),
           :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
           :cost => '1.23',
@@ -556,6 +765,7 @@ describe "Event" do
           :attendance_reminder => 2,
           :allow_booking => true,
         )
+        event.name = 'Test event'
         event.notepad = 'notepad'
         event.public_notepad = 'public notepad'
         event.update(@api).should be_true
@@ -611,6 +821,78 @@ describe "Event" do
         event.update(@api).should be_true
       end
 
+      describe "Badge links" do
+
+        before :each do
+          @event = Osm::Event.new({
+            :id => 2,
+            :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',
+            :badges => [Osm::Event::BadgeLink.new(badge_key: 'test')],
+            :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,
+            :attendance_reminder => 1,
+            :allow_booking => true,
+          })
+        end
+
+        it "Added" do
+          url = 'https://www.onlinescoutmanager.co.uk/ext/events/event/index.php?action=badgeAddToEvent&sectionid=1&eventid=2'
+          post_data = {
+            'apiid' => @CONFIGURATION[:api][:osm][:id],
+            'token' => @CONFIGURATION[:api][:osm][:token],
+            'userid' => 'user_id',
+            'secret' => 'secret',
+            'badgelinks' => [{
+              'section' => nil,
+              'badgetype' => nil,
+              'badge' => 'test2',
+              'columnname' => nil,
+              'data' => nil,
+              'newcolumnname' => nil,
+            }],
+          }
+          HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true,"error":"Update Error"}'}) }
+
+          @event.badges.push(Osm::Event::BadgeLink.new(badge_key: 'test2'))
+          @event.update(@api).should be_true
+        end
+
+        it "Removed" do
+          url = 'https://www.onlinescoutmanager.co.uk/ext/events/event/index.php?action=badgeDeleteFromEvent&sectionid=1&eventid=2'
+          post_data = {
+            'apiid' => @CONFIGURATION[:api][:osm][:id],
+            'token' => @CONFIGURATION[:api][:osm][:token],
+            'userid' => 'user_id',
+            'secret' => 'secret',
+            'badgelinks' => [{
+              'section' => nil,
+              'badgetype' => nil,
+              'badge' => 'test',
+              'columnname' => nil,
+              'data' => nil,
+              'newcolumnname' => nil,
+            }],
+          }
+          HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true,"error":"Update Error"}'}) }
+
+          @event.badges = []
+          @event.update(@api).should be_true
+        end
+
+      end
+
     end
 
     it "Update (failed)" do
@@ -626,6 +908,7 @@ describe "Event" do
         :notes => 'none',
         :id => 2
       )
+      event.id = 22
       event.update(@api).should be_false
     end
 

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.10"
+  VERSION = "1.2.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.11
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport