osm 1.2.14 → 1.2.15.dev

data/lib/osm/member.rb

@@ -438,7 +438,7 @@ module Osm
 
     # 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 [Symbol] link_to The page in My.SCOUT to link to (:payments, :events, :programme, :badges, :notice, :details, :census or :giftaid)
     # @param [#to_i] item_id Allows you to link to a specfic item (only for :events)
     # @return [String] the URL for this member's My.SCOUT
     # @raise [Osm::ObjectIsInvalid] If the Member is invalid
@@ -448,7 +448,7 @@ module Osm
       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::ArgumentIsInvalid, 'link_to is invalid' unless [:payments, :events, :programme, :badges, :notice, :details].include?(link_to)
+      raise Osm::ArgumentIsInvalid, 'link_to is invalid' unless [:payments, :events, :programme, :badges, :notice, :details, :census, :giftaid].include?(link_to)
 
       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)

data/lib/osm/model.rb

@@ -99,7 +99,7 @@ module Osm
     end
     def self.cache_write(api, key, data, options={})
       return false if @@cache.nil?
-      options.merge!(:expires_in => @@cache_ttl)
+      options.reverse_merge!(expires_in: @@cache_ttl)
       @@cache.write(cache_key(api, key), data, options)
     end
     def self.cache_exist?(api, key)

data/spec/osm/activity_spec.rb

@@ -93,18 +93,24 @@ describe "Activity" do
         ],
         'badges' => [
           {
-            'activityid' => '1',
-            'section' => 'section',
-            'badgetype' => 'type',
-            'badge' => 'badge',
-            'columnname' => 'col_name',
-            'label' => 'This is a label',
+            'badge' => 'activity_firesafety',
+            'badgeLongName' => 'Fire Safety',
+            'badge_id' => '181',
+            'badge_version' => '0',
+            'badgetype' => 'activity',
+            'badgetypeLongName' => 'Activity',
+            'column_id' => '93384',
+            'columnname' => 'b_01',
+            'columnnameLongName' => 'B: Fire drill',
+            'data' => 'Yes',
+            'section' => 'cubs',
+            'sectionLongName' => 'Cubs',
           }
         ]
       }
       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)
   
       activity.id.should == 1
@@ -132,13 +138,14 @@ describe "Activity" do
       activity.files[0].activity_id.should == 1
       activity.files[0].file_name.should == 'File Name'
       activity.files[0].name.should == 'Name'
-      activity.badges[0].activity_id.should == 1
-      activity.badges[0].section_type.should == :section
-      activity.badges[0].type.should == :type
-      activity.badges[0].badge.should == 'badge'
-      activity.badges[0].requirement.should == 'col_name'
-      activity.badges[0].label.should == 'This is a label'
-  
+      activity.badges[0].badge_type.should == :activity
+      activity.badges[0].badge_section.should == :cubs
+      activity.badges[0].badge_name.should == 'Fire Safety'
+      activity.badges[0].badge_id.should == 181
+      activity.badges[0].badge_version.should == 0
+      activity.badges[0].requirement_id.should == 93384
+      activity.badges[0].requirement_label.should == 'B: Fire drill'
+      activity.badges[0].data.should == 'Yes'
       activity.valid?.should be_true
     end
   
@@ -185,7 +192,7 @@ describe "Activity" do
         'location' => :indoors,
         'sections' => '["beavers","cubs"]',
         'tags' => '["tag1","tag2"]',
-        'links' => '[{"activityid":"2","section":"beavers","badgetype":"t","badge":"b","columnname":"r","label":"l"}]',
+        'links' => '[{"badge_id":"181","badge_version":"0","column_id":"93384","badge":null,"badgeLongName":"Badge name","columnname":null,"columnnameLongName":"l","data":"","section":"beavers","sectionLongName":null,"sections":["beavers","cubs"],"badgetype":"activity","badgetypeLongName":null}]',
         'shared' => 0,
         'sectionid' => 1,
         'secretEdit' => true,
@@ -203,7 +210,16 @@ describe "Activity" do
         :location => :indoors,
         :sections => [:beavers, :cubs],
         :tags => ['tag1', 'tag2'],
-        :badges => [Osm::Activity::Badge.new(:activity_id=>2, :section_type=>:beavers, :type=>:t, :badge=>'b', :requirement=>'r', :label=>'l')],
+        :badges => [Osm::Activity::Badge.new(
+          :badge_type => :activity,
+          :badge_section => :beavers,
+          :requirement_label => 'l',
+          :data => '',
+          :badge_name => 'Badge name',
+          :badge_id => 181,
+          :badge_version => 0,
+          :requirement_id => 93384,
+        )],
         :shared => 0,
         :section_id => 1,
       )

data/spec/osm/api_spec.rb

@@ -14,7 +14,7 @@ describe "API" 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].select{ |k,v| (k != :ogm) && (k != :osm)}) }.to raise_error(ArgumentError, ':osm does not exist in options hash')
     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')

data/spec/osm/badge_spec.rb

@@ -3,43 +3,64 @@ require 'spec_helper'
 
 describe "Badge" do
 
-  it "Create" do
-    badge = Osm::Badge.new(
-      :name => 'name',
-      :requirement_notes => 'notes',
-      :osm_key => 'key',
-      :osm_long_key => 'long_key',
-      :sections_needed => 1,
-      :total_needed => 2,
-      :needed_from_section => {'a' => 1},
-      :requirements => [],
-    )
+  describe "Create" do
+
+    before :each do
+      @badge_options = {
+        :name => 'name',
+        :identifier => '12_3',
+        :id => 12,
+        :version => 3,
+        :group_name => '',
+        :latest => true,
+        :sharing => :draft,
+        :user_id => 4,
+        :levels => [1, 2, 3],
+        :requirement_notes => 'notes',
+        :requirements => [],
+      }
+    end
+
+    it "Attributes set" do
+      badge = Osm::Badge.new(@badge_options)
+      badge.name.should == 'name'
+      badge.identifier.should == '12_3'
+      badge.id.should == 12
+      badge.version.should == 3
+      badge.group_name.should == ''
+      badge.latest.should be_true
+      badge.sharing.should == :draft
+      badge.user_id.should == 4
+      badge.levels.should == [1, 2, 3]
+      badge.requirement_notes.should == 'notes'
+      badge.requirements.should == []
+      badge.valid?.should be_true
+    end
+
+    it "Valid with nil for levels" do
+      badge = Osm::Badge.new(@badge_options.merge(levels: nil))
+      badge.levels.should be_nil
+      badge.valid?.should be_true
+    end
 
-    badge.name.should == 'name'
-    badge.requirement_notes.should == 'notes'
-    badge.osm_key.should == 'key'
-    badge.osm_long_key.should == 'long_key'
-    badge.sections_needed.should == 1
-    badge.total_needed.should == 2
-    badge.needed_from_section.should == {'a' => 1}
-    badge.requirements.should == []
-    badge.valid?.should be_true
   end
 
   it "Create Requirement" do
     requirement = Osm::Badge::Requirement.new(
       :name => 'name',
       :description => 'description',
-      :field => 'field',
+      :module_letter => 'a',
+      :field => 1,
       :editable => true,
-      :badge => Osm::Badge.new(:osm_key => 'key'),
+      :badge => Osm::Badge.new(:identifier => 'key'),
     )
 
     requirement.name.should == 'name'
     requirement.description.should == 'description'
-    requirement.field.should == 'field'
+    requirement.module_letter.should == 'a'
+    requirement.field.should == 1
     requirement.editable.should be_true
-    requirement.badge.osm_key.should == 'key'
+    requirement.badge.identifier.should == 'key'
     requirement.valid?.should be_true
   end
 
@@ -48,33 +69,34 @@ describe "Badge" do
       :member_id => 1,
       :first_name => 'First',
       :last_name => 'Last',
-      :completed => 4,
+      :due => 4,
       :awarded => 3,
       :awarded_date => Date.new(2000, 1, 2),
       :requirements => {},
       :section_id => 2,
-      :badge => Osm::Badge.new(:osm_key => 'key'),
+      :badge => Osm::Badge.new(:identifier => 'key'),
     )
 
     data.member_id.should == 1
     data.first_name.should == 'First'
     data.last_name.should == 'Last'
-    data.completed.should == 4
+    data.due.should == 4
     data.awarded.should == 3
     data.awarded_date.should == Date.new(2000, 1, 2)
     data.requirements.should == {}
     data.section_id.should == 2
-    data.badge.osm_key.should == 'key'
+    data.badge.identifier.should == 'key'
     data.valid?.should be_true
   end
 
 
-  it "Compare badges by name then osm_key" do
-    b1 = Osm::Badge.new(:name => 'A', :osm_key => 'a')
-    b2 = Osm::Badge.new(:name => 'B', :osm_key => 'a')
-    b3 = Osm::Badge.new(:name => 'B', :osm_key => 'b')
-    badges = [b3, b1, b2]
-    badges.sort.should == [b1, b2, b3]
+  it "Compare badges by name then id then version (descending)" do
+    b1 = Osm::Badge.new(:name => 'A', :id => 1, :version => 1)
+    b2 = Osm::Badge.new(:name => 'B', :id => 1, :version => 1)
+    b3 = Osm::Badge.new(:name => 'B', :id => 2, :version => 2)
+    b4 = Osm::Badge.new(:name => 'B', :id => 2, :version => 1)
+    badges = [b3, b1, b4, b2]
+    badges.sort.should == [b1, b2, b3, b4]
   end
 
   it "Compare badge requirements by badge then field" do
@@ -112,52 +134,57 @@ describe "Badge" do
     data.total_gained.should == 4
   end
 
-  it "Get total requirements met in each section for a member" do
+  it "Get total requirements met in each module for a member" do
     badge = Osm::Badge.new(
       :needed_from_section => {'a' => 1, 'b' => 2},
       :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 => 'y_1'),
-        Osm::Badge::Requirement.new(:field => 'y_2'),
-      ]
+        Osm::Badge::Requirement.new(:module_letter=> 'a', :field => '1'),
+        Osm::Badge::Requirement.new(:module_letter=> 'a', :field => '2'),
+        Osm::Badge::Requirement.new(:module_letter=> 'b', :field => '3'),
+        Osm::Badge::Requirement.new(:module_letter=> 'b', :field => '4'),
+        Osm::Badge::Requirement.new(:module_letter=> 'c', :field => '5'),
+        Osm::Badge::Requirement.new(:module_letter=> 'c', :field => '6'),
+      ],
+      :completion_criteria => {
+        :modules => [
+        { module_letter: 'a', module_id: 100 },
+        { module_letter: 'b', module_id: 200 },
+        { module_letter: 'c', module_id: 300 }
+      ]}
     )
     data = Osm::Badge::Data.new(
       :badge => badge,
-      :requirements => {
-        'a_1' => 'x',
-        'a_2' => '',
-        'b_1' => 'yes',
-        'b_2' => '2000-01-02',
-        'y_1' => 1,
-      }
+      :requirements => { 1=>'x', 2=>'', 3=>'yes', 4=>'2000-01-02', 5=>1 }
     )
-    data.gained_in_sections.should == {'a' => 0, 'b' => 2, 'y' => 1}
+    data.gained_in_modules.should == {'a'=>0, 'b'=>2, 'c'=>1, 100=>0, 200=>2, 300=>1}
   end
 
-  it "Get number of sections met for a member" do
+  it "Get modules met for a member" do
     badge = Osm::Badge.new(
-      :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'),
-      ]
+        Osm::Badge::Requirement.new(:module_letter=> 'a', :field => '1'),
+        Osm::Badge::Requirement.new(:module_letter=> 'a', :field => '2'),
+        Osm::Badge::Requirement.new(:module_letter=> 'b', :field => '3'),
+        Osm::Badge::Requirement.new(:module_letter=> 'b', :field => '4'),
+        Osm::Badge::Requirement.new(:module_letter=> 'c', :field => '5'),
+      ],
+      :completion_criteria => {
+        :modules => [
+        { module_letter: 'a', module_id: 1000, min_required: 1 },
+        { module_letter: 'b', module_id: 2000, min_required: 2 },
+        { module_letter: 'c', module_id: 3000, min_required: 1 }
+      ]}
     )
     data = Osm::Badge::Data.new(
       :badge => badge,
-      :requirements => {'a_1' => 'x', 'a_2' => '', 'b_1' => 'yes', 'b_2' => '2000-01-02', 'c_1' => 'yes'}
+      :requirements => {1=>'x', 2=>'', 3=>'yes', 4=>'2000-01-02', 5=>'yes'}
     )
-    data.sections_gained.should == 2
+    data.modules_gained.should == ['b', 'c']
   end
 
   describe "Works out if the badge has been earnt" do
     it "Staged" do
-      badge = Osm::StagedBadge.new(:osm_key => 'not_hikes_or_nights')
+      badge = Osm::StagedBadge.new(levels: [0, 1, 2, 3])
       data = Osm::Badge::Data.new(:awarded => 2, :badge => badge)
 
       data.stub(:earnt) { 1 }
@@ -171,95 +198,140 @@ describe "Badge" do
     end
 
     it "Non staged" do
-      badge = Osm::ActivityBadge.new()
-      data = Osm::Badge::Data.new(:completed => 1, :awarded => 1, :badge => badge)
+      completion_criteria = {
+        :min_modules_required => 0,
+        :min_requirements_completed => 0,
+        :modules => [
+          {module_id: 1, module_letter: 'a', min_required: 2},
+          {module_id: 2, module_letter: 'b', min_required: 1},
+          {module_id: 3, module_letter: 'c', min_required: 1},
+        ],
+        :badges_required => [],
+        :fields_required => [],
+      }
+      badge = Osm::ActivityBadge.new(completion_criteria: completion_criteria)
+      badge.requirements = [
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'a', field: 10),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'a', field: 11),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'b', field: 20),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'b', field: 21),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'c', field: 30),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'c', field: 31),
+      ]
+
+
+      data = Osm::Badge::Data.new(:due => 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 = Osm::Badge::Data.new(:due => 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)
+      # Number of modules required
+      this_badge = badge.clone
+      this_badge.completion_criteria = completion_criteria.merge({
+        :min_modules_required => 2
+      })
+
+      data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'y'}, :due => 0, :awarded => 0, :badge => this_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 = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'x'}, :due => 0, :awarded => 0, :badge => this_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
+      # Number of requirements needed
+      this_badge = badge.clone
+      this_badge.completion_criteria = completion_criteria.merge({
+        :min_requirements_completed => 2
+      })
 
-      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 = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'y'}, :due => 0, :awarded => 0, :badge => this_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 = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'x', 20=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
       data.earnt?.should be_true
 
-      badge = Osm::ActivityBadge.new(:total_needed => 0, :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
+      data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'x', 20=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
+      data.earnt?.should be_false
+
+
+      # Module combinations
+      this_badge = badge.clone
+      this_badge.completion_criteria = completion_criteria.merge({
+        :requires => [['a'], ['b', 'c']]
+      })
+      data = Osm::Badge::Data.new(:requirements => {10=>'x', 11=>'x', 20=>'x', 30=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
+      data.earnt?.should be_false
 
-      badge = Osm::ActivityBadge.new(:total_needed => 0, :sections_needed => -1, :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 = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'x', 30=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
       data.earnt?.should be_false
+
+      data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'y', 30=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
+      data.earnt?.should be_true
+
+      data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'x', 30=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
+      data.earnt?.should be_true
     end
   end
 
   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)
+    it "Staged (activity)" do
+      badge = Osm::StagedBadge.new(
+        :levels => [0, 1, 2, 3],
+        :completion_criteria => {
+          :min_modules_required => 0,
+          :min_requirements_completed => 0,
+          :modules => [
+            {module_id: 1, module_letter: 'a', min_required: 1},
+            {module_id: 2, module_letter: 'b', min_required: 1},
+            {module_id: 3, module_letter: 'c', min_required: 1},
+          ],
+          :show_letters => true,
+        }
+      )
+      badge.requirements = [
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'a', field: 10),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'a', field: 11),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'b', field: 20),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'b', field: 21),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'c', field: 30),
+        Osm::Badge::Requirement.new(badge: badge, module_letter: 'c', field: 31),
+      ]
+
+      requirements = {10=>'',11=>'',20=>'',21=>'',30=>'',31=>''}
+      data = Osm::Badge::Data.new(requirements: requirements, 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)
+      requirements = {10=>'y',11=>'',20=>'',21=>'',30=>'',31=>''}
+      data = Osm::Badge::Data.new(requirements: requirements, 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)
+      requirements = {10=>'y',11=>'',20=>'',21=>'y',30=>'',31=>''}
+      data = Osm::Badge::Data.new(requirements: requirements, 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')
+      requirements = {10=>'',11=>'',20=>'',21=>'y',30=>'',31=>''}
+      data = Osm::Badge::Data.new(requirements: requirements, badge: badge)
+      data.earnt.should == 2
 
-      Osm::Badge::Data.new(:requirements => {'y_01'=>9}, :badge => badge).earnt.should == 5
-      Osm::Badge::Data.new(:requirements => {'y_01'=>10}, :badge => badge).earnt.should == 10
-      Osm::Badge::Data.new(:requirements => {'y_01'=>11}, :badge => badge).earnt.should == 10
-      Osm::Badge::Data.new(:requirements => {'y_01'=>999}, :badge => badge).earnt.should == 200
+      requirements = {10=>'y',11=>'',20=>'y',21=>'',30=>'y',31=>''}
+      data = Osm::Badge::Data.new(requirements: requirements, badge: badge)
+      data.earnt.should == 3
     end
 
-    it "Hikes away" do
-      badge = Osm::StagedBadge.new(:osm_key => 'hikes')
-
-      Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 2
-      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 "Time on the water" do
-      badge = Osm::StagedBadge.new(:osm_key => 'timeonthewater')
-
-      Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 2
-      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
+    it "Staged (count)" do
+      badge = Osm::StagedBadge.new(
+        :levels => [0,1,2,3,4,5,10,15,20],
+        :completion_criteria => {:show_letters => false, :levels_column_id => 3000},
+        :requirements => []
+      )
+
+      Osm::Badge::Data.new(:requirements => {3000 => 9},   :badge => badge).earnt.should == 5
+      Osm::Badge::Data.new(:requirements => {3000 => 10},  :badge => badge).earnt.should == 10
+      Osm::Badge::Data.new(:requirements => {3000 => 11},  :badge => badge).earnt.should == 10
+      Osm::Badge::Data.new(:requirements => {3000 => 999}, :badge => badge).earnt.should == 20
     end
 
     it "Non staged" do
@@ -274,102 +346,94 @@ describe "Badge" do
   end
 
   it "Works out if the badge has been started" do
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {'a_01' => 'Yes', 'a_02' => ''}).started?.should be_true
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {'a_01' => 'Yes', 'a_02' => ''}, :completed => 1).started?.should be_false
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {'a_01' => 'xNo', 'a_02' => ''}).started?.should be_false
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {'a_01' => '', 'a_02' => ''}).started?.should be_false
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'Yes', 2 => ''}).started?.should be_true
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'Yes', 2 => ''}, :due => 1).started?.should be_false
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'xNo', 2 => ''}).started?.should be_false
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => '', 2 => ''}).started?.should be_false
 
-    # Staged Badge
+    # Staged Activity Badge
     Osm::Badge::Data.new(
-      :badge => Osm::StagedBadge.new,
-      :requirements => {'a_01' => 'Yes', 'b_01' => 'Yes', 'b_02' => ''},
-      :completed => 1,
-    ).started?.should be_true
-    Osm::Badge::Data.new(
-      :badge => Osm::StagedBadge.new(:osm_key => 'nightsaway'),
-      :requirements => {'a_01' => 5, 'y_01' => '5', 'custom_26695' => ''},
-      :completed => 5,
-    ).started?.should be_false
-    Osm::Badge::Data.new(
-      :badge => Osm::StagedBadge.new(:osm_key => 'hikes'),
-      :requirements => {'a_01' => 3, 'y_01' => '3', 'custom_26695' => ''},
-      :completed => 1,
+      :badge => Osm::StagedBadge.new(
+        :levels => [0,1,2],
+        :completion_criteria => {:show_letters => true},
+        :requirements => [
+          Osm::Badge::Requirement.new(:module_letter => 'a', :field => 1000),
+          Osm::Badge::Requirement.new(:module_letter => 'b', :field => 2000),
+          Osm::Badge::Requirement.new(:module_letter => 'b', :field => 2001),
+        ]
+      ),
+      :requirements => {1000 => 'Yes', 2000 => 'Yes', 2001 => ''},
+      :due => 1,
     ).started?.should be_true
 
-    # Scout's adventure challenge
+    # Staged Count Badge
     Osm::Badge::Data.new(
-      :badge => Osm::ChallengeBadge.new(:osm_key => 'adventure'),
-      :requirements => {'y_01' => 5, 'custom_26695' => 'Text'},
-      :completed => 0,
-    ).started?.should be_true
+      :badge => Osm::StagedBadge.new(:levels => [0,1,2,3,4,5,10,15,20], :completion_criteria => {:show_letters => false, :levels_column_id => 1000}),
+      :requirements => {1000 => 5, 2000 => '5', 3000 => ''},
+      :due => 5,
+      :awarded => 4,
+    ).started?.should be_false # Finished lvl 5 & not started lvl 10
     Osm::Badge::Data.new(
-      :badge => Osm::ChallengeBadge.new(:osm_key => 'adventure'),
-      :requirements => {'y_01' => '', 'custom_26695' => ''},
-      :completed => 0,
-    ).started?.should be_false
-
-    # Scout's community challenge
-    Osm::Badge::Data.new(
-      :badge => Osm::ChallengeBadge.new(:osm_key => 'community'),
-      :requirements => {'y_01' => 5, 'a_01' => '', 'custom_26695' => 'Text'},
-      :completed => 0,
-    ).started?.should be_true
-    Osm::Badge::Data.new(
-      :badge => Osm::ChallengeBadge.new(:osm_key => 'community'),
-      :requirements => {'y_01' => '', 'a_01' => '4', 'custom_26695' => 'Text'},
-      :completed => 0,
-    ).started?.should be_true
-    Osm::Badge::Data.new(
-      :badge => Osm::ChallengeBadge.new(:osm_key => 'community'),
-      :requirements => {'y_01' => '', 'a_01' => '', 'custom_26695' => ''},
-      :completed => 0,
-    ).started?.should be_false
-
-    # Beaver's adventure activity
-    Osm::Badge::Data.new(
-      :badge => Osm::ActivityBadge.new(:osm_key => 'adventure'),
-      :requirements => {'y_01' => 5, 'custom_26695' => 'Text'},
-      :completed => 0,
-    ).started?.should be_true
-    Osm::Badge::Data.new(
-      :badge => Osm::ActivityBadge.new(:osm_key => 'adventure'),
-      :requirements => {'y_01' => '', 'custom_26695' => ''},
-      :completed => 0,
-    ).started?.should be_false
+      :badge => Osm::StagedBadge.new(:levels => [0,1,2,3,4,5,10,15,20], :completion_criteria => {:show_letters => false, :levels_column_id => 1000}),
+      :requirements => {1000 => 6, 2000 => '6', 3000 => ''},
+      :due => 5,
+      :awarded => 3,
+    ).started?.should be_true # Finished lvl 5 & started lvl 10
   end
 
   it "Works out what stage of the badge has been started" do
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {'a_01' => 'Yes', 'a_02' => ''}).started.should == 1
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {'a_01' => 'Yes', 'a_02' => ''}, :completed => 1).started.should == 0
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {'a_01' => 'xNo', 'a_02' => ''}).started.should == 0
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {'a_01' => '', 'a_02' => ''}).started.should == 0
+    # Non-Staged badges (0 or 1)
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {10 => 'Yes', 11 => ''}).started.should == 1
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {10 => 'Yes', 11 => ''}, :due => 1).started.should == 0
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {10 => 'xNo', 11 => ''}).started.should == 0
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {10 => '', 11 => ''}).started.should == 0
+
+
+    # Staged Activity
+    staged_activity = Osm::StagedBadge.new(
+      :levels => [0,1,2],
+      :completion_criteria => {:show_letters => true},
+      :requirements => [
+        Osm::Badge::Requirement.new(:module_letter => 'a', :field => 100),
+        Osm::Badge::Requirement.new(:module_letter => 'b', :field => 200),
+        Osm::Badge::Requirement.new(:module_letter => 'b', :field => 201),
+      ]
+    )
 
-    # Staged Badge
     Osm::Badge::Data.new(
-      :badge => Osm::StagedBadge.new(:osm_key => 'test'),
-      :requirements => {'a_01' => 'Yes', 'b_01' => 'Yes', 'b_02' => ''},
-      :completed => 1,
+      :badge => staged_activity,
+      :requirements => {100 => 'Yes', 200 => 'Yes', 201 => ''},
+      :due => 1,
     ).started.should == 2
     Osm::Badge::Data.new(
-      :badge => Osm::StagedBadge.new(:osm_key => 'test'),
-      :requirements => {'a_01' => 'Yes', 'b_01' => 'Yes', 'b_02' => '', 'c_01' => 'Yes', 'c_02' => ''},
-      :completed => 1,
+      :badge => staged_activity,
+      :requirements => {100 => 'Yes', 200 => 'Yes', 201 => ''},
+      :due => 1,
     ).started.should == 2
     Osm::Badge::Data.new(
-      :badge => Osm::StagedBadge.new(:osm_key => 'test'),
-      :requirements => {'a_01' => '', 'b_01' => '', 'c_01' => '', 'd_01' => '', 'e_01' => ''},
-      :completed => 5,
+      :badge => staged_activity,
+      :requirements => {},
+      :due => 2,
     ).started.should == 0 # No more stages to do
+
+
+    # Staged count
+    staged_count = Osm::StagedBadge.new(
+      :levels => [0,1,2,3,4,5,10,15,20],
+      :completion_criteria => {:show_letters => false, :levels_column_id => 3000},
+      :requirements => []
+    )
+
     Osm::Badge::Data.new(
-      :badge => Osm::StagedBadge.new(:osm_key => 'nightsaway'),
-      :requirements => {'a_01' => 7, 'y_01' => '7', 'custom_26695' => ''},
-      :completed => 5,
+      :badge => staged_count,
+      :requirements => {3000 => 7},
+      :due => 5,
     ).started.should == 10
     Osm::Badge::Data.new(
-      :badge => Osm::StagedBadge.new(:osm_key => 'hikes'),
-      :requirements => {'a_01' => 3, 'y_01' => '3', 'custom_26695' => ''},
-      :completed => 1,
-    ).started.should == 5
+      :badge => staged_count,
+      :requirements => {3000 => 3},
+      :due => 3,
+    ).started.should == 0
   end
 
   describe "Using the OSM API" do
@@ -377,12 +441,32 @@ describe "Badge" do
     describe "Get Badges" do
 
       before :each do
-        @data = {
-          "badgeOrder" => "badge",
-          "structure" => {
-            "badge" => [
+        @badge_data = {
+          'badgeOrder' => '123_0',
+          'details' => {
+            '123_0' => {
+              'badge_id' => '123',
+              'badge_id_version' => '123_0',
+              'badge_identifier' => '123_0',
+              'badge_order' => '4',
+              'badge_version' => '0',
+              'config' => '{"numModulesRequired":1}',
+              'description' => 'b_req_notes',
+              'group_name' => '',
+              'lastupdated' => '2014-09-14 02:32:05',
+              'latest' => '1',
+              'name' => 'b_name',
+              'picture' => 'path/to/image.gif',
+              'portal_config' => '{"position":{"x":58,"y":282,"w":20,"h":20,"r":6}}',
+              'sharing' => 'default-locked',
+              'shortname' => '00',
+              'userid' => '0',
+            }
+          },
+          'structure' => {
+            '123_0' => [
               {
-                "rows" => [
+                'rows' => [
                   {"name" => "First name","field" => "firstname","width" => "120px"},
                   {"name" => "Last name","field" => "lastname","width" => "120px"},
                   {"name" => "Done","field" => "completed","width" => "70px","formatter" => "doneFormatter"},
@@ -390,222 +474,125 @@ describe "Badge" do
                 ],
                 "numactivities" => "23",
                 "noscroll" => true
-	      },{
-                "rows" => [
-                  {"name" => "r_name","field" => "r_field","width" => "80px","formatter" => "cellFormatter","tooltip" => "r_description","editable" => "true"}
-		]
+               },{
+                'rows' => [
+                  {"name" => "r_name","field" => "2345","width" => "80px","formatter" => "cellFormatter","tooltip" => "r_description","editable" => "true","module"=>"a"}
+                ]
               }
             ],
-          },
-          "details" => {
-            "badge" => {
-              "shortname" => "badge",
-              "name" => "b_name",
-              "description" => "b_req_notes",
-              "picture" => "badge.png",
-              "config" => "{\"sectionsneeded\":\"1\",\"totalneeded\":\"2\",\"sections\":{\"a\":\"1\"}}",
-              "order" => "1",
-              "groupname" => nil,
-              "status" => "3",
-              "userid" => "0",
-              "table" => "table"
-            },
-          },
-          "stock" => {"sectionid" => "1","badge" => "3"}
+          }
         }
-        @data = @data.to_json
-      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, :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))
-        badges.size.should == 1
-        badge = badges[0]
-        badge.name.should == 'b_name'
-        badge.requirement_notes.should == 'b_req_notes'
-        badge.osm_key.should == 'badge'
-        badge.osm_long_key.should == 'table'
-        badge.sections_needed.should == 1
-        badge.total_needed.should == 2
-        badge.needed_from_section.should == {'a' => 1}
-        badge.requirements.size.should == 1
-        requirement = badge.requirements[0]
-        requirement.name.should == 'r_name'
-        requirement.description.should == 'r_description'
-        requirement.field.should == 'r_field'
-        requirement.editable.should be_true
-        requirement.badge.osm_key.should == 'badge'
-      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, :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))
-        badges.size.should == 1
-        badge = badges[0]
-        badge.name.should == 'b_name'
-        badge.requirement_notes.should == 'b_req_notes'
-        badge.osm_key.should == 'badge'
-        badge.osm_long_key.should == 'table'
-        badge.sections_needed.should == 1
-        badge.total_needed.should == 2
-        badge.needed_from_section.should == {'a' => 1}
-        badge.requirements.size.should == 1
-        requirement = badge.requirements[0]
-        requirement.name.should == 'r_name'
-        requirement.description.should == 'r_description'
-        requirement.field.should == 'r_field'
-        requirement.editable.should be_true
-        requirement.badge.osm_key.should == 'badge'
-      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, :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))
-        badges.size.should == 1
-        badge = badges[0]
-        badge.name.should == 'b_name'
-        badge.requirement_notes.should == 'b_req_notes'
-        badge.osm_key.should == 'badge'
-        badge.osm_long_key.should == 'table'
-        badge.sections_needed.should == 1
-        badge.total_needed.should == 2
-        badge.needed_from_section.should == {'a' => 1}
-        badge.requirements.size.should == 1
-        requirement = badge.requirements[0]
-        requirement.name.should == 'r_name'
-        requirement.description.should == 'r_description'
-        requirement.field.should == 'r_field'
-        requirement.editable.should be_true
-        requirement.badge.osm_key.should == 'badge'
-      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, :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))
-        badges.size.should == 1
-        badge = badges[0]
-        badge.name.should == 'b_name'
-        badge.requirement_notes.should == 'b_req_notes'
-        badge.osm_key.should == 'badge'
-        badge.osm_long_key.should == 'table'
-        badge.sections_needed.should == 1
-        badge.total_needed.should == 2
-        badge.needed_from_section.should == {'a' => 1}
-        badge.requirements.size.should == 1
-        requirement = badge.requirements[0]
-        requirement.name.should == 'r_name'
-        requirement.description.should == 'r_description'
-        requirement.field.should == 'r_field'
-        requirement.editable.should be_true
-        requirement.badge.osm_key.should == 'badge'
+        @badge_data = @badge_data.to_json
+
+        @module_data = {'items' => [
+          {
+            'badge_id' => '123',
+            'badge_version' => '0',
+            'module_id' => '234',
+            'module_letter' => 'a',
+            'num_required' => '',
+            'custom_columns' => '',
+            'completed_into_column_id' => '',
+            'numeric_into_column_id' => '',
+            'add_column_id_to_numeric' => '',
+          },
+        ]}
+        @module_data = @module_data.to_json
       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, :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)
-        badges.size.should == 1
+      urls = {
+        Osm::CoreBadge => 'https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=getBadgeStructureByType&section=beavers&type_id=4&term_id=2&section_id=1',
+        Osm::ChallengeBadge => 'https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=getBadgeStructureByType&section=beavers&type_id=1&term_id=2&section_id=1',
+        Osm::StagedBadge => 'https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=getBadgeStructureByType&section=beavers&type_id=3&term_id=2&section_id=1',
+        Osm::ActivityBadge => 'https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=getBadgeStructureByType&section=beavers&type_id=2&term_id=2&section_id=1',
+      }
+      urls.each do |type, url|
+        it type.type.to_s.titleize do
+          FakeWeb.register_uri(:post, url, :body => @badge_data, :content_type => 'application/json')
+          FakeWeb.register_uri(:post, 'https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=_getModuleDetails', :body => @module_data, :content_type => 'application/json')
+          Osm::Term.stub(:get_current_term_for_section){ Osm::Term.new(:id => 2) }
+
+          badges = type.get_badges_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers))
+          badges.size.should == 1
+          badge = badges[0]
+          badge.name.should == 'b_name'
+          badge.requirement_notes.should == 'b_req_notes'
+          badge.identifier.should == '123_0'
+          badge.id.should == 123
+          badge.version.should == 0
+          badge.latest.should be_true
+          badge.user_id.should == 0
+          badge.sharing.should == :default_locked
+          badge.requirements.size.should == 1
+          badge.valid?.should be_true
+          requirement = badge.requirements[0]
+          requirement.name.should == 'r_name'
+          requirement.description.should == 'r_description'
+          requirement.field.should == 2345
+          requirement.module_letter.should == 'a'
+          requirement.editable.should be_true
+          requirement.badge.should == badge
+          requirement.valid?.should be_true
+          badge.completion_criteria.should == {
+            :min_modules_required => 1,
+            :fields_required => [],
+            :badges_required => [],
+            :min_requirements_completed => 0,
+            :requires => nil,
+            :add_columns_to_module => nil,
+            :levels_column => nil,
+            :show_letters => false,
+            :modules => [
+              {
+                :badge_id => 123,
+                :badge_version => 0,
+                :module_id => 234,
+                :module_letter => 'a',
+                :min_required => 0,
+                :custom_columns => 0,
+                :completed_into_column => nil,
+                :numeric_into_column => nil,
+                :add_column_id_to_numeric => nil,
+              }
+            ]
+          }
+        end
       end
 
     end
 
 
-    describe "Get badge data for a section" do
-
-      before :each do
-        @data = {
-          'identifier' => 'scoutid',
-          'items' => [{
-            'scoutid' => 3,
-            'firstname' => 'fn',
-            'lastname' => 'ln',
-            'sid' => '',
-            'completed' => '2',
-            'awarded' => '1',
-            'awardeddate' => '2000-01-02',
-            'patrolid' => 4,
-            'a_1' => 'd',
-          }]
-        }
-        @data = @data.to_json
-      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, :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]
-        data.member_id.should == 3
-        data.first_name.should == 'fn'
-        data.last_name.should == 'ln'
-        data.completed.should == 2
-        data.awarded.should == 1
-        data.awarded_date.should == Date.new(2000, 1, 2)
-        data.requirements.should == {'a_1' => 'd'}
-        data.section_id.should == 1
-        data.badge.osm_key.should == 'badge'
-      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, :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]
-        data.member_id.should == 3
-        data.first_name.should == 'fn'
-        data.last_name.should == 'ln'
-        data.completed.should == 2
-        data.awarded.should == 1
-        data.awarded_date.should == Date.new(2000, 1, 2)
-        data.requirements.should == {'a_1' => 'd'}
-        data.section_id.should == 1
-        data.badge.osm_key.should == 'badge'
-      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, :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]
-        data.member_id.should == 3
-        data.first_name.should == 'fn'
-        data.last_name.should == 'ln'
-        data.completed.should == 2
-        data.awarded.should == 1
-        data.awarded_date.should == Date.new(2000, 1, 2)
-        data.requirements.should == {'a_1' => 'd'}
-        data.section_id.should == 1
-        data.badge.osm_key.should == 'badge'
-      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, :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]
-        data.member_id.should == 3
-        data.first_name.should == 'fn'
-        data.last_name.should == 'ln'
-        data.completed.should == 2
-        data.awarded.should == 1
-        data.awarded_date.should == Date.new(2000, 1, 2)
-        data.requirements.should == {'a_1' => 'd'}
-        data.section_id.should == 1
-        data.badge.osm_key.should == 'badge'
-      end
-
+    it "Get badge data for a section" do
+      data = {
+        'identifier' => 'scoutid',
+        'items' => [{
+          'scoutid' => '3',
+          'firstname' => 'fn',
+          'lastname' => 'ln',
+          'completed' => '2',
+          'awarded' => '1',
+          'awardeddate' => '2000-01-02',
+          '2345' => 'd',
+        }]
+      }
+      data = data.to_json
+
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=getBadgeRecords&term_id=2&section=beavers&badge_id=123&section_id=1&badge_version=0", :body => data, :content_type => 'application/json')
+      datas = Osm::CoreBadge.new(:id => 123, :version => 0).get_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
+      datas.size.should == 1
+      data = datas[0]
+      data.member_id.should == 3
+      data.first_name.should == 'fn'
+      data.last_name.should == 'ln'
+      data.due.should == 2
+      data.awarded.should == 1
+      data.awarded_date.should == Date.new(2000, 1, 2)
+      data.requirements.should == {2345 => 'd'}
+      data.section_id.should == 1
+      data.badge.id.should == 123
     end
 
-    describe "Update badge data for a section/member" do
+    describe "Update badge data in OSM" do
 
       before :each do
         @update_post_data = {
@@ -613,288 +600,221 @@ describe "Badge" do
           'token' => @CONFIGURATION[:api][:osm][:token],
           'userid' => 'user_id',
           'secret' => 'secret',
-          'action' => 'updatesingle',
-          'id' => 1,
-          'col' => 'a',
-          'value' => '2',
-          'chal' => 'badge',
-          'sectionid' => 2,
+          'scoutid' => 1,
+          'section_id' => 2,
+          'badge_id' => 123,
+          'badge_version' => 0,
+          'field' => 2345,
+          'value' => '2'
         }
-        @update_body_data = {'sid' => '1', 'a' => '2', 'b' => '2'}
+        @update_body_data = {'scoutid' => '1', '2345' => '2', 'completed' => '0', 'awarded' => '0', 'firstname' => 'fn', 'lastname' => 'ln'}
 
-        @awarded_post_data = {
-          'apiid' => @CONFIGURATION[:api][:osm][:id],
-          'token' => @CONFIGURATION[:api][:osm][:token],
-          'userid' => 'user_id',
-          'secret' => 'secret',
-          'dateAwarded' => '2000-01-02',
-          'sectionid' => 2,
-          'section' => :beavers,
-          'chal' => 'badge',
-          'stagedLevel' => 1,
-          'due' => :awarded,
-        }
-        @awarded_body_data = [{'sid'=>'1', 'awarded'=>'1', 'awardeddate'=>'2000-01-02'}]
-        @awarded_url = "https://www.onlinescoutmanager.co.uk/challenges.php?action=award"
-      end
-
-      it "Core badge" do
-        data = Osm::Badge::Data.new(
+        @data = Osm::Badge::Data.new(
           :member_id => 1,
           :first_name => 'fn',
           :last_name => 'ln',
           :section_id => 2,
-          :requirements => {'a' => '1', 'b' => '2'},
+          :requirements => {2345 => '1', 6789 => '2'},
           :badge => Osm::CoreBadge.new(
-            :osm_key => 'badge',
+            :id => 123,
+            :version => 0,
             :requirements => [
-              Osm::Badge::Requirement.new(:field => 'a', :editable => true),
-              Osm::Badge::Requirement.new(:field => 'b', :editable => true),
+              Osm::Badge::Requirement.new(:field => 2345, :editable => true),
+              Osm::Badge::Requirement.new(:field => 6789, :editable => true),
             ]),
-          :completed => 0,
+          :due => 0,
         )
+     end
 
-        update_url = "https://www.onlinescoutmanager.co.uk/challenges.php?type=core&section=beavers"
-        HTTParty.should_receive(:post).with(update_url, {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
-        HTTParty.should_receive(:post).with(@awarded_url, {:body => @awarded_post_data.merge({'type' => :core})}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@awarded_body_data.to_json}) }
+     it "Success (requirmeent, due & awarded)" do
+        date = Date.new(2000, 1, 2)
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=updateSingleRecord', {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
         Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
-
-        data.requirements['a'] = '2'
-        data.awarded = 1
-        data.awarded_date = Date.new(2000, 1, 2)
-        data.update(@api).should be_true
+        @data.should_receive(:mark_awarded).with(@api, date, 1) { true }
+        @data.should_receive(:mark_due).with(@api, 1) { true }
+
+        @data.requirements[2345] = '2'
+        @data.due = 1
+        @data.awarded = 1
+        @data.awarded_date = date
+        @data.update(@api).should be_true
       end
 
-      it "Challenge badge" do
-        data = Osm::Badge::Data.new(
-          :member_id => 1,
-          :first_name => 'fn',
-          :last_name => 'ln',
-          :section_id => 2,
-          :requirements => {'a' => '1', 'b' => '2'},
-          :badge => Osm::ChallengeBadge.new(
-            :osm_key => 'badge',
-            :requirements => [
-              Osm::Badge::Requirement.new(:field => 'a', :editable => true),
-              Osm::Badge::Requirement.new(:field => 'b', :editable => true),
-            ]),
-          :completed => 0,
-        )
-
-        update_url = "https://www.onlinescoutmanager.co.uk/challenges.php?type=challenge&section=beavers"
-        HTTParty.should_receive(:post).with(update_url, {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
-        HTTParty.should_receive(:post).with(@awarded_url, {:body => @awarded_post_data.merge({'type' => :challenge})}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@awarded_body_data.to_json}) }
+      it "Success (just requirement)" do
+        date = Date.new(2000, 1, 2)
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=updateSingleRecord', {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
         Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+        @data.should_not_receive(:mark_awarded)
+        @data.should_not_receive(:mark_due)
 
-        data.requirements['a'] = '2'
-        data.awarded = 1
-        data.awarded_date = Date.new(2000, 1, 2)
-        data.update(@api).should be_true
+        @data.requirements[2345] = '2'
+        @data.update(@api).should be_true
       end
 
-      it "Staged badge" do
-        data = Osm::Badge::Data.new(
-          :member_id => 1,
-          :first_name => 'fn',
-          :last_name => 'ln',
-          :section_id => 2,
-          :requirements => {'a' => '1', 'b' => '2'},
-          :badge => Osm::StagedBadge.new(
-            :osm_key => 'badge',
-            :requirements => [
-              Osm::Badge::Requirement.new(:field => 'a', :editable => true),
-              Osm::Badge::Requirement.new(:field => 'b', :editable => true),
-            ]),
-          :completed => 0,
-        )
-
-        update_url = "https://www.onlinescoutmanager.co.uk/challenges.php?type=staged&section=beavers"
-        HTTParty.should_receive(:post).with(update_url, {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
-        HTTParty.should_receive(:post).with(@awarded_url, {:body => @awarded_post_data.merge({'type' => :staged})}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@awarded_body_data.to_json}) }
+      it "Success (just due)" do
+        date = Date.new(2000, 1, 2)
+        HTTParty.should_not_receive(:post)
         Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+        @data.should_not_receive(:mark_awarded)
+        @data.should_receive(:mark_due).with(@api, 1) { true }
 
-        data.requirements['a'] = '2'
-        data.awarded = 1
-        data.awarded_date = Date.new(2000, 1, 2)
-        data.update(@api).should be_true
+        @data.due = 1
+        @data.update(@api).should be_true
       end
 
-      it "Activity badge" do
-        data = Osm::Badge::Data.new(
-          :member_id => 1,
-          :first_name => 'fn',
-          :last_name => 'ln',
-          :section_id => 2,
-          :requirements => {'a' => '1', 'b' => '2'},
-          :badge => Osm::ActivityBadge.new(
-            :osm_key => 'badge',
-            :requirements => [
-              Osm::Badge::Requirement.new(:field => 'a', :editable => true),
-              Osm::Badge::Requirement.new(:field => 'b', :editable => true),
-            ]),
-          :completed => 0,
-        )
-
-        update_url = "https://www.onlinescoutmanager.co.uk/challenges.php?type=activity&section=beavers"
-        HTTParty.should_receive(:post).with(update_url, {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
-        HTTParty.should_receive(:post).with(@awarded_url, {:body => @awarded_post_data.merge({'type' => :activity})}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@awarded_body_data.to_json}) }
+      it "Success (just awarded)" do
+        date = Date.new(2000, 1, 2)
+        HTTParty.should_not_receive(:post)
         Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+        @data.should_receive(:mark_awarded).with(@api, date, 1) { true }
+        @data.should_not_receive(:mark_due).with(@api, 1) { true }
 
-        data.requirements['a'] = '2'
-        data.awarded = 1
-        data.awarded_date = Date.new(2000, 1, 2)
-        data.update(@api).should be_true
+        @data.awarded = 1
+        @data.awarded_date = date
+        @data.update(@api).should be_true
       end
 
-    end
-
-
-    describe "Mark badge awarded" do
-
-      before :each do
-        @awarded_post_data = {
-          'apiid' => @CONFIGURATION[:api][:osm][:id],
-          'token' => @CONFIGURATION[:api][:osm][:token],
-          'userid' => 'user_id',
-          'secret' => 'secret',
-          'dateAwarded' => '2000-01-02',
-          'sectionid' => 2,
-          'section' => :beavers,
-          'chal' => 'badge',
-          'stagedLevel' => 1,
-          'due' => :awarded,
-        }
-        @awarded_body_data = [{'sid'=>'1', 'awarded'=>'1', 'awardeddate'=>'2000-01-02'}]
-        @awarded_url = "https://www.onlinescoutmanager.co.uk/challenges.php?action=award"
+      it "Failed (requirement)" do
+        date = Date.new(2000, 1, 2)
+        @update_body_data['2345'] = '1'
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=updateSingleRecord', {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
+        Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+        @data.should_receive(:mark_awarded).with(@api, date, 1) { true }
+        @data.should_receive(:mark_due).with(@api, 1) { true }
+
+        @data.requirements[2345] = '2'
+        @data.due = 1
+        @data.awarded = 1
+        @data.awarded_date = date
+        @data.update(@api).should be_false
       end
 
-      it "Core badge" do
-        data = Osm::Badge::Data.new(
-          :member_id => 1,
-          :section_id => 2,
-          :badge => Osm::CoreBadge.new(
-            :osm_key => 'badge',
-          )
-        )
-
-        HTTParty.should_receive(:post).with(@awarded_url, {:body => @awarded_post_data.merge({'type' => :core})}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@awarded_body_data.to_json}) }
+      it "Failed (due)" do
+        date = Date.new(2000, 1, 2)
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=updateSingleRecord', {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
         Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
-
-        data.mark_awarded(@api, Date.new(2000, 1, 2), 1).should be_true
+        @data.should_receive(:mark_awarded).with(@api, date, 1) { true }
+        @data.should_receive(:mark_due).with(@api, 1) { false }
+
+        @data.requirements[2345] = '2'
+        @data.due = 1
+        @data.awarded = 1
+        @data.awarded_date = date
+        @data.update(@api).should be_false
       end
 
-      it "Challenge badge" do
-        data = Osm::Badge::Data.new(
-          :member_id => 1,
-          :section_id => 2,
-          :badge => Osm::ChallengeBadge.new(
-            :osm_key => 'badge',
-          )
-        )
-
-        HTTParty.should_receive(:post).with(@awarded_url, {:body => @awarded_post_data.merge({'type' => :challenge})}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@awarded_body_data.to_json}) }
+      it "Failed (awarded)" do
+        date = Date.new(2000, 1, 2)
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=updateSingleRecord', {:body => @update_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.to_json}) }
         Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
-
-        data.mark_awarded(@api, Date.new(2000, 1, 2), 1).should be_true
+        @data.should_receive(:mark_awarded).with(@api, date, 1) { false }
+        @data.should_receive(:mark_due).with(@api, 1) { true }
+
+        @data.requirements[2345] = '2'
+        @data.due = 1
+        @data.awarded = 1
+        @data.awarded_date = date
+        @data.update(@api).should be_false
       end
 
-      it "Staged badge" do
-        data = Osm::Badge::Data.new(
-          :member_id => 1,
-          :section_id => 2,
-          :badge => Osm::StagedBadge.new(
-            :osm_key => 'badge',
-          )
-        )
+    end
 
-        @awarded_body_data[0].merge!({'awarded' => '4'})
-        HTTParty.should_receive(:post).with(@awarded_url, {:body => @awarded_post_data.merge({'type' => :staged, 'stagedLevel' => 4})}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@awarded_body_data.to_json}) }
-        Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
 
-        data.mark_awarded(@api, Date.new(2000, 1, 2), 4).should be_true
-      end
+    it "Mark badge awarded" do
 
-      it "Activity badge" do
-        data = Osm::Badge::Data.new(
-          :member_id => 1,
-          :section_id => 2,
-          :badge => Osm::ActivityBadge.new(
-            :osm_key => 'badge',
-          )
+      awarded_post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'date' => '2000-01-02',
+        'sectionid' => 2,
+        'entries' => '[{"badge_id":"123","badge_version":"0","scout_id":"1","level":"1"}]',
+      }
+      awarded_body_data = {'scoutid'=>'1', 'completed'=>'1', 'awarded' => '1', 'awardeddate'=>'2000-01-02', 'firstname' => 'fn', 'lastname' => 'ln'}
+      awarded_url = "https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=awardBadge"
+
+      data = Osm::Badge::Data.new(
+        :member_id => 1,
+        :section_id => 2,
+        :badge => Osm::CoreBadge.new(
+          :id => 123,
+          :version => 0
         )
+      )
 
-        HTTParty.should_receive(:post).with(@awarded_url, {:body => @awarded_post_data.merge({'type' => :activity})}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@awarded_body_data.to_json}) }
-        Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
-
-        data.mark_awarded(@api, Date.new(2000, 1, 2), 1).should be_true
-      end
+      HTTParty.should_receive(:post).with(awarded_url, {:body => awarded_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>awarded_body_data.to_json}) }
+      Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
 
+      data.mark_awarded(@api, Date.new(2000, 1, 2), 1).should be_true
     end
 
+    it "Mark badge due" do
+
+      awarded_post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'section_id' => 2,
+        'badge_id' => 123,
+        'badge_version' => 0,
+        'scoutid' => 1,
+        'level' => 1
+      }
+      awarded_body_data = {'scoutid'=>'1', 'completed'=>'1', 'awarded' => '1', 'awardeddate'=>'2000-01-02', 'firstname' => 'fn', 'lastname' => 'ln'}
+      awarded_url = "https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=overrideCompletion"
+
+      data = Osm::Badge::Data.new(
+        :member_id => 1,
+        :section_id => 2,
+        :badge => Osm::CoreBadge.new(
+          :id => 123,
+          :version => 0
+        )
+      )
 
-    describe "Get summary data for a section" do
-
-      before :each do
-        @data = {
-          'items' => [
-            {
-              'firstname' => 'First',
-              'lastname' => 'Last',
-              'badge_none' => '',
-              'badge_earnt' => '2000-01-02',
-            }
-          ]
-        }
-        @data = @data.to_json
-      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, :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 == {
-          :first_name => 'First',
-          :last_name => 'Last',
-          'badge_none' => '',
-          'badge_earnt' => '2000-01-02',
-        }
-      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, :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 == {
-          :first_name => 'First',
-          :last_name => 'Last',
-          'badge_none' => '',
-          'badge_earnt' => '2000-01-02',
-        }
-      end
+      HTTParty.should_receive(:post).with(awarded_url, {:body => awarded_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>awarded_body_data.to_json}) }
+      Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
 
-      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, :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 == {
-          :first_name => 'First',
-          :last_name => 'Last',
-          'badge_none' => '',
-          'badge_earnt' => '2000-01-02',
-        }
-      end
+      data.mark_due(@api, 1).should be_true
+    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, :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 == {
-          :first_name => 'First',
-          :last_name => 'Last',
-          'badge_none' => '',
-          'badge_earnt' => '2000-01-02',
-        }
-      end
+    it "Get summary data for a section" do
+
+      data = {
+        'identifier' => 'scout_id',
+        'items' => [
+          {
+            'firstname' => 'First',
+            'lastname' => 'Last',
+            'scout_id' => 1,
+            '92_0' => nil,
+            '93_0' => '',
+            '94_0' => 'Started',
+            '95_0' => 'Due',
+            '96_0' => 'Awarded',
+            '97_0' => 'Awarded Lvl 2',
+            '98_0' => 'Due Lvl 3',
+          }
+        ]
+      }
+      data = data.to_json
+
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/badges/records/summary/?action=get&mode=verbose&section=beavers&sectionid=1&termid=2", :body => data, :content_type => 'application/json')
+      summary = Osm::Badge.get_summary_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), 2)
+      summary.size.should == 1
+      summary[0].should == {
+        :first_name => 'First',
+        :last_name => 'Last',
+        :name => 'First Last',
+        :member_id => 1,
+        '94_0' => :started,
+        '95_0' => :due,
+        '96_0' => :awarded,
+        '97_0' => :awarded,
+        '98_0' => :due,
+      }
     end
 
   end