ass_launcher 0.1.1.alpha → 0.2.0

data/lib/ass_launcher/enterprise/cli_defs_loader.rb

@@ -0,0 +1,36 @@
+module AssLauncher
+  module Enterprise
+    # @api private
+    # Mixin for {CliDef}
+    # Load all CLI definitions from files +cli_def/v.v.v.rb+
+    module CliDefsLoader
+      DEFS_PATH = File.expand_path('../cli_def', __FILE__)
+      def version_from_file_name(file)
+        Gem::Version.new File.basename(file, '.rb')
+      end
+      private :version_from_file_name
+
+      def defs_versions
+        Dir.glob(File.join(DEFS_PATH, '*.rb')).map do |l|
+          version_from_file_name l
+        end.sort
+      end
+      private :defs_versions
+
+      def load_def(v)
+        require File.join(DEFS_PATH, "#{v}")
+        @loaded_defs ||= []
+        @loaded_defs << v
+      end
+      private :load_def
+
+      def load_defs
+        defs_versions.sort.each do |v|
+          enterprise_version v
+          load_def v
+        end
+      end
+      private :load_defs
+    end
+  end
+end

data/lib/ass_launcher/enterprise/ole/ole_binaries.rb

@@ -128,7 +128,7 @@ module AssLauncher
         # @note It work not correct. If old version ole object is loded in
         # memory new registred version will be ignored.
         class COMConnector < AbstractAssOleBinary
-          require 'english'
+          require 'English'
           BINARY = 'comcntr.dll'
           def binary
             BINARY
@@ -203,10 +203,17 @@ module AssLauncher
           private :_binary_wrapper
 
           def reg_server
-            run_as_enterprise ['/regserver']
+            run_as_enterprise reg_server_args
           end
           private :reg_server
 
+          def reg_server_args
+            r = ['/regserver']
+            r << '-currentuser' if version >= Gem::Version.new('8.3.9')
+            r
+          end
+          private :reg_server_args
+
           def unreg_server
             run_as_enterprise ['/unregserver']
           end

data/lib/ass_launcher/enterprise/ole/win32ole.rb

@@ -24,7 +24,7 @@ class WIN32OLE
       args[1]
     end
   else
-    require 'win32ole'
+    require 'win32ole' unless AssLauncher::Platform.linux?
     @win32ole_loaded = true # for tests zonde
   end
   # :nocov:

data/lib/ass_launcher/enterprise/ole.rb

@@ -6,6 +6,13 @@ module AssLauncher
   module Enterprise
     # 1C:Enterprise ole objects layer
     module Ole
+      # Wrapper for {OLE_CLIENT_TYPES}
+      def self.ole_client(type)
+      fail ArgumentError, "Invalid ole type `#{type}'. Use types:"\
+        " #{OLE_CLIENT_TYPES.keys}" unless OLE_CLIENT_TYPES.key? type
+        OLE_CLIENT_TYPES[type]
+      end
+
       # 1C Infobase External Connection
       class IbConnection
         attr_reader :__ole__
@@ -54,7 +61,7 @@ module AssLauncher
         end
 
         # Set 1C Ole server properties
-        def __configure_com_connector__(**opts)
+        def __configure_com_connector__(opts)
           opts.each do |k, v|
             __ole_binary__.ole.setproperty(k, v)
           end
@@ -183,6 +190,15 @@ module AssLauncher
         end
         protected :__ole_binary__
       end
+
+      # Define type of 1C OLE clients
+      OLE_CLIENT_TYPES = {
+        external: AssLauncher::Enterprise::Ole::IbConnection,
+        wprocess: AssLauncher::Enterprise::Ole::WpConnection,
+        sagent: AssLauncher::Enterprise::Ole::AgentConnection,
+        thin: AssLauncher::Enterprise::Ole::ThinApplication,
+        thick: AssLauncher::Enterprise::Ole::ThickApplication
+      }
     end
   end
 end

data/lib/ass_launcher/enterprise/web_client.rb

@@ -0,0 +1,164 @@
+# encoding: utf-8
+
+module AssLauncher
+  module Enterprise
+    # Abstract 1C:Enterprise client. Provides {#location} method as URI
+    # generator for connection to
+    # 1C information base via web browser.
+    # @example (see #initialize)
+    # @example (see #location)
+    class WebClient
+      require 'uri'
+      require 'ass_launcher/enterprise/cli'
+      DEFAULT_OPTIONS = { disable_startup_messages: true }
+      DEFAULT_VERSION = '999'
+
+      # @return [URI] base uri location
+      attr_reader :uri
+      # Version for 1C:Enterprise platform
+      attr_reader :version
+      # @return [WebClient]
+      # @example
+      #
+      #  # Get webclient usin connection string:
+      #  connection_string =\
+      #  AssLauncher::Support::ConnectionString.new(
+      #    'ws="http://host:port/infobase"')
+      #  wc = AssLauncher::Enterprise::WebClient.new(cs.uri)
+      #
+      #  #or without connection_string
+      #  wc = AssLauncher::Enterprise::WebClient.new('http://host/path')
+      #
+      # @param uri [String URI] base infobase location
+      # @param version [String] version 1C:Enterprise platform.
+      #  The {Enterprise::WebClient#cli_spec}
+      #  depends on the {Enterprise::WebClient#version}.
+      #  Default supposed max possable version.
+      #  {Enterprise::WebClient::DEFAULT_VERSION}
+      #
+      def initialize(uri = '', version = DEFAULT_VERSION)
+        @version = Gem::Version.new(version || DEFAULT_VERSION)
+        @uri ||= URI(uri || '')
+      end
+
+      def uri=(uri)
+        @uri = URI(uri)
+      end
+
+      # @return [Cli::CliSpec]
+      def cli_spec
+        @cli_spec ||= AssLauncher::Enterprise::Cli::CliSpec.for(self)
+      end
+
+      # Defined run modes fo client
+      # @return (see Cli.defined_modes_for)
+      def self.run_modes
+        Cli.defined_modes_for(self)
+      end
+
+      # (see .run_modes)
+      def run_modes
+        self.class.run_modes
+      end
+
+      def build_args(&block)
+        args_builder.build_args(&block)
+      end
+      private :build_args
+
+      def args_builder
+        Cli::ArgumentsBuilder.new(cli_spec, run_modes[0])
+      end
+      private :args_builder
+
+      # Build URI location for connect to web infobase.
+      #
+      # We can use {Cli::ArgumentsBuilder} for
+      # build connection string with validation parameters on defined in
+      # {#cli_spec} specifications.
+      #
+      # Or we can pass parameters as +args+ array directly.
+      # @example
+      #  wc = AssLauncher::Enterprise::WebClient.new('http://host/path')
+      #
+      #  # Without ArgumentsBulder
+      #  wc.location(['O', 'low', 'C', 'passed string',
+      #    'N', '1cuser',
+      #    'P', '1cpassw',
+      #    'Authoff', '']) #=> URI
+      #
+      #  # With ArgumentsBulder
+      #  wc.location do
+      #    _O :Low
+      #    _C 'passed string'
+      #    _N '1cuser'
+      #    _P '1cuser_password'
+      #    wA :-
+      #    oIDA :-
+      #    authOff
+      #    _L 'en'
+      #    vL 'en'
+      #    debuggerURL 'localhost'
+      #    _UsePrivilegedMode
+      #  end  #=> URI
+      #
+      # @param args [Arry]
+      # @option options [bool] :disable_startup_messages adds or not
+      #  '/DisableStartupMessages' flag parameter into +args+
+      #
+      def location(args = [], **options, &block)
+        options = DEFAULT_OPTIONS.merge options
+        args += ['DisableStartupMessages', '']\
+          if options[:disable_startup_messages]
+        args += build_args(&block) if block_given?
+        add_to_query uri.dup, args_to_query(args)
+      end
+
+      def add_to_query(uri, q)
+        if uri.query
+          uri.query += escape "&#{q}" if q
+        else
+          uri.query = escape "#{q}" if q
+        end
+        uri
+      end
+      private :add_to_query
+
+      def escape(s)
+        self.class.escape(s)
+      end
+      private :escape
+
+      # Fuckin 1C is bad understand of CGI.escape.
+      # From escaping exclude: =&
+      # and ' ' replaced on '%20'
+      def self.escape(string)
+        string.gsub(/([^ a-zA-Z0-9_.\-=&]+)/) do
+          '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+        end.gsub(' ', '%20')
+      end
+
+      CLI_TO_WEB_PARAM_NAME = %r{^/}
+
+      def args_to_query(args)
+        r = to_query(args)
+        r.gsub!(/&$/, '')
+        return nil if r.empty?
+        r
+      end
+      private :args_to_query
+
+      def to_query(args)
+        r = ''
+        args.each_with_index do |v, i|
+          next if (i + 1).even?
+          r << "#{v.gsub(CLI_TO_WEB_PARAM_NAME, '')}"
+          r << "=#{args[i + 1]}" unless args[i + 1].to_s.empty?
+          r << '&'
+        end
+        r
+      end
+      private :to_query
+    end
+  end
+end

data/lib/ass_launcher/enterprise.rb

@@ -9,7 +9,7 @@ module AssLauncher
   # 1C:Entrprise platform abstraction layer
   module Enterprise
     require 'ass_launcher/enterprise/binary_wrapper'
-    require 'ass_launcher/enterprise/web_clients'
+    require 'ass_launcher/enterprise/web_client'
     require 'ass_launcher/enterprise/ole'
 
     extend AssLauncher::Support::Platforms
@@ -57,9 +57,20 @@ module AssLauncher
       end
     end
 
+    # Caching {BinaryWrapper} instances
+    # @api private
+    # @return [Hash]
+    def self.binary_wrappers_cache
+      @binary_wrappers_cache ||= {}
+    end
+
     def self.find_clients(klass)
       find_binaries(binaries(klass)).map do |binpath|
-        klass.new(binpath)
+        if binary_wrappers_cache.key?(binpath)
+          binary_wrappers_cache[binpath]
+        else
+          binary_wrappers_cache[binpath] = klass.new(binpath)
+        end
       end
     end
     private_class_method :find_clients
@@ -91,20 +102,36 @@ module AssLauncher
       end.compact
     end
 
-    # (see WebClients.client)
-    def self.web_client(name)
-      WebClients.client(name)
+    # @param uri (see WebClient#initialize)
+    # @param version (see WebClient#initialize)
+    # @return [AssLauncher::Enterprise::WebClient]
+    def self.web_client(uri = nil, version = nil)
+      WebClient.new(uri, version)
+    end
+
+    # Find binaries in Cygwin work slow.
+    # For rapid get binaries uses catch
+    # @return [Hash]
+    # @api private
+    def self.glob_cache
+      @glob_cache ||= {}
+    end
+
+    # Cliar {.glob_cache}
+    def self.clear_glob_cache
+      @glob_cache = nil
     end
 
     # Find and return all 1C:Entrprise binaries
     # @return [Array<BinaryWrapper>]
     def self.find_binaries(basename)
       return [] if basename.to_s.empty?
+      return glob_cache[basename] if glob_cache.key?(basename)
       r = []
       search_paths.flatten.each do |sp|
         r += platform.glob("#{sp}/**/#{basename}")
       end
-      r
+      glob_cache[basename] = r
     end
     private_class_method :find_binaries
   end

data/lib/ass_launcher/support/connection_string.rb

@@ -18,7 +18,7 @@ module AssLauncher
       class Error < StandardError; end
       class ParseError < StandardError; end
       # Commonn connection string fields
-      COMMON_FIELDS = %w(Usr Pwd LicDstr prmod Locale)
+      COMMON_FIELDS = %w(Usr Pwd LicDstr prmod Locale Zn)
       # Fields for server-infobase
       SERVER_FIELDS = %w(Srvr Ref)
       # Fields for file-infobase
@@ -121,6 +121,7 @@ module AssLauncher
         r += ['/P', pwd] if pwd
         r += ['/UsePrivilegedMode', ''] if prmod.to_s == '1'
         r += ['/L', locale] if locale
+        r += ['/Z', zn] if zn
         r
       end
       private :to_args_common
@@ -152,7 +153,10 @@ module AssLauncher
 
       def self.included(base)
         base.fields.each do |f|
-          base.send(:attr_accessor, f.downcase.to_sym)
+          base.send(:attr_reader, f.downcase.to_sym) unless\
+            base.instance_methods.include? f.downcase.to_sym
+          base.send(:attr_writer, f.downcase.to_sym) unless\
+            base.instance_methods.include? "#{f.downcase}=".to_sym
         end
       end
 
@@ -231,8 +235,6 @@ module AssLauncher
           SERVER_FIELDS
         end
 
-        include ConnectionString
-
         def initialize(hash)
           fail ConnectionString::Error unless required_fields_received?(hash)
           _set_properties(hash)
@@ -309,6 +311,8 @@ module AssLauncher
           ['/S', "#{srvr}/#{ref}"]
         end
         private :to_args_private
+
+        include ConnectionString
       end
 
       # Connection string for file-infobases
@@ -322,8 +326,6 @@ module AssLauncher
           required_fields | COMMON_FIELDS
         end
 
-        include ConnectionString
-
         def initialize(hash)
           fail ConnectionString::Error unless required_fields_received?(hash)
           _set_properties(hash)
@@ -364,6 +366,8 @@ module AssLauncher
           ['/F', path.realpath.to_s]
         end
         private :to_args_private
+
+        include ConnectionString
       end
 
       # Connection string for infobases published on http server
@@ -377,8 +381,6 @@ module AssLauncher
           required_fields | COMMON_FIELDS | HTTP_WEB_AUTH_FIELDS | PROXY_FIELDS
         end
 
-        include ConnectionString
-
         def initialize(hash)
           fail ConnectionString::Error unless required_fields_received?(hash)
           _set_properties(hash)
@@ -394,9 +396,29 @@ module AssLauncher
           uri = URI(ws)
           uri.user = wsn
           uri.password = wsp
+          q = uri_query
+          uri.query = escape q if q
           uri
         end
 
+        def escape(s)
+          AssLauncher::Enterprise::WebClient.escape s
+        end
+        private :escape
+
+        def uri_query
+          r = ''
+          r << "N=#{usr}&" if usr
+          r << "P=#{pwd}&" if pwd
+          r << "L=#{locale}&" if locale
+          r << "Z=#{zn}&" if zn
+          r << "UsePrivilegedMode&" if prmod
+          r.gsub!(/&$/i, '')
+          return nil if r.empty?
+          r
+        end
+        private :uri_query
+
         # Convert connection string to array of 1C:Enterprise parameters.
         # @return [Array] of 1C:Enterprise CLI parameters.
         def to_args_private
@@ -416,6 +438,9 @@ module AssLauncher
           r += ['-PPwd', wsppwd] if wsppwd
           r
         end
+        private :to_args_private_proxy
+
+        include ConnectionString
       end
     end
   end