osm 0.6.1 → 0.6.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.6.2
+
+  * Fix items not relevant to API appearing in permissions for a Section
+  * Fix started and started? methods for staged badges which have been completly done
+
 ## Version 0.6.1
 
   * Fixes to adventure badges

data/lib/osm.rb

@@ -139,7 +139,10 @@ module Osm
     }
 
     return permissions.inject({}) do |new_hash, (key, value)|
-      new_hash[key.to_sym] = (permissions_map[value.to_i] || [])
+      if ["badge", "member", "user", "register", "contact", "programme","events", "flexi", "finance"].include?(key)
+        # This is a permission we care about
+        new_hash[key.to_sym] = permissions_map[value.to_i]
+      end
       new_hash
     end
   end

data/lib/osm/badge.rb

@@ -385,6 +385,7 @@ module Osm
             end
           else
             # 'Normal' staged badge
+            return 0 if completed == 5 || awarded == 5 # No more stages can be started
             start_group = 'abcde'[completed] # Requirements use the group letter to denote stage
             started = 'z'
             requirements.each do |key, value|

data/spec/osm/api_spec.rb

@@ -68,12 +68,12 @@ describe "API" do
 
     it "Get from API" do
       body = [
-        {"sectionid"=>"1", "permissions"=>{"a"=>20}},
-        {"sectionid"=>"2", "permissions"=>{"a"=>10}}
+        {"sectionid"=>"1", "permissions"=>{"badge"=>20}},
+        {"sectionid"=>"2", "permissions"=>{"badge"=>10}}
       ]
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
 
-      permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
+      permissions = {1 => {:badge => [:read, :write]}, 2 => {:badge => [:read]}}
       OsmTest::Cache.should_not_receive('read')
       @api.get_user_permissions.should == permissions
     end
@@ -87,7 +87,7 @@ describe "API" do
 
     it "Get ignoring cache" do
       data = [
-        {"sectionid"=>"1", "permissions"=>{"a"=>10}},
+        {"sectionid"=>"1", "permissions"=>{"badge"=>10}},
       ]
       body = {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
@@ -100,7 +100,7 @@ describe "API" do
       OsmTest::Cache.should_not_receive('exist?').with('OSMAPI-osm-permissions-user_id')
       OsmTest::Cache.should_not_receive('read').with('OSMAPI-osm-permissions-user_id')
       HTTParty.should_receive(:post).with(url, {:body=>body}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
-      @api.get_user_permissions(:no_cache => true).should == {1 => {:a => [:read]}}
+      @api.get_user_permissions(:no_cache => true).should == {1 => {:badge => [:read]}}
     end
 
     it "Set" do

data/spec/osm/badge_spec.rb

@@ -206,6 +206,11 @@ describe "Badge" do
       :requirements => {'a_01' => 'Yes', 'b_01' => 'Yes', 'b_02' => '', 'c_01' => 'Yes', 'c_02' => ''},
       :completed => 1,
     ).started.should == 2
+    Osm::Badge::Data.new(
+      :badge => Osm::StagedBadge.new(:osm_key => 'test'),
+      :requirements => {'a_01' => '', 'b_01' => '', 'c_01' => '', 'd_01' => '', 'e_01' => ''},
+      :completed => 5,
+    ).started.should == 0 # No more stages to do
     Osm::Badge::Data.new(
       :badge => Osm::StagedBadge.new(:osm_key => 'nightsaway'),
       :requirements => {'a_01' => 7, 'y_01' => '7', 'custom_26695' => ''},

data/spec/osm/osm_spec.rb

@@ -83,4 +83,31 @@ describe "Online Scout Manager" do
 
   end
 
+
+  describe "Make permissions Hash" do
+
+    it "Make the hash" do
+      from_osm = {
+        'badge' => 100,
+        'programme' => 20,
+        'events' => 10,
+      }
+      Osm.make_permissions_hash(from_osm).should == {
+        :badge => [:read, :write, :administer],
+        :programme => [:read, :write],
+        :events => [:read],
+      }
+    end
+
+    it "Includes only relevant permissions" do
+      from_osm = {
+        't' => true,
+        'f' => false,
+        'badge' => 100,
+      }
+      Osm.make_permissions_hash(from_osm).keys.should == [:badge]
+    end
+
+  end
+
 end

data/version.rb

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

metadata

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