yao 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d9322e2d2c8af453bddcb207b1dcdb50c252745712f3d3f1e6f7f416f25da7
-  data.tar.gz: 11831fa1c4752f26306b72a1416767c56dc4eb238d16b9f593d4e9aa62736570
+  metadata.gz: 051a375b0fda12cf9a9a3553d13905638adb2af8e661606d2407c0a1b832c032
+  data.tar.gz: a0592f5d24e3d258b2b2bba0c6b7d16dc48a26a365a27c4b98354a349da04144
 SHA512:
-  metadata.gz: 45d0473120a677f5b322dfa9746ce9ba63599f214372f1f7b163c15ad9c73670983ee6cd03cb8d5298c3a426a913fcaa0f616e41b7b2d7d9ed3ba90f3c8a8d9c
-  data.tar.gz: e7773888bb3c9ca1e0baaecc4ca8b58f003a00e254c554fd4a6bc745803a19fc7eeae8c4ea6a03b058a793d8f1289c06a3f867374015a0fabec79996b3d7377e
+  metadata.gz: 9c3859bf07d45e3f257ab3b7c8e45da5304cb0046b823916617fcd896d3ea2e7811dd4b3fce463a9fb1916dba336df00c6f817a246feeea6227036b7206a49b0
+  data.tar.gz: 5fc9b2a499232273a76bde3134102d1913baa41c233cd42a5aa4d84704a19817a39285fcba8ab05bfbe0dc2d060705d7e0d580a30b4b53e49f2928b518ff7a44

data/lib/yao/faraday_middlewares.rb

@@ -64,6 +64,19 @@ class Faraday::Request::ReadOnly
 end
 Faraday::Request.register_middleware read_only: -> { Faraday::Request::ReadOnly }
 
+class Faraday::Request::UserAgent
+  def initialize(app, user_agent=nil)
+    @app = app
+    @user_agent = user_agent || "Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"
+  end
+
+  def call(env)
+    env[:request_headers]['User-Agent'] = @user_agent
+    @app.call(env)
+  end
+end
+Faraday::Request.register_middleware user_agent: -> { Faraday::Request::UserAgent }
+
 class Faraday::Response::OSDumper < Faraday::Response::Middleware
   def on_complete(env)
     require 'pp'

data/lib/yao/plugins/default_client_generator.rb

@@ -8,6 +8,7 @@ module Yao::Plugins
     def call(f, token)
       f.request :accept, 'application/json'
       f.request :url_encoded
+      f.request :user_agent
 
       if token
         f.request :os_token, token

data/lib/yao/resources/base.rb

@@ -7,7 +7,7 @@ module Yao::Resources
       names.map(&:to_s).each do |name|
         define_method(name) do
           if !@data.key?(name) && id
-            @data = self.class.get(id)
+            @data = self.class.get(id).to_hash
           end
           self[name]
         end
@@ -51,6 +51,10 @@ module Yao::Resources
       @data[name] = value
     end
 
+    def to_hash
+      @data
+    end
+
     def id
       self["id"]
     end

data/lib/yao/resources/restfully_accessible.rb

@@ -1,5 +1,5 @@
 require "forwardable"
-
+require "deep_merge"
 module Yao::Resources
   module RestfullyAccessible
     def self.extended(base)
@@ -85,12 +85,27 @@ module Yao::Resources
       else
         create_url
       end
-
-      json = GET(url, query).body
+      memo_query = query
+      res = {}
+      loop do
+        r = GET(url, query).body
+        if r.is_a?(Hash)
+          res.deep_merge!(r)
+          links = r.find {|k,_| k =~ /links/ }
+          if links && links.last.is_a?(Array) && next_link = links.last.find{|s| s["rel"] == "next" }
+            uri = URI.parse(next_link["href"])
+            query = Hash[URI::decode_www_form(uri.query)] if uri.query
+            next
+          end
+        else
+          res = r
+        end
+        break
+      end
       if return_single_on_querying && !query.empty?
-        [resource_from_json(json)]
+        [resource_from_json(res)]
       else
-        resources_from_json(json)
+        resources_from_json(res)
       end
     end
 

data/lib/yao/version.rb

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

data/test/support/restfully_accesible_stub.rb

@@ -41,6 +41,6 @@ module RestfullyAccessibleStub
   end
 
   def request_headers
-    {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"}
+    {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"}
   end
 end

data/test/yao/resources/test_hypervisor.rb

@@ -80,7 +80,7 @@ class TestHypervisor < TestYaoResource
 
   def test_list
     stub = stub_request(:get, "https://example.com:12345/os-hypervisors/detail")
-      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"})
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"})
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -105,7 +105,7 @@ class TestHypervisor < TestYaoResource
 
   def test_statistics
     stub = stub_request(:get, "https://example.com:12345/os-hypervisors/statistics")
-      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"})
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"})
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -137,7 +137,7 @@ class TestHypervisor < TestYaoResource
 
   def test_uptime
     stub = stub_request(:get, "https://example.com:12345/os-hypervisors/1/uptime")
-      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"})
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"})
       .to_return(
         status: 200,
         body: <<-JSON,

data/test/yao/resources/test_image.rb

@@ -41,11 +41,97 @@ class TestImage < TestYaoResource
 
   end
 
-  def test_resource_from_json
+  def test_to_hash
+    server = Yao::Resources::Server.new(
+      "OS-DCF:diskConfig" => "AUTO",
+      "OS-EXT-AZ:availability_zone" => "nova",
+      "OS-EXT-SRV-ATTR:host" => "compute",
+      "OS-EXT-SRV-ATTR:hostname" => "new-server-test",
+      "OS-EXT-SRV-ATTR:hypervisor_hostname" => "fake-mini",
+      "OS-EXT-SRV-ATTR:instance_name" => "instance-00000001",
+      "OS-EXT-SRV-ATTR:kernel_id" => "",
+      "OS-EXT-SRV-ATTR:launch_index" => 0,
+      "OS-EXT-SRV-ATTR:ramdisk_id" => "",
+      "OS-EXT-SRV-ATTR:reservation_id" => "r-l0i0clt2",
+      "OS-EXT-SRV-ATTR:root_device_name" => "/dev/sda",
+      "OS-EXT-SRV-ATTR:user_data" => "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==",
+      "OS-EXT-STS:power_state" => 1,
+      "OS-EXT-STS:task_state" => nil,
+      "OS-EXT-STS:vm_state" => "active",
+      "OS-SRV-USG:launched_at" => "2019-04-23T15:19:15.317839",
+      "OS-SRV-USG:terminated_at" => nil,
+      "accessIPv4" => "1.2.3.4",
+      "accessIPv6" => "80fe::",
+      "addresses" => {
+        "private" => [
+          {
+            "OS-EXT-IPS-MAC:mac_addr" => "aa:bb:cc:dd:ee:ff",
+            "OS-EXT-IPS:type" => "fixed",
+            "addr" => "192.168.0.3",
+            "version" => 4
+          }
+        ]
+      },
+      "config_drive" => "",
+      "created" => "2019-04-23T15:19:14Z",
+      "description" => nil,
+      "flavor" => {
+        "disk" => 1,
+        "ephemeral" => 0,
+        "extra_specs" => {},
+        "original_name" => "m1.tiny",
+        "ram" => 512,
+        "swap" => 0,
+        "vcpus" => 1
+      },
+      "hostId" => "2091634baaccdc4c5a1d57069c833e402921df696b7f970791b12ec6",
+      "host_status" => "UP",
+      "id" => "2ce4c5b3-2866-4972-93ce-77a2ea46a7f9",
+      "image" => {
+        "id" => "70a599e0-31e7-49b7-b260-868f441e862b",
+        "links" => [
+          {
+            "href" => "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+            "rel" => "bookmark"
+          }
+        ]
+      },
+      "key_name" => nil,
+      "links" => [
+        {
+          "href" => "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/2ce4c5b3-2866-4972-93ce-77a2ea46a7f9",
+          "rel" => "self"
+        },
+        {
+          "href" => "http://openstack.example.com/6f70656e737461636b20342065766572/servers/2ce4c5b3-2866-4972-93ce-77a2ea46a7f9",
+          "rel" => "bookmark"
+        }
+      ],
+      "locked" => true,
+      "locked_reason" => "I don't want to work",
+      "metadata" => {
+        "My Server Name" => "Apache1"
+      },
+      "name" => "new-server-test",
+      "os-extended-volumes:volumes_attached" => [],
+      "progress" => 0,
+      "security_groups" => [
+        {
+          "name" => "default"
+        }
+      ],
+      "status" => "ACTIVE",
+      "tags" => [],
+      "tenant_id" => "6f70656e737461636b20342065766572",
+      "trusted_image_certificates" => nil,
+      "updated" => "2019-04-23T15:19:15Z",
+      "user_id" => "fake"
+    )
 
-    image = Yao::Resources::Image.send(:resource_from_json, @@params)
-    check_image(image)
-    
+    assert_equal(server.image.to_hash, server['image__Yao::Resources::Image'].to_hash)
+
+    image = Yao::Resources::Image.new(@@params)
+    assert_equal(image.to_hash, @@params)
   end
 
   private

data/test/yao/resources/test_server.rb

@@ -162,6 +162,46 @@ class TestServer < TestYaoResource
     assert_requested(stub)
   end
 
+  def test_paging
+    stub = stub_request(:get, "https://example.com:12345/servers/detail")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "servers_links":[
+             {
+                "href":"https://example.com:12345/servers/detail",
+                "rel":"next"
+             }
+          ],
+          "servers": [{
+            "id": "dummy1"
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      ).times(1).then
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "servers": [{
+            "id": "dummy2"
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      ).times(1)
+
+    servers = Yao::Server.list
+    assert_instance_of(Array, servers)
+    assert_instance_of(Yao::Server, servers.first)
+    assert_equal('dummy1', servers.first.id)
+    assert_equal('dummy2', servers.last.id)
+
+    assert_requested(stub, times: 2)
+  end
+
   def test_list_detail
     assert_equal(Yao::Server.method(:list), Yao::Server.method(:list_detail))
   end

data/test/yao/test_client.rb

@@ -14,6 +14,7 @@ class TestClient < Test::Unit::TestCase
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
+      Faraday::Request::UserAgent,
       Faraday::Request::ReadOnly,
       Faraday::Response::OSErrorDetector,
       FaradayMiddleware::ParseJson
@@ -28,6 +29,7 @@ class TestClient < Test::Unit::TestCase
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
+      Faraday::Request::UserAgent,
       Faraday::Request::OSToken,
       Faraday::Request::ReadOnly,
       Faraday::Response::OSErrorDetector,
@@ -45,6 +47,7 @@ class TestClient < Test::Unit::TestCase
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
+      Faraday::Request::UserAgent,
       Faraday::Request::ReadOnly,
       Faraday::Response::OSErrorDetector,
       FaradayMiddleware::ParseJson,

data/yao.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "json"
+  spec.add_dependency "deep_merge"
   spec.add_dependency "faraday", "~> 1.0.1"
   spec.add_dependency "faraday_middleware"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Uchio, KONDO
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +198,7 @@ homepage: https://github.com/yaocloud/yao
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +213,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!
 test_files: