osm 1.0.4.dev → 1.0.4

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Version 1.0.4
 
-  * 
+  * Add notice board option to getting My.SCOUT link for a member (pass :notice as the parameter)
+  * Model.require\_ability\_to now only checks subscription level for youth sections
 
 ## Version 1.0.3
 

data/lib/osm/member.rb

@@ -369,7 +369,7 @@ module Osm
 
     # Get the My.SCOUT link for this member
     # @param [Osm::Api] api The api to use to make the request
-    # @param [Symbol] link_to The page in My.SCOUT to link to (:payments, :events, :programme or :badges)
+    # @param [Symbol] link_to The page in My.SCOUT to link to (:payments, :events, :programme, :badges or :notice)
     # @return [String] the link for this member's My.SCOUT
     # @raise [Osm::ObjectIsInvalid] If the Member is invalid
     # @raise [Osm::ArgumentIsInvalid] If link_to is not an allowed Symbol
@@ -378,7 +378,7 @@ module Osm
       raise Osm::ObjectIsInvalid, 'member is invalid' unless valid?
       require_ability_to(api, :read, :member, section_id)
       raise Osm::Error, 'the member does not already exist in OSM' if id.nil?
-      raise Osm::ArgumentIsInvalid, 'link_to is invalid' unless [:payments, :events, :programme, :badges].include?(link_to)
+      raise Osm::ArgumentIsInvalid, 'link_to is invalid' unless [:payments, :events, :programme, :badges, :notice].include?(link_to)
 
       if @myscout_link_key.nil?
         data = api.perform_query("api.php?action=getMyScoutKey&sectionid=#{section_id}&scoutid=#{self.id}")

data/lib/osm/model.rb

@@ -178,6 +178,7 @@ module Osm
         end
       end
       if section.nil? || section.subscription_level < level
+        level_name = ['Unknown', 'Bronze', 'Silver', 'Gold'][level]
         raise Osm::Forbidden, "Insufficent OSM subscription level (#{level} required for #{section.name})"
       end
     end
@@ -190,8 +191,12 @@ module Osm
     # @!macro options_get
     def self.require_ability_to(api, to, on, section, options={})
       require_permission(api, to, on, section, options)
-      require_subscription(api, :silver, section, options) if [:register, :contact, :events, :flexi].include?(on)
-      require_subscription(api, :gold, section, options) if [:finance].include?(on)
+      if section.youth_section? && [:register, :contact, :events, :flexi].include?(on)
+        require_subscription(api, :silver, section, options)
+      end
+      if section.youth_section? && [:finance].include?(on)
+        require_subscription(api, :gold, section, options)
+      end
     end
 
 

data/spec/osm/member_spec.rb

@@ -495,9 +495,7 @@ describe "Member" do
           :grouping_id => '3',
           :grouping_leader => 0,
         )
-      end
 
-      it "Default" do
         url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
         HTTParty.should_receive(:post).with(url, {:body => {
           'apiid' => @CONFIGURATION[:api][:osm][:id],
@@ -505,39 +503,34 @@ describe "Member" do
           'userid' => 'user_id',
           'secret' => 'secret',
         }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true,"key":"KEY-HERE"}'}) }
+      end
+
+      it "Default" do
         @member.myscout_link(@api).should == 'https://www.onlinescoutmanager.co.uk/parents/badges.php?sc=1&se=2&c=KEY-HERE'
       end
 
       it "Payments" do
-        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
-        FakeWeb.register_uri(:post, url, :body => '{"ok":true,"key":"KEY-HERE"}')
         @member.myscout_link(@api, :payments).should == 'https://www.onlinescoutmanager.co.uk/parents/payments.php?sc=1&se=2&c=KEY-HERE'
       end
 
       it "Events" do
-        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
-        FakeWeb.register_uri(:post, url, :body => '{"ok":true,"key":"KEY-HERE"}')
         @member.myscout_link(@api, :events).should == 'https://www.onlinescoutmanager.co.uk/parents/events.php?sc=1&se=2&c=KEY-HERE'
       end
 
       it "Programme" do
-        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
-        FakeWeb.register_uri(:post, url, :body => '{"ok":true,"key":"KEY-HERE"}')
         @member.myscout_link(@api, :programme).should == 'https://www.onlinescoutmanager.co.uk/parents/programme.php?sc=1&se=2&c=KEY-HERE'
       end
 
       it "Badges" do
-        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
-        FakeWeb.register_uri(:post, url, :body => '{"ok":true,"key":"KEY-HERE"}')
         @member.myscout_link(@api, :badges).should == 'https://www.onlinescoutmanager.co.uk/parents/badges.php?sc=1&se=2&c=KEY-HERE'
       end
 
-      it "Invalid" do
-        expect{ @member.myscout_link(@api, :invalid) }.to raise_error(Osm::ArgumentIsInvalid)
+      it "Notice board" do
+        @member.myscout_link(@api, :notice).should == 'https://www.onlinescoutmanager.co.uk/parents/notice.php?sc=1&se=2&c=KEY-HERE'
       end
 
     end
 
   end
 
-end
+end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.0.4.dev"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.0.4.dev
-  prerelease: 6
+  version: 1.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -240,9 +240,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: osm
 rubygems_version: 1.8.25