osm 0.2.2 → 0.3.0

data/lib/osm/badges.rb

@@ -0,0 +1,149 @@
+module Osm
+
+  class Badges
+
+    # Get badge stock levels for a section
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Osm::Section, Fixnum, #to_i] section The section (or its ID) to get the badge stock for
+    # @!macro options_get
+    # @return Hash
+    def self.get_stock(api, section, options={})
+      Osm::Model.require_ability_to(api, :read, :badge, section, options)
+      section = Osm::Section.get(api, section, options) unless section.is_a?(Osm::Section)
+      term_id = Osm::Term.get_current_term_for_section(api, section).id
+      cache_key = ['badge_stock', section.id]
+
+      if !options[:no_cache] && Osm::Model.cache_exist?(api, cache_key)
+        return Osm::Model.cache_read(api, cache_key)
+      end
+
+      data = api.perform_query("challenges.php?action=getInitialBadges&type=core&sectionid=#{section.id}&section=#{section.type}&termid=#{term_id}")
+      data = (data['stock'] || {}).select{ |k,v| !k.eql?('sectionid') }.
+                                   inject({}){ |new_hash,(badge, level)| new_hash[badge] = level.to_i; new_hash }
+
+      Osm::Model.cache_write(api, cache_key, data)
+      return data
+    end
+
+    # Update badge stock levels
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Osm::Section, Fixnum, #to_i] section The section (or its ID) to update ther badge stock for
+    # @param [Sring, #to_s] badge_key The badge to set the stock level for
+    # @param [Fixnum, #to_i] stock_level How many of the provided badge there are
+    # @return [Boolan] whether the update was successfull or not
+    def self.update_stock(api, section, badge_key, stock_level)
+      Osm::Model.require_ability_to(api, :write, :badge, section)
+      section = Osm::Section.get(api, section) unless section.is_a?(Osm::Section)
+
+      Osm::Model.cache_delete(api, ['badge_stock', section.id])
+
+      data = api.perform_query("challenges.php?action=updateStock", {
+        'stock' => stock_level,
+        'table' => badge_key,
+        'sectionid' => section.id,
+        'section' => section.type,
+      })
+      return data.is_a?(Hash) && (data['sectionid'].to_i == section.id) && (data[badge_key.to_s].to_i == stock_level)
+    end
+
+
+    # Get due badges
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Osm::Section, Fixnum, #to_i] section The section (or its ID) to get the due badges for
+    # @param [Osm::Term, Fixnum, #to_i, nil] term The term (or its ID) to get the due badges for, passing nil causes the current term to be used
+    # @!macro options_get
+    # @return [Osm::Badges::DueBadges]
+    def self.get_due_badges(api, section, term=nil, options={})
+      Osm::Model.require_ability_to(api, :read, :badge, section, options)
+      section = Osm::Section.get(api, section, options) unless section.is_a?(Osm::Section)
+      term_id = (term.nil? ? Osm::Term.get_current_term_for_section(api, section, options) : term).to_i
+      cache_key = ['due_badges', section.id, term_id]
+
+      if !options[:no_cache] && Osm::Model.cache_exist?(api, cache_key)
+        return Osm::Model.cache_read(api, cache_key)
+      end
+
+      data = api.perform_query("challenges.php?action=outstandingBadges&section=#{section.type}&sectionid=#{section.id}&termid=#{term_id}")
+
+      data = {} unless data.is_a?(Hash) # OSM/OGM returns an empty array to represent no badges
+      pending_raw = data['pending'] || {}
+      descriptions_raw = data['description'] || {}
+
+      attributes = {
+        :by_member => {},
+        :descriptions => {}
+      }
+
+      pending_raw.each do |key, members|
+        members.each do |member|
+          name = "#{member['firstname']} #{member['lastname']}"
+          description = descriptions_raw[key]['name'] + (descriptions_raw[key]['section'].eql?('staged') ? " (Level #{member['level']})" : '')
+          description_key = key + (descriptions_raw[key]['section'].eql?('staged') ? "_#{member['level']}" : '_1')
+          attributes[:descriptions][description_key] = description
+          attributes[:by_member][name] ||= []
+          attributes[:by_member][name].push(description_key)
+        end
+      end
+
+      due_badges = Osm::Badges::DueBadges.new(attributes)
+      Osm::Model.cache_write(api, cache_key, due_badges)
+      return due_badges
+    end
+
+
+    class DueBadges < Osm::Model
+      # @!attribute [rw] descriptions
+      #   @return [Hash] descriptions for each of the badges
+      # @!attribute [rw] by_member
+      #   @return [Hash] the due badges grouped by member
+
+      attribute :descriptions, :default => {}
+      attribute :by_member, :default => {}
+
+      attr_accessible :descriptions, :by_member
+
+      validates :descriptions, :hash => {:key_type => String, :value_type => String}
+
+      validates_each :by_member do |record, attr, value|
+        desc_keys = record.descriptions.keys
+        record.errors.add(attr, 'must be a Hash') unless value.is_a?(Hash)
+        value.each do |k, v|
+          record.errors.add(attr, 'keys must be String') unless k.is_a?(String)
+          record.errors.add(attr, 'values must be Arrays') unless v.is_a?(Array)
+          v.each do |vv|
+            record.errors.add(attr, 'internal values must be Strings') unless vv.is_a?(String)
+            record.errors.add(attr, 'internal values must exist as a key in :descriptions') unless desc_keys.include?(vv)
+          end
+        end
+      end
+
+
+      # @!method initialize
+      #   Initialize a new Term
+      #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+
+
+      # Check if there are no badges due
+      # @return [Boolean]
+      def empty?
+        return by_member.empty?
+      end
+
+      # Calculate the total number of badges needed
+      # @return [Hash] the total number of each badge which is due
+      def totals()
+        totals = {}
+        by_member.keys.each do |member_name|
+          by_member[member_name].each do |badge|
+            totals[badge] ||= 0
+            totals[badge] += 1
+          end
+        end
+        return totals
+      end
+
+    end # Class Badges::DueBadges
+
+  end # Class Badges
+
+end # Module

data/lib/osm/flexi_record.rb

@@ -237,7 +237,7 @@ module Osm
       # @!attribute [rw] grouping__id
       #   @return [Fixnum] OSM id for the grouping the member is in
       # @!attribute [rw] fields
-      #   @return [Hash] Keys are the field's id, values are the field values
+      #   @return [DirtyHashy] Keys are the field's id, values are the field values
 
       attribute :flexi_record, :type => Object
       attribute :member_id, :type => Integer
@@ -251,9 +251,18 @@ module Osm
       validates_numericality_of :grouping_id, :only_integer=>true, :greater_than_or_equal_to=>-2
       validates :fields, :hash => {:key_type => String}
 
+
       # @!method initialize
       #   Initialize a new FlexiRecord::Data
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+      # Override initialize to set @orig_attributes
+      old_initialize = instance_method(:initialize)
+      define_method :initialize do |*args|
+        ret_val = old_initialize.bind(self).call(*args)
+        self.fields = DirtyHashy.new(self.fields)
+        self.fields.clean_up!
+        return ret_val
+      end
 
 
       # Update data in OSM
@@ -267,20 +276,21 @@ module Osm
         term_id = Osm::Term.get_current_term_for_section(api, flexi_record.section_id).id
 
         updated = true
-        flexi_record.get_columns(api).each do |column|
-          if column.editable
+        editable_fields = flexi_record.get_columns(api).select{ |c| c.editable }.map{ |i| i.id }
+        fields.changes.each do |field, (was,now)|
+          if editable_fields.include?(field)
             data = api.perform_query("extras.php?action=updateScout", {
               'termid' => term_id,
               'scoutid' => self.member_id,
-              'column' => column.id,
-              'value' => fields[column.id],
+              'column' => field,
+              'value' => now,
               'sectionid' => flexi_record.section_id,
               'extraid' => flexi_record.id,
             })
             if (data.is_a?(Hash) && data['items'].is_a?(Array))
               data['items'].each do |item|
                 if item['scoutid'] == member_id.to_s  # Find this member from the list of all members
-                  updated = false unless item[column.id] == self.fields[column.id]
+                  updated = false unless item[field] == now
                 end
               end
             else
@@ -290,7 +300,7 @@ module Osm
         end
 
         if updated
-          reset_changed_attributes
+          fields.clean_up!
           # The cached datas for the flexi record will be out of date - remove them
           cache_delete(api, ['flexi_record_data', flexi_record.id])
         end

data/lib/osm/section.rb

@@ -291,29 +291,6 @@ module Osm
     end
 
 
-    # Get badge stock levels
-    # @param [Osm::Api] api The api to use to make the request
-    # @param [Osm::Term, Fixnum, #to_i, nil] term The term (or its ID) to get the stock levels for, passing nil causes the current term to be used
-    # @!macro options_get
-    # @return Hash
-    def get_badge_stock(api, term=nil, options={})
-      require_ability_to(api, :read, :badge, self, options)
-      term_id = term.nil? ? Osm::Term.get_current_term_for_section(api, self).id : term.to_i
-      cache_key = ['badge_stock', id, term_id]
-
-      if !options[:no_cache] && cache_exist?(api, cache_key)
-        return cache_read(api, cache_key)
-      end
-
-      data = api.perform_query("challenges.php?action=getInitialBadges&type=core&sectionid=#{id}&section=#{type}&termid=#{term_id}")
-      data = (data['stock'] || {}).select{ |k,v| !k.eql?('sectionid') }.
-                                   inject({}){ |new_hash,(badge, level)| new_hash[badge] = level.to_i; new_hash }
-
-      cache_write(api, cache_key, data)
-      return data
-    end
-
-
     # Check if this section is one of the youth sections
     # @return [Boolean]
     def youth_section?

data/osm.gemspec

@@ -22,11 +22,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'httparty', '~> 0.9'       # Used to make web requests to the API
   s.add_runtime_dependency 'active_attr', '~> 0.6'
   s.add_runtime_dependency 'activemodel', '~> 3.2'
+  s.add_runtime_dependency 'dirty_hashy', '~> 0.2.1'  # Used to trach changed data in Badge::Data and FlexiRecord::Data
 
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'rspec', '~> 2.11'
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'guard-rspec', '~> 2.4'
-  s.add_development_dependency 'rb-inotify', '~> 0.8.8'
+  s.add_development_dependency 'rb-inotify', '~> 0.9'
 
 end

data/spec/osm/badge_spec.rb

@@ -0,0 +1,452 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe "Badge" do
+
+  it "Create" do
+    badge = Osm::Badge.new(
+      :name => 'name',
+      :requirement_notes => 'notes',
+      :osm_key => 'key',
+      :sections_needed => 1,
+      :total_needed => 2,
+      :needed_from_section => {'a' => 1},
+      :requirements => [],
+    )
+
+    badge.name.should == 'name'
+    badge.requirement_notes.should == 'notes'
+    badge.osm_key.should == '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',
+      :editable => true,
+      :badge => Osm::Badge.new(:osm_key => 'key'),
+    )
+
+    requirement.name.should == 'name'
+    requirement.description.should == 'description'
+    requirement.field.should == 'field'
+    requirement.editable.should == true
+    requirement.badge.osm_key.should == 'key'
+    requirement.valid?.should be_true
+  end
+
+  it "Create Data" do
+    data = Osm::Badge::Data.new(
+      :member_id => 1,
+      :completed => true,
+      :awarded_date => Date.new(2000, 1, 2),
+      :requirements => {},
+      :section_id => 2,
+      :badge => Osm::Badge.new(:osm_key => 'key'),
+    )
+
+    data.member_id.should == 1
+    data.completed.should == true
+    data.awarded_date.should == Date.new(2000, 1, 2)
+    data.requirements.should == {}
+    data.section_id.should == 2
+    data.badge.osm_key.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]
+  end
+
+  it "Compare badge requirements by badge then field" do
+    b1 = Osm::Badge::Requirement.new(:badge => Osm::Badge.new(:name => 'A'), :field => 'a')
+    b2 = Osm::Badge::Requirement.new(:badge => Osm::Badge.new(:name => 'B'), :field => 'a')
+    b3 = Osm::Badge::Requirement.new(:badge => Osm::Badge.new(:name => 'B'), :field => 'b')
+    badges = [b3, b1, b2]
+    badges.sort.should == [b1, b2, b3]
+  end
+
+  it "Compare badge data by badge, section_id then member_id" do
+    b1 = Osm::Badge::Data.new(:badge => Osm::Badge.new(:name => 'A'), :section_id => 1, :member_id => 1)
+    b2 = Osm::Badge::Data.new(:badge => Osm::Badge.new(:name => 'B'), :section_id => 1, :member_id => 1)
+    b3 = Osm::Badge::Data.new(:badge => Osm::Badge.new(:name => 'B'), :section_id => 2, :member_id => 1)
+    b4 = Osm::Badge::Data.new(:badge => Osm::Badge.new(:name => 'B'), :section_id => 2, :member_id => 2)
+    badges = [b3, b4, b1, b2]
+    badges.sort.should == [b1, b2, b3, b4]
+  end
+
+
+  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'}
+    )
+    data.total_gained.should == 3
+  end
+
+  it "Get total requirements met in each section 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'),
+      ]
+    )
+    data = Osm::Badge::Data.new(
+      :badge => badge,
+      :requirements => {'a_1' => 'x', 'a_2' => '', 'b_1' => 'yes', 'b_2' => '2000-01-02'}
+    )
+    data.gained_in_sections.should == {'a' => 0, 'b' => 2}
+  end
+
+  it "Get number of sections met 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'),
+      ]
+    )
+    data = Osm::Badge::Data.new(
+      :badge => badge,
+      :requirements => {'a_1' => 'x', 'a_2' => '', 'b_1' => 'yes', 'b_2' => '2000-01-02'}
+    )
+    data.sections_gained.should == 1
+  end
+
+
+  describe "Using the OSM API" do
+
+    describe "Get Badges" do
+
+      before :each do
+        @data = {
+          "badgeOrder" => "badge",
+          "structure" => {
+            "badge" => [
+              {
+                "rows" => [
+                  {"name" => "First name","field" => "firstname","width" => "120px"},
+                  {"name" => "Last name","field" => "lastname","width" => "120px"},
+                  {"name" => "Done","field" => "completed","width" => "70px","formatter" => "doneFormatter"},
+                  {"name" => "Awarded","field" => "awardeddate","width" => "100px","formatter" => "dueFormatter"}
+                ],
+                "numactivities" => "23",
+                "noscroll" => true
+	      },{
+                "rows" => [
+                  {"name" => "r_name","field" => "r_field","width" => "80px","formatter" => "cellFormatter","tooltip" => "r_description","editable" => "true"}
+		]
+              }
+            ],
+          },
+          "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)
+        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.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 == 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)
+        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.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 == 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)
+        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.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 == 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)
+        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.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 == true
+        requirement.badge.osm_key.should == 'badge'
+      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' => '1',
+            'awarded' => '',
+            '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)
+        datas = Osm::CoreBadge.get_badge_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), Osm::Badge.new(:osm_key => 'badge'), 2)
+        datas.size.should == 1
+        data = datas[0]
+        data.member_id.should == 3
+        data.completed.should == true
+        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)
+        datas = Osm::ChallengeBadge.get_badge_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), Osm::Badge.new(:osm_key => 'badge'), 2)
+        datas.size.should == 1
+        data = datas[0]
+        data.member_id.should == 3
+        data.completed.should == true
+        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)
+        datas = Osm::StagedBadge.get_badge_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), Osm::Badge.new(:osm_key => 'badge'), 2)
+        datas.size.should == 1
+        data = datas[0]
+        data.member_id.should == 3
+        data.completed.should == true
+        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)
+        datas = Osm::ActivityBadge.get_badge_data_for_section(@api, Osm::Section.new(:id => 1, :type => :beavers), Osm::Badge.new(:osm_key => 'badge'), 2)
+        datas.size.should == 1
+        data = datas[0]
+        data.member_id.should == 3
+        data.completed.should == true
+        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
+
+    end
+
+    describe "Update badge data for a section/member" do
+
+      before :each do
+        @post_data = {
+          'apiid' => @CONFIGURATION[:api][:osm][:id],
+          'token' => @CONFIGURATION[:api][:osm][:token],
+          'userid' => 'user_id',
+          'secret' => 'secret',
+          'action' => 'updatesingle',
+          'id' => 1,
+          'col' => 'a',
+          'value' => '2',
+          'chal' => 'badge',
+          'sectionid' => 2,
+        }
+
+        @body_data = {'sid' => '1', 'a' => '2', 'b' => '2'}
+      end
+
+      it "Core badge" do
+        data = Osm::Badge::Data.new(
+          :member_id => 1,
+          :section_id => 2,
+          :requirements => {'a' => '1', 'b' => '2'},
+          :badge => Osm::CoreBadge.new(
+            :osm_key => 'badge',
+            :requirements => [
+              Osm::Badge::Requirement.new(:field => 'a', :editable => true),
+              Osm::Badge::Requirement.new(:field => 'b', :editable => true),
+            ]),
+          :completed => false,
+        )
+
+        url = "https://www.onlinescoutmanager.co.uk/challenges.php?type=core&section=beavers"
+        HTTParty.should_receive(:post).with(url, {:body => @post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@body_data.to_json}) }
+        Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+
+        data.requirements['a'] = '2'
+        data.update(@api).should be_true
+      end
+
+      it "Challenge badge" do
+        data = Osm::Badge::Data.new(
+          :member_id => 1,
+          :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 => false,
+        )
+
+        url = "https://www.onlinescoutmanager.co.uk/challenges.php?type=challenge&section=beavers"
+        HTTParty.should_receive(:post).with(url, {:body => @post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@body_data.to_json}) }
+        Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+
+        data.requirements['a'] = '2'
+        data.update(@api).should be_true
+      end
+
+      it "Staged badge" do
+        data = Osm::Badge::Data.new(
+          :member_id => 1,
+          :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 => false,
+        )
+
+        url = "https://www.onlinescoutmanager.co.uk/challenges.php?type=staged&section=beavers"
+        HTTParty.should_receive(:post).with(url, {:body => @post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@body_data.to_json}) }
+        Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+
+        data.requirements['a'] = '2'
+        data.update(@api).should be_true
+      end
+
+      it "Activity badge" do
+        data = Osm::Badge::Data.new(
+          :member_id => 1,
+          :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 => false,
+        )
+
+        url = "https://www.onlinescoutmanager.co.uk/challenges.php?type=activity&section=beavers"
+        HTTParty.should_receive(:post).with(url, {:body => @post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@body_data.to_json}) }
+        Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+
+        data.requirements['a'] = '2'
+        data.update(@api).should be_true
+      end
+
+    end
+
+  end
+
+end