osm 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.1.7
+
+  * Ignore sections of type discount - assuming they're a strange symtom of how OSM handles discount codes
+
 ## Version 0.1.6
 
   * Internal changes due to OSM adding total rows in register and fexi record data (the total rows are ignored)

data/lib/osm/section.rb

@@ -95,42 +95,44 @@ module Osm
       result = Array.new
       permissions = Hash.new
       data.each do |role_data|
-        section_data = ActiveSupport::JSON.decode(role_data['sectionConfig'])
-
-        # 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 FlexiRecord.new(
-            :id => Osm::to_i_or_nil(record_data['extraid']),
-            :name => record_data['name'],
+        unless role_data['section'].eql?('discount')  # It's not an actual section
+          section_data = ActiveSupport::JSON.decode(role_data['sectionConfig'])
+
+          # 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 FlexiRecord.new(
+              :id => Osm::to_i_or_nil(record_data['extraid']),
+              :name => record_data['name'],
+            )
+          end
+
+          section = new(
+            :id => Osm::to_i_or_nil(role_data['sectionid']),
+            :name => role_data['sectionname'],
+            :subscription_level => (subscription_levels[section_data['subscription_level']] || :unknown),
+            :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'],
           )
-        end
 
-        section = new(
-          :id => Osm::to_i_or_nil(role_data['sectionid']),
-          :name => role_data['sectionname'],
-          :subscription_level => (subscription_levels[section_data['subscription_level']] || :unknown),
-          :subscription_expires => Osm::parse_date(section_data['subscription_expires']),
-          :type => !section_data['sectionType'].nil? ? section_data['sectionType'].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'],
-        )
-
-        result.push section
-        cache_write(api, ['section', section.id], section)
-        permissions.merge!(section.id => make_permissions_hash(role_data['permissions']))
+          result.push section
+          cache_write(api, ['section', section.id], section)
+          permissions.merge!(section.id => make_permissions_hash(role_data['permissions']))
+        end
       end
 
       set_user_permissions(api, get_user_permissions(api).merge(permissions))
@@ -178,7 +180,9 @@ module Osm
 
       all_permissions = Hash.new
       data.each do |item|
-        all_permissions.merge!(Osm::to_i_or_nil(item['sectionid']) => make_permissions_hash(item['permissions']))
+        unless item['section'].eql?('discount')  # It's not an actual section
+          all_permissions.merge!(Osm::to_i_or_nil(item['sectionid']) => make_permissions_hash(item['permissions']))
+        end
       end
       cache_write(api, cache_key, all_permissions)
       return all_permissions

data/spec/osm/section_spec.rb

@@ -295,4 +295,18 @@ describe "Online Scout Manager API Strangeness" do
     section.get_notepad(@api).should == ''
   end
 
+  it "handles skipping of a 'discount' section" do
+    body = [
+      {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"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}}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>100, "member"=>100, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
+      {"sectionConfig"=>"{\"code\":1,\"districts\":[\"Loddon\",\"Kennet\"]}","groupname"=>"Berkshire","groupid"=>"2","groupNormalised"=>"1","sectionid"=>"3","sectionname"=>"County Admin","section"=>"discount","isDefault"=>"0","permissions"=>{"districts"=>["Loddon"]}}
+    ]
+    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
+
+    sections = Osm::Section.get_all(@api)
+    sections.size.should == 1
+    section = sections[0]
+    section.should_not be_nil
+    section.id.should == 1
+  end
+
 end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &78858770 !ruby/object:Gem::Requirement
+  requirement: &84367040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *78858770
+  version_requirements: *84367040
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &78858400 !ruby/object:Gem::Requirement
+  requirement: &84366580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *78858400
+  version_requirements: *84366580
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &78858050 !ruby/object:Gem::Requirement
+  requirement: &84365970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *78858050
+  version_requirements: *84365970
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &78857710 !ruby/object:Gem::Requirement
+  requirement: &84365620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *78857710
+  version_requirements: *84365620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &78857360 !ruby/object:Gem::Requirement
+  requirement: &84365110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *78857360
+  version_requirements: *84365110
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78857020 !ruby/object:Gem::Requirement
+  requirement: &84364610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *78857020
+  version_requirements: *84364610
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &78856600 !ruby/object:Gem::Requirement
+  requirement: &84364270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *78856600
+  version_requirements: *84364270
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: