osm 1.2.16 → 1.2.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODIwM2UyMGRkZWZiZmMxN2Y5M2VhODlkZDgyZDhjY2Y2YzRhYjYyZQ==
+    ZTc1N2JkYjExMjkyOGE2YTRhMWViOTUyMjU0ZDEyM2Y4MTI5ZTA5Zg==
   data.tar.gz: !binary |-
-    ZmQ1OWJlOWUyMDUzNWFiMzk5MGJjYmYwMzAxOWNjMWU3ZTdiMTRiOQ==
+    NGYzOGM2NTgyMTdlOTMyNzY4MGUwYWYxZDQwNzRiY2QxM2ExNTdhNg==
 SHA512:
   metadata.gz: !binary |-
-    NGUxNWIzNmE4MjlkMWQ1OTVhOTY2YTU3Y2VkMWZkYzZiMjFmZjk5Yzc1M2Qx
-    ZmRkZjU5YjA3MjNjYTQ3ZTFiMmEzYzkwOWRiYTc3YzhjNmRiOGE1YWQyZDc0
-    NDY3MWZkOTUwZjkwNTgyODk4MDY5Y2U3YzAzNGM5N2UwZDY5NDM=
+    ZGY4NGNiNzgwNTY3ODk1YTdlZjUxNTZmM2NhMzk3ZDJhZDQ0OGE4NTI0ZTIz
+    ZThjYTM0ZTc0YjA1ODVhZTUxYWEwZmQ0ZDEwMmQzYzQyODc2ZmNiNzJiMzY5
+    NzhlY2QxZDI5MTg4MDZlOTU2MzQ4Y2Q2ZDI1ODIzOGQ1ZjQyOGI=
   data.tar.gz: !binary |-
-    ZjE4OWI0YzNjZTliMTc2NzAwN2Y4N2JmOGQ4ZGNmYjA2OTJhMWJkMGNlZWU5
-    OTYxNjVhYTE5ZThjYjJhYWVmNjlmMWI1ZWQ3Yjg5ZWM5ZmQ0MGFkOTQ4ZTA1
-    YjE0NDlkOTdiYmY2MzhhNTYwZDRjMTZhZjU4MjZmYTJiYmYwOTY=
+    MmYxYjc2YzU4NDVjZjc0YjkwNzdjNTk0ZWEwODI2ZjZhODcyOWM3NDU5ODMx
+    ZDE4M2JmNmE2Nzc0NjQ1NTM5N2E2OWUxYmZlNTM5Y2U3OGYwNmZmOWViMzc3
+    NDcxYmRiMDc5MzkyOGYxZWM4ZjcwNjliMmY1M2UwYmNlYWYyY2M=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.17
+
+  * Update to match how OSM now lists activities within meetings.
+
 ## Version 1.2.16
 
   * Osm::Section gains instance methods:

data/lib/osm/meeting.rb

@@ -105,6 +105,9 @@ module Osm
         attributes[:activities] = Array.new
         unless our_activities.nil?
           our_activities.each do |activity_data|
+            if activity_data.is_a?(Array)
+              activity_data = activity_data.find{ |a| a.is_a?(Hash) && a.has_key?('activityid') }
+            end
             attributes[:activities].push Osm::Meeting::Activity.new(
               :activity_id => Osm::to_i_or_nil(activity_data['activityid']),
               :title => activity_data['title'],

data/spec/osm/meeting_spec.rb

@@ -318,5 +318,29 @@ describe "Meeting" do
       meeting.delete(@api).should be_true
     end
 
+  end # Describe using API
+
+  describe "API Strangeness" do
+    it "Activity details is an Array [id, Hash]" do
+      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" => [
+          ["6", {"activityid" => "6", "title" => "Activity 6", "notes" => "Some notes", "eveningid" => "5"}],
+        ]},
+        "badgelinks" => {"5" => []},
+      }
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/programme.php?action=getProgramme&sectionid=3&termid=4", :body => body.to_json, :content_type => 'application/json')
+
+      programme = Osm::Meeting.get_for_section(@api, 3, 4)
+      programme.size.should == 1
+      meeting = programme[0]
+      meeting.activities.size.should == 1
+      activity = meeting.activities[0]
+      activity.activity_id.should == 6
+      activity.title.should == 'Activity 6'
+      activity.notes.should == 'Some notes'
+      meeting.valid?.should be_true
+    end
   end
+
 end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.16"
+  VERSION = "1.2.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport