laximo 0.7 → 0.8

data/lib/laximo/options.rb

@@ -5,116 +5,76 @@ module Laximo
 
     extend self
 
-    def use_login(str = nil)
-
-      ::Laximo.deprecated!
-
-      return (@use_login === true) if str.nil?
-      @use_login = str
-
-    end # use login
-
     def login(str = nil)
 
       return @login if str.nil?
       @login = str
 
-    end # login
+    end
 
     def password(str = nil)
 
       return @password if str.nil?
       @password = str
 
-    end # password
-
-    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)
-
-      @ssl_key = ::OpenSSL::PKey::RSA.new(::File.read(str))
-
-    end # ssl_key
-
-    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)
-
-      @ssl_cert = ::OpenSSL::X509::Certificate.new(::File.read(str))
-
-    end # ssl_cert
-
-    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)
-
-    end # ssl_verify
-
-    def use_ssl(str = nil)
-
-      return (@use_ssl === true) if str.nil?
-      @use_ssl = str
-
-    end # use_ssl
+    end
 
     def timeout(str = nil)
 
       return @timeout if str.nil?
       @timeout = String(str).to_i(10).abs
 
-    end # timeout
+    end
 
     def user_agent(str = nil)
 
       return @user_agent if str.nil?
       @user_agent = str
 
-    end # user_agent
+    end
 
     def debug(str = nil)
       @debug = (str === true)
-    end # debug
+    end
 
     def debug?
       @debug === true
-    end # debug?
+    end
 
     def am_soap_action(str = nil)
 
       return @am_soap_action if str.nil?
       @am_soap_action = str
 
-    end # am_soap_action
+    end
 
     def am_soap_endpoint(str = nil)
 
       return @am_soap_endpoint if str.nil?
       @am_soap_endpoint = str
 
-    end # am_soap_endpoint
+    end
 
     def oem_soap_action(str = nil)
 
       return @oem_soap_action if str.nil?
       @oem_soap_action = str
 
-    end # oem_soap_action
+    end
 
     def oem_soap_endpoint(str = nil)
 
       return @oem_soap_endpoint if str.nil?
       @oem_soap_endpoint = str
 
-    end # oem_soap_endpoint
+    end
+
+    def locale(str = nil)
+
+      return @locale if str.nil?
+      @locale = str
+
+    end
 
   end # Options
 

data/lib/laximo/query.rb

@@ -8,189 +8,113 @@ module Laximo
       @func_name  = func_name
       @query      = {}
 
-    end # initialize
+    end
 
     def locale(v = nil)
-
-      @str    = nil
-      @query[:Locale] = escape(v)
-      self
-
-    end # locale
+      add_param(:Locale, v)
+    end
 
     def ssd(v = nil)
-
-      @str          = nil
-      @query[:ssd]  = escape(v)
-      self
-
-    end # ssd
+      add_param(:ssd, v)
+    end
 
     def catalog(v = nil)
-
-      @str              = nil
-      @query[:Catalog]  = escape(v)
-      self
-
-    end # catalog
+      add_param(:Catalog, v)
+    end
 
     def operation(v = nil)
+      add_param(:operation, v)
+    end
 
-      @str                = nil
-      @query[:operation]  = escape(v)
-      self
-
-    end # operation
+    def param(h = {})
 
-    def param(v = nil)
-
-      @str  = nil
-      if v.is_a?(Hash) && !v.empty?
-        @query[v.keys.first] = escape(v.values.first)
-      end
+      h.each { |k, v|
+        add_param(k, v)
+      }
       self
 
-    end # param
+    end
 
     def localized(v = false)
-
-      @str                = nil
-      @query[:Localized]  = (v === true)
-      self
-
-    end # localized
+      add_param(:Localized, (v === true))
+    end
 
     def wizard_id(v = nil)
-
-      @str              = nil
-      @query[:WizardId] = escape(v)
-      self
-
-    end # wizard_id
+      add_param(:WizardId, v)
+    end
 
     def value_id(v = nil)
+      add_param(:ValueId, v)
+    end
 
-      @str              = nil
-      @query[:ValueId]  = escape(v)
-      self
-
-    end # value_id
-
-    def options(args = [])
-
-      @str              = nil
-      @query[:Options]  = args.empty? ? nil : args.join(',')
-      self
-
-    end # options
+    def options(v = [])
+      add_param(:Options, v)
+    end
 
     def brand(v = nil)
-
-      @str            = nil
-      @query[:Brand]  = escape(v)
-      self
-
-    end # brand
+      add_param(:Brand, v)
+    end
 
     def oem(v = nil)
-
-      @str          = nil
-      @query[:OEM]  = escape(v)
-      self
-
-    end # oem
+      add_param(:OEM, v)
+    end
 
     def detail_id(v = nil)
-
-      @str              = nil
-      @query[:DetailId] = escape(v)
-      self
-
-    end # detail_id
+      add_param(:DetailId, v)
+    end
 
     def manufacturer_id(v = nil)
-
-      @str                    = nil
-      @query[:ManufacturerId] = escape(v)
-      self
-
-    end # manufacturer_id
+      add_param(:ManufacturerId, v)
+    end
 
     def vin(v = nil)
-
-      @str          = nil
-      @query[:VIN]  = escape(v)
-      self
-
-    end # vin
+      add_param(:VIN, v)
+    end
 
     def frame(v = nil)
-
-      @str            = nil
-      @query[:Frame]  = escape(v)
-      self
-
-    end # frame
+      add_param(:Frame, v)
+    end
 
     def frame_no(v = nil)
+      add_param(:FrameNo, v)
+    end
 
-      @str              = nil
-      @query[:FrameNo]  = escape(v)
-      self
-
-    end # frame_no
+    def ident_string(v = nil)
+      add_param(:IdentString, v)
+    end
 
     def vehicle_id(v = nil)
-
-      @str                = nil
-      @query[:VehicleId]  = escape(v)
-      self
-
-    end # vehicle_id
+      add_param(:VehicleId, v)
+    end
 
     def category_id(v = nil)
-
-      @str                = nil
-      @query[:CategoryId] = escape(v)
-      self
-
-    end # category_id
+      add_param(:CategoryId, v)
+    end
 
     def unit_id(v = nil)
-
-      @str              = nil
-      @query[:UnitId]   = escape(v)
-      self
-
-    end # unit_id
+      add_param(:UnitId, v)
+    end
 
     def filter(v = nil)
-
-      @str              = nil
-      @query[:Filter]   = escape(v)
-      self
-
-    end # filter
+      add_param(:Filter, v)
+    end
 
     def quick_group_id(v = nil)
-
-      @str                  = nil
-      @query[:QuickGroupId] = escape(v)
-      self
-
-    end # quick_group_id
+      add_param(:QuickGroupId, v)
+    end
 
     def all(v = nil)
 
-      @str          = nil
-      @query[:All]  = (v === true || v == 1 || v == '1' ? 1 : 0)
-      self
+      add_param(
+        :QuickGroupId,
+        (v === true || v == 1 || v == '1' ? 1 : 0)
+      )
 
-    end # all
+    end
 
     def call(request)
       request.call(self.to_s)
-    end # call
+    end
 
     def to_s
 
@@ -205,15 +129,24 @@ module Laximo
       @str[0] = ''
       @str = "#{@func_name}:#{@str}"
 
-    end # to_s
+    end
 
     alias :to_str :to_s
 
     private
 
-    def escape(str)
-      str.nil? ? nil : String(str)
-    end # escape
+    def add_param(k, v)
+
+      if v.is_a?(::Array)
+        @query[k] = v.empty? ? nil : v.join(',')
+      else
+        @query[k] = v.nil? ? nil : String(v)
+      end
+
+      @str = nil
+      self
+
+    end
 
   end # Query
 

data/lib/laximo/request.rb

@@ -1,17 +1,6 @@
-
+# encoding: utf-8
 module Laximo
 
-  REQUEST_MSG = %q(<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/">
-  <SOAP-ENV:Body>
-    <ns5692:QueryData xmlns:ns5692="%{act}">
-      <request xsi:type="xsd:string">%{msg}</request>
-    </ns5692:QueryData>
-  </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>).freeze
-
   REQUEST_LOGIN_MSG = %q(<?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
 xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -39,31 +28,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://sch
       set_request_params
       set_http_params
 
-    end # initialize
+    end
 
     def call(msg)
 
-      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)
-        }
-      end
+      @request.body = (REQUEST_LOGIN_MSG % {
+        msg:   msg,
+        act:   @soap_action,
+        login: ::Laximo.options.login,
+        hash:  hash(msg, ::Laximo.options.password)
+      })
 
       begin
         @http.request @request
-      rescue => ex
+      rescue ::Exception => ex
         ex
       end
 
-    end # call
+    end
 
     private
 
@@ -74,18 +56,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://sch
       @http.use_ssl      = ssl?
       @http.verify_mode  = ::OpenSSL::SSL::VERIFY_NONE
 
-      if ::Laximo.options.use_ssl
-        @http.key        = ::Laximo.options.ssl_key
-        @http.cert       = ::Laximo.options.ssl_cert
-      end
-
       @http.open_timeout = ::Laximo.options.timeout
       @http.read_timeout = ::Laximo.options.timeout
       @http.ssl_timeout  = ::Laximo.options.timeout
 
       self
 
-    end # set_http_params
+    end
 
     def set_request_params
 
@@ -96,11 +73,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://sch
 
       self
 
-    end # set_request_params
+    end
 
     def hash(command, password)
       ::Digest::MD5::hexdigest "#{command}#{password}"
-    end # hash
+    end
 
     def ssl?
       @uri.scheme == 'https'.freeze