osm 1.2.1 → 1.2.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 1.2.2
+
+  * Add base\_url method to Api class and instances
+  * Add get_photo method to member
+  * Add earnt and earnt? methods to Osm::Badge::Data to get the stage which has been earnt (based on the requirements hash)
+
 ## Version 1.2.1
 
   * Add section\_id read-only attribute to Osm::Error::NoCurrentTerm

data/lib/osm/api.rb

@@ -139,6 +139,21 @@ module Osm
       return self
     end
 
+    # Get the base URL for requests to OSM/OGM
+    # @param [Symbol] site For OSM or OGM (:osm or :ogm)
+    # @return [String] The base URL for requests
+    def self.base_url(site=@@site)
+      raise ArgumentError, "Invalid site" unless [:osm, :ogm].include?(site)
+      BASE_URLS[site]
+    end
+
+    # Get the base URL for requests to OSM.OGM
+    # @param site For OSM or OGM (:osm or :ogm), defaults to the default for this api object
+    # @return [String] The base URL for requests
+    def base_url(site=@site)
+      raise ArgumentError, "Invalid site" unless [:osm, :ogm].include?(site)
+      self.class.base_url(site)
+    end
 
     # Make a query to the OSM/OGM API
     # @param [String] url The script on the remote server to invoke
@@ -217,15 +232,23 @@ module Osm
 
       if @@debug
         puts "Result from :#{site} request to #{url}"
+        puts "#{result.response.content_type}"
         puts result.response.body
       end
 
       return nil if result.response.body.empty?
-      raise Osm::Error, result.response.body unless looks_like_json?(result.response.body)
-      decoded = ActiveSupport::JSON.decode(result.response.body)
-      osm_error = get_osm_error(decoded)
-      raise Osm::Error, osm_error if osm_error
-      return decoded        
+      case result.response.content_type
+        when 'application/json', 'text/html'
+          raise Osm::Error, result.response.body unless looks_like_json?(result.response.body)
+          decoded = ActiveSupport::JSON.decode(result.response.body)
+          osm_error = get_osm_error(decoded)
+          raise Osm::Error, osm_error if osm_error
+          return decoded
+        when 'image/jpeg'
+          return result.response.body
+        else
+          raise Osm::Error, "Unhandled content-type: #{result.response.content_type}"
+      end
     end
 
     # Check if text looks like it's JSON

data/lib/osm/badge.rb

@@ -282,6 +282,10 @@ module Osm
       validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
       validates :requirements, :hash => {:key_type => String, :value_type => String}
 
+      STAGES_NIGHTSAWAY = [1, 5, 10, 20, 35, 50, 75, 100, 125, 150, 175, 200]
+      STAGES_HIKESAWAY = [1, 5, 10, 20, 35, 50]
+
+
       # @!method initialize
       #   Initialize a new Badge
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
@@ -300,7 +304,7 @@ module Osm
       def total_gained
         count = 0
         requirements.each do |field, data|
-          next if data.blank? || data.to_s[0].downcase.eql?('x')
+          next unless reguiremet_met?(data)
           count += 1
         end
         return count
@@ -314,7 +318,7 @@ module Osm
         count = 0
 
         required.each do |section, needed|
-          next if gained[section] >= needed
+          next if gained[section] < needed
           count += 1
         end
         return count
@@ -328,22 +332,59 @@ module Osm
           field = field.split('_')[0]
           unless field.eql?('y')
             count[field] ||= 0
-            next if data.blank? || data.to_s[0].downcase.eql?('x')
+            next unless reguiremet_met?(data)
             count[field] += 1
           else
             # A total 'section'
-            count['a'] = data.to_i
+            count['y'] = data.to_i
           end
         end
         return count
       end
 
-      # Check if this badge is due
+      # Check if this badge is due (according data retrieved from OSM)
       # @return [Boolean] whether the badge is due to the member
       def due?
         completed > awarded
       end
 
+
+      # Check if this badge has been earnt
+      # @return [Boolean] whether the badge is due to the member
+      def earnt?
+        if badge.type == :staged
+          return (earnt > awarded)
+        end
+        return false if (completed.eql?(1) && awarded.eql?(1))
+        return true if (completed.eql?(1) && awarded.eql?(0))
+        return (total_gained >= badge.total_needed) && (sections_gained >= badge.sections_needed)
+      end
+
+      # Get what stage which has most recently been earnt
+      # (using #earnt? will tell you if it's still due (not yet awarded))
+      # @return [Fixnum] the stage which has most recently been due
+      def earnt
+        unless badge.type == :staged
+          return earnt? ? 1 : 0
+        end
+        if ['nightsaway', 'hikes'].include?(badge.osm_key)
+          total_done = requirements['y_01']
+          stages = STAGES_NIGHTSAWAY if badge.osm_key.eql?('nightsaway')
+          stages = STAGES_HIKESAWAY if badge.osm_key.eql?('hikes')
+          stages.reverse_each do |stage|
+            return stage if total_done >= stage
+          end
+        else
+          (awarded..5).reverse_each do |stage|
+            group = 'abcde'[stage - 1]
+            if gained_in_sections[group] >= badge.needed_from_section[group]
+              return stage
+            end
+          end
+        end
+        return 0
+      end
+
       # Check if this badge has been started
       # @return [Boolean] whether the badge has been started by the member (always false if the badge has been completed)
       def started?
@@ -352,9 +393,9 @@ module Osm
         requirements.each do |key, value|
           case key.split('_')[0]
             when 'a'
-              return true unless value.blank? || value.to_s[0].downcase.eql?('x')
+              return true if reguiremet_met?(value)
             when 'y'
-              return true if (requirements['y_01'].to_i > 0)
+              return true if (value.to_i > 0)
           end
         end
         return false
@@ -368,8 +409,8 @@ module Osm
         else
           # Staged badge
           if ['nightsaway', 'hikes'].include?(badge.osm_key) # Special staged badges
-            stages = [1, 5, 10, 20, 35, 50, 75, 100, 125, 150, 175, 200] if badge.osm_key.eql?('nightsaway')
-            stages = [1, 5, 10, 20, 35, 50] if badge.osm_key.eql?('hikes')
+            stages = STAGES_NIGHTSAWAY if badge.osm_key.eql?('nightsaway')
+            stages = STAGES_HIKESAWAY if badge.osm_key.eql?('hikes')
             done = requirements['y_01'].to_i
             return 0 if done < stages[0]                # Not started the first stage
             return 0 if done >= stages[stages.size - 1] # No more stages can be started
@@ -493,6 +534,12 @@ module Osm
         Osm.inspect_instance(self, options={:replace_with => {'badge' => :osm_key}})
       end
 
+      private
+      def reguiremet_met?(data)
+        return false if data == 0
+        !(data.blank? || data.to_s[0].downcase.eql?('x'))
+      end
+
     end # Class Data
 
   end # Class Badge

data/lib/osm/member.rb

@@ -80,6 +80,8 @@ module Osm
     #   @return [String] the member's current age (yy/mm)
     # @!attribute [rw] joined_years
     #   @return [Fixnum] how many years the member has been in Scouting
+    # @!attribute [rw] has_photo
+    #   @return [Boolean] whether the scout has a photo in OSM
 
     attribute :id, :type => Integer
     attribute :section_id, :type => Integer
@@ -120,12 +122,14 @@ module Osm
     attribute :joined, :type => Date
     attribute :age, :type => String
     attribute :joined_years, :type => Integer
+    attribute :has_photo, :type => Boolean, :default => false
 
     attr_accessible :id, :section_id, :type, :first_name, :last_name, :email1, :email2, :email3, :email4,
                     :phone1, :phone2, :phone3, :phone4, :address, :address2, :date_of_birth, :started,
                     :joining_in_years, :parents, :notes, :medical, :religion, :school, :ethnicity, :subs,
                     :custom1, :custom2, :custom3, :custom4, :custom5, :custom6, :custom7, :custom8, :custom9,
-                    :grouping_id, :grouping_leader, :joined, :age, :joined_years
+                    :grouping_id, :grouping_leader, :joined, :age, :joined_years,
+                    :has_photo
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -139,6 +143,7 @@ module Osm
     validates_presence_of :started
     validates_presence_of :joined
     validates_format_of :age, :with => /\A[0-9]{2}\/(0[0-9]|1[012])\Z/, :message => 'age is not in the correct format (yy/mm)', :allow_blank => true
+    validates_inclusion_of :has_photo, :in => [true, false]
 
 
     # Get members for a section
@@ -159,12 +164,17 @@ module Osm
       end
 
       data = api.perform_query("users.php?action=getUserDetails&sectionid=#{section.id}&termid=#{term_id}")
+      summary_data = api.perform_query("ext/members/contact/?action=getListOfMembers&sort=patrolid&sectionid=#{section.id}&termid=#{term_id}&section=#{section.type}") || {}
+
+      summary_data = summary_data['items'] || []
+      summary_data = Hash[summary_data.map { |i| [i['scoutid'].to_i, i] }]
 
       result = Array.new
       data['items'].each do |item|
+        id = Osm::to_i_or_nil(item['scoutid'])
         result.push Osm::Member.new(
           :section_id => section.id,
-          :id => Osm::to_i_or_nil(item['scoutid']),
+          :id => id,
           :type => item['type'],
           :first_name => item['firstname'],
           :last_name => item['lastname'],
@@ -202,6 +212,7 @@ module Osm
           :joined => Osm::parse_date(item['joined']),
           :age => item['age'].gsub(' ', ''),
           :joined_years => item['yrs'].to_i,
+          :has_photo => summary_data[id]['pic']
         )
       end
 
@@ -386,11 +397,36 @@ module Osm
       return @myscout_link_key
     end
 
+    # Get the member's photo
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Boolean] black_and_white Whether you want the photo in blank and white
+    # @!macro options_get
+    # @raise [Osm:Error] if the member has no photo or doesn't exist in OSM
+    # @return the photo of the member
+    def get_photo(api, black_and_white=false, options={})
+      raise Osm::ObjectIsInvalid, 'member is invalid' unless valid?
+      require_ability_to(api, :read, :member, section_id)
+      raise Osm::Error, 'the member does not already exist in OSM' if id.nil?
+      raise Osm::Error, "the member doesn't have a photo in OSM" unless has_photo
+
+      cache_key = ['member_photo', self.id, black_and_white]
+
+      if !options[:no_cache] && cache_exist?(api, cache_key)
+        return cache_read(api, cache_key)
+      end
+
+      url = "ext/members/contact/images/member.php?sectionid=#{section_id}&scoutid=#{self.id}&bw=#{black_and_white}"
+      image = api.perform_query(url)
+
+      cache_write(api, cache_key, image) unless image.nil?
+      return image
+    end
+
     # Get the My.SCOUT link for this member
     # @param [Osm::Api] api The api to use to make the request
     # @param [Symbol] link_to The page in My.SCOUT to link to (:payments, :events, :programme, :badges, :notice or :details)
     # @param [#to_i] item_id Allows you to link to a specfic item (only for :events)
-    # @return [String] the link for this member's My.SCOUT
+    # @return [String] the URL for this member's My.SCOUT
     # @raise [Osm::ObjectIsInvalid] If the Member is invalid
     # @raise [Osm::ArgumentIsInvalid] If link_to is not an allowed Symbol
     # @raise [Osm::Error] if the member does not already exist in OSM or the member's My.SCOUT key could not be retrieved from OSM
@@ -400,7 +436,7 @@ module Osm
       raise Osm::Error, 'the member does not already exist in OSM' if id.nil?
       raise Osm::ArgumentIsInvalid, 'link_to is invalid' unless [:payments, :events, :programme, :badges, :notice, :details].include?(link_to)
 
-      link = "https://www.onlinescoutmanager.co.uk/parents/#{link_to}.php?sc=#{self.id}&se=#{section_id}&c=#{myscout_link_key(api)}"
+      link = "#{api.base_url}/parents/#{link_to}.php?sc=#{self.id}&se=#{section_id}&c=#{myscout_link_key(api)}"
       link += "&e=#{item_id.to_i}" if item_id && link_to.eql?(:events)
       return link
     end

data/spec/osm/activity_spec.rb

@@ -102,7 +102,7 @@ describe "Activity" do
           }
         ]
       }
-      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", :body => body.to_json, :content_type => 'application/json')
   
   
       activity = Osm::Activity.get(@api, 1)

data/spec/osm/api_access_spec.rb

@@ -43,7 +43,7 @@ describe "API Access" do
           }
         ]
       }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getAPIAccess&sectionid=1", :body => body.to_json)
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getAPIAccess&sectionid=1", :body => body.to_json, :content_type => 'application/json')
     end
 
     describe "Get All" do

data/spec/osm/api_spec.rb

@@ -79,7 +79,7 @@ describe "API" do
         {"sectionid"=>"1", "permissions"=>{"badge"=>20}},
         {"sectionid"=>"2", "permissions"=>{"badge"=>10}}
       ]
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json, :content_type => 'application/json')
 
       permissions = {1 => {:badge => [:read, :write]}, 2 => {:badge => [:read]}}
       OsmTest::Cache.should_not_receive('read')
@@ -122,6 +122,20 @@ describe "API" do
   end
 
 
+  describe "Get base URL" do
+    it "For the class" do
+      Osm::Api.base_url(:osm).should == 'https://www.onlinescoutmanager.co.uk'
+      Osm::Api.base_url(:ogm).should == 'http://www.onlineguidemanager.co.uk'
+    end
+
+    it "For an instance" do
+      @api.base_url.should == 'https://www.onlinescoutmanager.co.uk'
+      @api.base_url(:osm).should == 'https://www.onlinescoutmanager.co.uk'
+      @api.base_url(:ogm).should == 'http://www.onlineguidemanager.co.uk'
+    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) { OsmTest::DummyHttpResult.new(:response=>{:code=>'500'}) }
@@ -146,4 +160,4 @@ describe "API" do
     end
   end
 
-end
+end

data/spec/osm/badge_spec.rb

@@ -95,9 +95,19 @@ describe "Badge" do
 
   it "Get total requirements gained for a member" do
     data = Osm::Badge::Data.new(
-      :requirements => {'a_1' => 'x', 'a_2' => 'a', 'b_1' => 'yes', 'b_2' => '2000-01-02'}
+      :requirements => {
+        'a_1' => 'a',
+        'a_2' => 'yes',
+        'a_3' => '2000-01-02',
+        'a_4' => 1,
+        'b_1' => 'x',
+        'b_2' => 'xYES',
+        'b_3' => '',
+        'b_4' => nil,
+        'b_5' => 0,
+      }
     )
-    data.total_gained.should == 3
+    data.total_gained.should == 4
   end
 
   it "Get total requirements met in each section for a member" do
@@ -108,37 +118,140 @@ describe "Badge" do
         Osm::Badge::Requirement.new(:field => 'a_2'),
         Osm::Badge::Requirement.new(:field => 'b_1'),
         Osm::Badge::Requirement.new(:field => 'b_2'),
+        Osm::Badge::Requirement.new(:field => 'y_1'),
+        Osm::Badge::Requirement.new(:field => 'y_2'),
       ]
     )
     data = Osm::Badge::Data.new(
       :badge => badge,
-      :requirements => {'a_1' => 'x', 'a_2' => '', 'b_1' => 'yes', 'b_2' => '2000-01-02'}
+      :requirements => {
+        'a_1' => 'x',
+        'a_2' => '',
+        'b_1' => 'yes',
+        'b_2' => '2000-01-02',
+        'y_1' => 1,
+      }
     )
-    data.gained_in_sections.should == {'a' => 0, 'b' => 2}
+    data.gained_in_sections.should == {'a' => 0, 'b' => 2, 'y' => 1}
   end
 
   it "Get number of sections met for a member" do
     badge = Osm::Badge.new(
-      :needed_from_section => {'a' => 1, 'b' => 2},
+      :needed_from_section => {'a' => 1, 'b' => 2, 'c' => 1},
       :requirements => [
         Osm::Badge::Requirement.new(:field => 'a_1'),
         Osm::Badge::Requirement.new(:field => 'a_2'),
         Osm::Badge::Requirement.new(:field => 'b_1'),
         Osm::Badge::Requirement.new(:field => 'b_2'),
+        Osm::Badge::Requirement.new(:field => 'c_1'),
       ]
     )
     data = Osm::Badge::Data.new(
       :badge => badge,
-      :requirements => {'a_1' => 'x', 'a_2' => '', 'b_1' => 'yes', 'b_2' => '2000-01-02'}
+      :requirements => {'a_1' => 'x', 'a_2' => '', 'b_1' => 'yes', 'b_2' => '2000-01-02', 'c_1' => 'yes'}
     )
-    data.sections_gained.should == 1
+    data.sections_gained.should == 2
+  end
+
+  describe "Works out if the badge has been earnt" do
+    it "Staged" do
+      badge = Osm::StagedBadge.new(:osm_key => 'not_hikes_or_nights')
+      data = Osm::Badge::Data.new(:awarded => 2, :badge => badge)
+
+      data.stub(:earnt) { 1 }
+      data.earnt?.should be_false
+
+      data.stub(:earnt) { 2 }
+      data.earnt?.should be_false
+
+      data.stub(:earnt) { 3 }
+      data.earnt?.should be_true
+    end
+
+    it "Non staged" do
+      badge = Osm::ActivityBadge.new()
+      data = Osm::Badge::Data.new(:completed => 1, :awarded => 1, :badge => badge)
+      data.earnt?.should be_false
+
+      badge = Osm::ActivityBadge.new()
+      data = Osm::Badge::Data.new(:completed => 1, :awarded => 0, :badge => badge)
+      data.earnt?.should be_true
+
+
+      badge = Osm::ActivityBadge.new(:total_needed => 0, :sections_needed => 2, :needed_from_section => {'a' => 2, 'b' => 1})
+      data = Osm::Badge::Data.new(:requirements => {'a_01'=>'y', 'a_02'=>'y', 'b_01' => 'y'}, :completed => 0, :awarded => 0, :badge => badge)
+      data.earnt?.should be_true
+
+      badge = Osm::ActivityBadge.new(:total_needed => 0, :sections_needed => 2, :needed_from_section => {'a' => 2, 'b' => 1})
+      data = Osm::Badge::Data.new(:requirements => {'a_01'=>'y', 'a_02'=>'y', 'b_01' => 'x'}, :completed => 0, :awarded => 0, :badge => badge)
+      data.earnt?.should be_false
+
+      badge = Osm::ActivityBadge.new(:total_needed => 3, :sections_needed => 0, :needed_from_section => {'a' => 2, 'b' => 1})
+      data = Osm::Badge::Data.new(:requirements => {'a_01'=>'y', 'a_02'=>'y', 'b_01' => 'y'}, :completed => 0, :awarded => 0, :badge => badge)
+      data.earnt?.should be_true
+
+      badge = Osm::ActivityBadge.new(:total_needed => 3, :sections_needed => 0, :needed_from_section => {'a' => 2, 'b' => 1})
+      data = Osm::Badge::Data.new(:requirements => {'a_01'=>'y', 'a_02'=>'x', 'b_01' => 'y'}, :completed => 0, :awarded => 0, :badge => badge)
+      data.earnt?.should be_false
+
+      badge = Osm::ActivityBadge.new(:total_needed => 3, :sections_needed => 2, :needed_from_section => {'a' => 2, 'b' => 1})
+      data = Osm::Badge::Data.new(:requirements => {'a_01'=>'y', 'a_02'=>'y', 'b_01' => 'y'}, :completed => 0, :awarded => 0, :badge => badge)
+      data.earnt?.should be_true
+
+      badge = Osm::ActivityBadge.new(:total_needed => 1, :sections_needed => 1, :needed_from_section => {'a' => 2, 'b' => 1})
+      data = Osm::Badge::Data.new(:requirements => {'a_01'=>'y', 'a_02'=>'y', 'b_01' => 'y'}, :completed => 0, :awarded => 0, :badge => badge)
+      data.earnt?.should be_true
+    end
   end
 
-  it "Works out if the badge is due" do
-    Osm::Badge::Data.new(:completed => 0, :awarded => 0).due?.should be_false
-    Osm::Badge::Data.new(:completed => 1, :awarded => 0).due?.should be_true
-    Osm::Badge::Data.new(:completed => 2, :awarded => 2).due?.should be_false
-    Osm::Badge::Data.new(:completed => 2, :awarded => 1).due?.should be_true
+  describe "Works out what level of a badge has been earnt" do
+    it "Staged" do
+      badge = Osm::StagedBadge.new(:osm_key => 'not_hikes_or_nights', :needed_from_section => {'a'=>1,'b'=>1,'c'=>1,'d'=>2,'e'=>2})
+
+      data = Osm::Badge::Data.new(:requirements=>{'a_01'=>'','b_01'=>'','c_01'=>'','d_01'=>'','d_02'=>'','e_01'=>'','e_02'=>''}, :badge=>badge)
+      data.earnt.should == 0
+
+      data = Osm::Badge::Data.new(:requirements=>{'a_01'=>'y','b_01'=>'','c_01'=>'','d_01'=>'','d_02'=>'','e_01'=>'','e_02'=>''}, :badge=>badge)
+      data.earnt.should == 1
+
+      data = Osm::Badge::Data.new(:requirements=>{'a_01'=>'y','b_01'=>'y','c_01'=>'','d_01'=>'y','d_02'=>'','e_01'=>'','e_02'=>''}, :badge=>badge)
+      data.earnt.should == 2
+
+      data = Osm::Badge::Data.new(:requirements=>{'a_01'=>'y','b_01'=>'y','c_01'=>'','d_01'=>'y','d_02'=>'y','e_01'=>'','e_02'=>''}, :badge=>badge)
+      data.earnt.should == 4
+    end
+
+    it "Nights away" do
+      badge = Osm::StagedBadge.new(:osm_key => 'nightsaway')
+
+      Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 1
+      Osm::Badge::Data.new(:requirements => {'y_01'=>5}, :badge => badge).earnt.should == 5
+      Osm::Badge::Data.new(:requirements => {'y_01'=>6}, :badge => badge).earnt.should == 5
+      Osm::Badge::Data.new(:requirements => {'y_01'=>199}, :badge => badge).earnt.should == 175
+      Osm::Badge::Data.new(:requirements => {'y_01'=>200}, :badge => badge).earnt.should == 200
+      Osm::Badge::Data.new(:requirements => {'y_01'=>999}, :badge => badge).earnt.should == 200
+    end
+
+    it "Hikes away" do
+      badge = Osm::StagedBadge.new(:osm_key => 'hikes')
+
+      Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 1
+      Osm::Badge::Data.new(:requirements => {'y_01'=>5}, :badge => badge).earnt.should == 5
+      Osm::Badge::Data.new(:requirements => {'y_01'=>6}, :badge => badge).earnt.should == 5
+      Osm::Badge::Data.new(:requirements => {'y_01'=>49}, :badge => badge).earnt.should == 35
+      Osm::Badge::Data.new(:requirements => {'y_01'=>50}, :badge => badge).earnt.should == 50
+      Osm::Badge::Data.new(:requirements => {'y_01'=>999}, :badge => badge).earnt.should == 50
+    end
+
+    it "Non staged" do
+      data = Osm::Badge::Data.new(:badge => Osm::ActivityBadge.new)
+
+      data.stub(:earnt?) { true }
+      data.earnt.should == 1
+
+      data.stub(:earnt?) { false }
+      data.earnt.should == 0
+    end
   end
 
   it "Works out if the badge has been started" do
@@ -285,7 +398,7 @@ describe "Badge" do
       end
 
       it "Core" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=core&sectionid=1&section=beavers&termid=2", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=core&sectionid=1&section=beavers&termid=2", :body => @data, :content_type => 'application/json')
         Osm::Term.stub(:get_current_term_for_section){ Osm::Term.new(:id => 2) }
 
         badges = Osm::CoreBadge.get_badges_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers))
@@ -307,7 +420,7 @@ describe "Badge" do
       end
 
       it "Challenge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=challenge&sectionid=1&section=beavers&termid=2", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=challenge&sectionid=1&section=beavers&termid=2", :body => @data, :content_type => 'application/json')
         Osm::Term.stub(:get_current_term_for_section){ Osm::Term.new(:id => 2) }
 
         badges = Osm::ChallengeBadge.get_badges_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers))
@@ -329,7 +442,7 @@ describe "Badge" do
       end
 
       it "Staged" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=staged&sectionid=1&section=beavers&termid=2", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=staged&sectionid=1&section=beavers&termid=2", :body => @data, :content_type => 'application/json')
         Osm::Term.stub(:get_current_term_for_section){ Osm::Term.new(:id => 2) }
 
         badges = Osm::StagedBadge.get_badges_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers))
@@ -351,7 +464,7 @@ describe "Badge" do
       end
 
       it "Activity" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=activity&sectionid=1&section=beavers&termid=2", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=activity&sectionid=1&section=beavers&termid=2", :body => @data, :content_type => 'application/json')
         Osm::Term.stub(:get_current_term_for_section){ Osm::Term.new(:id => 2) }
 
         badges = Osm::ActivityBadge.get_badges_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers))
@@ -373,7 +486,7 @@ describe "Badge" do
       end
 
       it "For a different section type" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=activity&sectionid=1&section=cubs&termid=2", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=activity&sectionid=1&section=cubs&termid=2", :body => @data, :content_type => 'application/json')
         Osm::Term.stub(:get_current_term_for_section){ Osm::Term.new(:id => 2) }
 
         badges = Osm::ActivityBadge.get_badges_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), :cubs)
@@ -404,7 +517,7 @@ describe "Badge" do
       end
 
       it "Core badge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?termid=2&type=core&section=beavers&c=badge&sectionid=1", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?termid=2&type=core&section=beavers&c=badge&sectionid=1", :body => @data, :content_type => 'application/json')
         datas = Osm::CoreBadge.new(:osm_key => 'badge').get_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
         datas.size.should == 1
         data = datas[0]
@@ -420,7 +533,7 @@ describe "Badge" do
       end
 
       it "Challenge badge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?termid=2&type=challenge&section=beavers&c=badge&sectionid=1", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?termid=2&type=challenge&section=beavers&c=badge&sectionid=1", :body => @data, :content_type => 'application/json')
         datas = Osm::ChallengeBadge.new(:osm_key => 'badge').get_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
         datas.size.should == 1
         data = datas[0]
@@ -436,7 +549,7 @@ describe "Badge" do
       end
 
       it "Staged badge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?termid=2&type=staged&section=beavers&c=badge&sectionid=1", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?termid=2&type=staged&section=beavers&c=badge&sectionid=1", :body => @data, :content_type => 'application/json')
         datas = Osm::StagedBadge.new(:osm_key => 'badge').get_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
         datas.size.should == 1
         data = datas[0]
@@ -452,7 +565,7 @@ describe "Badge" do
       end
 
       it "Activity badge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?termid=2&type=activity&section=beavers&c=badge&sectionid=1", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?termid=2&type=activity&section=beavers&c=badge&sectionid=1", :body => @data, :content_type => 'application/json')
         datas = Osm::ActivityBadge.new(:osm_key => 'badge').get_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
         datas.size.should == 1
         data = datas[0]
@@ -713,7 +826,7 @@ describe "Badge" do
       end
 
       it "Core badge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=summary&section=beavers&sectionid=1&termid=2&type=core", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=summary&section=beavers&sectionid=1&termid=2&type=core", :body => @data, :content_type => 'application/json')
         summary = Osm::CoreBadge.get_summary_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
         summary.size.should == 1
         summary[0].should == {
@@ -725,7 +838,7 @@ describe "Badge" do
       end
 
       it "Challenge badge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=summary&section=beavers&sectionid=1&termid=2&type=challenge", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=summary&section=beavers&sectionid=1&termid=2&type=challenge", :body => @data, :content_type => 'application/json')
         summary = Osm::ChallengeBadge.get_summary_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
         summary.size.should == 1
         summary[0].should == {
@@ -737,7 +850,7 @@ describe "Badge" do
       end
 
       it "Staged badge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=summary&section=beavers&sectionid=1&termid=2&type=staged", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=summary&section=beavers&sectionid=1&termid=2&type=staged", :body => @data, :content_type => 'application/json')
         summary = Osm::StagedBadge.get_summary_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
         summary.size.should == 1
         summary[0].should == {
@@ -749,7 +862,7 @@ describe "Badge" do
       end
 
       it "Activity badge" do
-        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=summary&section=beavers&sectionid=1&termid=2&type=activity", :body => @data)
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=summary&section=beavers&sectionid=1&termid=2&type=activity", :body => @data, :content_type => 'application/json')
         summary = Osm::ActivityBadge.get_summary_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
         summary.size.should == 1
         summary[0].should == {