osm 1.2.19 → 1.2.20

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.2.1
+  - jruby-1.7.20.1
 gemfile:
   - Gemfile
   - gemfiles/rails3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.20
+
+  * Fix to OSM changing the URL to get API permissions from
+
 ## Version 1.2.19
 
   * Fix validity checks for member in rails 3

data/README.md

@@ -29,6 +29,8 @@ This gem supports the following versions of ruby, it may work on other versions
 
   * 1.9.3
   * 2.0.0
+  * 2.2.1
+  * jruby-1.7.20.1
 
 
 ## OSM

data/lib/osm/api_access.rb

@@ -37,7 +37,7 @@ module Osm
         return get_from_ids(api, ids, cache_key, section, options, :get_all)
       end
 
-      data = api.perform_query("users.php?action=getAPIAccess&sectionid=#{section_id}")
+      data = api.perform_query("ext/settings/access/?action=getAPIAccess&sectionid=#{section_id}")
 
       permissions_map = {
         10  => [:read],

data/lib/osm/section.rb

@@ -379,13 +379,10 @@ module Osm
 
     # Compare Section based on group_name type (age order), then name
     def <=>(another)
+      type_order = [:beavers, :cubs, :scouts, :explorers, :network, :adults, :waiting]
       result = self.group_name <=> another.try(:group_name)
-      result = 0 if self.type == another.try(:type) && result == 0
-      [:beavers, :cubs, :scouts, :explorers, :network, :adults, :waiting].each do |type|
-        if result == 0
-          result = -1 if self.type == type
-          result =  1 if another.try(:type) == type
-        end
+      if result == 0
+        result = type_order.find_index(self.type) <=> type_order.find_index(another.try(:type))
       end
       result = self.name <=> another.try(:name) if result == 0
       return result

data/spec/osm/api_access_spec.rb

@@ -43,7 +43,7 @@ describe "API Access" do
           }
         ]
       }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=getAPIAccess&sectionid=1", :body => body.to_json, :content_type => 'application/json')
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/settings/access/?action=getAPIAccess&sectionid=1", :body => body.to_json, :content_type => 'application/json')
     end
 
     describe "Get All" do

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.19"
+  VERSION = "1.2.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport