haveapi-client 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2450bb773a086b4732b000238a127e2b86bb3123
-  data.tar.gz: 5749b665304e4a2d40f4104189404a31a666c000
+  metadata.gz: 1f73740e620eeb403f3cdec3491598f9b48bcfc4
+  data.tar.gz: 3e4d8544316b4a47f948f573de365055021725fc
 SHA512:
-  metadata.gz: 1b2ce5925416ee00884e332ef48b75a72830b09df905c3d32afabf811913bde41db355baf23faeb4061f63dd2ce006cc869a43081c3493bef1c39867ba103155
-  data.tar.gz: a703d0faed80a693d95906aae8d17030b7f135d41cbc16f9a0212d7c2db8c148968114d57ea1eeaa5e903497d6a20b68275ce8109da5b377eaa57521138751e4
+  metadata.gz: 037eee5721e264c732be091ee8fea13e0c96c63e824c8422b4a31e21b503f7e5be3e27114984e71dca37c7237f6c3a8f9392a7206bdd9e381757c0c42fac8d86
+  data.tar.gz: c891d03e167e84a0d7103498a65bfcee3146094de96124d998ea5a4d74d182001dc6609c6e0a58d6d39e327a52e04580cc36662287b8633d8e38345e200f88a0

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Jakub Skokan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -21,13 +21,15 @@ Or install it yourself as:
 ### CLI
     $ haveapi-cli -h
     Usage: haveapi-cli [options] <resource> <action> [objects ids] [-- [parameters]]
-        -a, --api URL                    API URL
+        -u, --api URL                    API URL
+        -a, --auth METHOD                Authentication method
             --list-versions              List all available API versions
-            --list-resources VERSION     List all resource in API version
-            --list-actions VERSION       List all resources and actions in API version
+            --list-auth-methods [VERSION]
+                                         List available authentication methods
+            --list-resources [VERSION]   List all resource in API version
+            --list-actions [VERSION]     List all resources and actions in API version
         -r, --raw                        Print raw response as is
-        -u, --username USER              User name
-        -p, --password PASSWORD          Password
+        -s, --save                       Save credentials to config file for later use
         -v, --[no-]verbose               Run verbosely
         -h, --help                       Show this message
   
@@ -35,20 +37,28 @@ Using the API example from
 [HaveAPI README](https://github.com/vpsfreecz/haveapi/blob/master/README.md#example),
 users would be listed with:
 
-    $ haveapi-cli -a https://your.api.tld user index -u yourname -p yourpassword
+    $ haveapi-cli --url https://your.api.tld --auth basic --username yourname --password yourpassword user index
     
 Nested resources and object IDs:
 
-    $ haveapi-cli -a https://your.api.tld user.invoice index 10 -u yourname -p yourpassword
+    $ haveapi-cli --url https://your.api.tld --auth basic --username yourname --password yourpassword user.invoice index 10
 
 where `10` is user ID.
+
+User credentials can be saved to a config:
+
+    $ haveapi-cli --url https://your.api.tld --auth basic --username yourname --password yourpassword --save user index
+    
+When saved, they don't have to be specified as command line options:
+
+    $ haveapi-cli --url https://your.api.tld user index
  
 ### Client library
 ```ruby
 require 'haveapi/client'
 
 api = HaveAPI::Client::Client.new('https://your.api.tld')
-api.login('yourname', 'yourpassword')
+api.authenticate(:basic, user: 'yourname', password: 'yourpassword')
 
 response = api.user.index
 p response.ok?

data/haveapi-client.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       =
   spec.description   = 'Ruby API and CLI for HaveAPI'
   spec.homepage      = ''
-  spec.license       = 'GPL'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/haveapi/cli.rb

@@ -1,2 +1,2 @@
-require 'haveapi/client'
-require 'haveapi/cli/cli'
+require_relative 'client'
+require_rel 'cli'

data/lib/haveapi/cli/authentication/base.rb

@@ -0,0 +1,52 @@
+module HaveAPI::CLI
+  module Authentication
+    # Base class for CLI interface of authentication providers
+    class Base
+      class << self
+        # Register this class as authentication provider with +name+.
+        # The +name+ must be the same as is used in client auth provider
+        # and on server side.
+        # All providers have to register.
+        def register(name)
+          HaveAPI::CLI::Cli.register_auth_method(name, Kernel.const_get(to_s))
+        end
+      end
+
+      attr_accessor :communicator
+
+      def initialize(opts = {})
+        opts ||= {}
+
+        opts.each do |k, v|
+          instance_variable_set("@#{k}", v)
+        end
+      end
+
+      # Implement this method to add CLI options for auth provider.
+      # +opts+ is an instance of OptionParser.
+      # This method is NOT called if the auth provider has been loaded
+      # from the config and wasn't specified as a command line option
+      # and therefore all necessary information must be stored in the config.
+      def options(opts)
+
+      end
+
+      # Implement this method to check if all needed information
+      # for successful authentication are provided.
+      # Ask the user on stdin if something is missing.
+      def validate
+
+      end
+
+      # This method should call HaveAPI::Client::Communicator#authenticate
+      # with arguments specific for this authentication provider.
+      def authenticate
+
+      end
+
+      def save
+        @communicator.auth_save
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module HaveAPI::CLI::Authentication
+  class Basic < Base
+    register :basic
+
+    def options(opts)
+      opts.on('--username USER', 'User name') do |u|
+        @user = u
+      end
+
+      opts.on('--password PASSWORD', 'Password') do |p|
+        @password = p
+      end
+    end
+
+    def validate
+      @user ||= ask('User name: ') { |q| q.default = nil }.to_s
+
+      @password ||= ask('Password: ') do |q|
+        q.default = nil
+        q.echo = false
+      end.to_s
+    end
+
+    def authenticate
+      @communicator.authenticate(:basic, {user: @user, password: @password})
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+module HaveAPI::CLI::Authentication
+  class Token < Base
+    register :token
+
+    def options(opts)
+      opts.on('--username USER', 'User name') do |u|
+        @user = u
+      end
+
+      opts.on('--password PASSWORD', 'Password') do |p|
+        @password = p
+      end
+
+      opts.on('--token TOKEN', 'Token') do |t|
+        @token = t
+      end
+
+      opts.on('--token-validity SECONDS', Integer,
+              'How long will token be valid in seconds, 0 for forever') do |s|
+        @validity = s
+      end
+
+      opts.on('--new-token', 'Request new token') do
+        @token = nil
+      end
+
+      via = %i(query_param header)
+
+      opts.on('--token-via VIA', via,
+              'Send token as a query parameter or in HTTP header',
+              "(#{via.join(', ')})") do |v|
+        @via = v.to_sym
+      end
+    end
+
+    def validate
+      return if @token
+
+      @user ||= ask('User name: ') { |q| q.default = nil }
+
+      @password ||= ask('Password: ') do |q|
+        q.default = nil
+        q.echo = false
+      end
+    end
+
+    def authenticate
+      @communicator.authenticate(:token, {
+          user: @user,
+          password: @password,
+          token: @token,
+          validity: @validity,
+          valid_to: @valid_to,
+          via: @via
+      })
+    end
+
+    def save
+      super.update({
+                       via: @via,
+                       validity: @validity
+                   })
+    end
+  end
+end

data/lib/haveapi/cli/cli.rb

@@ -2,17 +2,30 @@ require 'optparse'
 require 'pp'
 require 'highline/import'
 require 'table_print'
+require 'yaml'
 
 module HaveAPI
   module CLI
     class Cli
-      def self.run
-        c = new
+      class << self
+        attr_accessor :auth_methods
+
+        def run
+          c = new
+        end
+
+        def register_auth_method(name, klass)
+          @auth_methods ||= {}
+          @auth_methods[name] = klass
+        end
       end
 
       def initialize
+        @config = read_config || {}
         args, @opts = options
+
         @api = HaveAPI::Client::Communicator.new(api_url)
+        @api.identity = $0.split('/').last
 
         if @action
           method(@action.first).call( * @action[1..-1] )
@@ -37,6 +50,8 @@ module HaveAPI
 
         action = @api.get_action(resources, action, args[2..-1])
 
+        action.update_description(@api.describe_action(action)) if authenticate(action)
+
         @input_params = parameters(action)
 
         if action
@@ -78,14 +93,24 @@ module HaveAPI
         @global_opt = OptionParser.new do |opts|
           opts.banner = "Usage: #{$0} [options] <resource> <action> [objects ids] [-- [parameters]]"
 
-          opts.on('-a', '--api URL', 'API URL') do |url|
+          opts.on('-u', '--api URL', 'API URL') do |url|
             options[:client] = url
           end
 
+          opts.on('-a', '--auth METHOD', Cli.auth_methods.keys, 'Authentication method') do |m|
+            options[:auth] = m
+            @auth = Cli.auth_methods[m].new(server_config(options[:client])[:auth][m])
+            @auth.options(opts)
+          end
+
           opts.on('--list-versions', 'List all available API versions') do
             @action = [:list_versions]
           end
 
+          opts.on('--list-auth-methods [VERSION]', 'List available authentication methods') do |v|
+            @action = [:list_auth, v && v.sub(/^v/, '')]
+          end
+
           opts.on('--list-resources [VERSION]', 'List all resource in API version') do |v|
             @action = [:list_resources, v && v.sub(/^v/, '')]
           end
@@ -98,12 +123,8 @@ module HaveAPI
             options[:raw] = true
           end
 
-          opts.on('-u', '--username USER', 'User name') do |u|
-            options[:user] = u
-          end
-
-          opts.on('-p', '--password PASSWORD', 'Password') do |p|
-            options[:password] = p
+          opts.on('-s', '--save', 'Save credentials to config file for later use') do
+            options[:save] = true
           end
 
           opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
@@ -127,8 +148,11 @@ module HaveAPI
 
         @global_opt.parse!(args)
 
-        # p options
-        #p ARGV
+        unless options[:auth]
+          cfg = server_config(options[:client])
+
+          @auth = Cli.auth_methods[cfg[:last_auth]].new(cfg[:auth][cfg[:last_auth]]) if cfg[:last_auth]
+        end
 
         [args, options]
       end
@@ -206,10 +230,18 @@ module HaveAPI
         end
       end
 
+      def list_auth(v=nil)
+        desc = @api.describe_api
+
+        desc[:versions][(v && v.to_sym) || desc[:default_version].to_s.to_sym][:authentication].each_key do |auth|
+          puts auth if Cli.auth_methods.has_key?(auth)
+        end
+      end
+
       def list_resources(v=nil)
         desc = @api.describe_api
 
-        desc[:versions][v || desc[:default_version].to_s.to_sym][:resources].each do |resource, children|
+        desc[:versions][(v && v.to_sym) || desc[:default_version].to_s.to_sym][:resources].each do |resource, children|
           nested_resource(resource, children, false)
         end
       end
@@ -217,7 +249,7 @@ module HaveAPI
       def list_actions(v=nil)
         desc = @api.describe_api
 
-        desc[:versions][v || desc[:default_version].to_s.to_sym][:resources].each do |resource, children|
+        desc[:versions][(v && v.to_sym) || desc[:default_version].to_s.to_sym][:resources].each do |resource, children|
           nested_resource(resource, children, true)
         end
       end
@@ -271,17 +303,31 @@ module HaveAPI
 
         return if response.empty?
 
-        s = action.structure
         namespace = action.namespace(:output).to_sym
 
         case action.layout.to_sym
           when :list
-            tp response[namespace]
+            cols = []
+
+            action.params.each do |name, p|
+              if p[:type] == 'Resource'
+                cols << {name => {display_method: ->(r) { r[name] && r[name][p[:value_label].to_sym] } }}
+              else
+                cols << name
+              end
+            end
+
+            tp response[namespace], *cols
 
 
           when :object
             response[namespace].each do |k, v|
-              puts "#{k}: #{v}"
+
+              if action.params[k][:type] == 'Resource'
+                puts "#{k}: #{v[action.params[k][:value_label].to_sym]}"
+              else
+                puts "#{k}: #{v}"
+              end
             end
 
 
@@ -301,29 +347,66 @@ module HaveAPI
         end
       end
 
-      def params_valid?(action)
+      def authenticate(action)
         if action.auth?
-          @opts[:user] ||= ask('User name: ') { |q| q.default = nil }
+          if @auth
+            @auth.communicator = @api
+            @auth.validate
+            @auth.authenticate
+
+            if @opts[:save]
+              cfg = server_config(api_url)
+              cfg[:auth][@opts[:auth]] = @auth.save
+              cfg[:last_auth] = @opts[:auth]
+              write_config
+            end
 
-          @opts[:password] ||= ask('Password: ') do |q|
-            q.default = nil
-            q.echo = false
+          else
+            # FIXME: exit as auth is needed and has not been selected
           end
-        end
 
-        if action.auth? && !(@opts[:user] || @opts[:password])
-          return false
+          return true
         end
 
-        @api.login(@opts[:user], @opts[:password])
+        false
+      end
 
-        true
+      def params_valid?(action)
+        true # FIXME
       end
 
       protected
       def default_url
         'http://localhost:4567'
       end
+
+      def config_path
+        "#{Dir.home}/.haveapi-client.yml"
+      end
+
+      def write_config
+        File.open(config_path, 'w') do |f|
+          f.write(YAML.dump(@config))
+        end
+      end
+
+      def read_config
+        @config = YAML.load_file(config_path) if File.exists?(config_path)
+      end
+
+      def server_config(url)
+        unless @config[:servers]
+          @config[:servers] = [{url: url, auth: {}}]
+          return @config[:servers].first
+        end
+
+        @config[:servers].each do |s|
+          return s if s[:url] == url
+        end
+
+        @config[:servers] << {url: url, auth: {}}
+        @config[:servers].last
+      end
     end
   end
 end

data/lib/haveapi/client/action.rb

@@ -12,6 +12,7 @@ module HaveAPI
       def execute(*args)
         ret = @api.call(self, *args)
         @prepared_url = nil
+        @prepared_help = nil
         ret
       end
 
@@ -51,11 +52,19 @@ module HaveAPI
         @spec[:url]
       end
 
+      def help
+        @spec[:help]
+      end
+
       # Url with resolved parameters.
       def prepared_url
         @prepared_url || @spec[:url]
       end
 
+      def prepared_help
+        @prepared_help || @spec[:help]
+      end
+
       def http_method
         @spec[:method]
       end
@@ -68,12 +77,18 @@ module HaveAPI
         apply_args(args)
       end
 
+      def update_description(spec)
+        @spec = spec
+      end
+
       private
         def apply_args(args)
           @prepared_url ||= @spec[:url].dup
+          @prepared_help ||= @spec[:help].dup
 
           args.each do |arg|
             @prepared_url.sub!(/:[a-zA-Z\-_]+/, arg.to_s)
+            @prepared_help.sub!(/:[a-zA-Z\-_]+/, arg.to_s)
           end
         end
     end

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

@@ -0,0 +1,79 @@
+module HaveAPI::Client
+  module Authentication
+    # Raise this exception when authentication process fails somewhere
+    # outside action execution (in which access forbidden is raised from RestClient).
+    class AuthenticationFailed < Exception
+      def initialize(msg)
+        @msg = msg
+      end
+
+      def message
+        @msg
+      end
+    end
+
+    # Base class for all authentication providers.
+    #
+    # Authentication providers may reimplement only methods they need.
+    # You do not have to reimplement all methods.
+    class Base
+      class << self
+        # Register this class as authentication provider with +name+.
+        # The +name+ must be the same as is used in CLI auth provider (if any)
+        # and on server side.
+        # All providers have to register.
+        def register(name)
+          HaveAPI::Client::Communicator.register_auth_method(name, Kernel.const_get(to_s))
+        end
+      end
+
+      def initialize(communicator, description, opts)
+        @communicator = communicator
+        @desc = description
+        @opts = opts
+
+        setup
+      end
+
+      # Called right after initialize. Use this method to initialize provider.
+      def setup
+
+      end
+
+      # Return RestClient::Resource instance. This is mainly for HTTP basic auth.
+      def resource
+
+      end
+
+      # Called for each request. Returns a hash of query parameters.
+      def request_url_params
+        {}
+      end
+
+      # Called for each request. Returns a hash of parameters send in request
+      # body.
+      def request_payload
+        {}
+      end
+
+      # Called for each request. Returns a hash of HTTP headers.
+      def request_headers
+        {}
+      end
+
+      # Returns a hash of auth provider attributes to be saved e.g. in a file
+      # to be used later, without the user providing credentials again.
+      # You may wish to save a username or password (not recommended), tokens
+      # or whatever authentication provider needs to authenticate user
+      # without his input.
+      def save
+        @opts
+      end
+
+      # Load auth provider attributes from previous #save call.
+      def load(hash)
+        @opts = hash
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module HaveAPI::Client::Authentication
+  class Basic < Base
+    register :basic
+
+    def resource
+      RestClient::Resource.new(@communicator.url, @opts[:user], @opts[:password])
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+module HaveAPI::Client::Authentication
+  class NoAuth < Base
+
+  end
+end

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

@@ -0,0 +1,59 @@
+module HaveAPI::Client::Authentication
+  class Token < Base
+    register :token
+
+    def setup
+      @via = @opts[:via] || :header
+      @token = @opts[:token]
+      @valid_to = @opts[:valid_to]
+
+      request_token unless @token
+
+      @configured = true
+    end
+
+    def request_url_params
+      return {} unless @configured
+      check_validity
+      @via == :query_param ? {@desc[:query_parameter] => @token} : {}
+    end
+
+    def request_headers
+      return {} unless @configured
+      check_validity
+      @via == :header ? {@desc[:http_header] => @token} : {}
+    end
+
+    def save
+      {token: @token, valid_to: @valid_to}
+    end
+
+    def load(hash)
+      @token = hash[:token]
+      @valid_to = hash[:valid_to]
+    end
+
+    protected
+    def request_token
+      a = HaveAPI::Client::Action.new(@communicator, :request, @desc[:resources][:token][:actions][:request], [])
+      ret = a.execute({login: @opts[:user], password: @opts[:password], validity: @opts[:validity] || 300})
+
+      raise AuthenticationFailed.new('bad username or password') unless ret[:status]
+
+      @token = ret[:response][:token][:token]
+
+      @valid_to = ret[:response][:token][:valid_to]
+      @valid_to = @valid_to && DateTime.iso8601(@valid_to).to_time
+    end
+
+    def check_validity
+      if @valid_to && @valid_to < Time.now
+        if @opts[:user] && @opts[:password]
+          request_token
+        else
+          raise AuthenticationFailed.new('token expired')
+        end
+      end
+    end
+  end
+end

data/lib/haveapi/client/client.rb

@@ -3,15 +3,17 @@ require 'pp'
 class HaveAPI::Client::Client
   attr_reader :resources
 
-  def initialize(url, v=nil)
+  def initialize(url, v=nil, identity: 'haveapi-client')
     @version = v
-    @api = VpsAdmin::API::Communicator.new(url)
+    @api = HaveAPI::Client::Communicator.new(url, v)
+    @api.identity = identity
 
     setup_api(@api.describe_api)
   end
 
-  def login(*credentials)
-    @api.login(*credentials)
+  # See Communicator#authenticate.
+  def authenticate(*args)
+    @api.authenticate(*args)
   end
 
   private
@@ -21,7 +23,7 @@ class HaveAPI::Client::Client
     @resources = {}
 
     description[:versions][v.to_s.to_sym][:resources].each do |name, desc|
-      r = VpsAdmin::API::Resource.new(@api, name)
+      r = HaveAPI::Client::Resource.new(@api, name)
       r.setup(desc)
 
       define_singleton_method(name) do |*args|

data/lib/haveapi/client/communicator.rb

@@ -7,14 +7,39 @@ require_rel '../../restclient_ext'
 module HaveAPI
   module Client
     class Communicator
-      def initialize(url)
+      class << self
+        attr_reader :auth_methods
+
+        def register_auth_method(name, klass)
+          @auth_methods ||= {}
+          @auth_methods[name] = klass
+        end
+      end
+
+      attr_reader :url
+      attr_accessor :identity
+
+      def initialize(url, v = nil)
         @url = url
+        @auth = Authentication::NoAuth.new(self, {}, {})
         @rest = RestClient::Resource.new(@url)
-        @version = 1
+        @version = v
+        @identity = 'haveapi-client-ruby'
       end
 
-      def login(user, password)
-        @rest = RestClient::Resource.new(@url, user, password)
+      # Authenticate user with selected +auth_method+.
+      # +auth_method+ is a name of registered authentication provider.
+      # +options+ are specific for each authentication provider.
+      def authenticate(auth_method, options = {})
+        desc = describe_api(@version)
+        desc = desc[:versions][desc[:default_version].to_s.to_sym] unless @version
+
+        @auth = self.class.auth_methods[auth_method].new(self, desc[:authentication][auth_method], options)
+        @rest = @auth.resource || @rest
+      end
+
+      def auth_save
+        @auth.save
       end
 
       def describe_api(v=nil)
@@ -23,7 +48,7 @@ module HaveAPI
 
       def describe_resource(path)
         api = describe_api
-        tmp = describe_api[:versions][ describe_api[:default_version].to_s.to_sym ]
+        tmp = api[:versions][ api[:default_version].to_s.to_sym ]
 
         path.each do |r|
           tmp = tmp[:resources][r.to_sym]
@@ -34,12 +59,13 @@ module HaveAPI
         tmp
       end
 
-      def describe_action(v, r)
-
+      def describe_action(action)
+        description_for(action.prepared_help)
       end
 
       def get_action(resources, action, args)
         @spec ||= describe_api(@version)
+        @spec = @spec[:versions][@spec[:default_version].to_s.to_sym] unless @version
 
         tmp = @spec
 
@@ -63,8 +89,8 @@ module HaveAPI
         input_namespace = action.namespace(:input)
 
         if %w(POST PUT).include?(action.http_method)
-          args << {input_namespace => params}.to_json
-          args << {:content_type => :json, :accept => :json}
+          args << {input_namespace => params}.update(@auth.request_payload).to_json
+          args << {content_type: :json, accept: :json, user_agent: @identity}.update(@auth.request_headers)
 
         elsif %w(GET DELETE).include?(action.http_method)
           get_params = {}
@@ -73,7 +99,7 @@ module HaveAPI
             get_params["#{input_namespace}[#{k}]"] = v
           end
 
-          args << {params: get_params, accept: :json}
+          args << {params: get_params.update(@auth.request_url_params), accept: :json, user_agent: @identity}.update(@auth.request_headers)
         end
 
         begin
@@ -117,7 +143,10 @@ module HaveAPI
         end
 
         def description_for(path)
-          parse(@rest[path].get_options)
+          parse(@rest[path].get_options({
+              params: @auth.request_payload.update(@auth.request_url_params),
+              user_agent: @identity
+          }.update(@auth.request_headers)))
         end
 
         def parse(str)

data/lib/haveapi/client/version.rb

@@ -1,5 +1,5 @@
 module HaveAPI
   module Client
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,14 +131,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/haveapi-cli
 - haveapi-client.gemspec
 - lib/haveapi/cli.rb
+- lib/haveapi/cli/authentication/base.rb
+- lib/haveapi/cli/authentication/basic.rb
+- lib/haveapi/cli/authentication/token.rb
 - lib/haveapi/cli/cli.rb
 - lib/haveapi/client.rb
 - lib/haveapi/client/action.rb
+- lib/haveapi/client/authentication/base.rb
+- lib/haveapi/client/authentication/basic.rb
+- lib/haveapi/client/authentication/noauth.rb
+- lib/haveapi/client/authentication/token.rb
 - lib/haveapi/client/client.rb
 - lib/haveapi/client/communicator.rb
 - lib/haveapi/client/exceptions.rb
@@ -150,7 +158,7 @@ files:
 - lib/restclient_ext/resource.rb
 homepage: ''
 licenses:
-- GPL
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []