yao 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ea2f00c9ac02892a86b95ffd29c6dac6323d430fcc9656e053f7ceb0c55987
-  data.tar.gz: 174922729484e225f2d362f15a19fe5fad949c2e91ab7f301a858cd21eaf4073
+  metadata.gz: d6d9322e2d2c8af453bddcb207b1dcdb50c252745712f3d3f1e6f7f416f25da7
+  data.tar.gz: 11831fa1c4752f26306b72a1416767c56dc4eb238d16b9f593d4e9aa62736570
 SHA512:
-  metadata.gz: 97ef036c9655f766fa79475aaaa634067adc4f8f78c1521e5958de2a77f1360cfc504026e5b7321268f392062ea2b7f42c7ef84235696807945f5b766101a46b
-  data.tar.gz: 3e83cbce18a6e9a59d7fa23641e6309274a1f085082cfb9819c91a445dd45fb86333be02ba302685fed5428bd346d1bde1a1a3d7dc0d55094b703b8ec59ae6ef
+  metadata.gz: 45d0473120a677f5b322dfa9746ce9ba63599f214372f1f7b163c15ad9c73670983ee6cd03cb8d5298c3a426a913fcaa0f616e41b7b2d7d9ed3ba90f3c8a8d9c
+  data.tar.gz: e7773888bb3c9ca1e0baaecc4ca8b58f003a00e254c554fd4a6bc745803a19fc7eeae8c4ea6a03b058a793d8f1289c06a3f867374015a0fabec79996b3d7377e

data/lib/yao/error.rb

@@ -1,6 +1,7 @@
 module Yao
   class ReadOnlyViolationError < ::StandardError; end
   class TooManyItemFonud       < ::StandardError; end
+  class InvalidResponse        < ::StandardError; end
 
   class ServerError < ::StandardError
     def initialize(message, requested_env)

data/lib/yao/resources/restfully_accessible.rb

@@ -211,6 +211,8 @@ module Yao::Resources
         item = find_by_name(name)
         if item.size > 1
           raise Yao::TooManyItemFonud.new("More than one resource exists with the name '#{name}'")
+        elsif item.size.zero?
+          raise Yao::InvalidResponse.new("No resource exists with the name '#{name}'")
         end
         GET(create_url(item.first.id), query)
       end

data/lib/yao/resources/role.rb

@@ -37,7 +37,7 @@ module Yao::Resources
       def list_for_user(user_name, on:)
         user   = Yao::User.get(user_name)
         tenant = if api_version_v2?
-                   Yao::Tenant.find_by_name(on)
+                   Yao::Tenant.get(on)
                  else
                    Yao::Project.get(on)
                  end
@@ -54,7 +54,7 @@ module Yao::Resources
         role   = Yao::Role.get(role_name)
         user   = Yao::User.get(to)
         tenant = if api_version_v2?
-                   Yao::Tenant.find_by_name(on)
+                   Yao::Tenant.get(on)
                  else
                    Yao::Project.get(on)
                  end
@@ -71,7 +71,7 @@ module Yao::Resources
         role   = Yao::Role.get(role_name)
         user   = Yao::User.get(from)
         tenant = if api_version_v2?
-                   Yao::Tenant.find_by_name(on)
+                   Yao::Tenant.get(on)
                  else
                    Yao::Project.get(on)
                  end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/test/yao/resources/test_restfully_accessible.rb

@@ -66,6 +66,20 @@ class TestRestfullyAccesible < Test::Unit::TestCase
 
       assert_equal("OK", Test.get(name))
     end
+
+    test 'name (with no item JSON)' do
+      Test.return_single_on_querying = false
+      name = "dummy2"
+      uuid = "00112233-4455-6677-8899-aabbccddeeff"
+      body = {@resources_name => []}
+
+      stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), body)
+
+      assert_raise(Yao::InvalidResponse, "raise proper exception") do
+        Test.get(name)
+      end
+    end
   end
 
   sub_test_case 'get!' do

data/test/yao/resources/test_role.rb

@@ -60,7 +60,7 @@ class TestRole < TestYaoResource
       assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_requested(stub)
     end
-    
+
     def test_list_for_user
       stub_user
       stub_tenant
@@ -77,11 +77,11 @@ class TestRole < TestYaoResource
           JSON
           headers: {'Content-Type' => 'application/json'}
         )
-      
+
       roles = Yao::Role.list_for_user("test_user", on:"admin")
       assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_received(Yao::User) { |subject| subject.get("test_user") }
-      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_received(Yao::Tenant) { |subject| subject.get("admin") }
       assert_requested(stub)
     end
 
@@ -99,7 +99,7 @@ class TestRole < TestYaoResource
       Yao::Role.grant("test_role", to:"test_user", on:"admin")
       assert_received(Yao::Role) { |subject| subject.get("test_role") }
       assert_received(Yao::User) { |subject| subject.get("test_user") }
-      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_received(Yao::Tenant) { |subject| subject.get("admin") }
       assert_requested(stub)
     end
 
@@ -117,7 +117,7 @@ class TestRole < TestYaoResource
       Yao::Role.revoke("test_role", from:"test_user", on:"admin")
       assert_received(Yao::Role) { |subject| subject.get("test_role") }
       assert_received(Yao::User) { |subject| subject.get("test_user") }
-      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_received(Yao::Tenant) { |subject| subject.get("admin") }
       assert_requested(stub)
     end
   end
@@ -172,7 +172,7 @@ class TestRole < TestYaoResource
       assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_requested(stub)
     end
-    
+
     def test_list_for_user
       stub_user
       stub_project
@@ -189,7 +189,7 @@ class TestRole < TestYaoResource
           JSON
           headers: {'Content-Type' => 'application/json'}
         )
-      
+
       roles = Yao::Role.list_for_user("test_user", on:"admin")
       assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_received(Yao::Resources::User) { |subject| subject.get("test_user") }
@@ -249,9 +249,9 @@ class TestRole < TestYaoResource
       "name" => "test_user",
     }) }
   end
-  
+
   def stub_tenant
-    stub(Yao::Tenant).find_by_name { Yao::Tenant.new({
+    stub(Yao::Tenant).get { Yao::Tenant.new({
       "id" => "0123456789abcdef0123456789abcdef",
       "name" => "admin",
     }) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json