osm 1.2.23 → 1.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a1c77bba99130c55b0574c0a890c685e99611c2
-  data.tar.gz: 5b81b4165fbd1244ae170f310e5968aa5ffa76ad
+  metadata.gz: c000055060e9bf9c68a29ee0a70c9904f65a632d
+  data.tar.gz: b3ea3125f4a8e0cd3af8cd79f7adeaa8a2c497d9
 SHA512:
-  metadata.gz: 996af429a7bc3cebae38f122bffc7b3201e16f61d55a54c4320f83ac1501023bb94ff87d23da474bdf92883828741fdf91b832dc82c01c89aed995eb9bf69631
-  data.tar.gz: 087c903f06680b4216c16809dad00b3303b689814c6dc631a25d796154eaf48e39ea9c2a98f3e9cba364e3e1e81cad08e2517a6a94710b62488386c9975b0034
+  metadata.gz: 014a4e51a7e8ab1b2d85beeeeb58bfe440bcbeabdbe489d52b020b07620da2916f55aed25b5b2342a8b4db3a9ac6614e173f78c66e98d588d2f7ad8affc8a383
+  data.tar.gz: f559e2d25bbb91459322012301a61bdaf5e9a29d766727e94b8ee6db9343194b2312a74c83d25c6abe5607d57d61ce3ff2f3368e3f24877b708b78e18a9b79a6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.24
+
+  * Fix detection of no roles in api.get_user_roles!
+
 ## Version 1.2.23
 
   * Geting list of user roles for getting sections and permissions now done using the get_user_roles method of api instances

data/lib/osm/api.rb

@@ -194,8 +194,12 @@ module Osm
 
       begin
         data = perform_query('api.php?action=getUserRoles')
-        Osm::Model.cache_write(self, cache_key, data)
-        return data
+        unless data.eql?(false)
+          # false equates to no roles
+          Osm::Model.cache_write(self, cache_key, data)
+          return data
+        end
+        fail Osm::NoActiveRoles, "You do not have any active roles in OSM."
 
       rescue Osm::Error => e
         if e.message.eql?('false')

data/spec/osm/api_spec.rb

@@ -84,7 +84,7 @@ describe "API" do
     end
 
     it "User has no roles in OSM" do
-      @api.stub(:perform_query).with('api.php?action=getUserRoles'){ raise Osm::Error, 'false' }
+      @api.stub(:perform_query).with('api.php?action=getUserRoles'){ false }
       expect{ @api.get_user_roles! }.to raise_error(Osm::NoActiveRoles)
       @api.get_user_roles.should == []
     end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.23"
+  VERSION = "1.2.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 1.2.24
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport