osm 0.0.26 → 0.1.0

data/lib/osm/term.rb

@@ -1,8 +1,6 @@
 module Osm
 
-  class Term
-    include ::ActiveAttr::MassAssignmentSecurity
-    include ::ActiveAttr::Model
+  class Term < Osm::Model
 
     # @!attribute [rw] id
     #   @return [Fixnum] the id for the term
@@ -30,34 +28,150 @@ module Osm
     validates_presence_of :finish
 
 
-    # @!method initialize
-    #   Initialize a new Term
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+    # Get the terms that the OSM user can access
+    # @param [Osm::Api] api The api to use to make the request
+    # @!macro options_get
+    # @return [Array<Osm::Term>]
+    def self.get_all(api, options={})
+      cache_key = ['terms', api.user_id]
+
+      if !options[:no_cache] && cache_exist?(api, cache_key)
+        return cache_read(api, cache_key)
+      end
 
+      data = api.perform_query('api.php?action=getTerms')
+
+      result = Array.new
+      data.each_key do |key|
+        data[key].each do |term_data|
+          term = Osm::Term.new(
+            :id => Osm::to_i_or_nil(term_data['termid']),
+            :section_id => Osm::to_i_or_nil(term_data['sectionid']),
+            :name => term_data['name'],
+            :start => Osm::parse_date(term_data['startdate']),
+            :finish => Osm::parse_date(term_data['enddate']),
+          )
+          result.push term
+          cache_write(api, ['term', term.id], term)
+        end
+      end
+
+      cache_write(api, cache_key, result)
+      return result
+    end
 
-    # Initialize a new Term from api data
-    # @param [Hash] data the hash of data provided by the API
-    def self.from_api(data)
-      new(
-        :id => Osm::to_i_or_nil(data['termid']),
-        :section_id => Osm::to_i_or_nil(data['sectionid']),
-        :name => data['name'],
-        :start => Osm::parse_date(data['startdate']),
-        :finish => Osm::parse_date(data['enddate']),
-      )
+    # Get the terms that the OSM user can access for a given section
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Fixnum] section the section (or its ID) of the section to get terms for
+    # @!macro options_get
+    # @return [Array<Osm::Term>, nil] An array of terms or nil if the user can not access that section
+    def self.get_for_section(api, section, options={})
+      section_id = section.to_i
+      return nil unless get_user_permissions(api).keys.include?(section_id)
+      return get_all(api, options).select{ |term| term.section_id == section_id }
     end
 
-    # Get the term's data for use with the API
-    # @return [Hash]
-    def to_api
-      {
+    # Get a term
+    # @param [Osm::Api] The api to use to make the request
+    # @param [Fixnum] term_id the id of the required term
+    # @!macro options_get
+    # @return nil if an error occured or the user does not have access to that term
+    # @return [Osm::Section]
+    def self.get(api, term_id, options={})
+      cache_key = ['term', term_id]
+
+      if !options[:no_cache] && cache_exist?(api, cache_key)
+        return cache_read(api, cache_key)
+      end
+
+      terms = get_all(api, options)
+      return nil unless terms.is_a? Array
+
+      terms.each do |term|
+        if term.id == term_id
+          return (get_user_permissions(api).keys.include?(term.section_id) ? term : nil)
+        end
+      end
+      return nil
+    end
+
+    # Get the current term for a given section
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Osm::Section, Fixnum] section The section (or its ID)  to get terms for
+    # @!macro options_get
+    # @return [Osm::Term, nil] The current term or nil if the user can not access that section
+    def self.get_current_term_for_section(api, section, options={})
+      section_id = section.to_i
+      terms = get_for_section(api, section_id, options)
+
+      return nil if terms.nil?
+      terms.each do |term|
+        return term if term.current?
+      end
+
+      raise Error, 'There is no current term for the section.'
+    end
+
+    # Create a term in OSM
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Hash] options - the configuration of the new term
+    #   @option options [Osm::Section, Fixnum] :section (required) section or section_id to add the term to
+    #   @option options [String] :name (required) the name for the term
+    #   @option options [Date] :start (required) the date for the start of term
+    #   @option options [Date] :finish (required) the date for the finish of term
+    # @return [Boolean] if the operation suceeded or not
+    def self.create(api, options={})
+      raise ArgumentError, ":section can't be nil" if options[:section].nil?
+      raise ArgumentError, ":name can't be nil" if options[:name].nil?
+      raise ArgumentError, ":start can't be nil" if options[:start].nil?
+      raise ArgumentError, ":finish can't be nil" if options[:finish].nil?
+
+      api_data = {
+        'term' => options[:name],
+        'start' => options[:start].strftime(Osm::OSM_DATE_FORMAT),
+        'end' => options[:finish].strftime(Osm::OSM_DATE_FORMAT),
+        'termid' => '0'
+      }
+
+      data = api.perform_query("users.php?action=addTerm&sectionid=#{options[:section].to_i}", api_data)
+
+      # The cached terms for the section will be out of date - remove them
+      get_all(api, options).each do |term|
+        cache_delete(api, ['term', term.id]) if term.section_id == section_id
+      end
+      cache_delete(api, ['terms', api.user_id])
+
+      return data.is_a?(Hash) && data['terms'].is_a?(Hash)
+    end
+
+
+    # Update a term in OSM
+    # @param [Osm::Api] The api to use to make the request
+    # @return [Boolean] if the operation suceeded or not
+    def update(api)
+      raise ObjectIsInvalid, 'term is invalid' unless valid?
+
+      data = api.perform_query("users.php?action=addTerm&sectionid=#{section_id}", {
         'term' => name,
         'start' => start.strftime(Osm::OSM_DATE_FORMAT),
         'end' => finish.strftime(Osm::OSM_DATE_FORMAT),
         'termid' => id
-      }
+      })
+
+      # The cached terms for the section will be out of date - remove them
+      self.class.cache_delete(api, ['term', id])
+      self.class.cache_delete(api, ['terms', api.user_id])
+
+      return data.is_a?(Hash) && data['terms'].is_a?(Hash)
     end
 
+
+
+    # @!method initialize
+    #   Initialize a new Term
+    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+
+
     # Determine if the term is completly before the passed date
     # @param [Date] date
     # @return [Boolean] if the term is completly before the passed date

data/spec/osm/activity_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe "Activity" do
+describe "Using The API" do
 
-  it "Create from API data" do
-    data = {
+  it "Get One" do
+    body = {
         'details' => {
         'activityid' => '1',
         'version' => '0',
@@ -53,7 +53,10 @@ describe "Activity" do
         }
       ]
     }
-    activity = Osm::Activity.from_api(data)
+    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/programme.php?action=getActivity&id=1", :body => body.to_json)
+
+
+    activity = Osm::Activity.get(@api, 1)
 
     activity.id.should == 1
     activity.version.should == 0

data/spec/osm/api_access_spec.rb

@@ -4,52 +4,60 @@ require 'spec_helper'
 
 describe "API Access" do
 
-  it "Create from API data" do
+  it "Create" do
     data = {
-      'apiid' => '1',
-      'name' => 'Name',
-      'permissions' => {'permission' => '10'},
+      :id => 1,
+      :name => 'Name',
+      :permissions => {:permission => [:read]},
     }
-    api_access = Osm::ApiAccess.from_api(data)
+    api_access = Osm::ApiAccess.new(data)
 
     api_access.id.should == 1
     api_access.name.should == 'Name'
-    api_access.permissions.should == {:permission => 10}
+    api_access.permissions.should == {:permission => [:read]}
     api_access.valid?.should be_true
   end
 
 
-  it "Allows interegation of the permissions hash" do
-    api_access = Osm::ApiAccess.new({
-      :id => 1,
-      :name => 'Name',
-      :permissions => {
-        :read_only => 10,
-        :read_write => 20,
-      },
-    })
-
-    api_access.can_read?(:read_only).should == true
-    api_access.can_read?(:read_write).should == true
-
-    api_access.can_write?(:read_only).should == false
-    api_access.can_write?(:read_write).should == true
-
-    api_access.can_read?(:non_existant).should == false
-    api_access.can_write?(:non_existant).should == false
-  end
-
-
-  it "Tells us if it's the our api" do
-    Osm::Api.stub(:api_id) { '1' }
-
-    apis = {
-      :ours => Osm::ApiAccess.new({:id => 1, :name => 'Name', :permissions => {}}),
-      :not_ours => Osm::ApiAccess.new({:id => 2, :name => 'Name', :permissions => {}}),
-    }
+  describe "Using the API" do
+
+    before :each do
+      body = {
+        'apis' => [
+          {
+            'apiid' => '1',
+            'name' => 'API Name',
+            'permissions' => { 'read' => '10', 'readwrite' => '20' }
+          }, {
+            'apiid' => '2',
+            'name' => 'API 2 Name',
+            'permissions' => { 'read' => '10', 'readwrite' => '20' }
+          }
+        ]
+      }
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getAPIAccess&sectionid=1", :body => body.to_json)
+    end
+
+    it "Get All" do
+      api_accesses = Osm::ApiAccess.get_all(@api, 1)
+
+      api_accesses.size.should == 2
+      api_access = api_accesses[0]
+      api_access.id.should == 1
+      api_access.name.should == 'API Name'
+      api_access.permissions.should == {:read => [:read], :readwrite => [:read, :write]}
+    end
+
+    it "Get One" do
+      api_access = Osm::ApiAccess.get(@api, 1, 2)
+      api_access.id.should == 2
+    end
+
+    it "Get Ours" do
+      api_access = Osm::ApiAccess.get_ours(@api, 1)
+      api_access.id.should == 1
+    end
 
-    apis[:ours].our_api?.should == true
-    apis[:not_ours].our_api?.should == false
   end
 
 end

data/spec/osm/api_spec.rb

@@ -25,47 +25,35 @@ end
 
 describe "API" do
 
-  before :each do
-    @api_config = {
-      :api_id => '1',
-      :api_token => 'API TOKEN',
-      :api_name => 'API NAME',
-      :api_site => :scout,
-      :cache => OsmTest::Cache,
-    }.freeze
-    Osm::Api.configure(@api_config)
-  end
 
   it "Create" do
-    api = Osm::Api.new
-
-    api.nil?.should == false
-    Osm::Api.api_id.should == @api_config[:api_id]
-    Osm::Api.api_name.should == @api_config[:api_name]
+    @api.should_not be_nil
+    @api.api_id.should == @CONFIGURATION[:api][:osm][:id]
+    @api.api_name.should == @CONFIGURATION[:api][:osm][:name]
   end
 
-  it "Raises errors on bad arguents to configure" do
-    # Missing options
-    expect{ Osm::Api.configure(@api_config.select{ |k,v| (k != :api_id )}) }.to raise_error(ArgumentError, ':api_id does not exist in options hash')
-    expect{ Osm::Api.configure(@api_config.select{ |k,v| (k != :api_token)}) }.to raise_error(ArgumentError, ':api_token does not exist in options hash')
-    expect{ Osm::Api.configure(@api_config.select{ |k,v| (k != :api_name)}) }.to raise_error(ArgumentError, ':api_name does not exist in options hash')
-    expect{ Osm::Api.configure(@api_config.select{ |k,v| (k != :api_site)}) }.to raise_error(ArgumentError, ':api_site does not exist in options hash or is invalid, this should be set to either :scout or :guide')
-
-    # Invalid site
-    expect{ Osm::Api.configure(@api_config.select{ |k,v| (k != :api_site)}.merge(:api_site => :invalid)) }.to raise_error(ArgumentError, ':api_site does not exist in options hash or is invalid, this should be set to either :scout or :guide')
-
-    # Invalid default_cache_ttl
-    expect{ Osm::Api.configure(@api_config.merge(:default_cache_ttl => -1)) }.to raise_error(ArgumentError, ':default_cache_ttl must be greater than 0')
-    expect{ Osm::Api.configure(@api_config.merge(:default_cache_ttl => 'invalid')) }.to raise_error(ArgumentError, ':default_cache_ttl must be greater than 0')
+  it "Raises errors on bad arguments to configure" do
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].select{ |k,v| (k != :default_site)}) }.to raise_error(ArgumentError, ':default_site does not exist in options hash or is invalid, this should be set to either :osm or :ogm')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:default_site => :invalid)) }.to raise_error(ArgumentError, ':default_site does not exist in options hash or is invalid, this should be set to either :osm or :ogm')
+
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].select{ |k,v| (k != :ogm) && (k != :osm)}) }.to raise_error(ArgumentError, ':osm and/or :ogm must be present')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:osm => '')) }.to raise_error(ArgumentError, ':osm must be a Hash')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:osm => @CONFIGURATION[:api][:osm].select{ |k,v| (k != :id)})) }.to raise_error(ArgumentError, ':osm must contain a key :id')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:osm => @CONFIGURATION[:api][:osm].select{ |k,v| (k != :token)})) }.to raise_error(ArgumentError, ':osm must contain a key :token')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:osm => @CONFIGURATION[:api][:osm].select{ |k,v| (k != :name)})) }.to raise_error(ArgumentError, ':osm must contain a key :name')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:ogm => '')) }.to raise_error(ArgumentError, ':ogm must be a Hash')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:ogm => @CONFIGURATION[:api][:ogm].select{ |k,v| (k != :id)})) }.to raise_error(ArgumentError, ':ogm must contain a key :id')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:ogm => @CONFIGURATION[:api][:ogm].select{ |k,v| (k != :token)})) }.to raise_error(ArgumentError, ':ogm must contain a key :token')
+    expect{ Osm::Api.configure(@CONFIGURATION[:api].merge(:ogm => @CONFIGURATION[:api][:ogm].select{ |k,v| (k != :name)})) }.to raise_error(ArgumentError, ':ogm must contain a key :name')
   end
 
 
   it "Raises errors on bad arguments to create" do
-    # Both userid and secret (or neither) must be passed
-    expect{ Osm::Api.new('1') }.to raise_error(ArgumentError, 'You must pass a secret if you are passing a userid')
-    expect{ Osm::Api.new(nil, '1') }.to raise_error(ArgumentError, 'You must pass a userid if you are passing a secret')
+    # Both userid and secret must be passed
+    expect{ Osm::Api.new('1', nil) }.to raise_error(ArgumentError, 'You must pass a secret (get this by using the authorize method)')
+    expect{ Osm::Api.new(nil, '1') }.to raise_error(ArgumentError, 'You must pass a user_id (get this by using the authorize method)')
 
-    expect{ Osm::Api.new('1', '2', :invalid_site) }.to raise_error(ArgumentError, 'site is invalid, if passed it should be either :scout or :guide')
+    expect{ Osm::Api.new('1', '2', :invalid_site) }.to raise_error(ArgumentError, 'site is invalid, if passed it should be either :osm or :ogm, if not passed then you forgot to run Api.configure')
   end
 
 
@@ -75,1154 +63,51 @@ describe "API" do
 
     url = 'https://www.onlinescoutmanager.co.uk/users.php?action=authorise'
     post_data = {
-      'apiid' => @api_config[:api_id],
-      'token' => @api_config[:api_token],
+      'apiid' => @CONFIGURATION[:api][:osm][:id],
+      'token' => @CONFIGURATION[:api][:osm][:token],
       'email' => user_email,
       'password' => user_password,
     }
     HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"userid":"id","secret":"secret"}'}) }
 
-    Osm::Api.new.authorize(user_email, user_password).should == {'userid' => 'id', 'secret' => 'secret'}
+    Osm::Api.authorize(user_email, user_password).should == {:user_id => 'id', :secret => 'secret'}
   end
 
   it "sets a new API user" do
-    api = Osm::Api.new
-    api.set_user('1', '2')
+    @api.set_user('1', '2').is_a?(Osm::Api).should be_true
 
-    HTTParty.should_receive(:post).with("https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", {:body => {
-      'apiid' => @api_config[:api_id],
-      'token' => @api_config[:api_token],
+    HTTParty.should_receive(:post).with("https://www.onlinescoutmanager.co.uk/test", {:body => {
+      'apiid' => @CONFIGURATION[:api][:osm][:id],
+      'token' => @CONFIGURATION[:api][:osm][:token],
       'userid' => '1',
       'secret' => '2',
     }}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
-    api.get_roles
+    @api.perform_query('test')
   end
 
 
-  describe "Using the API:" do
-    it "Fetches the user's roles" do
-      body = [
-        {"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\":[{\"name\":\"Subs\",\"extraid\":\"529\"}],\"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"=>"1", "sectionname"=>"Section 1", "section"=>"cubs", "isDefault"=>"1", "permissions"=>{"badge"=>100, "member"=>100, "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)
-
-      roles = Osm::Api.new('1', '2').get_roles
-      roles.size.should == 2
-      roles[0].is_a?(Osm::Role).should be_true
-      roles[0].section.id.should_not == roles[1].section.id
-      roles[0].group_id.should == roles[1].group_id
-    end
-
-
-    it "Fetch the user's notepads" do
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads", :body => {"1" => "Section 1", "2" => "Section 2"}.to_json)
-      Osm::Api.new('1', '2').get_notepads.should == {1 => 'Section 1', 2 => 'Section 2'}
-    end
-
-
-    it "Fetch the notepad for a section" do
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads", :body => {"1" => "Section 1", "2" => "Section 2"}.to_json)
-      Osm::Api.new('1', '2').get_notepad(1).should == 'Section 1'
-      Osm::Api.new('1', '2').get_notepad(Osm::Section.new(:id => 2)).should == 'Section 2'
-    end
-
-    it "Fetch the notepad for a section (invalid section/id)" do
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads", :body => {"1" => "Section 1"}.to_json)
-
-      expect{ Osm::Api.new('1', '2').get_notepad(-10) }.to raise_error(ArgumentError, 'Invalid section ID')
-      expect{ Osm::Api.new('1', '2').get_notepad(0) }.to raise_error(ArgumentError, 'Invalid section ID')
-
-      expect{ Osm::Api.new('1', '2').get_notepad('1') }.to raise_error(ArgumentError, 'Invalid type for section')
-    end
-
-
-    it "Fetch a section's details" do
-      body = [
-        {"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\":[{\"name\":\"Subs\",\"extraid\":\"529\"}],\"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"=>"1", "sectionname"=>"Section 1", "section"=>"cubs", "isDefault"=>"1", "permissions"=>{"badge"=>100, "member"=>100, "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)
-
-      section = Osm::Api.new('1', '2').get_section(2)
-      section.is_a?(Osm::Section).should be_true
-      section.id.should == 2
-    end
-
-
-    it "Fetch a section's groupings (sixes, patrols etc.)" do
-      body = {"patrols" => [
-        {"patrolid" => "101","name" => "Group 1","active" => 1},
-        {"patrolid" => "106","name" => "Group 2","active" => 1},
-        {"patrolid" => "107","name" => "Group 3","active" => 0},
-      ]}
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getPatrols&sectionid=2", :body => body.to_json)
-
-      groupings = Osm::Api.new('1', '2').get_groupings(2)
-      groupings.size.should == 3
-      groupings[0].is_a?(Osm::Grouping).should be_true
-    end
-
-
-    it "Fetch terms" do
-      body = {
-        "9" => [
-          {"termid" => "1", "name" => "Term 1", "sectionid" => "9", "startdate" => (Date.today + 31).strftime('%Y-%m-%d'), "enddate" => (Date.today + 90).strftime('%Y-%m-%d')}
-        ],
-        "10" => [
-          {"termid" => "2", "name" => "Term 2", "sectionid" => "10", "startdate" => (Date.today + 31).strftime('%Y-%m-%d'), "enddate" => (Date.today + 90).strftime('%Y-%m-%d')},
-          {"termid" => "3", "name" => "Term 3", "sectionid" => "10", "startdate" => (Date.today + 91).strftime('%Y-%m-%d'), "enddate" => (Date.today + 180).strftime('%Y-%m-%d')}
-        ]
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getTerms", :body => body.to_json)
-
-      terms = Osm::Api.new('1', '2').get_terms
-      terms.size.should == 3
-      terms[0].is_a?(Osm::Term).should be_true
-    end
-
-
-    it "Fetch a term" do
-      body = {
-        "9" => [
-          {"termid" => "1", "name" => "Term 1", "sectionid" => "9", "startdate" => (Date.today + 31).strftime('%Y-%m-%d'), "enddate" => (Date.today + 90).strftime('%Y-%m-%d')}
-        ],
-        "10" => [
-          {"termid" => "2", "name" => "Term 2", "sectionid" => "10", "startdate" => (Date.today + 31).strftime('%Y-%m-%d'), "enddate" => (Date.today + 90).strftime('%Y-%m-%d')},
-          {"termid" => "3", "name" => "Term 3", "sectionid" => "10", "startdate" => (Date.today + 91).strftime('%Y-%m-%d'), "enddate" => (Date.today + 180).strftime('%Y-%m-%d')}
-        ]
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getTerms", :body => body.to_json)
-
-      term = Osm::Api.new('1', '2').get_term(2)
-      term.is_a?(Osm::Term).should be_true
-      term.id.should == 2
-    end
-
-
-    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}
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/programme.php?action=getProgramme&sectionid=3&termid=4", :body => body.to_json)
-
-      programme = Osm::Api.new('1', '2').get_programme(3, 4)
-      programme.size.should == 1
-      programme[0].is_a?(Osm::Evening).should be_true
-      programme[0].activities.size.should == 2
-    end
-
-
-    it "Fetch an activity" do
-      body = {
-        'details' => {
-          'activityid' => "1",
-          'version' => '0',
-          'groupid' => '1',
-          'userid' => '1',
-          'title' => "Activity 1",
-          'description' => '',
-          'resources' => '',
-          'instructions' => '',
-          'runningtime' => '',
-          'location' => 'indoors',
-          'shared' => '0',
-          'rating' => '0',
-          'facebook' => ''
-        },
-        'editable'=>false,
-        'rating'=>'0',
-        'used'=>'2',
-        'versions' => [
-          {
-            'value' => '0',
-            'userid' => '1',
-            'firstname' => 'Alice',
-            'label' => 'Current version - Alice',
-            'selected' => 'selected'
-          }
-        ],
-        'sections'=> ['beavers', 'cubs', 'scouts', 'explorers'],
-        'tags' => ""
-      }
-
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/programme.php?action=getActivity&id=1", :body => body.to_json)
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/programme.php?action=getActivity&id=1&version=0", :body => body.to_json)
-
-      activity = Osm::Api.new('1', '2').get_activity(1)
-      activity.id.should == 1
-
-      activity0 = Osm::Api.new('1', '2').get_activity(1, 0)
-      activity0.id.should == 1
-    end
-
-
-    it "Fetch members' details" do
-      body = {
-        'identifier' => 'scoutid',
-        'items' => [{
-          'scoutid' => '1', 'sectionid' => '1', 'type' => '',
-          'firstname' => 'John', 'lastname' => 'Doe',
-          'email1' => '', 'email2' => '', 'email3' => '', 'email4' => '',
-          'phone1' => '', 'phone2' => '', 'phone3' => '', 'phone4' => '', 'address' => '', 'address2' => '',
-          'dob' => '2001-02-03', 'started' => '2006-01-01', 'joining_in_yrs' => '-1',
-          'parents' => '', 'notes' => '', 'medical' => '', 'religion' => '', 'school' => '', 'ethnicity' => '',
-          'subs' => '', 'patrolid' => '1', 'patrolleader' => '0', 'joined' => '2006-01-01',
-          'age' => '6 / 0', 'yrs' => '9', 'patrol' => '1'
-        }]
-      }
-
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getUserDetails&sectionid=1&termid=2", :body => body.to_json)
-      members = Osm::Api.new('1', '2').get_members(1, 2)
-      members[0].id.should == 1
-    end
-
-
-    it "Fetch the API Access for a section" do
-      body = {
-        'apis' => [{
-          'apiid' => '1',
-          'name' => 'Test API',
-          'permissions' => {}
-        }]
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getAPIAccess&sectionid=1", :body => body.to_json)
-      apis = Osm::Api.new('1', '2').get_api_access(1)
-      apis[0].id.should == 1
-    end
-
-
-    it "Fetch our API Access for a section" do
-      body = {
-        'apis' => [{
-          'apiid' => '1',
-          'name' => 'Test API',
-          'permissions' => {}
-        },{
-          'apiid' => '2',
-          'name' => 'Test API 2',
-          'permissions' => {}
-        }]
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getAPIAccess&sectionid=1", :body => body.to_json)
-      api = Osm::Api.new('1', '2').get_our_api_access(1)
-      api.id.should == 1
-    end
-
-    it "Fetch our API Access for a section (not in returned data)" do
-      body = {
-        'apis' => []
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getAPIAccess&sectionid=1", :body => body.to_json)
-      api = Osm::Api.new('1', '2').get_our_api_access(1)
-      api.should be_nil
-    end
-
-
-    it "Fetch events for a section" do
-      body = {
-        'identifier' => 'eventid',
-        'label' => 'name',
-        'items' => [{
-          'eventid' => '1',
-          'name' => 'An Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '0'
-        }]
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => body.to_json)
-      events = Osm::Api.new('1', '2').get_events(1)
-      events[0].id.should == 1
-    end
-
-    it "Fetch an event" do
-      body = {
-        'identifier' => 'eventid',
-        'label' => 'name',
-        'items' => [{
-          'eventid' => '2',
-          'name' => 'An Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '0'
-        }]
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => body.to_json)
-      event = Osm::Api.new('1', '2').get_event(1, 2)
-      event.id.should == 2
-    end
-
-    it "Fetch an event's fields" do
-      events_body = {
-        'identifier' => 'eventid',
-        'label' => 'name',
-        'items' => [{
-          'eventid' => '2',
-          'name' => 'An Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '0'
-        }]
-      }
-      fields_body = {
-        'config' => '[{"id":"f_1","name":"Field 1"}]'
-      }
-
-      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)
-      api = Osm::Api.new('1', '2')
-
-      fields = api.get_event_fields(api.get_event(1, 2), 3)
-      fields.should == {'f_1' => 'Field 1'}
-    end
-
-    it "Fetch an event's attendance" do
-      events_body = {
-        'identifier' => 'eventid',
-        'label' => 'name',
-        'items' => [{
-          'eventid' => '2',
-          'name' => 'An Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '0'
-        }]
-      }
-      attendance_body = {
-	'identifier' => 'scoutid',
-	'eventid' => '2',
-	'items' => [
-          {
-	    'scoutid' => '1',
-	    'attending' => 'Yes',
-            'firstname' => 'First',
-            'lastname' => 'Last',
-            'dob' => '1980-01-02',
-            'patrolid' => '2',
-            'f_1' => '',
-          }
-        ]
-      }
-
-      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=getEventAttendance&eventid=2&sectionid=1&termid=3", :body => attendance_body.to_json)
-      api = Osm::Api.new('1', '2')
-
-      attendance = api.get_event_attendance(api.get_event(1, 2), 3)
-      attendance.is_a?(Array).should be_true
-    end
-
-    it "Update an event's attendance" do
-      events_body = {
-        'identifier' => 'eventid',
-        'label' => 'name',
-        'items' => [{
-          'eventid' => '2',
-          'name' => 'An Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '0'
-        }]
-      }
-      attendance_body = {
-	'identifier' => 'scoutid',
-	'eventid' => '2',
-	'items' => [
-          {
-	    'scoutid' => '1',
-	    'attending' => 'Yes',
-            'firstname' => 'First',
-            'lastname' => 'Last',
-            'dob' => '1980-01-02',
-            'patrolid' => '2',
-            'f_1' => '',
-          }
-        ]
-      }
-
-      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=getEventAttendance&eventid=2&sectionid=1&termid=3", :body => attendance_body.to_json)
-
-      api = Osm::Api.new('1', '2')
-      e = api.get_event(1, 2)
-      ea = api.get_event_attendance(e, 3)[0]
-      ea.fields['f_1'] = 'TEST'
-
-      HTTParty.should_receive(:post).with(
-        "https://www.onlinescoutmanager.co.uk/events.php?action=updateScout",
-        {:body => {
-          'scoutid' => 1,
-          'column' => 'f_1',
-          'value' => 'TEST',
-          'sectionid' => 1,
-          'row' => 0,
-          'eventid' => 2,
-          'apiid' => '1',
-          'token' => 'API TOKEN',
-          'userid' => '1',
-          'secret' => '2',
-        }}
-      ) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
-      api.update_event_attendance(e, ea, 'f_1').should be_true
-    end
-
-    it "Fetch events for a section honoring archived option" do
-      body = {
-        'identifier' => 'eventid',
-        'label' => 'name',
-        'items' => [{
-          'eventid' => '1',
-          'name' => 'An Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '0'
-        },{
-          'eventid' => '2',
-          'name' => 'An Archived Event',
-          'startdate' => '2001-02-03',
-          'enddate' => nil,
-          'starttime' => '00:00:00',
-          'endtime' => '00:00:00',
-          'cost' => '0.00',
-          'location' => '',
-          'notes' => '',
-          'sectionid' => 1,
-          'googlecalendar' => nil,
-          'archived' => '1'
-        }]
-      }
-
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => body.to_json)
-      Osm::Api.new('1', '2').get_events(1).size.should == 1
-      Osm::Api.new('1', '2').get_events(1, {:include_archived => true}).size.should == 2
-    end
-
-
-    it "Fetch due badges for a section" do
-      badges_body = []
-      roles_body = [{
-        "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\":[{\"name\":\"Subs\",\"extraid\":\"529\"}],\"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" => "1", "sectionname" => "Section 1", "section" => "cubs", "isDefault" => "1",
-        "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 => roles_body.to_json)
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=outstandingBadges&section=cubs&sectionid=1&termid=2", :body => badges_body.to_json)
-
-      due_badges = Osm::Api.new('1', '2').get_due_badges(1, 2)
-      due_badges.should_not be_nil
-    end
-
-
-    it "Fetch badge requirements for an evening" do
-      badges_body = [{'a'=>'a'},{'a'=>'A'}]
-      FakeWeb.register_uri(:post, 'https://www.onlinescoutmanager.co.uk/users.php?action=getActivityRequirements&date=2000-01-02&sectionid=3&section=cubs', :body => badges_body.to_json)
-
-      section = Osm::Section.new(:id => 3, :type => :cubs)
-      evening = Date.new(2000, 1, 2)
-
-      Osm::Api.new('1', '2').get_badge_requirements_for_evening(section, evening).should == badges_body
-    end
-
-
-    it "Fetch badge stock levels for a section" do
-      badges_body = {
-        'stock' => {
-          'sectionid' => '1',
-          'badge_1' => '1',
-          'badge_2' => '2'
-        }
-      }
-
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=core&sectionid=1&section=test&termid=2", :body => badges_body.to_json)
-
-      section = Osm::Section.new(:id => 1, :type => :test)
-      term = Osm::Term.new(:id => 2)
-      stock = Osm::Api.new('1', '2').get_badge_stock_levels(section, term)
-      stock.should == {'badge_1' => 1, 'badge_2' => 2}
-    end
-
-    it "Fetch badge stock levels for a section (data from API missing)" do
-      badges_body = {}
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=core&sectionid=1&section=test&termid=2", :body => badges_body.to_json)
-
-      section = Osm::Section.new(:id => 1, :type => :test)
-      term = Osm::Term.new(:id => 2)
-      stock = Osm::Api.new('1', '2').get_badge_stock_levels(section, term)
-      stock.should == {}
-    end
-
-    it "Fetch the register structure for a section" do
-      data = [
-        {"rows" => [{"name"=>"First name","field"=>"firstname","width"=>"100px"},{"name"=>"Last name","field"=>"lastname","width"=>"100px"},{"name"=>"Total","field"=>"total","width"=>"60px"}],"noscroll"=>true},
-        {"rows" => []}
-      ]
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=registerStructure&sectionid=1&termid=2", :body => data.to_json)
-
-      register_structure = Osm::Api.new('1', '2').get_register_structure(1, 2)
-      register_structure.is_a?(Array).should be_true
-    end
-
-    it "Fetch the register data for a section" do
-      data = {
-        'identifier' => 'scoutid',
-        'label' => "name",
-        'items' => []
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=register&sectionid=1&termid=2", :body => data.to_json)
-
-      register = Osm::Api.new('1', '2').get_register_data(1, 2)
-      register.is_a?(Array).should be_true
-    end
-
-
-    it "Fetch the flexi record fields for a section" do
-      data = {
-        "extraid" => "2",
-        "sectionid" => "1",
-        "name" => "A Flexi Record",
-        "config" => "[{\"id\":\"f_1\",\"name\":\"Field 1\",\"width\":\"150\"},{\"id\":\"f_2\",\"name\":\"Field 2\",\"width\":\"150\"}]",
-        "total" => "none",
-        "extrafields" => "[]",
-        "structure" => [
-          {
-            "rows" => [
-              {"name" => "First name","field" => "firstname","width" => "150px"},
-              {"name" => "Last name","field" => "lastname","width" => "150px"},
-            ],
-            "noscroll" => true
-          },
-          {"rows" => [
-            {"name" => "Field 1","field" => "f_1","width" => "150px","editable" => true},
-            {"name" => "Filed 2","field" => "f_2","width" => "150px","editable" => true},
-          ]}
-        ]
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/extras.php?action=getExtra&sectionid=1&extraid=2", :body => data.to_json)
-
-      fields = Osm::Api.new('1', '2').get_flexi_record_fields(1, 2)
-      fields.is_a?(Array).should be_true
-    end
-
-    it "Fetch the flexi record data for a section" do
-      data = {
-        'identifier' => 'scoutid',
-        'label' => "name",
-        'items' => [{
-          "scoutid" => "1",
-          "firstname" => "First",
-          "lastname" => "Last",
-          "dob" => "",
-          "patrolid" => "2",
-          "total" => "",
-          "completed" => "",
-          "f_1" => "A",
-          "f_2" => "B",
-          "age" => "",
-          "patrol" => "Green"
-        }]
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/extras.php?action=getExtraRecords&sectionid=1&extraid=2&termid=3&section=cubs", :body => data.to_json)
-
-      records = Osm::Api.new('1', '2').get_flexi_record_data(Osm::Section.new(:id => 1, :type => :cubs), 2, 3)
-      records.is_a?(Array).should be_true
-    end
-
-
-    it "Create an evening (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=addActivityToProgramme'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'meetingdate' => '2000-01-02',
-        'sectionid' => 1,
-        'activityid' => -1,
-      }
-
-      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}'}) }
-      api.create_evening(1, Date.new(2000, 1, 2)).should be_true
-    end
-
-    it "Create an evening (failed)" do
-      url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=addActivityToProgramme'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'meetingdate' => '2000-01-02',
-        'sectionid' => 1,
-        'activityid' => -1,
-      }
-
-      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}'}) }
-      api.create_evening(1, Date.new(2000, 1, 2)).should be_false
-    end
-
-
-    it "Update an evening (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=editEvening'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'eveningid' => 1, 'sectionid' => 2, 'meetingdate' => '2000-01-02', 'starttime' => nil,
-        'endtime' => nil, 'title' => 'Unnamed meeting', 'notesforparents' =>'', 'prenotes' => '',
-        '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}'}) }
-
-      evening = Osm::Evening.new(:id=>1, :section_id=>2, :meeting_date=>Date.new(2000, 01, 02))
-      api.update_evening(evening).should be_true
-    end
-
-    it "Update an evening (failed)" do
-      url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=editEvening'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'eveningid' => 1, 'sectionid' => 2, 'meetingdate' => '2000-01-02', 'starttime' => nil,
-        'endtime' => nil, 'title' => 'Unnamed meeting', 'notesforparents' =>'', 'prenotes' => '',
-        '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}'}) }
-
-      evening = Osm::Evening.new(:id=>1, :section_id=>2, :meeting_date=>Date.new(2000, 01, 02))
-      api.update_evening(evening).should be_false
-    end
-
-    it "Update an evening (invalid evening)" do
-      api = Osm::Api.new('user', 'secret')
-      evening = Osm::Evening.new
-      expect{ api.update_evening(evening) }.to raise_error(Osm::ArgumentIsInvalid)
-    end
-
-
-    it "Create an event (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        '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'
-      }
-
-      api = Osm::Api.new('user', 'secret')
-      api.stub(:get_events) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
-
-      api.create_event(Osm::Event.new({
-        :section_id => 1,
-        :name => 'Test event',
-        :start => DateTime.new(2000, 01, 02, 03, 04, 05),
-        :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
-        :cost => '1.23',
-        :location => 'Somewhere',
-        :notes => 'none'
-      })).should == 2
-    end
-
-    it "Create an event (failed)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        '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'
-      }
-
-      api = Osm::Api.new('user', 'secret')
-      api.stub(:get_events) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
-
-      api.create_event(Osm::Event.new({
-        :section_id => 1,
-        :name => 'Test event',
-        :start => DateTime.new(2000, 01, 02, 03, 04, 05),
-        :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
-        :cost => '1.23',
-        :location => 'Somewhere',
-        :notes => 'none'
-      })).should be_nil
-    end
-
-    it "Update an event (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        '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',
-        'eventid' => 2
-      }
-
-      api = Osm::Api.new('user', 'secret')
-      api.stub(:get_events) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"id":2}'}) }
-
-      api.update_event(Osm::Event.new({
-        :section_id => 1,
-        :name => 'Test event',
-        :start => DateTime.new(2000, 01, 02, 03, 04, 05),
-        :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
-        :cost => '1.23',
-        :location => 'Somewhere',
-        :notes => 'none',
-        :id => 2
-      })).should be_true
-    end
-
-    it "Update an event (failed)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addEvent&sectionid=1'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        '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',
-        'eventid' => 2
-      }
-
-      api = Osm::Api.new('user', 'secret')
-      api.stub(:get_events) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
-
-      api.update_event(Osm::Event.new({
-        :section_id => 1,
-        :name => 'Test event',
-        :start => DateTime.new(2000, 01, 02, 03, 04, 05),
-        :finish => DateTime.new(2001, 02, 03, 04, 05, 06),
-        :cost => '1.23',
-        :location => 'Somewhere',
-        :notes => 'none',
-        :id => 2
-      })).should be_false
-    end
-
-    it "Delete an event (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=deleteEvent&sectionid=1&eventid=2'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-      }
-
-      api = Osm::Api.new('user', 'secret')
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
-
-      api.delete_event(Osm::Event.new({
-        :section_id => 1,
-        :name => 'Test event',
-        :id => 2
-      })).should be_true
-    end
-
-    it "Delete an event (failed)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=deleteEvent&sectionid=1&eventid=2'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-      }
-
-      api = Osm::Api.new('user', 'secret')
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":false}'}) }
-
-      api.delete_event(Osm::Event.new({
-        :section_id => 1,
-        :name => 'Test event',
-        :id => 2
-      })).should be_false
-    end
-
-    it "Add field to an event (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addColumn&sectionid=1&eventid=2'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'columnName' => 'Test field',
-      }
-
-      api = Osm::Api.new('user', 'secret')
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"eventid":"2"}'}) }
-
-      api.add_event_field(Osm::Event.new({
-        :section_id => 1,
-        :name => 'Test event',
-        :id => 2
-      }), 'Test field').should be_true
-    end
-
-    it "Add field to an event (failed)" do
-      url = 'https://www.onlinescoutmanager.co.uk/events.php?action=addColumn&sectionid=1&eventid=2'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'columnName' => 'Test field',
-      }
-
-      api = Osm::Api.new('user', 'secret')
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
-
-      api.add_event_field(Osm::Event.new({
-        :section_id => 1,
-        :name => 'Test event',
-        :id => 2
-      }), 'Test field').should be_false
-    end
-
-
-    it "Create a term (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=addTerm&sectionid=1'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'term' => 'A Term',
-        'start' => '2010-01-01',
-        'end' => '2010-12-31',
-        'termid' => '0'
-      }
-
-      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=>'{"terms":{}}'}) }
-
-      api.create_term({
-        :section => 1,
-        :name => 'A Term',
-        :start => Date.new(2010, 01, 01),
-        :finish => Date.new(2010, 12, 31),
-      }).should be_true
-    end
-
-    it "Create a term (failed)" do
-      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=addTerm&sectionid=1'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'term' => 'A Term',
-        'start' => '2010-01-01',
-        'end' => '2010-12-31',
-        'termid' => '0'
-      }
-
-      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=>'{}'}) }
-
-      api.create_term({
-        :section => 1,
-        :name => 'A Term',
-        :start => Date.new(2010, 01, 01),
-        :finish => Date.new(2010, 12, 31),
-      }).should be_false
-    end
-
-    it "Update register attendance" do
-      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=registerUpdate&sectionid=1&termid=2'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'scouts' => '["3"]',
-        'selectedDate' => '2000-01-02',
-        'present' => 'Yes',
-        'section' => :cubs,
-        'sectionid' => 1,
-        'completedBadges' => '[{"a":"A"},{"b":"B"}]'
-      }
-
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
-      Osm::Api.new('user', 'secret').update_register({
-        :section => Osm::Section.new(:id=>1, :type=>:cubs),
-        :term => 2,
-        :evening => Date.new(2000, 1, 2),
-        :attendance => 'Yes',
-        :members => 3,
-        :completed_badge_requirements => [{'a'=>'A'}, {'b'=>'B'}]
-      }).should be_true
-    end
-
-
-    it "Update a term (succeded)" do
-      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=addTerm&sectionid=1'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'term' => 'A Term',
-        'start' => '2010-01-01',
-        'end' => '2010-12-31',
-        'termid' => 2
-      }
-      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=>'{"terms":{}}'}) }
-
-      term = Osm::Term.new(:id=>2, :section_id=>1, :name=>'A Term', :start=>Date.new(2010, 01, 01), :finish=>Date.new(2010, 12, 31))
-      api.update_term(term).should be_true
-    end
-
-    it "Update a term (failed)" do
-      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=addTerm&sectionid=1'
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-        'term' => 'A Term',
-        'start' => '2010-01-01',
-        'end' => '2010-12-31',
-        'termid' => 2
-      }
-      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=>'{}'}) }
-
-      term = Osm::Term.new(:id=>2, :section_id=>1, :name=>'A Term', :start=>Date.new(2010, 01, 01), :finish=>Date.new(2010, 12, 31))
-      api.update_term(term).should be_false
-    end
-
-    it "Update a term (invalid term)" do
-      api = Osm::Api.new('user', 'secret')
-      term = Osm::Term.new
-      expect{ api.update_term(term) }.to raise_error(Osm::ArgumentIsInvalid)
-    end
-
-  end
-
-
-  describe "Options Hash" do
-    it "Uses the API's user and secret when not passed" do
-      url = "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads"
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-      }
-
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"1":"Section 1"}'}) }
-      Osm::Api.new('user', 'secret').get_notepads.should == {1 => 'Section 1'}
-    end
-
-    it "Uses the user and secret passed in" do
-      url = "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads"
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-      }
-      api = Osm::Api.new('1', '2')
-
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"1":"Section 1"}'}) }
-      api.should_receive(:warn).with('[DEPRECATION OF OPTION] use of the api_data option is deprecated.')
-
-      api.get_notepads({}, {'userid'=>'user', 'secret'=>'secret'}).should == {1 => 'Section 1'}
-    end
-  end
-
-
-  describe "Caching behaviour:" do
-    it "Controls access to items in the cache (forbids if unknown)" do
-      api1 = Osm::Api.new('1', 'secret')
-      api2 = Osm::Api.new('2', 'secret')
-
-      body = {"9" => [{"termid" => "1", "name" => "Term 1", "sectionid" => "9", "startdate" => (Date.today + 31).strftime('%Y-%m-%d'), "enddate" => (Date.today + 90).strftime('%Y-%m-%d')}]}
-
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getTerms", :body => body.to_json)
-      terms = api1.get_terms
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getTerms", :body => {}.to_json)
-      api2.get_term(terms[0].id).should be_nil
-    end
-
-    it "Controls access to items in the cache (allows if known)" do
-      api1 = Osm::Api.new('1', 'secret')
-      api2 = Osm::Api.new('2', 'secret')
-
-      body = {"9" => [{"termid" => "1", "name" => "Term 1", "sectionid" => "9", "startdate" => (Date.today + 31).strftime('%Y-%m-%d'), "enddate" => (Date.today + 90).strftime('%Y-%m-%d')}]}
-
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getTerms", :body => body.to_json)
-      terms = api1.get_terms
-      api1.get_term(terms[0].id).should_not be_nil
-      api2.get_term(terms[0].id).should_not be_nil
-    end
-
-
-    it "Fetches from the cache when the cache holds it" do
-      url = "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads"
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-      }
-
-      # Fetch first time (and 'prime' the cache)
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=> {"1" => "Section 1"}.to_json}) }
-      Osm::Api.new('user', 'secret').get_notepad(1).should == 'Section 1'
-
-      # Fetch second time
-      HTTParty.should_not_receive(:post)
-      Osm::Api.new('user', 'secret').get_notepad(1).should == 'Section 1'
-    end
-
-    it "Doesn't fetch from the cache when told not to" do
-      url = "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads"
-      post_data = {
-        'apiid' => @api_config[:api_id],
-        'token' => @api_config[:api_token],
-        'userid' => 'user',
-        'secret' => 'secret',
-      }
-
-      # Fetch first time (and 'prime' the cache)
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"1":"Section 1"}'}) }
-      Osm::Api.new('user', 'secret').get_notepad(1).should == 'Section 1'
-
-      # Fetch second time
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"1":"New content."}'}) }
-      Osm::Api.new('user', 'secret').get_notepad(1, {:no_cache => true}).should == 'New content.'
-    end
-
-
-    it "Uses the provided cache_prepend_to_key text" do
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads", :body => {"1" => "Section 1"}.to_json)
-
-      OsmTest::Cache.should_receive('exist?').with('OSMAPI-notepads-1')
-      Osm::Api.new('1', '2').get_notepads.should == {1 => 'Section 1'}
-
-      Osm::Api.configure(@api_config.merge(:cache_prepend_to_key => 'AB'))
-      OsmTest::Cache.should_receive('exist?').with('AB-notepads-1')
-      Osm::Api.new('1', '2').get_notepads.should == {1 => 'Section 1'}
-    end
-  end
-
 
   describe "OSM and Internet error conditions:" do
     it "Raises a connection error if the HTTP status code was not 'OK'" do
       HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'500'}) }
-      expect{ Osm::Api.new.authorize('email@example.com', 'password') }.to raise_error(Osm::ConnectionError, 'HTTP Status code was 500')
+      expect{ Osm::Api.authorize('email@example.com', 'password') }.to raise_error(Osm::ConnectionError, 'HTTP Status code was 500')
     end
 
 
     it "Raises a connection error if it can't connect to OSM" do
       HTTParty.stub(:post) { raise SocketError }
-      expect{ Osm::Api.new.authorize('email@example.com', 'password') }.to raise_error(Osm::ConnectionError, 'A problem occured on the internet.')
+      expect{ Osm::Api.authorize('email@example.com', 'password') }.to raise_error(Osm::ConnectionError, 'A problem occured on the internet.')
     end
 
 
     it "Raises an error if OSM returns an error (as a hash)" do
       HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"error":"Error message"}'}) }
-      expect{ Osm::Api.new.authorize('email@example.com', 'password') }.to raise_error(Osm::Error, 'Error message')
+      expect{ Osm::Api.authorize('email@example.com', 'password') }.to raise_error(Osm::Error, 'Error message')
     end
 
     it "Raises an error if OSM returns an error (as a plain string)" do
       HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'Error message'}) }
-      expect{ Osm::Api.new.authorize('email@example.com', 'password') }.to raise_error(Osm::Error, 'Error message')
+      expect{ Osm::Api.authorize('email@example.com', 'password') }.to raise_error(Osm::Error, 'Error message')
     end
   end