osm 1.0.6 → 1.2.0

data/spec/osm/member_spec.rb

@@ -482,7 +482,7 @@ describe "Member" do
     end
 
     describe "Get My.SCOUT link" do
-      
+
       before :each do
         @member = Osm::Member.new(
           :id => 1,
@@ -495,7 +495,9 @@ describe "Member" do
           :grouping_id => '3',
           :grouping_leader => 0,
         )
+      end
 
+      it "Get the key" 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],
@@ -503,32 +505,50 @@ describe "Member" do
           'userid' => 'user_id',
           'secret' => 'secret',
         }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true,"key":"KEY-HERE"}'}) }
+
+        @member.myscout_link_key(@api).should == 'KEY-HERE'
       end
 
       it "Default" do
+        @member.stub(:myscout_link_key) { 'KEY-HERE' }
         @member.myscout_link(@api).should == 'https://www.onlinescoutmanager.co.uk/parents/badges.php?sc=1&se=2&c=KEY-HERE'
       end
 
       it "Payments" do
+        @member.stub(:myscout_link_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
+        @member.stub(:myscout_link_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 "Specific Event" do
+        @member.stub(:myscout_link_key) { 'KEY-HERE' }
+        @member.myscout_link(@api, :events, 2).should == 'https://www.onlinescoutmanager.co.uk/parents/events.php?sc=1&se=2&c=KEY-HERE&e=2'
+      end
+
       it "Programme" do
+        @member.stub(:myscout_link_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
+        @member.stub(:myscout_link_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 "Notice board" do
+        @member.stub(:myscout_link_key) { 'KEY-HERE' }
         @member.myscout_link(@api, :notice).should == 'https://www.onlinescoutmanager.co.uk/parents/notice.php?sc=1&se=2&c=KEY-HERE'
       end
 
+      it "Personal details" do
+        @member.stub(:myscout_link_key) { 'KEY-HERE' }
+        @member.myscout_link(@api, :details).should == 'https://www.onlinescoutmanager.co.uk/parents/details.php?sc=1&se=2&c=KEY-HERE'
+      end
+
     end
 
   end

data/spec/osm/section_spec.rb

@@ -24,6 +24,7 @@ describe "Section" do
       :myscout_events_expires => (Date.today + 61).strftime('%Y-%m-%d'),
       :myscout_badges_expires => (Date.today + 62).strftime('%Y-%m-%d'),
       :myscout_programme_expires => (Date.today + 63).strftime('%Y-%m-%d'),
+      :myscout_details_expires => (Date.today + 64),
       :myscout_events => true,
       :myscout_badges => true,
       :myscout_programme => true,
@@ -34,10 +35,13 @@ describe "Section" do
       :myscout_badges_partial => true,
       :myscout_programme_summary => true,
       :myscout_programme_times => true,
+      :myscout_programme_show => 20,
       :myscout_event_reminder_count => 4,
       :myscout_event_reminder_frequency => 5,
       :myscout_payment_reminder_count => 6,
       :myscout_payment_reminder_frequency => 7,
+      :myscout_details => true,
+      :myscout_details_email_changes_to => 'notify-changes-to@example.com',
       :sms_sent_test => true,
       :sms_messages_sent => 8,
       :sms_messages_remaining => 9,
@@ -64,6 +68,7 @@ describe "Section" do
     section.myscout_events_expires.should == Date.today + 61
     section.myscout_badges_expires.should == Date.today + 62
     section.myscout_programme_expires.should == Date.today + 63
+    section.myscout_details_expires.should == Date.today + 64
     section.myscout_events.should == true
     section.myscout_badges.should == true
     section.myscout_programme.should == true
@@ -74,10 +79,13 @@ describe "Section" do
     section.myscout_badges_partial.should == true
     section.myscout_programme_summary.should == true
     section.myscout_programme_times.should == true
+    section.myscout_programme_show.should == 20
     section.myscout_event_reminder_count.should == 4
     section.myscout_event_reminder_frequency.should == 5
     section.myscout_payment_reminder_count.should == 6
     section.myscout_payment_reminder_frequency.should == 7
+    section.myscout_details.should == true
+    section.myscout_details_email_changes_to.should == 'notify-changes-to@example.com'
     section.sms_sent_test.should == true
     section.sms_messages_sent.should == 8
     section.sms_messages_remaining.should == 9
@@ -98,6 +106,8 @@ describe "Section" do
     section.flexi_records.should == []
     section.myscout_email_address_from.should == ''
     section.myscout_email_address_copy.should == ''
+    section.myscout_details_email_changes_to.should == ''
+    section.myscout_programme_show.should == 0
     section.sms_sent_test.should == false
     section.sms_messages_sent.should == 0
     section.sms_messages_remaining.should == 0
@@ -108,7 +118,7 @@ describe "Section" do
 
     before :each do
       body = [
-        {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Flexi Record 1\",\"extraid\":\"111\"}],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true},\"gocardless\":\"true\",\"portal\":{\"paymentRemindFrequency\":\"7\",\"paymentRemindCount\":\"6\",\"eventRemindFrequency\":\"5\",\"eventRemindCount\":\"4\",\"badgesPartial\":1,\"programmeTimes\":1,\"programmeSummary\":1,\"emailAddress\":\"send_from@example.com\",\"emailAddressCopy\":null,\"payments\":1,\"badges\":1,\"emails\":{\"email1\":\"true\",\"email2\":\"false\"},\"events\":1,\"programme\":1},\"portalExpires\":{\"events\":\"2013-01-06\",\"eventsA\":1,\"badges\":\"2013-01-07\",\"badgesA\":1,\"programme\":\"2013-01-08\",\"programmeA\":1},\"hasSentTestSMS\":true,\"sms_remaining\":8,\"sms_sent\":9}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>10, "member"=>20, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
+        {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Flexi Record 1\",\"extraid\":\"111\"}],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true},\"gocardless\":\"true\",\"portal\":{\"paymentRemindFrequency\":\"7\",\"paymentRemindCount\":\"6\",\"eventRemindFrequency\":\"5\",\"eventRemindCount\":\"4\",\"badgesPartial\":1,\"programmeTimes\":1,\"programmeShow\":\"10\",\"programmeSummary\":1,\"details\":1,\"contactNotificationEmail\":\"notify-changes-to@example.com\",\"emailAddress\":\"send_from@example.com\",\"emailAddressCopy\":null,\"payments\":1,\"badges\":1,\"emails\":{\"email1\":\"true\",\"email2\":\"false\"},\"events\":1,\"programme\":1},\"portalExpires\":{\"events\":\"2013-01-06\",\"eventsA\":1,\"badges\":\"2013-01-07\",\"badgesA\":1,\"programme\":\"2013-01-08\",\"programmeA\":1,\"details\":\"2013-01-09\",\"detailsA\":1},\"hasSentTestSMS\":true,\"sms_remaining\":8,\"sms_sent\":9}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>10, "member"=>20, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
         {"sectionConfig"=>"{\"subscription_level\":3,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"cubs\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member's Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member's Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[],\"wizard\":\"false\",\"fields\":{\"email1\":true,\"email2\":true,\"email3\":true,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":true,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":true,\"saved\":true},\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false},\"hasSentTestSMS\":true,\"sms_remaining\":8,\"sms_sent\":9}", "groupname"=>"1st Somewhere", "groupid"=>"1", "groupNormalised"=>"1", "sectionid"=>"2", "sectionname"=>"Section 2", "section"=>"cubs", "isDefault"=>"0", "permissions"=>{"badge"=>100, "member"=>100, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}}
       ]
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
@@ -138,6 +148,8 @@ describe "Section" do
         section.myscout_events_expires.should == Date.new(2013, 1, 6)
         section.myscout_badges_expires.should == Date.new(2013, 1, 7)
         section.myscout_programme_expires.should == Date.new(2013, 1, 8)
+        section.myscout_programme_show.should == 10
+        section.myscout_details_expires.should == Date.new(2013, 1, 9)
         section.myscout_events.should == true
         section.myscout_badges.should == true
         section.myscout_programme.should == true
@@ -152,9 +164,12 @@ describe "Section" do
         section.myscout_event_reminder_frequency.should == 5
         section.myscout_payment_reminder_count.should == 6
         section.myscout_payment_reminder_frequency.should == 7
+        section.myscout_details.should == true
+        section.myscout_details_email_changes_to.should == 'notify-changes-to@example.com'
         section.sms_sent_test.should == true
         section.sms_messages_remaining.should == 8
         section.sms_messages_sent.should == 9
+        section.valid?.should be_true
       end
 
       it "From cache" do

data/spec/osm/sms_spec.rb

@@ -5,7 +5,7 @@ describe "SMS" do
 
   describe "Send an SMS" do
 
-    it "Success" do
+    it "First" do
       HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/sms.php?action=sendText&sectionid=1', {:body => {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
         'token' => @CONFIGURATION[:api][:osm][:token],
@@ -14,7 +14,7 @@ describe "SMS" do
         'msg' => 'Test message.',
         'scouts' => '2,3',
         'source' => '441234567890',
-        'all' => :one,
+        'type' => :one,
         'scheduled' => 'now',
       }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>{'result'=>true,'sent'=>2,'message'=>'Success','debug'=>nil,'config'=>{}}.to_json}) }
 
@@ -22,7 +22,94 @@ describe "SMS" do
         @api,
         1,      # Section
         [2, 3], # Members
-        :one,
+        :first,
+        '441234567890', # Source address
+        'Test message.' # Message text
+      )
+
+      result.should == {
+        :result => true,
+        :sent => 2,
+        :message => 'Success'
+      }
+    end
+
+    it "All" do
+      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/sms.php?action=sendText&sectionid=1', {:body => {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'msg' => 'Test message.',
+        'scouts' => '2,3',
+        'source' => '441234567890',
+        'type' => :all,
+        'scheduled' => 'now',
+      }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>{'result'=>true,'sent'=>2,'message'=>'Success','debug'=>nil,'config'=>{}}.to_json}) }
+
+      result = Osm::Sms.send_sms(
+        @api,
+        1,      # Section
+        [2, 3], # Members
+        :all,
+        '441234567890', # Source address
+        'Test message.' # Message text
+      )
+
+      result.should == {
+        :result => true,
+        :sent => 2,
+        :message => 'Success'
+      }
+    end
+
+    it "2 & 3" do
+      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/sms.php?action=sendText&sectionid=1', {:body => {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'msg' => 'Test message.',
+        'scouts' => '2,3',
+        'source' => '441234567890',
+        'type' => '23',
+        'scheduled' => 'now',
+      }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>{'result'=>true,'sent'=>2,'message'=>'Success','debug'=>nil,'config'=>{}}.to_json}) }
+
+      result = Osm::Sms.send_sms(
+        @api,
+        1,      # Section
+        [2, 3], # Members
+        '23',
+        '441234567890', # Source address
+        'Test message.' # Message text
+      )
+
+      result.should == {
+        :result => true,
+        :sent => 2,
+        :message => 'Success'
+      }
+    end
+
+    it "1 & 4" do
+      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/sms.php?action=sendText&sectionid=1', {:body => {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'msg' => 'Test message.',
+        'scouts' => '2,3',
+        'source' => '441234567890',
+        'type' => '14',
+        'scheduled' => 'now',
+      }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>{'result'=>true,'sent'=>2,'message'=>'Success','debug'=>nil,'config'=>{}}.to_json}) }
+
+      result = Osm::Sms.send_sms(
+        @api,
+        1,      # Section
+        [2, 3], # Members
+        '14',
         '441234567890', # Source address
         'Test message.' # Message text
       )

data/spec/osm/term_spec.rb

@@ -191,7 +191,7 @@ describe "Term" do
         body += ']}'
         FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getTerms", :body => body)
     
-        expect{ Osm::Term.get_current_term_for_section(@api, 9) }.to raise_error(Osm::Error, 'There is no current term for the section.')
+        expect{ Osm::Term.get_current_term_for_section(@api, 9) }.to raise_error(Osm::Error::NoCurrentTerm, 'There is no current term for the section.')
       end
     end
 

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.0.6"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -196,9 +196,12 @@ files:
 - lib/osm/api_access.rb
 - lib/osm/badge.rb
 - lib/osm/badges.rb
+- lib/osm/budget.rb
 - lib/osm/event.rb
 - lib/osm/flexi_record.rb
+- lib/osm/giftaid.rb
 - lib/osm/grouping.rb
+- lib/osm/invoice.rb
 - lib/osm/meeting.rb
 - lib/osm/member.rb
 - lib/osm/model.rb
@@ -212,9 +215,12 @@ files:
 - spec/osm/api_spec.rb
 - spec/osm/badge_spec.rb
 - spec/osm/badges_spec.rb
+- spec/osm/budget_spec.rb
 - spec/osm/event_spec.rb
 - spec/osm/flexi_record_spec.rb
+- spec/osm/giftaid_spec.rb
 - spec/osm/grouping_spec.rb
+- spec/osm/invoice_spec.rb
 - spec/osm/meeting_spec.rb
 - spec/osm/member_spec.rb
 - spec/osm/model_spec.rb