osm 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## version 0.0.7.dev
+
+  * Work on documentation:
+    * Clarify use of 'mystery' attributes
+  * Rename ProgrammeItem to Evening (and move ProgrammeActivity to Evening->EveningActivity)
+
 ## Version 0.0.6
 
   * Usage changes:

data/lib/osm/activity.rb

@@ -22,27 +22,27 @@ module Osm
     # @!attribute [r] running_time
     #   @return [FixNum] duration of the activity in minutes
     # @!attribute [r] location
-    #   @return [Symbol] :indoors or :outdoors
+    #   @return [Symbol] :indoors, :outdoors or :both
     # @!attribute [r] shared
-    #   @return [FixNum] ?
+    #   @return [FixNum] 2 - Public, 0 - Private
     # @!attribute [r] rating
     #   @return [FixNum] ?
     # @!attribute [r] editable
-    #   @return [Boolean] ?
+    #   @return [Boolean] Wether the current API user can edit this activity
     # @!attribute [r] deletable
-    #   @return [Boolean] ?
+    #   @return [Boolean] Wether the current API user can delete this activity
     # @!attribute [r] used
-    #   @return [FixNum] ?
+    #   @return [FixNum] How many times this activity has been used (total accross all of OSM)
     # @!attribute [r] versions
-    #   @return [Hash] ?
+    #   @return [Array<Hash>] ? (:value - version, :firstname - created by, :label - label, :user_id - OSM user ID of creator)
     # @!attribute [r] sections
     #   @return [Array<Symbol>] the sections the activity is appropriate for
     # @!attribute [r] tags
     #   @return [Array<String>] the tags attached to the activity
     # @!attribute [r] files
-    #   @return [Array] ?
+    #   @return [Array<Hash> ? ('fileid', 'filename', 'name')
     # @!attribute [r] badges
-    #   @return [Array] ?
+    #   @return [Array<Hash> ? ('section', 'badgetype', 'badge', 'columnname', 'label')
 
 
     # Initialize a new Activity using the hash returned by the API call
@@ -61,7 +61,7 @@ module Osm
       @shared = data['details']['shared'].to_i
       @rating = data['details']['rating'].to_i
       @editable = data['editable']
-      @deletable = data['deletable']
+      @deletable = data['deletable'] ? true : false
       @used = data['used'].to_i
       @versions = data['versions']
       @sections = Osm::make_array_of_symbols(data['sections'] || [])

data/lib/osm/api.rb

@@ -252,7 +252,7 @@ module Osm
     # @param [FixNum] term_id the term to get the programme for
     # @!macro options_get
     # @!macro options_api_data
-    # @return [Array<Osm::ProgrammeItem>]
+    # @return [Array<Osm::Evening>]
     def get_programme(section_id, term_id, options={}, api_data={})
       if !options[:no_cache] && Rails.cache.exist?("OSMAPI-programme-#{section_id}-#{term_id}") && self.user_can_access?(:programme, section_id, api_data)
         return Rails.cache.read("OSMAPI-programme-#{section_id}-#{term_id}")
@@ -267,9 +267,9 @@ module Osm
       activities = data['activities'] || {}
 
       items.each do |item|
-        programme_item = Osm::ProgrammeItem.new(item, activities[item['eveningid']])
-        result.push programme_item
-        programme_item.activities.each do |activity|
+        evening = Osm::Evening.new(item, activities[item['eveningid']])
+        result.push evening
+        evening.activities.each do |activity|
           self.user_can_access :activity, activity.activity_id, api_data
         end
       end
@@ -495,25 +495,11 @@ module Osm
     end
 
     # Update an evening in OSM
-    # @param [Osm::ProgrammeItem] programme_item is the Osm::ProgrammeItem object to update
+    # @param [Osm::Evening] evening the evening to update
     # @!macro options_api_data
     # @return [Boolean] if the operation suceeded or not
-    def update_evening(programme_item, api_data={})
-      response = perform_query("programme.php?action=editEvening", api_data.merge({
-        'eveningid' => programme_item.evening_id,
-        'sectionid' => programme_item.section_id,
-        'meetingdate' => programme_item.meeting_date.try(:strftime, '%Y-%m-%d'),
-        'starttime' => programme_item.start_time,
-        'endtime' => programme_item.end_time,
-        'title' => programme_item.title,
-        'notesforparents' => programme_item.notes_for_parents,
-        'prenotes' => programme_item.pre_notes,
-        'postnotes' => programme_item.post_notes,
-        'games' => programme_item.games,
-        'leaders' => programme_item.leaders,
-        'activity' => programme_item.activities_for_saving,
-        'googlecalendar' => programme_item.google_calendar || '',
-      }))
+    def update_evening(evening, api_data={})
+      response = perform_query("programme.php?action=editEvening", api_data.merge(evening.data_for_saving))
 
       # The cached programmes for the section will be out of date - remove them
       get_terms(api_data).each do |term|

data/lib/osm/{programme_item.rb → evening.rb}

@@ -1,8 +1,8 @@
 module Osm
 
-  class ProgrammeItem
+  class Evening
 
-    attr_accessor :evening_id, :section_id, :title, :notes_for_parents, :games, :pre_notes, :post_notes, :leaders, :meeting_date, :activities, :google_calendar
+    attr_accessor :evening_id, :section_id, :title, :notes_for_parents, :games, :pre_notes, :post_notes, :leaders, :meeting_date, :activities
     attr_reader :start_time, :end_time
     # @!attribute [rw] evening_id
     #   @return [FixNum] the id of the evening
@@ -23,9 +23,7 @@ module Osm
     # @!attribute [rw] meeting_date
     #   @return [Date] the date of the evening
     # @!attribute [rw] activities
-    #   @return [Array<ProgrammeActivity>] tlist of activities being done during the evening
-    # @!attribute [rw] google_calendar
-    #   @return [String] ?
+    #   @return [Array<EveningActivity>] list of activities being done during the evening
     # @!attribute [rw] start_time
     #   @return [String] the start time (hh:mm)
     # @!attribute [rw] end_time
@@ -46,14 +44,14 @@ module Osm
       @start_time = data['starttime'].nil? ? nil : data['starttime'][0..4]
       @end_time = data['endtime'].nil? ? nil : data['endtime'][0..4]
       @meeting_date = Osm::parse_date(data['meetingdate'])
-      @google_calendar = data['googlecalendar']
 
       @activities = Array.new
       unless activities.nil?
         activities.each do |item|
-          @activities.push Osm::ProgrammeActivity.new(item)
+          @activities.push EveningActivity.new(item)
         end
       end
+      @activities.freeze
     end
 
     # Custom setters for times
@@ -67,7 +65,27 @@ module Osm
       end
     end
 
+    # Get the evening's data for use with the API
+    # @return [Hash]
+    def data_for_saving
+      {
+        'eveningid' => evening_id,
+        'sectionid' => section_id,
+        'meetingdate' => meeting_date.try(:strftime, '%Y-%m-%d'),
+        'starttime' => start_time,
+        'endtime' => end_time,
+        'title' => title,
+        'notesforparents' => notes_for_parents,
+        'prenotes' => pre_notes,
+        'postnotes' => post_notes,
+        'games' => games,
+        'leaders' => leaders,
+        'activity' => activities_for_saving,
+      }
+    end
+
 
+    private
     # Get the JSON for the activitied to pass to the OSM API
     # @return [String]
     def activities_for_saving
@@ -82,6 +100,28 @@ module Osm
       return ActiveSupport::JSON.encode(to_save)
     end
 
+
+    class EveningActivity
+  
+      attr_reader :activity_id, :title, :notes
+      # @!attribute [r] activity_id
+      #   @return [FixNum] the activity being done
+      # @!attribute [r] title
+      #   @return [String] the activity's title
+      # @!attribute [r] notes
+      #   @return [String] notes relevant to doing this activity on this evening
+  
+      # Initialize a new EveningActivity using the hash returned by the API call
+      # @param data the hash of data for the object returned by the API
+      def initialize(data)
+        @activity_id = Osm::to_i_or_nil(data['activityid'])
+        @title = data['title']
+        @notes = data['notes']
+      end
+  
+    end
+
+
   end
 
 end

data/lib/osm/event.rb

@@ -14,7 +14,7 @@ module Osm
     # @!attribute [r] end
     #   @return [DateTime] when the event ends
     # @!attribute [r] cost
-    #   @return [?] the cost of the event
+    #   @return [String] the cost of the event
     # @!attribute [r] location
     #   @return [String] where the event is
     # @!attribute [r] notes

data/lib/osm/member.rb

@@ -12,7 +12,7 @@ module Osm
     # @!attribute [r] first_name
     #   @return [String] the member's first name
     # @!attribute [r] last_name
-    #   @return [String] the imember's last name
+    #   @return [String] the member's last name
     # @!attribute [r] email1
     #   @return [String] the 1st email address for the member
     # @!attribute [r] email2
@@ -38,7 +38,7 @@ module Osm
     # @!attribute [r] started
     #   @return [Date] when the member started Scouting
     # @!attribute [r] joined_in_years
-    #   @return [FixNum] thow many full years the member has been in Scouting
+    #   @return [FixNum] ?
     # @!attribute [r] parents
     #   @return [String] the member's parent's names
     # @!attribute [r] notes
@@ -62,7 +62,7 @@ module Osm
     # @!attribute [r] age
     #   @return [String] the member's current age (yy/mm)
     # @!attribute [r] joined_years
-    #   @return [FixNum] ?
+    #   @return [FixNum] how many years the member has been in Scouting
 
 
     # Initialize a new Member using the hash returned by the API call

data/lib/osm/role.rb

@@ -2,17 +2,13 @@ module Osm
 
   class Role
 
-    attr_reader :section, :group_name, :group_id, :group_normalized, :default, :permissions
+    attr_reader :section, :group_name, :group_id, :permissions
     # @!attribute [r] section
     #   @return [Osm::Section] the section this role related to
     # @!attribute [r] group_name
     #   @return [String] the name of the group the section is in
     # @!attribute [r] group_id
     #   @return [FixNum] the group the section is in
-    # @!attribute [r] group_normalized
-    #   @return [FixNum] ?
-    # @!attribute [r] default
-    #   @return [Boolean] was this the last section this user used in OSM
     # @!attribute [r] permissions
     #   @return [Hash] the permissions the user has in this role
 
@@ -22,8 +18,6 @@ module Osm
       @section = Osm::Section.new(data['sectionid'], data['sectionname'], ActiveSupport::JSON.decode(data['sectionConfig']), self)
       @group_name = data['groupname']
       @group_id = Osm::to_i_or_nil(data['groupid'])
-      @group_normalized = Osm::to_i_or_nil(data['groupNormalised'])
-      @default = data['isDefault'].eql?('1') ? true : false
       @permissions = Osm::symbolize_hash(data['permissions'] || {})
 
       # Convert permission values to a number

data/lib/osm/section.rb

@@ -2,7 +2,7 @@ module Osm
 
   class Section
 
-    attr_reader :id, :name, :subscription_level, :subscription_expires, :type, :num_scouts, :has_badge_records, :has_programme, :wizard, :column_names, :fields, :intouch_fields, :mobile_fields, :extra_records, :role
+    attr_reader :id, :name, :subscription_level, :subscription_expires, :type, :num_scouts, :column_names, :fields, :intouch_fields, :mobile_fields, :extra_records, :role
     # @!attribute [r] id
     #   @return [FixNum] the id for the section
     # @!attribute [r] name
@@ -15,12 +15,6 @@ module Osm
     #   @return [Symbol] the section type (:beavers, :cubs, :scouts, :exporers, :adults, :waiting, :unknown)
     # @!attribute [r] num_scouts
     #   @return [FixNum] how many members the section has
-    # @!attribute [r] has_badge_records
-    #   @return [Boolean] ?
-    # @!attribute [r] has_programme
-    #   @return [Boolean] ?
-    # @!attribute [r] wizard
-    #   @return [Boolean] ?
     # @!attribute [r] column_names
     #   @return [Hash] custom names to use for the data columns
     # @!attribute [r] fields
@@ -48,9 +42,6 @@ module Osm
       @subscription_expires = data['subscription_expires'] ? Date.parse(data['subscription_expires'], 'yyyy-mm-dd') : nil
       @type = !data['sectionType'].nil? ? data['sectionType'].to_sym : :unknown
       @num_scouts = data['numscouts']
-      @has_badge_records = data['hasUsedBadgeRecords'].eql?('1') ? true : false
-      @has_programme = data['hasProgramme']
-      @wizard = (data['wizard'] || '').downcase.eql?('true') ? true : false
       @column_names = Osm::symbolize_hash(data['columnNames'] || {})
       @fields = Osm::symbolize_hash(data['fields'] || {})
       @intouch_fields = Osm::symbolize_hash(data['intouch'] || {})

data/spec/osm/api_spec.rb

@@ -188,7 +188,7 @@ describe "API" do
 
       programme = Osm::Api.new('1', '2').get_programme(3, 4)
       programme.size.should == 1
-      programme[0].is_a?(Osm::ProgrammeItem).should be_true
+      programme[0].is_a?(Osm::Evening).should be_true
       programme[0].activities.size.should == 2
     end
 
@@ -410,14 +410,14 @@ describe "API" do
         'secret' => 'secret',
         'eveningid' => nil, 'sectionid' => nil, 'meetingdate' => nil, 'starttime' => nil,
         'endtime' => nil, 'title' => 'Unnamed meeting', 'notesforparents' =>'', 'prenotes' => '',
-        'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]', 'googlecalendar' => '',
+        'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]',
       }
       api = Osm::Api.new('user', 'secret')
       api.stub(:get_terms) { [] }
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
 
-      programme_item = Osm::ProgrammeItem.new({}, [])
-      api.update_evening(programme_item).should be_true
+      evening = Osm::Evening.new({}, [])
+      api.update_evening(evening).should be_true
     end
 
     it "Update an evening (failed)" do
@@ -429,14 +429,14 @@ describe "API" do
         'secret' => 'secret',
         'eveningid' => nil, 'sectionid' => nil, 'meetingdate' => nil, 'starttime' => nil,
         'endtime' => nil, 'title' => 'Unnamed meeting', 'notesforparents' =>'', 'prenotes' => '',
-        'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]', 'googlecalendar' => '',
+        'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]',
       }
       api = Osm::Api.new('user', 'secret')
       api.stub(:get_terms) { [] }
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
 
-      programme_item = Osm::ProgrammeItem.new({}, [])
-      api.update_evening(programme_item).should be_false
+      evening = Osm::Evening.new({}, [])
+      api.update_evening(evening).should be_false
     end
   end
 

data/spec/osm/evening_spec.rb

@@ -0,0 +1,103 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'date'
+
+describe "Evening" do
+
+  it "Create" do
+    data = {
+      'eveningid' => 1,
+      'sectionid' => 2,
+      'title' => 'Evening Name',
+      'notesforparents' => 'Notes for parents',
+      'games' => 'Games',
+      'prenotes' => 'Before',
+      'postnotes' => 'After',
+      'leaders' => 'Leaders',
+      'starttime' => '19:00',
+      'endtime' => '21:00',
+      'meetingdate' => '2000-01-02',
+    }
+    activities = [{
+      'eveningid' => 1,
+      'activityid' => 2,
+      'title' => 'Activity Name',
+      'notes' => 'Notes',
+    }]
+    e = Osm::Evening.new(data, activities)
+
+    e.evening_id.should == 1
+    e.section_id.should == 2
+    e.title.should == 'Evening Name'
+    e.notes_for_parents.should == 'Notes for parents'
+    e.games.should == 'Games'
+    e.pre_notes.should == 'Before'
+    e.post_notes.should == 'After'
+    e.leaders.should == 'Leaders'
+    e.start_time.should == '19:00'
+    e.end_time.should == '21:00'
+    e.meeting_date.should == Date.new(2000, 1, 2)
+
+    e.activities.frozen?.should be_true
+    ea = e.activities[0]
+    ea.activity_id.should == 2
+    ea.title.should == 'Activity Name'
+    ea.notes.should == 'Notes'
+  end
+
+
+  it "Raises exceptions when trying to set invalid times" do
+    e = Osm::Evening.new({}, [])
+    
+    expect{ e.start_time = 'abcde' }.to raise_error(ArgumentError)
+    expect{ e.start_time = '24:00' }.to raise_error(ArgumentError)
+    expect{ e.start_time = '10:61' }.to raise_error(ArgumentError)
+    e.start_time = '12:34'
+    e.start_time.should == '12:34'
+
+    expect{ e.end_time = 'abcde' }.to raise_error(ArgumentError)
+    expect{ e.end_time = '24:00' }.to raise_error(ArgumentError)
+    expect{ e.end_time = '10:61' }.to raise_error(ArgumentError)
+    e.end_time = '23:45'
+    e.end_time.should == '23:45'
+  end
+
+
+  it "Creates the data for saving through the API" do
+    data = {
+      'eveningid' => 1,
+      'sectionid' => 2,
+      'title' => 'Evening Name',
+      'notesforparents' => 'Notes for parents',
+      'games' => 'Games',
+      'prenotes' => 'Before',
+      'postnotes' => 'After',
+      'leaders' => 'Leaders',
+      'starttime' => '19:00',
+      'endtime' => '21:00',
+      'meetingdate' => '2000-01-02',
+    }
+    activities = [{
+      'eveningid' => 3,
+      'activityid' => 4,
+      'title' => 'Activity Name',
+      'notes' => 'Notes',
+    }]
+    e = Osm::Evening.new(data, activities)
+    e.data_for_saving.should == {
+      'eveningid' => 1,
+      'sectionid' => 2,
+      'meetingdate' => '2000-01-02',
+      'starttime' => '19:00',
+      'endtime' => '21:00',
+      'title' => 'Evening Name',
+      'notesforparents' => 'Notes for parents',
+      'prenotes' => 'Before',
+      'postnotes' => 'After',
+      'games' => 'Games',
+      'leaders' => 'Leaders',
+      'activity' => '[{"activityid":4,"notes":"Notes"}]',
+    }
+  end
+
+end

data/spec/osm/section_spec.rb

@@ -23,9 +23,6 @@ describe "Section" do
       'subscription_expires' => (Date.today + 60).strftime('%Y-%m-%d'),
       'sectionType' => 'cubs',
       'numscouts' => 10,
-      'hasUsedBadgeRecords' => '1',
-      'hasProgramme' => true,
-      'wizard' => 'False',
       'columnNames' => {},
       'fields' => {},
       'intouch' => {},
@@ -41,9 +38,6 @@ describe "Section" do
     section.subscription_expires.should == Date.today + 60
     section.type.should == :cubs
     section.num_scouts.should == 10
-    section.has_badge_records.should == true
-    section.has_programme.should == true
-    section.wizard.should == false
     section.column_names.should == {}
     section.fields.should == {}
     section.intouch_fields.should == {}

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000Z
+date: 2012-08-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &80730730 !ruby/object:Gem::Requirement
+  requirement: &76902620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *80730730
+  version_requirements: *76902620
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &80713860 !ruby/object:Gem::Requirement
+  requirement: &76892140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *80713860
+  version_requirements: *76892140
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &80710730 !ruby/object:Gem::Requirement
+  requirement: &76890970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80710730
+  version_requirements: *76890970
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &80697000 !ruby/object:Gem::Requirement
+  requirement: &76889000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80697000
+  version_requirements: *76889000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80694320 !ruby/object:Gem::Requirement
+  requirement: &76886900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80694320
+  version_requirements: *76886900
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &80680900 !ruby/object:Gem::Requirement
+  requirement: &76883060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80680900
+  version_requirements: *76883060
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -98,11 +98,10 @@ files:
 - lib/osm/api.rb
 - lib/osm/api_access.rb
 - lib/osm/due_badges.rb
+- lib/osm/evening.rb
 - lib/osm/event.rb
 - lib/osm/grouping.rb
 - lib/osm/member.rb
-- lib/osm/programme_activity.rb
-- lib/osm/programme_item.rb
 - lib/osm/role.rb
 - lib/osm/section.rb
 - lib/osm/term.rb
@@ -112,12 +111,11 @@ files:
 - spec/osm/api_spec.rb
 - spec/osm/api_strangeness_spec.rb
 - spec/osm/due_badges_spec.rb
+- spec/osm/evening_spec.rb
 - spec/osm/event_spec.rb
 - spec/osm/grouping_spec.rb
 - spec/osm/member_spec.rb
 - spec/osm/osm_spec.rb
-- spec/osm/programme_activity_spec.rb
-- spec/osm/programme_item_spec.rb
 - spec/osm/role_spec.rb
 - spec/osm/section_spec.rb
 - spec/osm/term_spec.rb

data/lib/osm/programme_activity.rb

@@ -1,26 +0,0 @@
-module Osm
-
-  class ProgrammeActivity
-
-    attr_reader :evening_id, :activity_id, :title, :notes
-    # @!attribute [r] eveing_id
-    #   @return [FixNum] the evening the activity is being done
-    # @!attribute [r] activity_id
-    #   @return [FixNum] the activity being done
-    # @!attribute [r] title
-    #   @return [String] the activity's title
-    # @!attribute [r] notes
-    #   @return [String] tnotes relevant to doing this activity on this evening
-
-    # Initialize a new EveningActivity using the hash returned by the API call
-    # @param data the hash of data for the object returned by the API
-    def initialize(data)
-      @evening_id = Osm::to_i_or_nil(data['eveningid'])
-      @activity_id = Osm::to_i_or_nil(data['activityid'])
-      @title = data['title']
-      @notes = data['notes']
-    end
-
-  end
-
-end

data/spec/osm/programme_activity_spec.rb

@@ -1,21 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe "Programme Activity" do
-
-  it "Create" do
-    data = {
-      'eveningid' => 1,
-      'activityid' => 2,
-      'title' => 'Activity Name',
-      'notes' => 'Notes',
-    }
-    pa = Osm::ProgrammeActivity.new(data)
-
-    pa.evening_id.should == 1
-    pa.activity_id.should == 2
-    pa.title.should == 'Activity Name'
-    pa.notes.should == 'Notes'
-  end
-
-end

data/spec/osm/programme_item_spec.rb

@@ -1,64 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'date'
-
-describe "Programme Item" do
-
-  it "Create" do
-    data = {
-      'eveningid' => 1,
-      'sectionid' => 2,
-      'title' => 'Evening Name',
-      'notesforparents' => 'Notes for parents',
-      'games' => 'Games',
-      'prenotes' => 'Before',
-      'postnotes' => 'After',
-      'leaders' => 'Leaders',
-      'starttime' => '19:00',
-      'endtime' => '21:00',
-      'meetingdate' => '2000-01-02',
-    }
-    pi = Osm::ProgrammeItem.new(data, [])
-
-    pi.evening_id.should == 1
-    pi.section_id.should == 2
-    pi.title.should == 'Evening Name'
-    pi.notes_for_parents.should == 'Notes for parents'
-    pi.games.should == 'Games'
-    pi.pre_notes.should == 'Before'
-    pi.post_notes.should == 'After'
-    pi.leaders.should == 'Leaders'
-    pi.start_time.should == '19:00'
-    pi.end_time.should == '21:00'
-    pi.meeting_date.should == Date.new(2000, 1, 2)
-  end
-
-
-  it "Raises exceptions when trying to set invalid times" do
-    pi = Osm::ProgrammeItem.new({}, [])
-    
-    expect{ pi.start_time = 'abcde' }.to raise_error(ArgumentError)
-    expect{ pi.start_time = '24:00' }.to raise_error(ArgumentError)
-    expect{ pi.start_time = '10:61' }.to raise_error(ArgumentError)
-    pi.start_time = '12:34'
-    pi.start_time.should == '12:34'
-
-    expect{ pi.end_time = 'abcde' }.to raise_error(ArgumentError)
-    expect{ pi.end_time = '24:00' }.to raise_error(ArgumentError)
-    expect{ pi.end_time = '10:61' }.to raise_error(ArgumentError)
-    pi.end_time = '23:45'
-    pi.end_time.should == '23:45'
-  end
-
-
-  it "Makes a list of activities to save for OSM's API" do
-    pi = Osm::ProgrammeItem.new({}, [{
-      'eveningid' => 1,
-      'activityid' => 2,
-      'title' => 'Activity Name',
-      'notes' => 'Notes',
-    }])
-    pi.activities_for_saving.should == '[{"activityid":2,"notes":"Notes"}]'
-  end
-
-end