osm 0.6.2 → 0.6.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.6.3
+
+  * Fix started? and started methods for badges with a combination of custom and normal requirements
+
 ## Version 0.6.2
 
   * Fix items not relevant to API appearing in permissions for a Section

data/lib/osm/badge.rb

@@ -347,20 +347,15 @@ module Osm
       # Check if this badge has been started
       # @return [Boolean] whether the badge has been started by the member (always false if the badge has been completed)
       def started?
-        unless badge.type == :staged
-          return false if completed?
-          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 (started > completed) if badge.type.eql?(:staged) # It's a staged badge
+        return false if completed?
+        requirements.each do |key, value|
+          case key.split('_')[0]
+            when 'a'
               return true unless value.blank? || value[0].downcase.eql?('x')
-            end
+            when 'y'
+              return true if (requirements['y_01'].to_i > 0)
           end
-        else
-          # Staged badge
-          return (started > completed)
         end
         return false
       end

data/spec/osm/badge_spec.rb

@@ -176,6 +176,23 @@ describe "Badge" do
       :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'),

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors: