osm 1.2.2 → 1.2.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.3
+
+  * Fix bug determining if a badge has been earnt (-1 sections required = all required)
+
 ## Version 1.2.2
 
   * Add base\_url method to Api class and instances

data/lib/osm/badge.rb

@@ -357,7 +357,11 @@ module Osm
         end
         return false if (completed.eql?(1) && awarded.eql?(1))
         return true if (completed.eql?(1) && awarded.eql?(0))
-        return (total_gained >= badge.total_needed) && (sections_gained >= badge.sections_needed)
+        if badge.sections_needed == -1 # require all sections
+          return (sections_gained == badge.needed_from_section.keys.size)
+        else
+          return (total_gained >= badge.total_needed) && (sections_gained >= badge.sections_needed)
+        end
       end
 
       # Get what stage which has most recently been earnt

data/spec/osm/badge_spec.rb

@@ -201,6 +201,14 @@ describe "Badge" do
       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.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
+
+      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.earnt?.should be_false
     end
   end
 

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

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