lingotek-client 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/lingotek-client/api.rb

@@ -1,27 +1,29 @@
 require 'oauth'
-require 'rest-client'
+require_relative 'rest-client-patch'
 
 require_relative './schema'
 
 module LingotekClient
   class Api
 
-    def initialize(url, key, secret, external_id)
+    def initialize(url, key, secret, external_id, validate = false)
       @url = URI.parse(url)
       @key = key
       @secret = secret
       @external_id = external_id
+      @validate = validate
       generate_token
-      RestClient.reset_before_execution_procs
-      RestClient.add_before_execution_proc do |req, params|
-        @access_token.sign! req
-      end
     end
 
     def method_missing(method, *args, &block)
       inputs = args.first || {}
+      if args[1].nil?
+        validate = @validate
+      else
+        validate = args[1] 
+      end
 
-      LingotekClient::Schema.validate!(method, inputs.keys )
+      LingotekClient::Schema.validate!(method, inputs.keys ) if validate
       # retrive the file params
       file_upload_params = inputs.select { |k,v|  v.is_a? File }
       inputs.delete_if { |k,v|  v.is_a? File }
@@ -35,14 +37,45 @@ module LingotekClient
 
     private
 
-
     def post(method, params = {}, file_upload_params = {})
       params[:externalId] ||= @external_id
-      RestClient.post(url_path(method, params), file_upload_params)
+      client = RestClient::Resource.new url_path(method, params)
+      client.add_before_execution_proc do |req, params|
+        @access_token.sign! req
+      end
+      client.post(file_upload_params)
     end
 
+
+#     def post(method, params = {}, file_upload_params = {})
+#       params[:externalId] ||= @external_id
+#       client = RestClient::Resource.new url_path(method, params)
+#       client.post(file_upload_params)
+#     end
+
+#     def post(method, params = {}, file_upload_params = {})
+#       params[:externalId] ||= @external_id
+#       RestClient.post(url_path(method, params), file_upload_params)
+#     end
+
     def url_path(method, params)
-      "#{site}#{@url.path}#{method}?#{URI.encode_www_form(params)}"
+      "#{site}#{@url.path}#{method}?#{uri_encode_www_form(params)}"
+    end
+
+    def uri_encode_www_form(params)
+      query = URI.encode_www_form(params.select { |k,v| (!v.is_a?(Array)) } )
+      query << '&' unless query.empty?
+      query << uri_encode_www_form_array(params.select { |k,v| v.is_a? Array } )
+    end
+
+    def uri_encode_www_form_array(params)
+      str = ""
+      params.each do |k,v|
+        v.each do |single_value|
+          str << "#{k}=#{single_value}&"
+        end
+      end
+      str.gsub(/\&$/, '')
     end
 
     def site

data/lib/lingotek-client/api_schema.rb

@@ -68,6 +68,7 @@ module APISchema
       findLabel: { required: [:name, :limit], optional: []},
       findTM: { required: [:tmVaultId, :sourceLang, :targetLang], optional: [:searchText, :startDate, :endDate]},
       flushDocumentProgress: { required: [:documentId], optional: []},
+      getAnalysis: { required: [:group], optional: []},
       getClientCommunityPreference: { required: [:key], optional: []},
       getCMSKey: { required: [], optional: []},
       getCommunityDictionary: { required: [:type], optional: []},

data/lib/lingotek-client/rest-client-patch.rb

@@ -0,0 +1,133 @@
+require 'rest-client'
+
+module RestClient
+  class Resource
+    attr_reader :before_execution_procs
+
+    def initialize(url, options={}, backwards_compatibility=nil, &block)
+      @url = url
+      @block = block
+      if options.class == Hash
+        @options = options
+      else # compatibility with previous versions
+        @options = { :user => options, :password => backwards_compatibility }
+      end
+      @before_execution_procs = [] 
+    end
+
+    def add_before_execution_proc( & block )
+      @before_execution_procs << block
+    end
+
+    def reset_before_execution_procs
+      @before_execution_procs = []
+    end
+
+    def post(payload, additional_headers={}, &block)
+     headers = (options[:headers] || {}).merge(additional_headers)
+     args = options.merge(
+                    :method => :post,
+                    :url => url,
+                    :payload => payload,
+                    :headers => headers)
+     request = Request.new(args)
+    @before_execution_procs.each do |before_proc|
+       request.add_before_execution_proc &before_proc
+    end
+     request.execute( &(block || @block) )
+   end
+
+  end
+
+  class Request
+    attr_reader :before_execution_procs
+
+    def initialize args
+      @method = args[:method] or raise ArgumentError, "must pass :method"
+      @headers = args[:headers] || {}
+      if args[:url]
+        @url = process_url_params(args[:url], headers)
+      else
+        raise ArgumentError, "must pass :url"
+      end
+      @cookies = @headers.delete(:cookies) || args[:cookies] || {}
+      @payload = Payload.generate(args[:payload])
+      @user = args[:user]
+      @password = args[:password]
+      @timeout = args[:timeout]
+      @open_timeout = args[:open_timeout]
+      @block_response = args[:block_response]
+      @raw_response = args[:raw_response] || false
+      @verify_ssl = args[:verify_ssl] || false
+      @ssl_client_cert = args[:ssl_client_cert] || nil
+      @ssl_client_key = args[:ssl_client_key] || nil
+      @ssl_ca_file = args[:ssl_ca_file] || nil
+      @tf = nil # If you are a raw request, this is your tempfile
+      @max_redirects = args[:max_redirects] || 10
+      @processed_headers = make_headers headers
+      @args = args
+      @before_execution_procs = [] 
+    end
+
+    def add_before_execution_proc( & block )
+      @before_execution_procs << block
+    end
+
+    def reset_before_execution_procs
+      @before_execution_procs = []
+    end
+
+    def transmit uri, req, payload, & block
+      setup_credentials req
+
+      net = net_http_class.new(uri.host, uri.port)
+      net.use_ssl = uri.is_a?(URI::HTTPS)
+      if (@verify_ssl == false) || (@verify_ssl == OpenSSL::SSL::VERIFY_NONE)
+        net.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      elsif @verify_ssl.is_a? Integer
+        net.verify_mode = @verify_ssl
+        net.verify_callback = lambda do |preverify_ok, ssl_context|
+          if (!preverify_ok) || ssl_context.error != 0
+            err_msg = "SSL Verification failed -- Preverify: #{preverify_ok}, Error: #{ssl_context.error_string} (#{ssl_context.error})"
+            raise SSLCertificateNotVerified.new(err_msg)
+          end
+          true
+        end
+      end
+      net.cert = @ssl_client_cert if @ssl_client_cert
+      net.key = @ssl_client_key if @ssl_client_key
+      net.ca_file = @ssl_ca_file if @ssl_ca_file
+      net.read_timeout = @timeout if @timeout
+      net.open_timeout = @open_timeout if @open_timeout
+
+      # disable the timeout if the timeout value is -1
+      net.read_timeout = nil if @timeout == -1
+      net.out_timeout = nil if @open_timeout == -1
+
+      RestClient.before_execution_procs.each do |before_proc|
+        before_proc.call(req, args)
+      end
+
+      @before_execution_procs.each do |before_proc|
+        before_proc.call(req, args)
+      end
+
+      log_request
+
+      net.start do |http|
+        if @block_response
+          http.request(req, payload ? payload.to_s : nil, & @block_response)
+        else
+          res = http.request(req, payload ? payload.to_s : nil) { |http_response| fetch_body(http_response) }
+          log_response res
+          process_result res, & block
+        end
+      end
+    rescue EOFError
+      raise RestClient::ServerBrokeConnection
+    rescue Timeout::Error
+      raise RestClient::RequestTimeout
+    end
+  end
+
+end

data/lib/lingotek-client.rb

@@ -1,5 +1,5 @@
 module LingotekClient
-end                               
+end
 
 require "lingotek-client/version"
 require "lingotek-client/api"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lingotek-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client lib for lingotek apis
 email:
 - fribeiro@lingotek.com
@@ -70,9 +102,9 @@ extra_rdoc_files:
 files:
 - lib/lingotek-client/version.rb
 - lib/lingotek-client/api.rb
+- lib/lingotek-client/rest-client-patch.rb
 - lib/lingotek-client/schema.rb
 - lib/lingotek-client/api_schema.rb
-- lib/VERSION
 - lib/lingotek-client.rb
 - update_schema/update_schema
 - update_schema/table.html
@@ -80,7 +112,7 @@ files:
 - VERSION
 - LICENSE
 - README.md
-homepage: 
+homepage: http://lingotek.com
 licenses: []
 post_install_message: 
 rdoc_options:

data/lib/VERSION

@@ -1 +0,0 @@
-0.1.0