yao 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da4cbfc5d9e7c25ca43e5ae65d409b6932e6c6c5
-  data.tar.gz: 2af6c4274cc2af3a46fd9b84e705c880ea3b9e43
+SHA256:
+  metadata.gz: e1789686116892938a28b82e269c12b5f5ef72c49c1e9f5135f24e98351d208a
+  data.tar.gz: c2c470d8474707f81999cc6fa7f1a470315a2dd7d7ccc525c321ce5c5457d63b
 SHA512:
-  metadata.gz: 071b7b04433f864f04dad54a41d836ee5391bde791bdd3bcf4f6b0db502f794ccb263eb30d6227539d355034a6a3052c8f2acdc21c4ad8b4d4fd6fe5252a451b
-  data.tar.gz: 36794af6d54fc929b72ef4ea4d22cf9113fc6841d43036504c28f11da4a919128daa8d8032d48127719cd81b26bc20f1db2a11a74d816d53b9beeb055c4e7653
+  metadata.gz: 2cd63d1b7243beb3593f63ff2f9fd5869a61bf77887c9e8217c7a90cb460968221afa3cf639916c940cce4ec68b1a9372cb006b60e7bc979dda010e4ee49db92
+  data.tar.gz: aee7a7cbf7e888bd0cd2c6cb6e0a2a78e206526c3140fd914426b6a794077e537238845fea29ef7eb0324ced1eee26e9ddce9b7dd35d0a9593a5c74d063e6c7d

data/lib/yao/resources/restfully_accessible.rb

@@ -20,15 +20,15 @@ module Yao::Resources
     end
     attr_reader :service
 
+    def api_version
+      @api_version || ''
+    end
+
     def api_version=(v)
       raise("Set api_version after service is declared") unless service
       @api_version = v
-      if cli = client
-        cli.url_prefix.path += "/#{api_version}" unless cli.url_prefix.to_s.include?("/#{api_version}")
-      end
       api_version
     end
-    attr_reader :api_version
 
     def admin=(bool)
       @admin = bool
@@ -76,7 +76,7 @@ module Yao::Resources
 
     # restful methods
     def list(query={})
-      json = GET(resources_path, query).body
+      json = GET(create_url([api_version, resources_path]), query).body
       if @return_single_on_querying && !query.empty?
         return_resource(resource_from_json(json))
       else
@@ -88,7 +88,7 @@ module Yao::Resources
       res = if id_or_name_or_permalink.start_with?("http://", "https://")
               GET(id_or_name_or_permalink, query)
             elsif uuid?(id_or_name_or_permalink)
-              GET([resources_path, id_or_name_or_permalink].join("/"), query)
+              GET(create_url([api_version, resources_path, id_or_name_or_permalink]), query)
             else
               get_by_name(id_or_name_or_permalink, query)
             end
@@ -105,7 +105,7 @@ module Yao::Resources
       params = {
         resource_name_in_json => resource_params
       }
-      res = POST(resources_path) do |req|
+      res = POST(create_url([api_version, resources_path])) do |req|
         req.body = params.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -116,7 +116,7 @@ module Yao::Resources
       params = {
         resource_name_in_json => resource_params
       }
-      res = PUT([resources_path, id].join("/")) do |req|
+      res = PUT(create_url([api_version, resources_path, id])) do |req|
         req.body = params.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -124,11 +124,15 @@ module Yao::Resources
     end
 
     def destroy(id)
-      res = DELETE([resources_path, id].join("/"))
+      res = DELETE(create_url([api_version, resources_path, id]))
       res.body
     end
 
     private
+    def create_url(paths)
+      paths.select{|s| s != ''}.join('/')
+    end
+
     def resource_name_in_json
       @_resource_name_in_json ||= resource_name.sub(/^os-/, "").tr("-", "_")
     end
@@ -157,13 +161,13 @@ module Yao::Resources
     def get_by_name(name, query={})
       # At first, search by ID. If nothing is found, search by name.
       begin
-        GET([resources_path, name].join("/"), query)
+        GET(create_url([api_version, resources_path, name]), query)
       rescue Yao::ItemNotFound
         item = find_by_name(name)
         if item.size > 1
           raise Yao::TooManyItemFonud.new("More than one resource exists with the name '#{name}'")
         end
-        GET([resources_path, item.first.id].join("/"), query)
+        GET(create_url([api_version, resources_path, item.first.id]), query)
       end
     end
   end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!