haveapi-fs 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5df8fafea917e1335994de7b5ad0dce1258f6a74
-  data.tar.gz: 440b1b976a5fd643d3a6b4274f482b6cf29829d7
+  metadata.gz: 2a31acec8bd60953c1833b73bfd7fb2bb7653586
+  data.tar.gz: 62e2bffff1703eea4f1d4a772a26d3bf508ba3a5
 SHA512:
-  metadata.gz: fcd2321eab8bd586e06b43e589e0d4555d390cccb1258952566af806641a5f34f75cc95591a0a54d002d03111e439c13dc3889706d22a585192d32fb0d9c99bf
-  data.tar.gz: 16200aca0f63b9353b19640200bf3b94c8417b0744110f17d3a974ec92c548cbf7e9296f275cd73078e926767ab2e0a6038a0d55321d0066d6fa86abb4db893b
+  metadata.gz: 89293e052eca008f96160c4ded94f933bdbd1a066386b076dadb7a01475a82c3cf80fd5d63f6dc4a7aa4fb07883a49d74175decf4b815cc7d56b5d91c3c55476
+  data.tar.gz: 1a9c49e4c579677b4143217dd66838ad29970f25a335058e2c27fac0678d8a9711d109ce7edbedc3ff51428ab3922d997cfa999ccfa2e9861fe84a04f8e9dc61

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Sat Apr 22 2017 - version 0.9.0
+- Wrapper for hash and hash_list formats, so that they behave the same as
+  object and object_list
+
 * Fri Feb 10 2017 - version 0.8.0
 - Require haveapi-client v0.8
 

data/haveapi-fs.gemspec

@@ -6,7 +6,7 @@ require 'haveapi/fs/version'
 Gem::Specification.new do |spec|
   spec.name          = 'haveapi-fs'
   spec.version       = HaveAPI::Fs::VERSION
-  spec.date          = '2017-02-10'
+  spec.date          = '2017-04-22'
   spec.authors       = ['Jakub Skokan']
   spec.email         = ['jakub.skokan@vpsfree.cz']
   spec.summary       =
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10.3'
 
   spec.add_runtime_dependency 'rfusefs', '~> 1.0.3'
-  spec.add_runtime_dependency 'haveapi-client', '~> 0.8.0'
+  spec.add_runtime_dependency 'haveapi-client', '~> 0.9.0'
   spec.add_runtime_dependency 'md2man', '~> 5.1.1'
   spec.add_runtime_dependency 'highline', '~> 1.7.8'
 end

data/lib/haveapi/fs/components/action_dir.rb

@@ -64,8 +64,26 @@ module HaveAPI::Fs::Components
               ret,
           )
 
+        when :hash
+          res = HaveAPI::Fs::HashWrapper.new(
+              @resource.instance_variable_get('@client'),
+              @resource.instance_variable_get('@api'),
+              @resource,
+              @action,
+              ret.response,
+          )
+
+        when :hash_list
+          res = HaveAPI::Fs::HashListWrapper.new(
+              @resource.instance_variable_get('@client'),
+              @resource.instance_variable_get('@api'),
+              @resource,
+              @action,
+              ret.response,
+          )
+
         else
-          res = ret
+          res = ret.response
         end
 
         children[:output].data = res

data/lib/haveapi/fs/components/action_output.rb

@@ -20,12 +20,7 @@ module HaveAPI::Fs::Components
       return ret unless @data
 
       if @list
-        if @data.is_a?(HaveAPI::Client::ResourceInstanceList)
-          ret.concat(@data.map { |v| v.id.to_s })
-
-        else
-          ret.concat(@data.response.map { |v| v[:id].to_s })
-        end
+        ret.concat(@data.map { |v| v.id.to_s })
 
       else
         ret.concat(parameters.keys.map(&:to_s))
@@ -68,7 +63,7 @@ module HaveAPI::Fs::Components
             @action_dir.action,
             name,
             :output,
-            @data.is_a?(HaveAPI::Client::ResourceInstance) ? @data : @data.response,
+            @data,
         ]
 
       else

data/lib/haveapi/fs/components/resource_action_dir.rb

@@ -5,7 +5,7 @@ module HaveAPI::Fs::Components
 
     def initialize(r)
       @resource = r
-      @instance = r.is_a?(HaveAPI::Client::ResourceInstance)
+      @instance = r.is_a?(HaveAPI::Client::ResourceInstance) || r.is_a?(HaveAPI::Fs::HashWrapper)
 
       super()
     end

data/lib/haveapi/fs/components/resource_dir.rb

@@ -65,7 +65,23 @@ module HaveAPI::Fs::Components
           # need to load it all, a single query should be sufficient.
           begin
             obj = @resource.show(id, meta: meta_params)
-            [ResourceInstanceDir, obj]
+
+            case @resource.actions[:show].output_layout
+            when :object
+              [ResourceInstanceDir, obj]
+
+            when :hash
+              [ResourceInstanceDir, HaveAPI::Fs::HashWrapper.new(
+                  @resource.instance_variable_get('@client'),
+                  @resource.instance_variable_get('@api'),
+                  @resource,
+                  @resource.actions[:show],
+                  obj.response
+              )]
+
+            else
+              fail "Unexpected layout '#{@resource.actions[:show].output_layout}'"
+            end
 
           rescue HaveAPI::Client::ActionFailed
             # Not found

data/lib/haveapi/fs/hash_list_wrapper.rb

@@ -0,0 +1,21 @@
+module HaveAPI::Fs
+  class HashListWrapper < Array
+    def initialize(client, api, resource, action, data)
+      data.each do |v|
+        self << HashWrapper.new(client, api, resource, action, v)
+      end
+    end
+
+    def id
+      @data[:id]
+    end
+
+    def [](k)
+      @data[k]
+    end
+
+    def []=(k, v)
+      @data[k] = v
+    end
+  end
+end

data/lib/haveapi/fs/hash_wrapper.rb

@@ -0,0 +1,25 @@
+module HaveAPI::Fs
+  class HashWrapper < HaveAPI::Client::Resource
+    def initialize(client, api, resource, action, data)
+      super(client, api, resource._name)
+      setup(resource.instance_variable_get('@description'))
+
+      @data = data
+      @data.each do |k, v|
+        define_singleton_method(k) { v }
+      end
+    end
+
+    def attributes
+      @data
+    end
+
+    def [](k)
+      @data[k]
+    end
+
+    def []=(k, v)
+      @data[k] = v
+    end
+  end
+end

data/lib/haveapi/fs/version.rb

@@ -1,5 +1,5 @@
 module HaveAPI
   module Fs
-    VERSION = '0.8.0'
+    VERSION = '0.9.0'
   end
 end

data/lib/haveapi/fs.rb

@@ -19,6 +19,8 @@ require_relative 'fs/component'
 require_relative 'fs/factory'
 require_relative 'fs/help'
 require_relative 'fs/remote_control'
+require_relative 'fs/hash_wrapper'
+require_relative 'fs/hash_list_wrapper'
 require_relative 'fs/version'
 require_relative 'fs/auth/base'
 require_relative 'fs/auth/basic'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-fs
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: md2man
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,8 @@ files:
 - lib/haveapi/fs/exceptions.rb
 - lib/haveapi/fs/factory.rb
 - lib/haveapi/fs/fs.rb
+- lib/haveapi/fs/hash_list_wrapper.rb
+- lib/haveapi/fs/hash_wrapper.rb
 - lib/haveapi/fs/help.rb
 - lib/haveapi/fs/main.rb
 - lib/haveapi/fs/remote_control.rb