haveapi-client 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba1c7ae5a2334ed6d530c44443334b36024154e
-  data.tar.gz: e1467467e046d68d8d615628bae42ae4071bd05a
+  metadata.gz: d38285efbe924232434c9d4bdf0ece969eb8c36f
+  data.tar.gz: 185865048fd39008b57baa63a67f5a105de3ad24
 SHA512:
-  metadata.gz: a3691d90ceb3e86b50747e6d53611a23992fd6d7c5a8c973d49c9949e09296f6874d4e353c29fdafd5b76ede2d50f7dc2725e9f7964176452f4920cdd0ee6045
-  data.tar.gz: 4dbffe7e183ceb67ef494e51b46068f9e3e169b34a5088206e86e64c45f26d49033c4055fa10a59b4fe5fdd04a91d808d594630ae3d84ad62f43c54514f004a5
+  metadata.gz: 8124895cf8f6387235cee2f4c11ec6e539d14cdaf0519fd3fcce7981bf7b9e83720b93d2b242dde66d5b4191c33ea52c2b97cd60a2c005aab3591f0e21126165
+  data.tar.gz: a6653cabef8e918dcafe4216e7aa2482014a1ecd569fead986d994ad28d97206e2b09de3a62a8997b8370b01d1e2cd07a05388c781da799254e08688bff36738

data/CHANGELOG

@@ -1,3 +1,10 @@
+* Tue Sep 12 2017 - version 0.10.0
+- Client: accessor to communicator object
+- Basic authentication: add accessors to credentials
+- Token authentication: support for token renewal and revoking
+- Compatibility with Elixir server API
+- Relax dependency version requirements
+
 * Sat Apr 22 2017 - version 0.9.0
 - Resource.setup_from_clone: set also @description
 

data/haveapi-client.gemspec

@@ -6,7 +6,7 @@ require 'haveapi/client/version'
 Gem::Specification.new do |spec|
   spec.name          = 'haveapi-client'
   spec.version       = HaveAPI::Client::VERSION
-  spec.date          = '2017-04-22'
+  spec.date          = '2017-09-12'
   spec.authors       = ['Jakub Skokan']
   spec.email         = ['jakub.skokan@vpsfree.cz']
   spec.summary       =
@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
 
-  spec.add_runtime_dependency 'activesupport', '~> 4.1.14'
-  spec.add_runtime_dependency 'require_all', '~> 1.3.3'
+  spec.add_runtime_dependency 'activesupport', '>= 4.0'
+  spec.add_runtime_dependency 'require_all'
   spec.add_runtime_dependency 'rest-client', '~> 1.8.0'
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'highline', '~> 1.7.8'

data/lib/haveapi/cli/cli.rb

@@ -307,15 +307,17 @@ module HaveAPI::CLI
       @action_opt = OptionParser.new do |opts|
         opts.banner = ''
 
-        action.input[:parameters].each do |name, p|
-          opts.on(param_option(name, p), p[:description] || p[:label] || '') do |*args|
-            arg = args.first
+        if action.input
+          action.input[:parameters].each do |name, p|
+            opts.on(param_option(name, p), p[:description] || p[:label] || ' ') do |*args|
+              arg = args.first
 
-            if arg.nil?
-              options[name] = read_param(name, p)
+              if arg.nil?
+                options[name] = read_param(name, p)
 
-            else
-              options[name] = args.first
+              else
+                options[name] = args.first
+              end
             end
           end
         end
@@ -510,7 +512,7 @@ module HaveAPI::CLI
         return
       end
 
-      return if response.empty?
+      return if response.empty? || action.output.nil?
 
       namespace = action.namespace(:output).to_sym
 

data/lib/haveapi/client/action.rb

@@ -13,13 +13,19 @@ module HaveAPI::Client
     end
 
     def execute(data, *_)
-      params = Params.new(self, data)
+      args = [self]
       
-      unless params.valid?
-        raise ValidationError.new(self, params.errors)
+      if input
+        params = Params.new(self, data)
+        
+        unless params.valid?
+          raise ValidationError.new(self, params.errors)
+        end
+
+        args << params.to_api << {}
       end
 
-      ret = @api.call(self, params.to_api)
+      ret = @api.call(*args)
       reset
       ret
     end

data/lib/haveapi/client/authentication/basic.rb

@@ -5,5 +5,8 @@ module HaveAPI::Client::Authentication
     def resource
       RestClient::Resource.new(@communicator.url, @opts[:user], @opts[:password])
     end
+
+    def user ; @opts[:user] ; end
+    def password ; @opts[:password] ; end
   end
 end

data/lib/haveapi/client/authentication/token.rb

@@ -34,6 +34,33 @@ module HaveAPI::Client::Authentication
       @valid_to = hash[:valid_to]
     end
 
+    def renew
+      a = HaveAPI::Client::Action.new(
+          nil,
+          @communicator,
+          :renew,
+          @desc[:resources][:token][:actions][:renew],
+          []
+      )
+      ret = HaveAPI::Client::Response.new(a, a.execute({}))
+      raise HaveAPI::Client::ActionFailed.new(ret) unless ret.ok?
+
+      @valid_to = ret[:valid_to]
+      @valid_to = @valid_to && DateTime.iso8601(@valid_to).to_time
+    end
+
+    def revoke
+      a = HaveAPI::Client::Action.new(
+          nil,
+          @communicator,
+          :revoke,
+          @desc[:resources][:token][:actions][:revoke],
+          []
+      )
+      ret = HaveAPI::Client::Response.new(a, a.execute({}))
+      raise HaveAPI::Client::ActionFailed.new(ret) unless ret.ok?
+    end
+
     protected
     def request_token
       a = HaveAPI::Client::Action.new(

data/lib/haveapi/client/client.rb

@@ -81,6 +81,11 @@ class HaveAPI::Client::Client
     keys.empty? ? @opts.clone : @opts.select { |k, _| keys.include?(k) }
   end
 
+  # @return [HaveAPI::Client::Communicator]
+  def communicator
+    @api
+  end
+
   # Initialize the client if it is not yet initialized and call the resource
   # if it exists.
   def method_missing(symbol, *args)

data/lib/haveapi/client/communicator.rb

@@ -105,9 +105,9 @@ module HaveAPI::Client
       end
     end
 
-    def call(action, params, raw: false)
+    def call(action, params = {}, raw: false)
       args = []
-      input_namespace = action.namespace(:input)
+      input_namespace = action.input && action.namespace(:input)
       meta = nil
 
       if params.is_a?(Hash) && params[:meta]
@@ -116,7 +116,8 @@ module HaveAPI::Client
       end
 
       if %w(POST PUT).include?(action.http_method)
-        ns = {input_namespace => params}
+        ns = {}
+        ns[input_namespace] = params if input_namespace
         ns[:_meta] = meta if meta
         ns.update(@auth.request_payload)
 

data/lib/haveapi/client/resource.rb

@@ -114,7 +114,7 @@ module HaveAPI::Client
 
           raise ActionFailed.new(ret) unless ret.ok?
 
-          return_value = case action.output_layout
+          return_value = case action.output && action.output_layout
             when :object
               ResourceInstance.new(@client, @api, self, action: action, response: ret)
 

data/lib/haveapi/client/response.rb

@@ -44,7 +44,7 @@ class HaveAPI::Client::Response
 
   # Access namespaced params directly.
   def [](key)
-    return unless %i(object hash).include?(@action.layout.to_sym)
+    return unless %i(object hash).include?(@action.output_layout.to_sym)
 
     @response[:response][@action.namespace(:output).to_sym][key]
   end

data/lib/haveapi/client/version.rb

@@ -1,6 +1,6 @@
 module HaveAPI
   module Client
     PROTOCOL_VERSION = '1.2'
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-client
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,30 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.14
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.14
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement