eac_tools 0.69.1 → 0.70.0

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/processes/web_server.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'avm/instances/process'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Processes
+        class WebServer < ::Avm::Instances::Process
+          def available?
+            instance.apache_resource.present?
+          end
+
+          def enable
+            apache_resource_change(__method__)
+          end
+
+          def disable
+            apache_resource_change(__method__)
+          end
+
+          private
+
+          def apache_resource_change(action)
+            instance.apache_resource.send(action)
+            instance.platform_instance.apache.service(:reload)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/processes.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Processes
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.17.2'
+    VERSION = '0.18.0'
   end
 end

data/sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/instances/base_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/base'
+
+::RSpec.describe ::Avm::EacWebappBase0::Instances::Base do
+  let(:instance) { described_class.by_id('the-app_0') }
+
+  describe '#install_apache_resource_name' do
+    it { expect(instance.install_apache_resource_name).to eq(instance.id) }
+  end
+end

data/sub/avm-eac_webapp_base0/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__)).stub_avm_contexts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.69.1
+  version: 0.70.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.77'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.77'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -158,20 +158,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
@@ -232,20 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -350,57 +338,6 @@ files:
 - Gemfile.lock
 - lib/eac_tools.rb
 - lib/eac_tools/version.rb
-- sub/aranha-parsers/Gemfile
-- sub/aranha-parsers/aranha-parsers.gemspec
-- sub/aranha-parsers/lib/aranha/parsers.rb
-- sub/aranha-parsers/lib/aranha/parsers/base.rb
-- sub/aranha-parsers/lib/aranha/parsers/html.rb
-- sub/aranha-parsers/lib/aranha/parsers/html/base.rb
-- sub/aranha-parsers/lib/aranha/parsers/html/item.rb
-- sub/aranha-parsers/lib/aranha/parsers/html/item_list.rb
-- sub/aranha-parsers/lib/aranha/parsers/html/node.rb
-- sub/aranha-parsers/lib/aranha/parsers/html/node/base.rb
-- sub/aranha-parsers/lib/aranha/parsers/html/node/default.rb
-- sub/aranha-parsers/lib/aranha/parsers/html/node/default/numeric_support.rb
-- sub/aranha-parsers/lib/aranha/parsers/html/node/default/string_support.rb
-- sub/aranha-parsers/lib/aranha/parsers/invalid_state_exception.rb
-- sub/aranha-parsers/lib/aranha/parsers/json.rb
-- sub/aranha-parsers/lib/aranha/parsers/json/base.rb
-- sub/aranha-parsers/lib/aranha/parsers/patches.rb
-- sub/aranha-parsers/lib/aranha/parsers/patches/ofx_parser.rb
-- sub/aranha-parsers/lib/aranha/parsers/rspec.rb
-- sub/aranha-parsers/lib/aranha/parsers/rspec/setup.rb
-- sub/aranha-parsers/lib/aranha/parsers/rspec/shared_examples/source_target_fixtures.rb
-- sub/aranha-parsers/lib/aranha/parsers/rspec/source_target_fixtures_controller.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_address.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_address/fetch_content_error.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_address/file.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_address/hash_http_base.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_address/hash_http_get.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_address/hash_http_post.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_address/http_get.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_target_fixtures.rb
-- sub/aranha-parsers/lib/aranha/parsers/source_target_fixtures/source_target_file.rb
-- sub/aranha-parsers/lib/aranha/parsers/version.rb
-- sub/aranha-parsers/spec/lib/aranha/parsers/rspec/shared_examples/source_target_fixtures_spec.rb
-- sub/aranha-parsers/spec/lib/aranha/parsers/rspec/shared_examples/source_target_fixtures_spec_files/fixture1.source.txt
-- sub/aranha-parsers/spec/lib/aranha/parsers/rspec/shared_examples/source_target_fixtures_spec_files/fixture1.target.yaml
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec.rb
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_get.source.yml
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_get.target.yaml
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_post.source.yml
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_post.target.yaml
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/http_get.source.yml
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/http_get.target.yaml
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/http_get_spec.rb
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_address_spec.rb
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec.rb
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec_files/stub1.source.txt
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec_files/stub1.target.html
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec_files/stub2.source.html
-- sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec_files/stub3.target.yaml
-- sub/aranha-parsers/spec/lib/rubocop_check_spec.rb
-- sub/aranha-parsers/spec/spec_helper.rb
 - sub/avm-eac_asciidoctor_base0/Gemfile
 - sub/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0.rb
@@ -626,6 +563,9 @@ files:
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_host.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/base.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/daemon.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/tasks_scheduler.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/runners.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/runners/bundle.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/runners/code_runner.rb
@@ -880,9 +820,11 @@ files:
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/json.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/provider.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/xml.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_base.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_host.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_path.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/install.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/build.rb
@@ -890,6 +832,8 @@ files:
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/setup_files_unit.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/version.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/processes.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/processes/web_server.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_host.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_path.rb
@@ -915,6 +859,7 @@ files:
 - sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/xml_spec.rb
 - sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/xml_spec_files/xml_code.xml.source
 - sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/xml_spec_files/xml_code.xml.target
+- sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/instances/base_spec.rb
 - sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/sources/base_spec.rb
 - sub/avm-eac_webapp_base0/spec/rubocop_spec.rb
 - sub/avm-eac_webapp_base0/spec/spec_helper.rb
@@ -1207,6 +1152,7 @@ files:
 - sub/avm/lib/avm/instances/base/dockerizable.rb
 - sub/avm/lib/avm/instances/base/entry_keys.rb
 - sub/avm/lib/avm/instances/base/install.rb
+- sub/avm/lib/avm/instances/base/processes.rb
 - sub/avm/lib/avm/instances/base/subcommand_parent.rb
 - sub/avm/lib/avm/instances/base/web.rb
 - sub/avm/lib/avm/instances/data.rb
@@ -1216,6 +1162,7 @@ files:
 - sub/avm/lib/avm/instances/docker_image.rb
 - sub/avm/lib/avm/instances/entry_keys.rb
 - sub/avm/lib/avm/instances/ids.rb
+- sub/avm/lib/avm/instances/process.rb
 - sub/avm/lib/avm/instances/runner.rb
 - sub/avm/lib/avm/launcher.rb
 - sub/avm/lib/avm/launcher/context.rb

data/sub/aranha-parsers/Gemfile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec
-
-local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
-eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/aranha-parsers/aranha-parsers.gemspec

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-
-require 'aranha/parsers/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'aranha-parsers'
-  s.version     = ::Aranha::Parsers::VERSION
-  s.authors     = ['Esquilo Azul Company']
-  s.summary     = 'Parsers\' utilities for Ruby.'
-
-  s.files = Dir['{lib}/**/*']
-
-  s.add_dependency 'activesupport', '>= 4.0.0'
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
-  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.117'
-  s.add_dependency 'nokogiri', '~> 1.15', '>= 1.15.1'
-  s.add_dependency 'ofx-parser', '~> 1.1'
-
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
-end

data/sub/aranha-parsers/lib/aranha/parsers/base.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require 'open-uri'
-require 'fileutils'
-require 'aranha/parsers/source_address'
-require 'eac_ruby_utils/fs/temp'
-
-module Aranha
-  module Parsers
-    class Base
-      class << self
-        # @deprecated Use {#from_string} instead.
-        # @param content [String]
-        # @return [Aranha::Parsers::Base]
-        def from_content(content)
-          from_string(content)
-        end
-
-        # @param string [String]
-        # @return [Aranha::Parsers::Base]
-        def from_string(string)
-          ::EacRubyUtils::Fs::Temp.on_file do |path|
-            ::File.open(path.to_s, 'w:UTF-8') do |f|
-              f.write string.dup.force_encoding('UTF-8')
-            end
-            r = new(path.to_path)
-            r.content
-            r
-          end
-        end
-      end
-
-      LOG_DIR_ENVVAR = 'ARANHA_PARSERS_LOG_DIR'
-
-      attr_reader :source_address
-
-      def initialize(url)
-        @source_address = ::Aranha::Parsers::SourceAddress.new(url)
-        log_content(source_address.serialize, '-source-address')
-      end
-
-      delegate :url, to: :source_address
-
-      def content
-        @content ||= log_content(source_address_content)
-      end
-
-      # @return [String]
-      delegate :content, to: :source_address, prefix: true
-
-      private
-
-      # @return [String]
-      def log_content(content, suffix = '')
-        path = log_file(suffix)
-
-        File.open(path, 'wb') { |file| file.write(content) } if path
-
-        content
-      end
-
-      def log_file(suffix)
-        dir = log_parsers_dir
-        return nil unless dir
-
-        f = ::File.join(dir, "#{self.class.name.parameterize}#{suffix}.log")
-        FileUtils.mkdir_p(File.dirname(f))
-        f
-      end
-
-      def log_parsers_dir
-        return ENV[LOG_DIR_ENVVAR] if ENV[LOG_DIR_ENVVAR]
-        return ::Rails.root.join('log', 'parsers') if rails_root_exist?
-
-        nil
-      end
-
-      def rails_root_exist?
-        ::Rails.root
-        true
-      rescue NameError
-        false
-      end
-    end
-  end
-end

data/sub/aranha-parsers/lib/aranha/parsers/html/base.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'nokogiri'
-require 'aranha/parsers/base'
-require 'aranha/parsers/html/node/default'
-
-module Aranha
-  module Parsers
-    module Html
-      class Base < ::Aranha::Parsers::Base
-        class << self
-          def fields
-            @fields ||= []
-            @fields.dup
-          end
-
-          def field(name, type, xpath)
-            @fields ||= []
-            @fields << Field.new(name, type, xpath)
-          end
-
-          # @param node [Nokogiri::XML::Node]
-          # @return [Aranha::Parsers::Html::Base]
-          def from_node(node)
-            from_string(node.to_html)
-          end
-
-          # @param haystack [String]
-          # @param needle [String]
-          # @return [String]
-          def xpath_ends_with(haystack, needle)
-            "substring(#{haystack}, string-length(#{haystack}) - string-length(#{needle}) + 1) " \
-              "= #{needle}"
-          end
-
-          Field = Struct.new(:name, :type, :xpath)
-        end
-
-        def nokogiri
-          @nokogiri ||= Nokogiri::HTML(content, &:noblanks)
-        end
-
-        protected
-
-        def node_parser_class
-          ::Aranha::Parsers::Html::Node::Default
-        end
-
-        private
-
-        def node_parser
-          @node_parser ||= node_parser_class.new(fields)
-        end
-
-        def fields
-          self.class.fields.map { |f| [f.name, f.type, f.xpath] }
-        end
-      end
-    end
-  end
-end

data/sub/aranha-parsers/lib/aranha/parsers/html/item.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'aranha/parsers/html/base'
-
-module Aranha
-  module Parsers
-    module Html
-      class Item < Base
-        def data
-          @data ||= node_parser.parse(item_node)
-        end
-
-        def item_node
-          @item_node ||= begin
-            r = item_xpath ? nokogiri.at_xpath(item_xpath) : nokogiri
-            raise "Item node not found (Item xpath: #{item_xpath})" unless r
-
-            r
-          end
-        end
-      end
-    end
-  end
-end

data/sub/aranha-parsers/lib/aranha/parsers/html/item_list.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'aranha/parsers/html/base'
-
-module Aranha
-  module Parsers
-    module Html
-      class ItemList < Base
-        def data
-          items_data
-        end
-
-        def item_data(item)
-          item
-        end
-
-        def items_data
-          count = 0
-          @data ||= nokogiri.xpath(items_xpath).map do |m|
-            count += 1
-            item_data(node_parser.parse(m))
-          end
-        rescue StandardError => e
-          raise StandardError, "#{e.message} (Count: #{count})"
-        end
-
-        def items_xpath
-          raise "Class #{self.class} has no method \"#{__method__}\". Implement it"
-        end
-      end
-    end
-  end
-end

data/sub/aranha-parsers/lib/aranha/parsers/html/node/base.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Aranha
-  module Parsers
-    module Html
-      module Node
-        class Base
-          attr_reader :fields
-
-          def initialize(fields)
-            @fields = fields
-          end
-
-          def parse(node)
-            fields.map do |f|
-              [f[0], parse_field(node, f[2], f[1])]
-            rescue StandardError => e
-              raise StandardError, "#{e.message}\nFields: #{f}"
-            end.to_h
-          end
-
-          private
-
-          def parse_field(node, xpath, parser_method)
-            value_method = "#{parser_method}_value"
-            return send(value_method, node, xpath) if respond_to?(value_method)
-
-            raise "Method \"#{value_method}\" not found in #{self.class}"
-          end
-        end
-      end
-    end
-  end
-end

data/sub/aranha-parsers/lib/aranha/parsers/html/node/default/numeric_support.rb

@@ -1,129 +0,0 @@
-# frozen_string_literal: true
-
-require 'aranha/parsers/html/node/base'
-require 'eac_ruby_utils/core_ext'
-
-module Aranha
-  module Parsers
-    module Html
-      module Node
-        class Default < ::Aranha::Parsers::Html::Node::Base
-          module NumericSupport
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @return [Float]
-            def decimal_comma_value(node, xpath)
-              parse_decimal_comma(node, xpath, true)
-            end
-
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @return [Float, nil]
-            def decimal_comma_optional_value(node, xpath)
-              parse_decimal_comma(node, xpath, false)
-            end
-
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @return [Float]
-            def decimal_dot_value(node, xpath)
-              parse_decimal_dot(node, xpath, true)
-            end
-
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @return [Float, nil]
-            def decimal_dot_optional_value(node, xpath)
-              parse_decimal_dot(node, xpath, false)
-            end
-
-            def integer_value(node, xpath)
-              r = string_value(node, xpath)
-              return nil if r.blank?
-
-              m = /\d+/.match(r)
-              raise "Integer not found in \"#{r}\"" unless m
-
-              m[0].to_i
-            end
-
-            def integer_optional_value(node, xpath)
-              r = string_value(node, xpath)
-              m = /\d+/.match(r)
-              m ? m[0].to_i : nil
-            end
-
-            def float_value(node, xpath)
-              parse_float(node, xpath, true)
-            end
-
-            def float_optional_value(node, xpath)
-              parse_float(node, xpath, false)
-            end
-
-            # @deprecated Use {#decimal_dot_value} instead.
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @return [Float]
-            def us_decimal_value(node, xpath)
-              decimal_dot_value(node, xpath)
-            end
-
-            # @deprecated Use {#decimal_dot_optional_value} instead.
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @return [Float, nil]
-            def us_decimal_optional_value(node, xpath)
-              decimal_dot_optional_value(node, xpath)
-            end
-
-            private
-
-            def parse_float(node, xpath, required)
-              s = string_value(node, xpath)
-              m = /\d+(?:[\.\,](\d+))?/.match(s)
-              if m
-                m[0].delete('.').tr(',', '.').to_f
-              elsif required
-                raise "Float value not found in \"#{s}\""
-              end
-            end
-
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @param required [Boolean]
-            # @param separator [String]
-            # @param delimiter [String]
-            # @return [Float, nil]
-            def parse_decimal(node, xpath, required, separator, delimiter)
-              s = string_value(node, xpath)
-              m = /\d+(?:[#{::Regexp.quote(separator + delimiter)}](\d+))?/.match(s)
-              if m
-                m[0].delete(delimiter).to_f
-              elsif required
-                raise "decimal [Separator=\"#{separator}, Delimiter=\"#{delimiter}\"] value not " \
-                  "found in \"#{s}\""
-              end
-            end
-
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @param required [Boolean]
-            # @return [Float, nil]
-            def parse_decimal_dot(node, xpath, required)
-              parse_decimal(node, xpath, required, '.', ',')
-            end
-
-            # @param node [Nokogiri::XML::Element]
-            # @param xpath [String]
-            # @param required [Boolean]
-            # @return [Float, nil]
-            def parse_decimal_comma(node, xpath, required)
-              parse_decimal(node, xpath, required, ',', '.')
-            end
-          end
-        end
-      end
-    end
-  end
-end