laximo 0.6.5.1 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 03ede08d655e997ba3cd7984c915919a1fae0a73
-  data.tar.gz: 8c264484cdedc5b7c33092c748d90de3c783abb5
+SHA256:
+  metadata.gz: c5231fd40d0de250d120193a3b50f0c6686313e1bc2969024230fa45c550a1ef
+  data.tar.gz: ee05b5bce8fc90ff18d006bdd530cb364be4be261cfda8dbea51708f058e91db
 SHA512:
-  metadata.gz: ee1b821651bd6683d2a739d74d412cd79a45433b3f91524aa39493a50f43f0f4eff67fdcbcfa8a2c41b3118daaf8af3f699aad8aee0c8ce0707065e8a54151bb
-  data.tar.gz: 421d851481fbb3cc214be66526dd83cc4a8d69181d3bdf078308623365e93bfbb1b262a7246259c89de536db06624eadf37271ccd242a8c61fcc177f8d9a86f9
+  metadata.gz: 76b415fdf80d0bb1b921a5d304c0a9e53738acbc772a3426e3705dfc33e1ce3605b466a227f10f2fbe0347531e1cecec2c99082bbb30d1b838625d9832802635
+  data.tar.gz: 55b581b6aa6713f1ca86d639302453553b94629c8b3f994119b387af41e8a892e92a87fdf3cb4284c9d596370d9f656e69744997751681bcfa4883ab758e6d05

data/README.md

@@ -12,21 +12,18 @@ Ruby 1.9.3+
 2. В консоли `bundle install`
 3. Задаем параметры конфигурации в файле `config/initializers/laximo.rb`:
 ```ruby
-Laximo.options.use_ssl            true
-Laximo.options.ssl_key            ::File.join(Rails.root, 'db', 'ssl', 'client.key')
-Laximo.options.ssl_cert           ::File.join(Rails.root, 'db', 'ssl', 'client.pem')
-Laximo.options.ssl_verify         false
+Laximo.options.login              'mylogin'    # имейте в виду, что такие параметры
+Laximo.options.password           'mypassword' # должны быть вынесены в переменные окружения
 
 Laximo.options.timeout            10
 Laximo.options.debug              false
 ```
-или для авторизации по подписке
+
+Авторизация по ssl считается устаревшей и в ближайшее время будет удалена:
 ```ruby
 Laximo.options.use_ssl            true
-Laximo.options.use_login          true
-Laximo.options.login              'mylogin'    # имейте в виду, что такие параметры
-Laximo.options.password           'mypassword' # должны быть вынесены в переменные окружения
-Laximo.options.ssl_verify         false
+Laximo.options.ssl_key            ::File.join(Rails.root, 'db', 'ssl', 'client.key')
+Laximo.options.ssl_cert           ::File.join(Rails.root, 'db', 'ssl', 'client.pem')
 
 Laximo.options.timeout            10
 Laximo.options.debug              false
@@ -128,4 +125,4 @@ res.result   # []
 Автор: [Tyralion](mailto:piliaiev@gmail.com)
 [Список контрибьюторов](https://github.com/dancingbytes/laximo/graphs/contributors)
 
-Copyright (c) 2015-2016 DansingBytes.ru, под лицензией BSD
+Copyright (c) 2015-2018 DansingBytes.ru, под лицензией BSD

data/lib/laximo.rb

@@ -4,6 +4,7 @@ require 'nokogiri'
 require 'cgi'
 require 'uri'
 require 'net/http'
+require 'net/https'
 
 require 'laximo/version'
 require 'laximo/options'

data/lib/laximo/options.rb

@@ -7,8 +7,10 @@ module Laximo
 
     def use_login(str = nil)
 
-      return @use_login if str.nil?
-      @use_login = str === true
+      ::Laximo.deprecated!
+
+      return (@use_login === true) if str.nil?
+      @use_login = str
 
     end # use login
 
@@ -28,6 +30,8 @@ module Laximo
 
     def ssl_key(str = nil)
 
+      ::Laximo.deprecated!
+
       return @ssl_key if str.nil?
       raise ::LoadError.new("File #{str} is not found") unless File.exists?(str)
 
@@ -37,6 +41,8 @@ module Laximo
 
     def ssl_cert(str = nil)
 
+      ::Laximo.deprecated!
+
       return @ssl_cert if str.nil?
       raise ::LoadError.new("File #{str} is not found") unless File.exists?(str)
 
@@ -46,6 +52,8 @@ module Laximo
 
     def ssl_verify(str = nil)
 
+      ::Laximo.deprecated!
+
       return @ssl_verify if str.nil?
       @ssl_verify = (str === true ? ::OpenSSL::SSL::VERIFY_PEER : ::OpenSSL::SSL::VERIFY_NONE)
 
@@ -53,8 +61,8 @@ module Laximo
 
     def use_ssl(str = nil)
 
-      return @use_ssl if str.nil?
-      @use_ssl = str === true
+      return (@use_ssl === true) if str.nil?
+      @use_ssl = str
 
     end # use_ssl
 

data/lib/laximo/request.rb

@@ -32,9 +32,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://sch
       @soap_endpoint  = soap_endpoint
       @soap_action    = soap_action
 
-      uri      = URI(soap_endpoint)
-      @http    = ::Net::HTTP.new(uri.host, uri.port)
-      @request = ::Net::HTTP::Post.new(uri.request_uri)
+      @uri     = URI(soap_endpoint)
+      @http    = ::Net::HTTP.new(@uri.host, @uri.port)
+      @request = ::Net::HTTP::Post.new(@uri.request_uri)
 
       set_request_params
       set_http_params
@@ -43,18 +43,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://sch
 
     def call(msg)
 
-      if ::Laximo.options.use_login
+      if ::Laximo.options.use_ssl
+        @request.body = REQUEST_MSG % {
+          msg: msg,
+          act: @soap_action
+        }
+      else
         @request.body = REQUEST_LOGIN_MSG % {
           msg:   msg,
           act:   @soap_action,
           login: ::Laximo.options.login,
           hash:  hash(msg, ::Laximo.options.password)
         }
-      else
-        @request.body = REQUEST_MSG % {
-            msg: msg,
-            act: @soap_action
-        }
       end
 
       begin
@@ -71,12 +71,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://sch
 
       @http.set_debug_output($stdout) if ::Laximo.options.debug?
 
-      @http.use_ssl      = ::Laximo.options.use_ssl
-      @http.verify_mode  = ::Laximo.options.ssl_verify
+      @http.use_ssl      = ssl?
+      @http.verify_mode  = ::OpenSSL::SSL::VERIFY_NONE
 
-      unless ::Laximo.options.use_login
-        @http.key          = ::Laximo.options.ssl_key
-        @http.cert         = ::Laximo.options.ssl_cert
+      if ::Laximo.options.use_ssl
+        @http.key        = ::Laximo.options.ssl_key
+        @http.cert       = ::Laximo.options.ssl_cert
       end
 
       @http.open_timeout = ::Laximo.options.timeout
@@ -99,11 +99,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://sch
     end # set_request_params
 
     def hash(command, password)
-
-      Digest::MD5::hexdigest "#{command}#{password}"
-
+      ::Digest::MD5::hexdigest "#{command}#{password}"
     end # hash
 
+    def ssl?
+      @uri.scheme == 'https'.freeze
+    end
+
   end # Request
 
 end # Laximo

data/lib/laximo/respond.rb

@@ -38,7 +38,7 @@ module Laximo
 
       def result!
 
-        raise error if failure?
+        raise StandardError, error.inspect if failure?
         result
 
       end # result!
@@ -132,11 +132,8 @@ module Laximo
           doc = ::Nokogiri::XML(http.body)
           doc.remove_namespaces!
 
-          if ::Laximo.options.use_login
-            res = doc.xpath(RESPONSE_LOGIN_RESULT).children[0].to_s
-          else
-            res = doc.xpath(RESPONSE_RESULT).children[0].to_s
-          end
+          res = doc.xpath(RESPONSE_LOGIN_RESULT).children[0].to_s
+          res = doc.xpath(RESPONSE_RESULT).children[0].to_s if res.blank?
 
           @error  = nil
           @result = parsing_result(

data/lib/laximo/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Laximo
 
-  VERSION = '0.6.5.1'.freeze
+  VERSION = '0.7'.freeze
 
 end # Laximo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laximo
 version: !ruby/object:Gem::Version
-  version: 0.6.5.1
+  version: '0.7'
 platform: ruby
 authors:
 - Ivan Pilyaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Api for Laximo services