osm 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.6.1
+
+  * Fixes to adventure badges
+
 ## Version 0.6.0
 
   * Badge::Data

data/lib/osm/badge.rb

@@ -326,9 +326,14 @@ module Osm
         count = {}
         requirements.each do |field, data|
           field = field.split('_')[0]
-          count[field] ||= 0
-          next if data.blank? || data[0].downcase.eql?('x')
-          count[field] += 1
+          unless field.eql?('y')
+            count[field] ||= 0
+            next if data.blank? || data[0].downcase.eql?('x')
+            count[field] += 1
+          else
+            # A total 'section'
+            count['a'] = data.to_i
+          end
         end
         return count
       end
@@ -344,8 +349,14 @@ module Osm
       def started?
         unless badge.type == :staged
           return false if completed?
-          requirements.each do |key, value|
-            return true unless value.blank? || value[0].downcase.eql?('x')
+          if badge.osm_key == 'adventure'
+            # Badge requires completing a number of activities
+            return (requirements['y_01'].to_i > 0)
+          else
+            # 'Normal' nonstaged badge
+            requirements.each do |key, value|
+              return true unless value.blank? || value[0].downcase.eql?('x')
+            end
           end
         else
           # Staged badge
@@ -373,6 +384,7 @@ module Osm
               end
             end
           else
+            # 'Normal' staged badge
             start_group = 'abcde'[completed] # Requirements use the group letter to denote stage
             started = 'z'
             requirements.each do |key, value|

data/spec/osm/badge_spec.rb

@@ -146,6 +146,7 @@ describe "Badge" do
     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
+
     # Staged Badge
     Osm::Badge::Data.new(
       :badge => Osm::StagedBadge.new,
@@ -162,6 +163,30 @@ describe "Badge" do
       :requirements => {'a_01' => 2, 'y_01' => '2', 'custom_26695' => ''},
       :completed => 1,
     ).started?.should be_true
+
+    # Scout's adventure challenge
+    Osm::Badge::Data.new(
+      :badge => Osm::ChallengeBadge.new(:osm_key => 'adventure'),
+      :requirements => {'y_01' => 5, 'custom_26695' => 'Text'},
+      :completed => 0,
+    ).started?.should be_true
+    Osm::Badge::Data.new(
+      :badge => Osm::ChallengeBadge.new(:osm_key => 'adventure'),
+      :requirements => {'y_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
   end
 
   it "Works out what stage of the badge has been started" do

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport