haveapi-client 0.3.0 → 0.4.0

data/lib/haveapi/client/parameters/typed.rb

@@ -0,0 +1,72 @@
+module HaveAPI::Client
+  class Parameters::Typed
+    module Boolean
+      def self.to_b(str)
+        return true if str === true
+        return true if str =~ /^(true|t|yes|y|1)$/i
+
+        return false if str === false
+        return false if str =~ /^(false|f|no|n|0)$/i
+
+        false
+      end
+    end
+
+    attr_reader :errors, :value
+
+    def initialize(params, desc, value)
+      @params = params
+      @desc = desc
+      @value = coerce(value)
+      @errors = []
+    end
+
+    def valid?
+      ret = Validator.validate(@desc[:validators], @value, @params)
+
+      @errors.concat(ret) unless ret === true
+      ret === true
+    end
+
+    def to_api
+      if @desc[:type] == 'Datetime' && value.is_a?(Time)
+        value.iso8601
+
+      else
+        value
+      end
+    end
+
+    protected
+    def coerce(raw)
+      type = @desc[:type]
+
+      val = if type == 'Integer'
+        raw.to_i
+
+      elsif type == 'Float'
+        raw.to_f
+
+      elsif type == 'Boolean'
+        Boolean.to_b(raw)
+
+      elsif type == 'Datetime'
+        begin
+          Time.iso8601(raw)
+
+        rescue ArgumentError
+          @errors << 'not in ISO 8601 format'
+          nil
+        end
+
+      elsif type == 'String'
+        raw.to_s
+
+      else
+        raw
+      end
+
+      val
+    end
+  end
+end

data/lib/haveapi/client/params.rb

@@ -0,0 +1,72 @@
+module HaveAPI::Client
+  module Parameters ; end
+
+  class Params
+    attr_reader :errors, :params
+
+    def initialize(action, data)
+      @action = action
+      @data = data
+      @params = {}
+      @errors = {}
+      coerce
+    end
+
+    def coerce
+      @action.input_params.each do |name, p|
+        next unless @data.has_key?(name)
+
+        if p[:type] == 'Resource'
+          @params[name] = Parameters::Resource.new(self, p, @data[name])
+
+        else
+          @params[name] = Parameters::Typed.new(self, p, @data[name])
+        end
+      end
+    end
+
+    def valid?
+      @action.input_params.each do |name, p|
+        next if p[:validators].nil?
+
+        if p[:validators][:presence] && @params[name].nil?
+          error(name, 'required parameter missing')
+
+        elsif @params[name].nil?
+          next
+        end
+
+        if !@params[name].valid?
+          error(name, @params[name].errors)
+        end
+
+      end
+
+      @errors.empty?
+    end
+
+    def to_api
+      ret = {}
+
+      @params.each do |name, p|
+        ret[name] = p.to_api
+      end
+
+      ret[:meta] = @data[:meta] if @data.has_key?(:meta)
+
+      ret
+    end
+
+    protected
+    def error(param, msg)
+      @errors[param] ||= []
+
+      if msg.is_a?(::Array)
+        @errors[param].concat(msg)
+
+      else
+        @errors[param] << msg
+      end
+    end
+  end
+end

data/lib/haveapi/client/resource_instance.rb

@@ -21,10 +21,12 @@ module HaveAPI::Client
       if response
         if response.is_a?(Hash)
           @params = response
+          @prepared_args = response[:_meta][:url_params]
 
         else
           @response = response
           @params = response.response
+          @prepared_args = response.meta[:url_params]
         end
 
         setup_from_clone(resource)

data/lib/haveapi/client/validator.rb

@@ -0,0 +1,55 @@
+module HaveAPI::Client
+  module Validators ; end
+
+  class Validator
+    class << self
+      def name(v)
+        Validator.register(v, self)
+      end
+      
+      def register(name, klass)
+        @validators ||= {}
+        @validators[name] = klass
+      end
+
+      def validate(validators, param, other_params)
+        ret = []
+        
+        validators.each do |name, desc|
+          fail "unsupported validator '#{name}'" if @validators[name].nil?
+
+          v = @validators[name].new(desc, param, other_params)
+          ret.concat(v.errors) unless v.valid?
+        end
+
+        ret.empty? ? true : ret
+      end
+    end
+
+    attr_reader :value, :params
+
+    def initialize(opts, value, other_params)
+      @opts = opts
+      @value = value
+      @params = other_params.params
+    end
+
+    def errors
+      @errors || [opts[:message] % { value: value }]
+    end
+
+    def valid?
+      raise NotImplementedError
+    end
+
+    protected
+    def opts
+      @opts
+    end
+
+    def error(e)
+      @errors ||= []
+      @errors << e
+    end
+  end
+end

data/lib/haveapi/client/validators/acceptance.rb

@@ -0,0 +1,9 @@
+module HaveAPI::Client
+  class Validators::Acceptance < Validator
+    name :accept
+
+    def valid?
+      value == opts[:value]
+    end
+  end
+end

data/lib/haveapi/client/validators/confirmation.rb

@@ -0,0 +1,18 @@
+module HaveAPI::Client
+  class Validators::Confirmation < Validator
+    name :confirm
+
+    def valid?
+      other = opts[:parameter].to_sym
+      
+      if opts[:equal]
+        return false if params[other].nil?
+        value == params[other].value
+
+      else
+        other = params[other] ? params[other].value : nil
+        value != other
+      end
+    end
+  end
+end

data/lib/haveapi/client/validators/custom.rb

@@ -0,0 +1,9 @@
+module HaveAPI::Client
+  class Validators::Custom < Validator
+    name :custom
+
+    def valid?
+      true
+    end
+  end
+end

data/lib/haveapi/client/validators/exclusion.rb

@@ -0,0 +1,9 @@
+module HaveAPI::Client
+  class Validators::Exclusion < Validator
+    name :exclude
+
+    def valid?
+      !opts[:values].include?(value)
+    end
+  end
+end

data/lib/haveapi/client/validators/format.rb

@@ -0,0 +1,16 @@
+module HaveAPI::Client
+  class Validators::Format < Validator
+    name :format
+
+    def valid?
+      rx = Regexp.new(opts[:rx])
+
+      if opts[:match]
+        rx.match(value) ? true : false
+
+      else
+        rx.match(value) ? false : true
+      end
+    end
+  end
+end

data/lib/haveapi/client/validators/inclusion.rb

@@ -0,0 +1,14 @@
+module HaveAPI::Client
+  class Validators::Inclusion < Validator
+    name :include
+
+    def valid?
+      if opts[:values].is_a?(::Hash)
+        opts[:values].keys.include?(value)
+
+      else
+        opts[:values].include?(value)
+      end
+    end
+  end
+end

data/lib/haveapi/client/validators/length.rb

@@ -0,0 +1,14 @@
+module HaveAPI::Client
+  class Validators::Length < Validator
+    name :length
+
+    def valid?
+      len = value.length
+
+      return len == opts[:equals] if opts[:equals]
+      return len >= opts[:min] if opts[:min] && !opts[:max]
+      return len <= opts[:max] if !opts[:min] && opts[:max]
+      len >= opts[:min] && len <= opts[:max]
+    end
+  end
+end

data/lib/haveapi/client/validators/numericality.rb

@@ -0,0 +1,24 @@
+module HaveAPI::Client
+  class Validators::Numericality < Validator
+    name :number
+
+    def valid?
+      if value.is_a?(::String)
+        return false if /\A\d+\z/ !~ value
+        v = value.to_i
+
+      else
+        v = value
+      end
+
+      ret = true
+      ret = false if opts[:min] && v < opts[:min]
+      ret = false if opts[:max] && v > opts[:max]
+      ret = false if opts[:step] && (v - (opts[:min] || 0)) % opts[:step] != 0
+      ret = false if opts[:mod] && v % opts[:mod] != 0
+      ret = false if opts[:odd] && v % 2 == 0
+      ret = false if opts[:even] && v % 2 > 0
+      ret
+    end
+  end
+end

data/lib/haveapi/client/validators/presence.rb

@@ -0,0 +1,11 @@
+module HaveAPI::Client
+  class Validators::Presence < Validator
+    name :present
+
+    def valid?
+      return false if value.nil?
+      return !value.strip.empty? if !opts[:empty] && value.is_a?(::String)
+      true
+    end
+  end
+end

data/lib/haveapi/client/version.rb

@@ -1,5 +1,6 @@
 module HaveAPI
   module Client
-    VERSION = '0.3.0'
+    PROTOCOL_VERSION = '1.0'
+    VERSION = '0.4.0'
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.14
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rest_client
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +86,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.21
-- !ruby/object:Gem::Dependency
-  name: table_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.7.8
 description: Ruby API and CLI for HaveAPI
 email:
 - jakub.skokan@vpsfree.cz
@@ -130,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -141,7 +128,9 @@ files:
 - lib/haveapi/cli/authentication/basic.rb
 - lib/haveapi/cli/authentication/token.rb
 - lib/haveapi/cli/cli.rb
+- lib/haveapi/cli/command.rb
 - lib/haveapi/cli/example_formatter.rb
+- lib/haveapi/cli/output_formatter.rb
 - lib/haveapi/client.rb
 - lib/haveapi/client/action.rb
 - lib/haveapi/client/authentication/base.rb
@@ -152,10 +141,23 @@ files:
 - lib/haveapi/client/communicator.rb
 - lib/haveapi/client/exceptions.rb
 - lib/haveapi/client/inflections.rb
+- lib/haveapi/client/parameters/resource.rb
+- lib/haveapi/client/parameters/typed.rb
+- lib/haveapi/client/params.rb
 - lib/haveapi/client/resource.rb
 - lib/haveapi/client/resource_instance.rb
 - lib/haveapi/client/resource_instance_list.rb
 - lib/haveapi/client/response.rb
+- lib/haveapi/client/validator.rb
+- lib/haveapi/client/validators/acceptance.rb
+- lib/haveapi/client/validators/confirmation.rb
+- lib/haveapi/client/validators/custom.rb
+- lib/haveapi/client/validators/exclusion.rb
+- lib/haveapi/client/validators/format.rb
+- lib/haveapi/client/validators/inclusion.rb
+- lib/haveapi/client/validators/length.rb
+- lib/haveapi/client/validators/numericality.rb
+- lib/haveapi/client/validators/presence.rb
 - lib/haveapi/client/version.rb
 - lib/restclient_ext/request.rb
 - lib/restclient_ext/resource.rb
@@ -179,8 +181,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Ruby API and CLI for HaveAPI
 test_files: []
+has_rdoc: