osm 0.1.8 → 0.1.9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.1.9
+
+  * Fix fetching of members for a waiting list
+  * Fix 'undefuned method' when creating an event without a start or finish datetime
+
 ## Version 0.1.8
 
   * Fix 'undefined local variable' when getting a section's notepad from the cache

data/lib/osm/event.rb

@@ -135,12 +135,12 @@ module Osm
       data = api.perform_query("events.php?action=addEvent&sectionid=#{event.section_id}", {
         'name' => event.name,
         'location' => event.location,
-        'startdate' => event.start.strftime(Osm::OSM_DATE_FORMAT),
-        'enddate' => event.finish.strftime(Osm::OSM_DATE_FORMAT),
+        'startdate' => event.start? ? event.start.strftime(Osm::OSM_DATE_FORMAT) : '',
+        'enddate' => event.finish? ? event.finish.strftime(Osm::OSM_DATE_FORMAT) : '',
         'cost' => event.cost,
         'notes' => event.notes,
-        'starttime' => event.start.strftime(Osm::OSM_TIME_FORMAT),
-        'endtime' => event.finish.strftime(Osm::OSM_TIME_FORMAT),
+        'starttime' => event.start? ? event.start.strftime(Osm::OSM_TIME_FORMAT) : '',
+        'endtime' => event.finish? ? event.finish.strftime(Osm::OSM_TIME_FORMAT) : '',
       })
 
       # The cached events for the section will be out of date - remove them

data/lib/osm/member.rb

@@ -148,20 +148,21 @@ module Osm
     # @!macro options_get
     # @return [Array<Osm::Member>]
     def self.get_for_section(api, section, term=nil, options={})
+      section = Osm::Section.get(api, section) if section.is_a?(Fixnum)
+      term = -1 if section.waiting?
       term_id = term.nil? ? Osm::Term.get_current_term_for_section(api, section).id : term.to_i
-      section_id = section.to_i
-      cache_key = ['members', section_id, term_id]
+      cache_key = ['members', section.id, term_id]
 
-      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, section_id, :member).include?(:read)
+      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, section.id, :member).include?(:read)
         return cache_read(api, cache_key)
       end
 
-      data = api.perform_query("users.php?action=getUserDetails&sectionid=#{section_id}&termid=#{term_id}")
+      data = api.perform_query("users.php?action=getUserDetails&sectionid=#{section.id}&termid=#{term_id}")
 
       result = Array.new
       data['items'].each do |item|
         result.push Osm::Member.new(
-          :section_id => section_id,
+          :section_id => section.id,
           :id => Osm::to_i_or_nil(item['scoutid']),
           :type => item['type'],
           :first_name => item['firstname'],

data/spec/osm/member_spec.rb

@@ -116,6 +116,11 @@ describe "Member" do
   describe "Using the API" do
 
     it "Create from API data" do
+      body = [
+        {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true}}", "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}},
+      ]
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
+
       body = {
         'identifier' => 'scoutid',
         'items' => [{
@@ -170,6 +175,22 @@ describe "Member" do
       members[0].id.should == 1
     end
 
+    it "Create from API data (Waiting list)" do
+      body = [
+        {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"waiting\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true}}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"waiting", "isDefault"=>"1", "permissions"=>{"badge"=>10, "member"=>20, "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)
+
+      body = {
+        'identifier' => 'scoutid',
+        'items' => []
+      }
+
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getUserDetails&sectionid=1&termid=-1", :body => body.to_json)
+      members = Osm::Member.get_for_section(@api, 1, 2)
+      members.size.should == 0
+    end
+
   end
 
 end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000Z
+date: 2012-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &78658520 !ruby/object:Gem::Requirement
+  requirement: &74299010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *78658520
+  version_requirements: *74299010
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &78657990 !ruby/object:Gem::Requirement
+  requirement: &74298560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *78657990
+  version_requirements: *74298560
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &78657380 !ruby/object:Gem::Requirement
+  requirement: &74297850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *78657380
+  version_requirements: *74297850
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &78657030 !ruby/object:Gem::Requirement
+  requirement: &74296950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *78657030
+  version_requirements: *74296950
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &78656680 !ruby/object:Gem::Requirement
+  requirement: &74296610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *78656680
+  version_requirements: *74296610
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78656170 !ruby/object:Gem::Requirement
+  requirement: &74296090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *78656170
+  version_requirements: *74296090
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &78655640 !ruby/object:Gem::Requirement
+  requirement: &74295670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *78655640
+  version_requirements: *74295670
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -149,12 +149,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -414349837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -414349837
 requirements: []
 rubyforge_project: osm
 rubygems_version: 1.8.10
@@ -162,4 +168,3 @@ signing_key:
 specification_version: 3
 summary: Use the Online Scout Manager API
 test_files: []
-has_rdoc: