osm 1.2.13 → 1.2.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ExNWUzMjEwM2JjMjI1ZTMwN2I5MjAzNjY2YjY4MTUxNDg3ZGNlNg==
+    ZGU3ZmNhNzhmMTBlNDY4ZmJjMTU2YmUwNmRiN2NlODgxNGYyZWZjYg==
   data.tar.gz: !binary |-
-    NWE5Y2U1MWRmMjY0Y2RiYTU1YzUxNmNmZjUyYzlkZjYxZGUzMzhmMw==
+    NTY0OGM2NDkzOWVlMWJhOTU5MWNiZjJkMGIyZjUwMjRmY2I1ZGNlMg==
 SHA512:
   metadata.gz: !binary |-
-    N2I2YjcwYWRhNWY1YTI0NGRlNzRhZTJkZjkwZTk4ZWUwYjIzMmNmNjUyNDQ1
-    YTIzYTQ0MWJhYTZmZWUzNjViNjgwY2Y5YWUxN2FiMWVkN2EwODk1ZDI3YzY2
-    MjEyYWViZTJiOWExMzVkYTRiZjg4ZWY2ZThkNmIxNmIwNTBiYTA=
+    OTY5Njg0MmZhYjkwZDBlYjNiZWIwMWE5OGRkNDYyMmM0M2ZiNDU2MDQ2MTY4
+    ZTczNDI4ZjdhZDVlMGVhY2E3ZGI0MGZhYjBlOWRmNjU3YzliMjJlNGU1MWEy
+    Yzg3MDg3ZDkzYzBhNmI2M2Y1MzU1YWYxOWZlNzVhOTFlOWM0MWM=
   data.tar.gz: !binary |-
-    YWYzNGFhYTM3Y2E1NDVmM2IxMWFkYjkwZTY1NGE3ZTJmY2E0NTA0OWZiNTIx
-    NDUwMWY3MmI0NDUxYTQxMTZiZTA2NWRlM2EzY2QxMDQ5NTRiMWFhMzliMDZl
-    ZGY1NDgyYTE2OGIwNzhlNWQzYmEyODlhNWVkZWViNDdlM2I5YzI=
+    Nzc4ZjljYTQ1YzVhNDM3MTlhYTUwZDY1YWRmOWQ2MjFmOTllNTZmZmI0NTZi
+    ZjZkMjVhNWQ0YWViNDAzN2RjNDkxYWI2N2M5NTQyOGNiZDllZTNlMjEzMjhl
+    MzY4ZGRmNDFkYjdhNGIwN2Q3Zjk5ZjgyOTI1OGNiMjhkMjA4ZjU=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.14
+
+  * Fix fetching sections when user doesn't have access to any
+
 ## Version 1.2.13
 
   * Fix event.get\_attendance ignoring term in building the cache key

data/lib/osm/section.rb

@@ -192,74 +192,75 @@ module Osm
       ids = Array.new
       permissions = Hash.new
       data.each do |role_data|
-        unless role_data['section'].eql?('discount')  # It's not an actual section
-          section_data = role_data['sectionConfig'].is_a?(String) ? ActiveSupport::JSON.decode(role_data['sectionConfig']) : role_data['sectionConfig']
-          myscout_data = section_data['portal'] || {}
-          section_data['portalExpires'] ||= {}
-          section_id = Osm::to_i_or_nil(role_data['sectionid'])
-
-          # Make sense of flexi records
-          fr_data = []
-          flexi_records = []
-          fr_data = section_data['extraRecords'] if section_data['extraRecords'].is_a?(Array)
-          fr_data = section_data['extraRecords'].values if section_data['extraRecords'].is_a?(Hash)
-          fr_data.each do |record_data|
-            # Expect item to be: {:name=>String, :extraid=>Fixnum}
-            # Sometimes get item as: [String, {"name"=>String, "extraid"=>Fixnum}]
-            record_data = record_data[1] if record_data.is_a?(Array)
-            flexi_records.push Osm::FlexiRecord.new(
-              :id => Osm::to_i_or_nil(record_data['extraid']),
-              :name => record_data['name'],
-              :section_id => section_id,
-            )
-          end
-
-          section = new(
-            :id => section_id,
-            :name => role_data['sectionname'],
-            :subscription_level => Osm::to_i_or_nil(section_data['subscription_level']),
-            :subscription_expires => Osm::parse_date(section_data['subscription_expires']),
-            :type => !section_data['sectionType'].nil? ? section_data['sectionType'].to_sym : (!section_data['section'].nil? ? section_data['section'].to_sym : :unknown),
-            :num_scouts => section_data['numscouts'],
-            :column_names => section_data['columnNames'].is_a?(Hash) ? Osm::symbolize_hash(section_data['columnNames']) : {},
-            :fields => section_data['fields'].is_a?(Hash) ? Osm::symbolize_hash(section_data['fields']) : {},
-            :intouch_fields => section_data['intouch'].is_a?(Hash) ? Osm::symbolize_hash(section_data['intouch']) : {},
-            :mobile_fields => section_data['mobFields'].is_a?(Hash) ? Osm::symbolize_hash(section_data['mobFields']) : {},
-            :flexi_records => flexi_records.sort,
-            :group_id => role_data['groupid'],
-            :group_name => role_data['groupname'],
-            :gocardless => (section_data['gocardless'] || 'false').downcase.eql?('true'),
-            :myscout_events_expires => Osm::parse_date(section_data['portalExpires']['events']),
-            :myscout_badges_expires => Osm::parse_date(section_data['portalExpires']['badges']),
-            :myscout_programme_expires => Osm::parse_date(section_data['portalExpires']['programme']),
-            :myscout_details_expires => Osm::parse_date(section_data['portalExpires']['details']),
-            :myscout_events => myscout_data['events'] == 1,
-            :myscout_badges => myscout_data['badges'] == 1,
-            :myscout_programme => myscout_data['programme'] == 1,
-            :myscout_payments => myscout_data['payments'] == 1,
-            :myscout_details => myscout_data['details'] == 1,
-            :myscout_emails => (myscout_data['emails'] || {}).inject({}) { |n,(k,v)| n[k.to_sym] = v.eql?('true'); n},
-            :myscout_email_address_from => myscout_data['emailAddress'] ? myscout_data['emailAddress'] : '',
-            :myscout_email_address_copy => myscout_data['emailAddressCopy'] ? myscout_data['emailAddressCopy'] : '',
-            :myscout_badges_partial => myscout_data['badgesPartial'] == 1,
-            :myscout_programme_summary => myscout_data['programmeSummary'] == 1,
-            :myscout_programme_times => myscout_data['programmeTimes'] == 1,
-            :myscout_programme_show => myscout_data['programmeShow'].to_i,
-            :myscout_event_reminder_count => myscout_data['eventRemindCount'].to_i,
-            :myscout_event_reminder_frequency => myscout_data['eventRemindFrequency'].to_i,
-            :myscout_payment_reminder_count => myscout_data['paymentRemindCount'].to_i,
-            :myscout_payment_reminder_frequency => myscout_data['paymentRemindFrequency'].to_i,
-            :myscout_details_email_changes_to => myscout_data['contactNotificationEmail'],
-            :sms_sent_test => section_data['hasSentTestSMS'],
-            :sms_messages_sent => section_data['sms_sent'],
-            :sms_messages_remaining => section_data['sms_remaining'],
+        next if role_data['section'].eql?('discount')  # It's not an actual section
+        next if role_data['sectionConfig'].nil? # No config for the section = user hasn't got access
+
+        section_data = role_data['sectionConfig'].is_a?(String) ? ActiveSupport::JSON.decode(role_data['sectionConfig']) : role_data['sectionConfig']
+        myscout_data = section_data['portal'] || {}
+        section_data['portalExpires'] ||= {}
+        section_id = Osm::to_i_or_nil(role_data['sectionid'])
+
+        # Make sense of flexi records
+        fr_data = []
+        flexi_records = []
+        fr_data = section_data['extraRecords'] if section_data['extraRecords'].is_a?(Array)
+        fr_data = section_data['extraRecords'].values if section_data['extraRecords'].is_a?(Hash)
+        fr_data.each do |record_data|
+          # Expect item to be: {:name=>String, :extraid=>Fixnum}
+          # Sometimes get item as: [String, {"name"=>String, "extraid"=>Fixnum}]
+          record_data = record_data[1] if record_data.is_a?(Array)
+          flexi_records.push Osm::FlexiRecord.new(
+            :id => Osm::to_i_or_nil(record_data['extraid']),
+            :name => record_data['name'],
+            :section_id => section_id,
           )
-
-          result.push section
-          ids.push section.id
-          cache_write(api, ['section', section.id], section)
-          permissions.merge!(section.id => Osm.make_permissions_hash(role_data['permissions']))
         end
+
+        section = new(
+          :id => section_id,
+          :name => role_data['sectionname'],
+          :subscription_level => Osm::to_i_or_nil(section_data['subscription_level']),
+          :subscription_expires => Osm::parse_date(section_data['subscription_expires']),
+          :type => !section_data['sectionType'].nil? ? section_data['sectionType'].to_sym : (!section_data['section'].nil? ? section_data['section'].to_sym : :unknown),
+          :num_scouts => section_data['numscouts'],
+          :column_names => section_data['columnNames'].is_a?(Hash) ? Osm::symbolize_hash(section_data['columnNames']) : {},
+          :fields => section_data['fields'].is_a?(Hash) ? Osm::symbolize_hash(section_data['fields']) : {},
+          :intouch_fields => section_data['intouch'].is_a?(Hash) ? Osm::symbolize_hash(section_data['intouch']) : {},
+          :mobile_fields => section_data['mobFields'].is_a?(Hash) ? Osm::symbolize_hash(section_data['mobFields']) : {},
+          :flexi_records => flexi_records.sort,
+          :group_id => role_data['groupid'],
+          :group_name => role_data['groupname'],
+          :gocardless => (section_data['gocardless'] || 'false').downcase.eql?('true'),
+          :myscout_events_expires => Osm::parse_date(section_data['portalExpires']['events']),
+          :myscout_badges_expires => Osm::parse_date(section_data['portalExpires']['badges']),
+          :myscout_programme_expires => Osm::parse_date(section_data['portalExpires']['programme']),
+          :myscout_details_expires => Osm::parse_date(section_data['portalExpires']['details']),
+          :myscout_events => myscout_data['events'] == 1,
+          :myscout_badges => myscout_data['badges'] == 1,
+          :myscout_programme => myscout_data['programme'] == 1,
+          :myscout_payments => myscout_data['payments'] == 1,
+          :myscout_details => myscout_data['details'] == 1,
+          :myscout_emails => (myscout_data['emails'] || {}).inject({}) { |n,(k,v)| n[k.to_sym] = v.eql?('true'); n},
+          :myscout_email_address_from => myscout_data['emailAddress'] ? myscout_data['emailAddress'] : '',
+          :myscout_email_address_copy => myscout_data['emailAddressCopy'] ? myscout_data['emailAddressCopy'] : '',
+          :myscout_badges_partial => myscout_data['badgesPartial'] == 1,
+          :myscout_programme_summary => myscout_data['programmeSummary'] == 1,
+          :myscout_programme_times => myscout_data['programmeTimes'] == 1,
+          :myscout_programme_show => myscout_data['programmeShow'].to_i,
+          :myscout_event_reminder_count => myscout_data['eventRemindCount'].to_i,
+          :myscout_event_reminder_frequency => myscout_data['eventRemindFrequency'].to_i,
+          :myscout_payment_reminder_count => myscout_data['paymentRemindCount'].to_i,
+          :myscout_payment_reminder_frequency => myscout_data['paymentRemindFrequency'].to_i,
+          :myscout_details_email_changes_to => myscout_data['contactNotificationEmail'],
+          :sms_sent_test => section_data['hasSentTestSMS'],
+          :sms_messages_sent => section_data['sms_sent'],
+          :sms_messages_remaining => section_data['sms_remaining'],
+        )
+
+        result.push section
+        ids.push section.id
+        cache_write(api, ['section', section.id], section)
+        permissions.merge!(section.id => Osm.make_permissions_hash(role_data['permissions']))
       end
 
       permissions.each do |s_id, perms|

data/spec/osm/section_spec.rb

@@ -385,4 +385,11 @@ describe "Online Scout Manager API Strangeness" do
     sections[1].should_not be_nil
   end
 
+  it "Handles user having access to no sections" do
+    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => '[{"isDefault":"1"}]', :content_type => 'application/json')
+
+    sections = Osm::Section.get_all(@api)
+    sections.should == []
+  end
+
 end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.13"
+  VERSION = "1.2.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.2.14
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport