osm 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -1,10 +1,13 @@
 ## Version 1.0.6
 
-  * 
+  * Add badge\_links to Meeting
+  * Event.add\_column method gains a required attirbute (default false) to control whether parents are required to enter something
+  * Event::Column gains parent\_required attribute (default false)
+  * Event::Attendance gains get\_audit\_trail(api) method
 
 ## Version 1.0.5
 
-  * Fix undefined method youth_section? within Model.require\_ability\_to
+  * Fix undefined method youth\_section? within Model.require\_ability\_to
 
 ## Version 1.0.4
 

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec' do
+guard 'rspec', all_on_start: true, all_after_pass: true do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^lib/([^/]+)/(.+)\.rb$}) { |m| "spec/#{m[1]}/#{m[2]}_spec.rb" }

data/lib/osm.rb

@@ -94,7 +94,7 @@ module Osm
   def self.parse_datetime(date_time)
     return nil if date_time.nil? || date_time.empty?
     begin
-      return DateTime.strptime((date_time), OSM_DATETIME_FORMAT)
+      return DateTime.strptime(date_time, OSM_DATETIME_FORMAT)
     rescue ArgumentError
       return nil
     end

data/lib/osm/event.rb

@@ -267,6 +267,7 @@ module Osm
         'No' => :no,
         'Invited' => :invited,
         'Show in My.SCOUT' => :shown,
+        'Reserved' => :reserved,
       }
 
       attendance = []
@@ -297,15 +298,17 @@ module 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)
+    # @param [Boolean] required Whether the parent is required to enter something
     # @return [Boolean] whether the update succedded
     # @raise [Osm::ArgumentIsInvalid] If the name is blank
-    def add_column(api, name, label='')
+    def add_column(api, name, label='', required=false)
       require_ability_to(api, :write, :events, section_id)
       raise Osm::ArgumentIsInvalid, 'name is invalid' if name.blank?
 
       data = api.perform_query("events.php?action=addColumn&sectionid=#{section_id}&eventid=#{id}", {
         'columnName' => name,
-        'parentLabel' => label
+        'parentLabel' => label,
+        'parentRequire' => (required ? 1 : 0),
       })
 
       # The cached events for the section will be out of date - remove them
@@ -396,7 +399,7 @@ module Osm
       column_data = ActiveSupport::JSON.decode(event_data['config'] || '[]')
       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'], :event => event)
+        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
       return event
@@ -411,15 +414,18 @@ module Osm
       #   @return [String] name for the column (displayed in OSM)
       # @!attribute [rw] label
       #   @return [String] label to display in My.SCOUT ("" prevents display in My.SCOUT)
+      # @!attribute [rw] parent_required
+      #   @return [Boolean] whether the parent is required to enter something
       # @!attriute [rw] event
       #   @return [Osm::Event] the event that this column belongs to
 
       attribute :id, :type => String
       attribute :name, :type => String
       attribute :label, :type => String, :default => ''
+      attribute :parent_required, :type => Boolean, :default => false
       attribute :event
 
-      attr_accessible :id, :name, :label, :event
+      attr_accessible :id, :name, :label, :parent_required, :event
 
       validates_presence_of :id
       validates_presence_of :name
@@ -439,12 +445,13 @@ module Osm
         data = api.perform_query("events.php?action=renameColumn&sectionid=#{event.section_id}&eventid=#{event.id}", {
           'columnId' => id,
           'columnName' => name,
-          'pL' => label
+          'pL' => label,
+          'pR' => (parent_required ? 1 : 0),
         })
 
         (ActiveSupport::JSON.decode(data['config']) || []).each do |i|
           if i['id'] == id
-            if i['name'].eql?(name) && (i['pL'].nil? || i['pL'].eql?(label))
+            if i['name'].eql?(name) && (i['pL'].nil? || i['pL'].eql?(label)) && (i['pR'].eql?('1') == parent_required)
               reset_changed_attributes
                 # The cached event will be out of date - remove it
                 cache_delete(api, ['event', event.id])
@@ -513,7 +520,7 @@ module Osm
       # @!attribute [rw] date_of_birth
       #   @return [Date] the member's date of birth
       # @!attribute [rw] attending
-      #   @return [Symbol] whether the member is attending (either :yes, :no, :invited, :shown or nil)
+      #   @return [Symbol] whether the member is attending (either :yes, :no, :invited, :shown, :reserved or nil)
       # @!attribute [rw] payments
       #   @return [Hash] keys are the payment's id, values are the payment state
       # @!attribute [rw] payment_control
@@ -545,7 +552,7 @@ module Osm
       validates_presence_of :last_name
       validates_presence_of :date_of_birth
       validates_inclusion_of :payment_control, :in => [:manual, :automatic, nil]
-      validates_inclusion_of :attending, :in => [:yes, :no, :invited, :shown, nil]
+      validates_inclusion_of :attending, :in => [:yes, :no, :invited, :shown, :reserved, nil]
 
 
       # @!method initialize
@@ -575,6 +582,7 @@ module Osm
           :no => 'No',
           :invited => 'Invited',
           :shown => 'Show in My.SCOUT',
+          :reserved => 'Reserved',
         }
 
         updated = true
@@ -622,6 +630,56 @@ module Osm
         return updated
       end
 
+      # Get audit trail
+      # @param [Osm::Api] api The api to use to make the request
+      # @!macro options_get
+      # @return [Array<Hash>]
+      def get_audit_trail(api, options={})
+        require_ability_to(api, :read, :events, event.section_id, options)
+        cache_key = ['event\_attendance\_audit', event.id, member_id]
+
+        if !options[:no_cache] && cache_exist?(api, cache_key)
+          return cache_read(api, cache_key)
+        end
+
+        data = api.perform_query("events.php?action=getEventAudit&sectionid=#{event.section_id}&scoutid=#{member_id}&eventid=#{event.id}")
+        data ||= []
+
+        attending_values = {
+          'Yes' => :yes,
+          'No' => :no,
+          'Invited' => :invited,
+          'Show in My.SCOUT' => :shown,
+          'Reserved' => :reserved,
+        }
+
+        trail = []
+        data.each do |item|
+          this_item = {
+            :at => DateTime.strptime(item['date'], '%d/%m/%Y %H:%M'),
+            :by => item['updatedby'].strip,
+            :type => item['type'].to_sym,
+            :description => item['desc'],
+            :event_id => event.id,
+            :member_id => member_id,
+            :event_attendance => self,
+          }
+          if this_item[:type].eql?(:detail)
+            results = this_item[:description].match(/\ASet '(?<label>.+)' to '(?<value>.+)'\Z/)
+            this_item[:label] = results[:label]
+            this_item[:value] = results[:value]
+          end
+          if this_item[:type].eql?(:attendance)
+            results = this_item[:description].match(/\AAttendance: (?<attending>.+)\Z/)
+            this_item[:attendance] = attending_values[results[:attending]]
+          end
+          trail.push this_item
+        end
+
+        cache_write(api, cache_key, trail)
+        return trail
+      end
+
       # @! method automatic_payments?
       #  Check wether payments are made automatically for this member
       #  @return [Boolean]
@@ -645,8 +703,10 @@ module Osm
       #  @return [Boolean]
       # @! method is_shown?
       #  Check wether the member can see the event in My.SCOUT
+      # @! method is_reserved?
+      #  Check wether the member has reserved a space when one becomes availible
       #  @return [Boolean]
-      [:attending, :not_attending, :invited, :shown].each do |attending_type|
+      [:attending, :not_attending, :invited, :shown, :reserved].each do |attending_type|
         define_method "is_#{attending_type}?" do
           attending == attending_type
         end

data/lib/osm/meeting.rb

@@ -2,6 +2,7 @@ module Osm
 
   class Meeting < Osm::Model
     class Activity; end # Ensure the constant exists for the validators
+    class BadgeLink; end # Ensure the constant exists for the validators
 
     # @!attribute [rw] id
     #   @return [Fixnum] the id of the meeting
@@ -23,6 +24,8 @@ module Osm
     #   @return [Date] the date of the meeting
     # @!attribute [rw] activities
     #   @return [Array<Activity>] list of activities being done during the meeting
+    # @!attribute [rw] badge_links
+    #   @return [Array<BadgeLink>] list of badge links added to the meeting
     # @!attribute [rw] start_time
     #   @return [String] the start time (hh:mm)
     # @!attribute [rw] finish_time
@@ -40,8 +43,9 @@ module Osm
     attribute :start_time, :type => String
     attribute :finish_time, :type => String
     attribute :activities, :default => []
+    attribute :badge_links, :default => []
 
-    attr_accessible :id, :section_id, :title, :notes_for_parents, :games, :pre_notes, :post_notes, :leaders, :date, :activities, :start_time, :finish_time
+    attr_accessible :id, :section_id, :title, :notes_for_parents, :games, :pre_notes, :post_notes, :leaders, :date, :activities, :start_time, :finish_time, :badge_links
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -49,8 +53,8 @@ module Osm
     validates_presence_of :date
     validates_format_of :start_time, :with => Osm::OSM_TIME_REGEX, :message => 'is not in the correct format (HH:MM)', :allow_blank => true
     validates_format_of :finish_time, :with => Osm::OSM_TIME_REGEX, :message => 'is not in the correct format (HH:MM)', :allow_blank => true
-
     validates :activities, :array_of => {:item_type => Osm::Meeting::Activity, :item_valid => true}
+    validates :badge_links, :array_of => {:item_type => Osm::Meeting::BadgeLink, :item_valid => true}
 
     # @!method initialize
     #   Initialize a new Meeting
@@ -79,6 +83,7 @@ module Osm
       data = {'items'=>[],'activities'=>{}} if data.is_a? Array
       items = data['items'] || []
       activities = data['activities'] || {}
+      badge_links = data['badgelinks'] || {}
 
       items.each do |item|
         attributes = {}
@@ -93,7 +98,7 @@ module Osm
         attributes[:start_time] = item['starttime'].nil? ? nil : item['starttime'][0..4]
         attributes[:finish_time] = item['endtime'].nil? ? nil : item['endtime'][0..4]
         attributes[:date] = Osm::parse_date(item['meetingdate'])
-  
+
         our_activities = activities[item['eveningid']]
         attributes[:activities] = Array.new
         unless our_activities.nil?
@@ -105,7 +110,21 @@ module Osm
             )
           end
         end
-  
+
+        our_badge_links = badge_links[item['eveningid']]
+        attributes[:badge_links] = Array.new
+        unless our_badge_links.nil?
+          our_badge_links.each do |badge_link_data|
+            attributes[:badge_links].push Osm::Meeting::BadgeLink.new(
+              :badge_key => badge_link_data['badge'],
+              :badge_type => badge_link_data['badgetype'].downcase.to_sym,
+              :requirement_key => badge_link_data['columnname'],
+              :badge_section => badge_link_data['section'].downcase.to_sym,
+              :label => badge_link_data['label'],
+            )
+          end
+        end
+
         result.push new(attributes)
       end
 
@@ -156,7 +175,17 @@ module Osm
         }
         activities_data.push this_activity
       end
-      activities_data = ActiveSupport::JSON.encode(activities_data)
+
+      badge_links_data = Array.new
+      badge_links.each do |badge_link|
+        this_badge_link = {
+          'section' => badge_link.badge_section,
+          'badge' => badge_link.badge_key,
+          'columnname' => badge_link.requirement_key,
+          'badgetype' => badge_link.badge_type,
+        }
+        badge_links_data.push this_badge_link
+      end
 
       api_data = {
         'eveningid' => id,
@@ -170,7 +199,8 @@ module Osm
         'postnotes' => post_notes,
         'games' => games,
         'leaders' => leaders,
-        'activity' => activities_data,
+        'activity' => ActiveSupport::JSON.encode(activities_data),
+        'badgelinks' => ActiveSupport::JSON.encode(badge_links_data),
       }
       response = api.perform_query("programme.php?action=editEvening", api_data)
 
@@ -290,6 +320,46 @@ module Osm
 
     end # Class Meeting::Activity
 
+
+    class BadgeLink
+      include ActiveModel::MassAssignmentSecurity
+      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 :badge_key, :type => String
+      attribute :badge_type, :type => Object
+      attribute :requirement_key, :type => String
+      attribute :badge_section, :type => Object
+      attribute :label, :type => String
+
+      attr_accessible :badge_key, :badge_type, :requirement_key, :badge_section, :label
+
+      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_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 title then activity_id
+      def <=>(another)
+        return self.label <=> another.try(:label)
+      end
+
+    end # Class Meeting::BadgeLink
+
   end # Class Meeting
 
 end # Module

data/spec/osm/event_spec.rb

@@ -155,7 +155,7 @@ describe "Event" do
         'notes' => 'Notes',
         'notepad' => 'notepad',
         'publicnotes' => 'public notepad',
-        'config' => '[{"id":"f_1","name":"Name","pL":"Label"}]',
+        'config' => '[{"id":"f_1","name":"Name","pL":"Label","pR":"1"}]',
         'sectionid' => '1',
         'googlecalendar' => nil,
         'archived' => '0',
@@ -200,6 +200,7 @@ describe "Event" do
         event.columns[0].id.should == 'f_1'
         event.columns[0].name.should == 'Name'
         event.columns[0].label.should == 'Label'
+        event.columns[0].parent_required.should == true
         event.valid?.should be_true
       end
 
@@ -778,6 +779,7 @@ describe "Event" do
         'secret' => 'secret',
         'columnName' => 'Test name',
         'parentLabel' => 'Test label',
+        'parentRequire' => 1
       }
       body = {
         'eventid' => '2',
@@ -787,7 +789,7 @@ describe "Event" do
 
       event = Osm::Event.new(:id => 2, :section_id => 1)
       event.should_not be_nil
-      event.add_column(@api, 'Test name', 'Test label').should be_true
+      event.add_column(@api, 'Test name', 'Test label', true).should be_true
       column = event.columns[0]
       column.id.should == 'f_1'
       column.name.should == 'Test name'
@@ -813,10 +815,11 @@ describe "Event" do
         'columnId' => 'f_1',
         'columnName' => 'New name',
         'pL' => 'New label',
+        'pR' => 1
       }
       body = {
         'eventid' => '2',
-        'config' => '[{"id":"f_1","name":"New name","pL":"New label"}]'
+        'config' => '[{"id":"f_1","name":"New name","pL":"New label","pR":"1"}]'
       }
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>body.to_json}) }
 
@@ -825,6 +828,7 @@ describe "Event" do
       column = event.columns[0]
       column.name = 'New name'
       column.label = 'New label'
+      column.parent_required = true
 
       column.update(@api).should be_true
 
@@ -873,6 +877,41 @@ describe "Event" do
       column.delete(@api).should be_false
     end
 
+    it "Get audit trail" do
+      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=getEventAudit&sectionid=1&scoutid=2&eventid=3'
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+      }
+      data = [
+	{"date" => "10/06/2013 19:17","updatedby" => "My.SCOUT","type" => "detail","desc" => "Set 'Test' to 'Test data'"},
+	{"date" => "10/06/2013 19:16","updatedby" => "My.SCOUT","type" => "attendance","desc" => "Attendance: Yes"},
+	{"date" => "10/06/2013 19:15","updatedby" => "A Leader ","type" => "attendance","desc" => "Attendance: Reserved"},
+	{"date" => "10/06/2013 19:14","updatedby" => "A Leader ","type" => "attendance","desc" => "Attendance: No"},
+	{"date" => "10/06/2013 19:13","updatedby" => "A Leader ","type" => "attendance","desc" => "Attendance: Yes"},
+	{"date" => "10/06/2013 19:12","updatedby" => "A Leader ","type" => "attendance","desc" => "Attendance: Invited"},
+	{"date" => "10/06/2013 19:11","updatedby" => "A Leader ","type" => "attendance","desc" => "Attendance: Show in My.SCOUT"},
+      ]
+
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
+
+      ea = Osm::Event::Attendance.new(
+        :event => Osm::Event.new(:id => 3, :section_id => 1),
+        :member_id => 2,
+      )
+      ea.get_audit_trail(@api).should == [
+        {:event_attendance => ea, :event_id => 3, :member_id => 2, :at => DateTime.new(2013, 6, 10, 19, 17), :by => 'My.SCOUT', :type => :detail, :description => "Set 'Test' to 'Test data'", :label => 'Test', :value => 'Test data'},
+        {:event_attendance => ea, :event_id => 3, :member_id => 2, :at => DateTime.new(2013, 6, 10, 19, 16), :by => 'My.SCOUT', :type => :attendance, :description => "Attendance: Yes", :attendance => :yes},
+        {:event_attendance => ea, :event_id => 3, :member_id => 2, :at => DateTime.new(2013, 6, 10, 19, 15), :by => 'A Leader', :type => :attendance, :description => "Attendance: Reserved", :attendance => :reserved},
+        {:event_attendance => ea, :event_id => 3, :member_id => 2, :at => DateTime.new(2013, 6, 10, 19, 14), :by => 'A Leader', :type => :attendance, :description => "Attendance: No", :attendance => :no},
+        {:event_attendance => ea, :event_id => 3, :member_id => 2, :at => DateTime.new(2013, 6, 10, 19, 13), :by => 'A Leader', :type => :attendance, :description => "Attendance: Yes", :attendance => :yes},
+        {:event_attendance => ea, :event_id => 3, :member_id => 2, :at => DateTime.new(2013, 6, 10, 19, 12), :by => 'A Leader', :type => :attendance, :description => "Attendance: Invited", :attendance => :invited},
+        {:event_attendance => ea, :event_id => 3, :member_id => 2, :at => DateTime.new(2013, 6, 10, 19, 11), :by => 'A Leader', :type => :attendance, :description => "Attendance: Show in My.SCOUT", :attendance => :shown},
+      ]
+    end
+
   end
 
 

data/spec/osm/meeting_spec.rb

@@ -17,7 +17,8 @@ describe "Meeting" do
       :start_time => '19:00',
       :finish_time => '21:00',
       :date => Date.new(2000, 01, 02),
-      :activities => []
+      :activities => [],
+      :badge_links => []
     )
 
     e.id.should == 1
@@ -32,6 +33,7 @@ describe "Meeting" do
     e.finish_time.should == '21:00'
     e.date.should == Date.new(2000, 1, 2)
     e.activities.should == []
+    e.badge_links.should == []
     e.valid?.should be_true
   end
 
@@ -49,7 +51,7 @@ describe "Meeting" do
 
   describe "Meeting::Activity" do
 
-    it "Create Meeting::Activity" do
+    it "Create" do
       ea = Osm::Meeting::Activity.new(
         :activity_id => 2,
         :title => 'Activity Name',
@@ -74,21 +76,84 @@ describe "Meeting" do
   end
 
 
+  describe "Meeting::BadgeLink" do
+
+    it "Create" do
+      bl = Osm::Meeting::BadgeLink.new(
+        :badge_key => 'artist',
+        :badge_type => :activity,
+        :requirement_key => 'a_01',
+        :badge_section => :cubs,
+        :label => 'Cubs Artist Activity - A: Poster',
+      )
+
+      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.valid?.should be_true
+    end
+
+    it "Sorts by label" do
+      a1 = Osm::Meeting::BadgeLink.new(:label => 'a')
+      a2 = Osm::Meeting::BadgeLink.new(:label => 'b')
+
+      data = [a2, a1]
+      data.sort.should == [a1, a2]
+    end
+
+  end
+
+
   describe 'Using the API' do
 
     it "Fetch the term's programme for a section" do
-      items = [{"eveningid" => "5", "sectionid" =>"3", "title" => "Weekly Meeting 1", "notesforparents" => "", "games" => "", "prenotes" => "", "postnotes" => "", "leaders" => "", "meetingdate" => "2001-02-03", "starttime" => "19:15:00", "endtime" => "20:30:00", "googlecalendar" => ""}]
-      activities = {"5" => [
-        {"activityid" => "6", "title" => "Activity 6", "notes" => "", "eveningid" => "5"},
-        {"activityid" => "7", "title" => "Activity 7", "notes" => "", "eveningid" => "5"}
-      ]}
-      body = {"items" => items, "activities" => activities}
+      body = {
+        "items" => [{"eveningid" => "5", "sectionid" =>"3", "title" => "Weekly Meeting 1", "notesforparents" => "parents", "games" => "games", "prenotes" => "before", "postnotes" => "after", "leaders" => "leaders", "meetingdate" => "2001-02-03", "starttime" => "19:15:00", "endtime" => "20:30:00", "googlecalendar" => ""}],
+        "activities" => {"5" => [
+          {"activityid" => "6", "title" => "Activity 6", "notes" => "Some notes", "eveningid" => "5"},
+          {"activityid" => "7", "title" => "Activity 7", "notes" => "", "eveningid" => "5"}
+        ]},
+        "badgelinks" => {"5" => [{
+          "badge" => "artist",
+          "badgetype" => "activity",
+          "columnname" => "a_01",
+          "eveningid" => "5",
+          "label" => "Cubs Artist Activity - A: Poster",
+          "section" => "cubs",
+          "sectionid" => "3",
+         }]},
+      }
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/programme.php?action=getProgramme&sectionid=3&termid=4", :body => body.to_json)
 
       programme = Osm::Meeting.get_for_section(@api, 3, 4)
       programme.size.should == 1
-      programme[0].is_a?(Osm::Meeting).should be_true
-      programme[0].activities.size.should == 2
+      meeting = programme[0]
+      meeting.is_a?(Osm::Meeting).should be_true
+      meeting.id.should == 5
+      meeting.section_id.should == 3
+      meeting.title.should == 'Weekly Meeting 1'
+      meeting.notes_for_parents.should == 'parents'
+      meeting.games.should == 'games'
+      meeting.pre_notes.should == 'before'
+      meeting.post_notes.should == 'after'
+      meeting.leaders.should == 'leaders'
+      meeting.date.should == Date.new(2001, 2, 3)
+      meeting.start_time.should == '19:15'
+      meeting.finish_time.should == '20:30'
+      meeting.activities.size.should == 2
+      activity = meeting.activities[0]
+      activity.activity_id.should == 6
+      activity.title.should == 'Activity 6'
+      activity.notes.should == 'Some notes'
+      meeting.badge_links.size.should == 1
+      badge_link = meeting.badge_links[0]
+      badge_link.badge_key.should == 'artist'
+      badge_link.badge_type.should == :activity
+      badge_link.requirement_key.should == 'a_01'
+      badge_link.badge_section.should == :cubs
+      badge_link.label.should == 'Cubs Artist Activity - A: Poster'
     end
 
     it "Fetch badge requirements for a meeting" do
@@ -181,12 +246,20 @@ describe "Meeting" do
         'secret' => 'secret',
         'eveningid' => 1, 'sectionid' => 2, 'meetingdate' => '2000-01-02', 'starttime' => nil,
         'endtime' => nil, 'title' => 'Unnamed meeting', 'notesforparents' =>'', 'prenotes' => '',
-        'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]',
+        'postnotes' => '', 'games' => '', 'leaders' => '',
+        'activity' => '[{"activityid":3,"notes":"Some notes"}]',
+        'badgelinks' => '[{"section":"beavers","badge":"badge","columnname":"b_03","badgetype":"activity"}]',
       }
       Osm::Term.stub(:get_for_section) { [] }
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
 
-      meeting = Osm::Meeting.new(:id=>1, :section_id=>2, :date=>Date.new(2000, 01, 02))
+      meeting = Osm::Meeting.new(
+        :id=>1,
+        :section_id=>2,
+        :date=>Date.new(2000, 01, 02),
+        :activities => [Osm::Meeting::Activity.new(:activity_id => 3, :title => 'Activity Title', :notes => 'Some notes')],
+        :badge_links => [Osm::Meeting::BadgeLink.new(:badge_key => 'badge', :badge_type => :activity, :requirement_key => 'b_03', :badge_section => :beavers, :label => 'Label')]
+      )
       meeting.update(@api).should be_true
     end
 
@@ -199,7 +272,7 @@ describe "Meeting" do
         'secret' => 'secret',
         'eveningid' => 1, 'sectionid' => 2, 'meetingdate' => '2000-01-02', 'starttime' => nil,
         'endtime' => nil, 'title' => 'Unnamed meeting', 'notesforparents' =>'', 'prenotes' => '',
-        'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]',
+        'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]', 'badgelinks' => '[]',
       }
       Osm::Term.stub(:get_for_section) { [] }
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport