osm 1.2.9 → 1.2.10

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWU5MjViOTkxMDVjZDlkYjkwM2EzZDNkNDg1YzRiZjk4OGQxMmU2Mg==
+  data.tar.gz: !binary |-
+    YjkzMjgzNGQyMjA2NjFkN2RhOTU1YjFkYzY1MzhkMzFlZTI5YTJjMA==
+SHA512:
+  metadata.gz: !binary |-
+    ODRiY2RiNjE2NjUxMGJhY2U2MDZhYzI2ZjAwYzQxOWFiNjYxN2ZjNzI1NzUy
+    ZWI0NGFlNjk3Zjc4NTE3MTlkZmVhNzVkYzAxMDkzNDE0YmRiZjc1MGExM2U3
+    YzhmNjhlYTJjOWRmZmE5ZmFkNjI4NGU4YWRiMTA2NjE3YTk2NzU=
+  data.tar.gz: !binary |-
+    YTUxNzMzMTlhOTRhMDViNzNhYjU2MDNiYzM1YzQ2NjY4ZjFiMzQzMTRlYjc0
+    NDY1ZmU3MDRjMjI3ZTc2ODNhNjg2OWZkZjk1YmEzYWUyMWE3NGRlYmRiYjQw
+    ZWYwMjcxODcyYjY0ZGVhOTZhZWZjMTM3ZTg4YWE1YWQzNDA3ZTg=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 1.2.10
+
+ * Update levels for Hikes and Nights away staged badges (released April 2014)
+ * Add levels for new Time on the water staged badge (released April 2014)
+
 ## Version 1.2.9
 
  * Add osm\_long\_key to badges to make getting badge stock easier

data/lib/osm/badge.rb

@@ -293,9 +293,11 @@ module Osm
       validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
       validates :requirements, :hash => {:key_type => String, :value_type => String}
 
-      STAGES_NIGHTSAWAY = [1, 5, 10, 20, 35, 50, 75, 100, 125, 150, 175, 200]
-      STAGES_HIKESAWAY = [1, 5, 10, 20, 35, 50]
-
+      STAGES = {
+        'nightsaway' => [1, 2, 3, 4, 5, 10, 15, 20, 35, 50, 75, 100, 125, 150, 175, 200],
+        'hikes' => [1, 2, 5, 10, 15, 20, 35, 50],
+        'timeonthewater' => [1, 2, 5, 10, 15, 20, 35, 50],
+      }
 
       # @!method initialize
       #   Initialize a new Badge
@@ -382,10 +384,9 @@ module Osm
         unless badge.type == :staged
           return earnt? ? 1 : 0
         end
-        if ['nightsaway', 'hikes'].include?(badge.osm_key)
+        if STAGES.keys.include?(badge.osm_key)
           total_done = requirements['y_01']
-          stages = STAGES_NIGHTSAWAY if badge.osm_key.eql?('nightsaway')
-          stages = STAGES_HIKESAWAY if badge.osm_key.eql?('hikes')
+          stages = STAGES[badge.osm_key]
           stages.reverse_each do |stage|
             return stage if total_done >= stage
           end
@@ -423,9 +424,8 @@ module Osm
           return started? ? 1 : 0
         else
           # Staged badge
-          if ['nightsaway', 'hikes'].include?(badge.osm_key) # Special staged badges
-            stages = STAGES_NIGHTSAWAY if badge.osm_key.eql?('nightsaway')
-            stages = STAGES_HIKESAWAY if badge.osm_key.eql?('hikes')
+          if STAGES.keys.include?(badge.osm_key) # Special staged badges
+            stages = STAGES[badge.osm_key]
             done = requirements['y_01'].to_i
             return 0 if done < stages[0]                # Not started the first stage
             return 0 if done >= stages[stages.size - 1] # No more stages can be started

data/spec/osm/badge_spec.rb

@@ -234,18 +234,27 @@ describe "Badge" do
     it "Nights away" do
       badge = Osm::StagedBadge.new(:osm_key => 'nightsaway')
 
-      Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 1
-      Osm::Badge::Data.new(:requirements => {'y_01'=>5}, :badge => badge).earnt.should == 5
-      Osm::Badge::Data.new(:requirements => {'y_01'=>6}, :badge => badge).earnt.should == 5
-      Osm::Badge::Data.new(:requirements => {'y_01'=>199}, :badge => badge).earnt.should == 175
-      Osm::Badge::Data.new(:requirements => {'y_01'=>200}, :badge => badge).earnt.should == 200
+      Osm::Badge::Data.new(:requirements => {'y_01'=>9}, :badge => badge).earnt.should == 5
+      Osm::Badge::Data.new(:requirements => {'y_01'=>10}, :badge => badge).earnt.should == 10
+      Osm::Badge::Data.new(:requirements => {'y_01'=>11}, :badge => badge).earnt.should == 10
       Osm::Badge::Data.new(:requirements => {'y_01'=>999}, :badge => badge).earnt.should == 200
     end
 
     it "Hikes away" do
       badge = Osm::StagedBadge.new(:osm_key => 'hikes')
 
-      Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 1
+      Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 2
+      Osm::Badge::Data.new(:requirements => {'y_01'=>5}, :badge => badge).earnt.should == 5
+      Osm::Badge::Data.new(:requirements => {'y_01'=>6}, :badge => badge).earnt.should == 5
+      Osm::Badge::Data.new(:requirements => {'y_01'=>49}, :badge => badge).earnt.should == 35
+      Osm::Badge::Data.new(:requirements => {'y_01'=>50}, :badge => badge).earnt.should == 50
+      Osm::Badge::Data.new(:requirements => {'y_01'=>999}, :badge => badge).earnt.should == 50
+    end
+
+    it "Time on the water" do
+      badge = Osm::StagedBadge.new(:osm_key => 'timeonthewater')
+
+      Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 2
       Osm::Badge::Data.new(:requirements => {'y_01'=>5}, :badge => badge).earnt.should == 5
       Osm::Badge::Data.new(:requirements => {'y_01'=>6}, :badge => badge).earnt.should == 5
       Osm::Badge::Data.new(:requirements => {'y_01'=>49}, :badge => badge).earnt.should == 35
@@ -283,7 +292,7 @@ describe "Badge" do
     ).started?.should be_false
     Osm::Badge::Data.new(
       :badge => Osm::StagedBadge.new(:osm_key => 'hikes'),
-      :requirements => {'a_01' => 2, 'y_01' => '2', 'custom_26695' => ''},
+      :requirements => {'a_01' => 3, 'y_01' => '3', 'custom_26695' => ''},
       :completed => 1,
     ).started?.should be_true
 
@@ -358,7 +367,7 @@ describe "Badge" do
     ).started.should == 10
     Osm::Badge::Data.new(
       :badge => Osm::StagedBadge.new(:osm_key => 'hikes'),
-      :requirements => {'a_01' => 2, 'y_01' => '2', 'custom_26695' => ''},
+      :requirements => {'a_01' => 3, 'y_01' => '3', 'custom_26695' => ''},
       :completed => 1,
     ).started.should == 5
   end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.9
-  prerelease: 
+  version: 1.2.10
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -36,7 +33,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,7 +40,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,7 +47,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -60,7 +54,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -68,7 +61,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -79,7 +71,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,7 +81,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dirty_hashy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -98,7 +88,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,7 +95,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,7 +102,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -122,7 +109,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -133,7 +119,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -144,7 +129,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -152,7 +136,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,7 +143,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -171,7 +153,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +163,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,7 +170,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +177,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -206,7 +184,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,7 +191,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -222,7 +198,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -292,27 +267,26 @@ files:
 homepage: https://github.com/robertgauld/osm
 licenses:
 - BSD 3 clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: osm
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use the Online Scout Manager API
 test_files: []
 has_rdoc: