osm 0.0.21 → 0.0.22

data/CHANGELOG.md

@@ -1,10 +1,21 @@
+## Version 0.0.22
+
+  * Adjustments so DueBadge is similar enough to badge\_stock data to be useful:
+    * by\_member Hash -> Keys are member's name (String), values are the badge key (String)
+    * descriptions Hash -> keys are the badge key (String), values are the badge name (String)
+    * totals Hash -> keys are the badge key (String), values are the  number required (Fixnum)
+    * Badge keys are the same as are used in getting badge stock levels
+  * Add ability to get badge stock levels
+  * Add ability to Create a term
+  * Add ability to Update a term
+
 ## Version 0.0.21
 
   * Fix getting section\_id and grouping\_id for api.get\_members
 
 ## Version 0.0.20
 
-  * Start deprecation of api\_data option in api methods (raise a warning and adjust documentation)
+  * Deprecation of api\_data option in api methods (raise a warning if used and adjust documentation)
   * Hide sesitive information when printing data sent to OSM in debug mode
   * Add archived attribute to Event
   * Add :include\_archived option to api.get\_events method

data/README.md

@@ -72,6 +72,7 @@ however it should be noted that when the OSM API adds a feature it can be diffic
   * API Access
   * API Access for our app
   * Due Badges
+  * Evening
   * Events
   * Flexi Record Data
   * Flexi Record Structure
@@ -100,25 +101,30 @@ however it should be noted that when the OSM API adds a feature it can be diffic
 
 ## Parts of the OSM API currently NOT supported:
 
+  * Badges:
+    * Which requirements each member has met:
+      * Retreive
+      * Update
+    * Retrieve details for each badge (stock, short column names etc.)
   * Retreival of leader access
-  * Terms:
-    * Create
-    * Update
   * Register - Update attendance
-  * Flexi Record - Update data
+  * Flexi Records:
+    * Update data
+    * Delete
+    * Update
+    * Add Column
   * Events:
     * Attendance (everything)
     * Create
     * Update
+    * Delete
   * Member:
     * Update
     * Add
-  * Badges:
-    * Which requirements each member has met:
-      * Retreive
-      * Update
-    * Retrieve details for each badge (stock, short column names etc.)
+    * Delete
   * Update Activity
+  * Add activity to programme
+  * Delete Evening
   * Gift aid (everything)
   * Finances (Everything)
   * SMS:

data/lib/osm/api.rb

@@ -163,7 +163,7 @@ module Osm
     end
 
     # Get the notepad for a specified section
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the notepad for
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the notepad for
     # @!macro options_get
     # @!macro options_api_data
     # @return nil if an error occured or the user does not have access to that section
@@ -291,8 +291,8 @@ module Osm
     end
 
     # Get the programme for a given term
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the programme for
-    # @param [Osm:term, Fixnum] term the term (or its ID) to get the programme for, passing nil causes the current term to be used
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the programme for
+    # @param [Osm::term, Fixnum, nil] term the term (or its ID) to get the programme for, passing nil causes the current term to be used
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Osm::Evening>]
@@ -356,8 +356,8 @@ module Osm
     end
 
     # Get members
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the members for
-    # @param [Osm:Term, Fixnum] term the term (or its ID) to get the members for, passing nil causes the current term to be used
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the members for
+    # @param [Osm::Term, Fixnum, nil] term the term (or its ID) to get the members for, passing nil causes the current term to be used
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Osm::Member>]
@@ -384,7 +384,7 @@ module Osm
     end
 
     # Get API access details for a given section
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the details for
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the details for
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Osm::ApiAccess>]
@@ -414,7 +414,7 @@ module Osm
     end
 
     # Get our API access details for a given section
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the details for
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the details for
     # @!macro options_get
     # @!macro options_api_data
     # @return [Osm::ApiAccess]
@@ -437,7 +437,7 @@ module Osm
     end
 
     # Get events
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the events for
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the events for
     # @!macro options_get
     # @option options [Boolean] :include_archived (optional) if true then archived activities will also be returned
     # @!macro options_api_data
@@ -471,7 +471,8 @@ module Osm
     end
 
     # Get due badges
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the due badges for
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the due badges for
+    # @param [Osm::Term, Fixnum, 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
     # @!macro options_api_data
     # @return [Osm::DueBadges]
@@ -496,8 +497,8 @@ module Osm
     end
 
     # Get register structure
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the structure for
-    # @param [Osm:Term, Fixnum] section the term (or its ID) to get the structure for, passing nil causes the current term to be used
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the structure for
+    # @param [Osm::Term, Fixnum, nil] section the term (or its ID) to get the structure for, passing nil causes the current term to be used
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Osm::RegisterField>] representing the fields of the register
@@ -526,8 +527,8 @@ module Osm
     end
 
     # Get register data
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the register for
-    # @param [Osm:Term, Fixnum] section the term (or its ID) to get the register for, passing nil causes the current term to be used
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the register for
+    # @param [Osm::Term, Fixnum, nil] section the term (or its ID) to get the register for, passing nil causes the current term to be used
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<RegisterData>] representing the attendance of each member
@@ -554,7 +555,7 @@ module Osm
     end
 
     # Get flexirecord structure
-    # @param [Osm:Section, Fixnum] section the section (or its ID) to get the structure for
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the structure for
     # @param [Fixnum] the id of the Flexi Record
     # @!macro options_get
     # @!macro options_api_data
@@ -585,7 +586,7 @@ module Osm
     # Get flexi record data
     # @param [Osm:Section, Fixnum] section the section (or its ID) to get the register for
     # @param [Fixnum] the id of the Flexi Record
-    # @param [Osm:Term, Fixnum] section the term (or its ID) to get the register for, passing nil causes the current term to be used
+    # @param [Osm:Term, Fixnum, nil] section the term (or its ID) to get the register for, passing nil causes the current term to be used
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<FlexiRecordData>]
@@ -611,8 +612,32 @@ module Osm
       return to_return
     end
 
+    # Get badge stock levels
+    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the stock levels for
+    # @param [Osm::Term, Fixnum, nil] section 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_levels(section, term=nil, options={})
+      section_id = id_for_section(section)
+      section_type = type_for_section(section)
+      term_id = id_for_term(term, section)
+      cache_key = "badge_stock-#{section_id}-#{term_id}"
+
+      if !options[:no_cache] && cache_exist?(cache_key) && self.user_can_access?(:badge, section_id)
+        return cache_read(cache_key)
+      end
+
+      data = 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') }
+
+      self.user_can_access :badge, section_id
+      cache_write(cache_key, data, :expires_in => @@default_cache_ttl)
+      return data
+    end
+
+
     # Create an evening in OSM
-    # @param [Fixnum] section_id the id of the section to add the term to
+    # @param [Osm::Section, Fixnum] section or section_id to add the evening to
     # @param [Date] meeting_date the date of the meeting
     # @!macro options_api_data
     # @return [Boolean] if the operation suceeded or not
@@ -635,6 +660,39 @@ module Osm
       return data.is_a?(Hash) && (data['result'] == 0)
     end
 
+    # Create a term in OSM
+    # @param [Hash] options - the configuration of the new term
+    #   @option options [Osm::Section, Fixnum] :section (required) section or section_id to add the term to
+    #   @option options [String] :name (required) the name for the term
+    #   @option options [Date] :start (required) the date for the start of term
+    #   @option options [Date] :finish (required) the date for the finish of term
+    # @return [Boolean] if the operation suceeded or not
+    def create_term(options={})
+      raise ArgumentError, ":section can't be nil" if options[:section].nil?
+      raise ArgumentError, ":name can't be nil" if options[:name].nil?
+      raise ArgumentError, ":start can't be nil" if options[:start].nil?
+      raise ArgumentError, ":finish can't be nil" if options[:finish].nil?
+
+      section_id = id_for_section(options[:section])
+      api_data = {
+        'term' => options[:name],
+        'start' => options[:start].strftime(Osm::OSM_DATE_FORMAT),
+        'end' => options[:finish].strftime(Osm::OSM_DATE_FORMAT),
+        'termid' => '0'
+      }
+
+      data = perform_query("users.php?action=addTerm&sectionid=#{section_id}", api_data)
+
+      # The cached terms for the section will be out of date - remove them
+      get_terms.each do |term|
+        cache_delete("term-#{term.id}") if term.section_id == section_id
+      end
+      cache_delete("terms-#{@userid}")
+
+      return data.is_a?(Hash) && data['terms'].is_a?(Hash)
+    end
+
+
     # Update an evening in OSM
     # @param [Osm::Evening] evening the evening to update
     # @!macro options_api_data
@@ -652,6 +710,22 @@ module Osm
       return response.is_a?(Hash) && (response['result'] == 0)
     end
 
+    # Update a term in OSM
+    # @param [Osm::Term] term the term to update
+    # @return [Boolean] if the operation suceeded or not
+    def update_term(term)
+      raise ArgumentIsInvalid, 'term is invalid' unless term.valid?
+
+      data = perform_query("users.php?action=addTerm&sectionid=#{term.section_id}", term.to_api)
+
+      # The cached terms for the section will be out of date - remove them
+      cache_delete("term-#{term.id}")
+      cache_delete("terms-#{@userid}")
+
+      return data.is_a?(Hash) && data['terms'].is_a?(Hash)
+    end
+  
+  
 
     protected
     # Set access permission for the current user on a resource stored in the cache
@@ -660,7 +734,7 @@ module Osm
     # @param [Hash] api_data the data hash used in accessing the api
     # @param [Boolean] permission wether the user can access the resource
     # @return [Boolean] the permission which was set
-    def user_can_access(resource_type, resource_id, api_data, permission=true)
+    def user_can_access(resource_type, resource_id, api_data={}, permission=true)
       user = (api_data['userid'] || @userid).to_i
       resource_id = resource_id.to_i
       resource_type = resource_type.to_sym
@@ -677,7 +751,7 @@ module Osm
     # @param [Hash] api_data the data hash used in accessing the api
     # @return nil if the combination of user and resource has not been set
     # @return [Boolean] if the user can access the resource
-    def user_can_access?(resource_type, resource_id, api_data)
+    def user_can_access?(resource_type, resource_id, api_data={})
       user = (api_data['userid'] || @userid).to_i
       resource_id = resource_id.to_i
       resource_type = resource_type.to_sym
@@ -785,11 +859,11 @@ module Osm
       id_for(Osm::Section, section, 'section')
     end
 
-    def type_for_section(section, api_data)
+    def type_for_section(section, api_data={})
       (section.is_a?(Osm::Section) ? section : get_section(section, api_data)).type.to_s
     end
 
-    def id_for_term(term, section, api_data)
+    def id_for_term(term, section, api_data={})
       return term.nil? ? Osm::find_current_term_id(self, id_for_section(section), api_data) : id_for(Osm::Term, term, 'term')
     end
 

data/lib/osm/due_badges.rb

@@ -14,28 +14,17 @@ module Osm
 
     attr_accessible :descriptions, :by_member
 
-    validates_each :descriptions do |record, attr, value|
-      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 Symbols') unless k.is_a?(Symbol)
-        record.errors.add(attr, 'values must be Hashes') unless v.is_a?(Hash)
-        [:name, :section, :type, :badge].each do |key|
-          record.errors.add(attr, "values must include the key #{key}") unless v.keys.include?(key)
-        end
-      end
-    end
+    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 Hashes') unless vv.is_a?(Hash)
-          record.errors.add(attr, 'internal values must include the key :badge') unless vv.keys.include?(:badge)
-          record.errors.add(attr, 'internal values :badge value must be a Symbol') unless vv[:badge].is_a?(Symbol)
-          record.errors.add(attr, 'internal values must include the key :extra_information') unless vv.keys.include?(:extra_information)
-          record.errors.add(attr, 'internal values :extra_information value must be a String') unless vv[:extra_information].is_a?(String)
+          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
@@ -49,39 +38,27 @@ module Osm
     # Initialize a new DueBadges from api data
     # @param [Hash] data the hash of data provided by the API
     def self.from_api(data)
-      data = {} unless data.is_a?(Hash)
-      attributes = {}
-
-      attributes[:pending] = data['pending'].is_a?(Hash) ? Osm::symbolize_hash(data['pending']) : {}
-      attributes[:descriptions] = data['description'].is_a?(Hash) ? Osm::symbolize_hash(data['description']) : {}
-
-      attributes[:pending].each_key do |key|
-        attributes[:pending][key].each_with_index do |item, index|
-          attributes[:pending][key][index] = item = Osm::symbolize_hash(item)
-          item[:sid] = item[:sid].to_i
-          item[:completed] = item[:completed].to_i
-        end
-      end
-      attributes[:descriptions].each_key do |key|
-        attributes[:descriptions][key] = Osm::symbolize_hash(attributes[:descriptions][key])
-        attributes[:descriptions][key][:section] = attributes[:descriptions][key][:section].to_sym
-        attributes[:descriptions][key][:type] = attributes[:descriptions][key][:type].to_sym
-      end
-
-
-      attributes[:by_member] = {}
-      attributes[:pending].each_key do |key|
-        attributes[:pending][key].each do |item|
-          name = "#{item[:firstname]} #{item[:lastname]}"
+      data = {} unless data.is_a?(Hash) # OSM 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] ||= []
-          badge = {
-            :badge => key,
-            :extra_information => item[:extra]
-          }
-          attributes[:by_member][name].push badge
+          attributes[:by_member][name].push(description_key)
         end
       end
-      
+
       new(attributes)
     end
 
@@ -93,15 +70,12 @@ module Osm
 
     # Calculate the total number of badges needed
     # @return [Hash] the total number of each badge which is due
-    def totals(attributes={})
+    def totals()
       totals = {}
       by_member.keys.each do |member_name|
-        by_member[member_name].each do |badge_record|
-          badge_symbol = badge_record[:badge]
-          badge_extra = badge_record[:extra_information]
-          totals[badge_record[:badge]] ||= {}
-          totals[badge_symbol][badge_extra] ||= 0
-          totals[badge_symbol][badge_extra] += 1
+        by_member[member_name].each do |badge|
+          totals[badge] ||= 0
+          totals[badge] += 1
         end
       end
       return totals

data/lib/osm/term.rb

@@ -47,6 +47,17 @@ module Osm
       )
     end
 
+    # Get the term's data for use with the API
+    # @return [Hash]
+    def to_api
+      {
+        'term' => name,
+        'start' => start.strftime(Osm::OSM_DATE_FORMAT),
+        'end' => finish.strftime(Osm::OSM_DATE_FORMAT),
+        'termid' => id
+      }
+    end
+
     # Determine if the term is completly before the passed date
     # @param [Date] date
     # @return [Boolean] if the term is completly before the passed date

data/spec/osm/api_spec.rb

@@ -401,6 +401,33 @@ describe "API" do
     end
 
 
+    it "Fetch badge stock levels for a section" do
+      badges_body = {
+        'stock' => {
+          'sectionid' => 1,
+          'badge_1' => 1,
+          'badge_2' => 2
+        }
+      }
+
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=core&sectionid=1&section=test&termid=2", :body => badges_body.to_json)
+
+      section = Osm::Section.new(:id => 1, :type => :test)
+      term = Osm::Term.new(:id => 2)
+      stock = Osm::Api.new('1', '2').get_badge_stock_levels(section, term)
+      stock.should == {'badge_1' => 1, 'badge_2' => 2}
+    end
+
+    it "Fetch badge stock levels for a section (data from API missing)" do
+      badges_body = {}
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=core&sectionid=1&section=test&termid=2", :body => badges_body.to_json)
+
+      section = Osm::Section.new(:id => 1, :type => :test)
+      term = Osm::Term.new(:id => 2)
+      stock = Osm::Api.new('1', '2').get_badge_stock_levels(section, term)
+      stock.should == {}
+    end
+
     it "Fetch the register structure for a section" do
       data = [
         {"rows" => [{"name"=>"First name","field"=>"firstname","width"=>"100px"},{"name"=>"Last name","field"=>"lastname","width"=>"100px"},{"name"=>"Total","field"=>"total","width"=>"60px"}],"noscroll"=>true},
@@ -557,7 +584,107 @@ describe "API" do
       api = Osm::Api.new('user', 'secret')
       evening = Osm::Evening.new
       expect{ api.update_evening(evening) }.to raise_error(Osm::ArgumentIsInvalid)
-    end  end
+    end
+
+
+    it "Create a term (succeded)" do
+      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=addTerm&sectionid=1'
+      post_data = {
+        'apiid' => @api_config[:api_id],
+        'token' => @api_config[:api_token],
+        'userid' => 'user',
+        'secret' => 'secret',
+        'term' => 'A Term',
+        'start' => '2010-01-01',
+        'end' => '2010-12-31',
+        'termid' => '0'
+      }
+
+      api = Osm::Api.new('user', 'secret')
+      api.stub(:get_terms) { [] }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"terms":{}}'}) }
+
+      api.create_term({
+        :section => 1,
+        :name => 'A Term',
+        :start => Date.new(2010, 01, 01),
+        :finish => Date.new(2010, 12, 31),
+      }).should be_true
+    end
+
+    it "Create a term (failed)" do
+      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=addTerm&sectionid=1'
+      post_data = {
+        'apiid' => @api_config[:api_id],
+        'token' => @api_config[:api_token],
+        'userid' => 'user',
+        'secret' => 'secret',
+        'term' => 'A Term',
+        'start' => '2010-01-01',
+        'end' => '2010-12-31',
+        'termid' => '0'
+      }
+
+      api = Osm::Api.new('user', 'secret')
+      api.stub(:get_terms) { [] }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+
+      api.create_term({
+        :section => 1,
+        :name => 'A Term',
+        :start => Date.new(2010, 01, 01),
+        :finish => Date.new(2010, 12, 31),
+      }).should be_false
+    end
+
+
+    it "Update a term (succeded)" do
+      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=addTerm&sectionid=1'
+      post_data = {
+        'apiid' => @api_config[:api_id],
+        'token' => @api_config[:api_token],
+        'userid' => 'user',
+        'secret' => 'secret',
+        'term' => 'A Term',
+        'start' => '2010-01-01',
+        'end' => '2010-12-31',
+        'termid' => 2
+      }
+      api = Osm::Api.new('user', 'secret')
+      api.stub(:get_terms) { [] }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"terms":{}}'}) }
+
+      term = Osm::Term.new(:id=>2, :section_id=>1, :name=>'A Term', :start=>Date.new(2010, 01, 01), :finish=>Date.new(2010, 12, 31))
+      api.update_term(term).should be_true
+    end
+
+    it "Update a term (failed)" do
+      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=addTerm&sectionid=1'
+      post_data = {
+        'apiid' => @api_config[:api_id],
+        'token' => @api_config[:api_token],
+        'userid' => 'user',
+        'secret' => 'secret',
+        'term' => 'A Term',
+        'start' => '2010-01-01',
+        'end' => '2010-12-31',
+        'termid' => 2
+      }
+      api = Osm::Api.new('user', 'secret')
+      api.stub(:get_terms) { [] }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+
+      term = Osm::Term.new(:id=>2, :section_id=>1, :name=>'A Term', :start=>Date.new(2010, 01, 01), :finish=>Date.new(2010, 12, 31))
+      api.update_term(term).should be_false
+    end
+
+    it "Update a term (invalid term)" do
+      api = Osm::Api.new('user', 'secret')
+      term = Osm::Term.new
+      expect{ api.update_term(term) }.to raise_error(Osm::ArgumentIsInvalid)
+    end
+
+  end
 
 
   describe "Options Hash" do

data/spec/osm/due_badges_spec.rb

@@ -11,21 +11,21 @@ describe "DueBadge" do
             'scoutid' => '1',
             'firstname' => 'John',
             'lastname' => 'Doe',
-            'completed' => '',
+            'level' => '',
             'extra' => '',
           }
         ],
-        'cubs_core_participation' => [{
+        'staged_staged_participation' => [{
             'sid' => '2',
             'firstname' => 'Jane',
             'lastname' => 'Doe',
-            'completed' => '3',
-            'extra' => 'Lvl 3'
+            'level' => '2',
+            'extra' => 'Lvl 2'
           }, {
             'sid' => '1',
             'firstname' => 'John',
             'lastname' => 'Doe',
-            'completed' => '2',
+            'level' => '2',
             'extra' => 'Lvl 2'
           }
         ]
@@ -38,10 +38,10 @@ describe "DueBadge" do
           'type' => 'activity',
           'badge' => 'badge_name'
         },
-        'cubs_core_participation' => {
+        'staged_staged_participation' => {
           'name' => 'Participation',
-          'section' => 'cubs',
-          'type' => 'core',
+          'section' => 'staged',
+          'type' => 'staged',
           'badge' => 'participation'
         }
       }
@@ -49,9 +49,9 @@ describe "DueBadge" do
     db = Osm::DueBadges.from_api(data)
 
     db.empty?.should == false
-    db.descriptions.should == {:badge_name=>{:name=>"Badge Name", :section=>:cubs, :type=>:activity, :badge=>"badge_name"}, :cubs_core_participation=>{:name=>"Participation", :section=>:cubs, :type=>:core, :badge=>"participation"}}
-    db.by_member.should == {"John Doe"=>[{:badge=>:badge_name, :extra_information=>""}, {:badge=>:cubs_core_participation, :extra_information=>"Lvl 2"}], "Jane Doe"=>[{:badge=>:cubs_core_participation, :extra_information=>"Lvl 3"}]}
-    db.totals.should == {:badge_name=>{""=>1}, :cubs_core_participation=>{"Lvl 3"=>1, "Lvl 2"=>1}}
+    db.descriptions.should == {'badge_name_1'=>'Badge Name', 'staged_staged_participation_2'=>'Participation (Level 2)'}
+    db.by_member.should == {'John Doe'=>['badge_name_1', 'staged_staged_participation_2'], 'Jane Doe'=>['staged_staged_participation_2']}
+    db.totals.should == {'staged_staged_participation_2'=>2, 'badge_name_1'=>1}
     db.valid?.should be_true
   end
 

data/spec/osm/term_spec.rb

@@ -33,6 +33,17 @@ describe "Term" do
   end
 
 
+  it "Creates the data for saving through the API" do
+    term = Osm::Term.new(@attributes)
+    term.to_api.should == {
+      'term' => @attributes[:name],
+      'start' => @attributes[:start].strftime(Osm::OSM_DATE_FORMAT),
+      'end' => @attributes[:finish].strftime(Osm::OSM_DATE_FORMAT),
+      'termid' => @attributes[:id]
+    }
+  end
+
+
   it "Compares two matching terms" do
     term1 = Osm::Term.new(@attributes)
     term2 = Osm::Term.new(@attributes)

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000Z
+date: 2012-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &84462520 !ruby/object:Gem::Requirement
+  requirement: &83982580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *84462520
+  version_requirements: *83982580
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &84461050 !ruby/object:Gem::Requirement
+  requirement: &83975470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *84461050
+  version_requirements: *83975470
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &84459560 !ruby/object:Gem::Requirement
+  requirement: &83974580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *84459560
+  version_requirements: *83974580
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &84432320 !ruby/object:Gem::Requirement
+  requirement: &83973660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *84432320
+  version_requirements: *83973660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &84430640 !ruby/object:Gem::Requirement
+  requirement: &83972980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *84430640
+  version_requirements: *83972980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84429660 !ruby/object:Gem::Requirement
+  requirement: &83972430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *84429660
+  version_requirements: *83972430
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &84429240 !ruby/object:Gem::Requirement
+  requirement: &83968460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *84429240
+  version_requirements: *83968460
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: