ehbrs-tools 0.27.0 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2fcd84889771b212325a7f4315bb2e03a9584ffd36dfa13184efa56fe0294c7
-  data.tar.gz: e4fba78ac97dfd0628bb7f1f4efc0c8fc2f46b6b598b74cb50c71bf5e3785156
+  metadata.gz: 644c4ba64fc1a688a62d35b89e6aadb311239b33611e782556931a6b3cf185b5
+  data.tar.gz: a8f8e6f90cdf1746b0996b0c1330f86559ba7bcf62c57df7015103a48a946043
 SHA512:
-  metadata.gz: b28bbf0f2abcf8cf7c4ff92f27b96a0f9d3761316cfa5796750606cc3249f00df80187410156b93caae02a649945b7bc2bc87afe656521b5fb6394828a566ee8
-  data.tar.gz: f6e325bb6fd61d6ee7eca4cae4de5c0a057b2c1954df5e693cb28143be82c411804771071dcffdbee482ac6aee53412889fbb6eeab4bb21d45c8074abb49d6d6
+  metadata.gz: b6fb53198617263ae78fab68ebeae06ab0cb311c2353675defe9dc857d07fff5c93eb237b970910d2f7aa520521b342a74477908ad88dcaf4eb5f6122b00952d
+  data.tar.gz: c41b33ff7bcac502642466954e89ede742a2aca4a7cde650602476ac1bf3602f7756972c12593e346ff274744c3512a16a5604bf60de5ff22616bd242cc80984

data/Gemfile

@@ -11,3 +11,5 @@ Dir["#{gems_subdir}/*"].each do |dir|
   basename = ::File.basename(dir)
   gem basename, path: "#{gems_subdir}/#{basename}"
 end
+
+gem 'httpclient', git: 'https://github.com/livelink/httpclient.git'

data/Gemfile.lock

@@ -1,7 +1,13 @@
+GIT
+  remote: https://github.com/livelink/httpclient.git
+  revision: 40f7e88078c95f9a6909fb56f9e313632637cd72
+  specs:
+    httpclient (2.8.4)
+
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.27.0)
+    ehbrs-tools (0.28.3)
       avm-tools (~> 0.82, >= 0.82.1)
       eac_cli (~> 0.12, >= 0.12.5)
       eac_ruby_utils (~> 0.71)
@@ -14,11 +20,12 @@ PATH
 PATH
   remote: vendor/aranha-parsers
   specs:
-    aranha-parsers (0.8.5)
+    aranha-parsers (0.10.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.7)
       curb (~> 0.9.10)
       eac_ruby_utils (~> 0.74)
+      faraday_middleware
       httpclient (~> 2.8, >= 2.8.3)
       nokogiri (~> 1.12, >= 1.12.4)
       ofx-parser (~> 1.1.0)
@@ -33,7 +40,7 @@ PATH
 PATH
   remote: vendor/eac_cli
   specs:
-    eac_cli (0.23.0)
+    eac_cli (0.23.1)
       colorize (~> 0.8.1)
       eac_config (~> 0.5, >= 0.5.1)
       eac_ruby_utils (~> 0.70)
@@ -52,29 +59,53 @@ PATH
       eac_ruby_utils (~> 0.74)
       eac_templates (~> 0.1)
 
+PATH
+  remote: vendor/eac_fs
+  specs:
+    eac_fs (0.7.0)
+      content-type
+      eac_ruby_utils (~> 0.70)
+      ruby-filemagic
+
 PATH
   remote: vendor/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.10.1)
+    eac_ruby_base0 (0.13.1)
       eac_cli (~> 0.22, >= 0.22.2)
-      eac_ruby_gems_utils (~> 0.9.5, ~> 0.9)
+      eac_fs (~> 0.3)
+      eac_ruby_gems_utils (~> 0.9.6, ~> 0.9)
+      eac_ruby_utils (~> 0.70)
+
+PATH
+  remote: vendor/eac_ruby_gems_utils
+  specs:
+    eac_ruby_gems_utils (0.9.8)
+      bundler
       eac_ruby_utils (~> 0.70)
 
 PATH
   remote: vendor/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.75.0)
+    eac_ruby_utils (0.79.0)
       activesupport (>= 4.0)
       addressable (~> 2.6)
       filesize
       net-ssh (~> 4.2)
 
+PATH
+  remote: vendor/eac_templates
+  specs:
+    eac_templates (0.2.0)
+      eac_config (~> 0.5)
+      eac_ruby_utils (~> 0.64)
+
 PATH
   remote: vendor/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.11.0)
+    ehbrs_ruby_utils (0.12.2)
       aranha-parsers (~> 0.8, >= 0.8.5)
       avm (~> 0.3, >= 0.3.2)
+      eac_fs (~> 0.5)
       eac_ruby_utils (~> 0.70)
       eac_templates (~> 0.1, >= 0.1.1)
       taglib-ruby (~> 1.1)
@@ -83,7 +114,7 @@ PATH
 PATH
   remote: vendor/ultimate_lyrics
   specs:
-    ultimate_lyrics (0.1.1)
+    ultimate_lyrics (0.1.2)
       aranha-parsers (~> 0.8, >= 0.8.5)
       eac_ruby_utils (~> 0.74)
 
@@ -100,41 +131,63 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     asciidoctor (2.0.16)
     ast (2.4.2)
-    avm (0.3.2)
+    avm (0.8.0)
+      eac_cli (~> 0.23, >= 0.23.1)
       eac_docker (~> 0.3)
       eac_git (~> 0.6)
-      eac_ruby_utils (~> 0.68)
+      eac_ruby_utils (~> 0.77)
       eac_templates (~> 0.1, >= 0.1.1)
-    avm-apps (0.4.1)
-      eac_ruby_utils (~> 0.67)
+      filesize (~> 0.2)
+      htmlbeautifier (~> 1.3, >= 1.3.1)
+      minitar (~> 0.9)
     avm-eac_asciidoctor_base0 (0.3.1)
       asciidoctor (~> 2.0, >= 2.0.12)
       avm-eac_webapp_base0 (~> 0.1)
       eac_ruby_utils (~> 0.63)
       os
       rouge (~> 3.26)
+    avm-eac_rails_base1 (0.1.2)
+      avm-eac_webapp_base0 (~> 0.1)
+      eac_ruby_utils (~> 0.68)
+    avm-eac_redmine_base0 (0.3.0)
+      avm-eac_rails_base1 (~> 0.1)
+      avm-eac_ubuntu_base0 (~> 0.2)
+      curb (~> 0.9.10)
+      eac_fs (~> 0.4)
+      eac_ruby_utils (~> 0.68)
+    avm-eac_ruby_base1 (0.1.0)
+      avm (~> 0.6)
+      eac_ruby_utils (~> 0.76)
+    avm-eac_ubuntu_base0 (0.2.0)
+      avm (~> 0.7)
+      eac_ruby_utils (~> 0.77, >= 0.77.1)
+      eac_templates (~> 0.2)
     avm-eac_webapp_base0 (0.1.1)
       avm (~> 0.1)
       eac_ruby_utils (~> 0.68)
-    avm-tools (0.105.0)
+    avm-files (0.2.0)
+      avm (~> 0.6)
+      eac_fs (~> 0.5)
+      eac_ruby_utils (~> 0.76)
+      eac_templates (~> 0.2)
+    avm-git (0.1.0)
+      avm-files (~> 0.1)
+      eac_git (~> 0.9)
+      eac_ruby_utils (~> 0.76)
+    avm-tools (0.111.0)
       aranha-parsers (~> 0.4)
-      asciidoctor (~> 2.0, >= 2.0.12)
       avm (~> 0.1)
-      avm-apps (~> 0.2)
       avm-eac_asciidoctor_base0
+      avm-eac_redmine_base0 (~> 0.3)
+      avm-eac_ruby_base1 (~> 0.1)
+      avm-eac_ubuntu_base0 (~> 0.2)
+      avm-files (~> 0.1)
+      avm-git (~> 0.1)
       clipboard (~> 1.3, >= 1.3.3)
-      content-type (~> 0.0.1)
       curb (~> 0.9.10)
-      eac_docker (~> 0.2)
-      eac_git (~> 0.2)
       eac_ruby_base0 (~> 0.7, >= 0.7.2)
       eac_ruby_gems_utils (~> 0.6, >= 0.6.1)
-      eac_templates (~> 0.1)
-      filesize
       git (~> 1.7)
-      htmlbeautifier (~> 1.3, >= 1.3.1)
-      minitar
-      os
       ruby-progressbar (~> 1.10, >= 1.10.1)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -153,7 +206,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
     dry-inflector (0.2.1)
-    eac_git (0.7.3)
+    eac_git (0.9.0)
       eac_ruby_utils (~> 0.74)
       parseconfig (~> 1.0, >= 1.0.8)
     eac_ruby_gem_support (0.4.0)
@@ -162,12 +215,6 @@ GEM
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    eac_ruby_gems_utils (0.9.5)
-      bundler (~> 2.2, >= 2.2.17)
-      eac_ruby_utils (~> 0.70)
-    eac_templates (0.1.2)
-      eac_config (~> 0.5)
-      eac_ruby_utils (~> 0.64)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -187,13 +234,14 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
     filesize (0.2.0)
     git (1.9.1)
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.3.1)
-    httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inifile (3.0.0)
@@ -202,18 +250,18 @@ GEM
     minitest (5.14.4)
     multipart-post (2.1.1)
     net-ssh (4.2.0)
-    nokogiri (1.12.4-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
-    os (1.1.1)
+    os (1.1.4)
     parallel (1.21.0)
-    parseconfig (1.1.0)
+    parseconfig (1.1.2)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rainbow (3.0.0)
     rchardet (1.8.0)
@@ -231,7 +279,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -245,6 +293,7 @@ GEM
       rubocop (>= 0.72.0)
     rubocop-rspec (1.38.1)
       rubocop (>= 0.68.1)
+    ruby-filemagic (0.7.2)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -264,7 +313,7 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   x86_64-linux
@@ -275,11 +324,15 @@ DEPENDENCIES
   eac_cli!
   eac_config!
   eac_docker!
+  eac_fs!
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.3)
+  eac_ruby_gems_utils!
   eac_ruby_utils!
+  eac_templates!
   ehbrs-tools!
   ehbrs_ruby_utils!
+  httpclient!
   ultimate_lyrics!
 
 BUNDLED WITH

data/lib/ehbrs/tools/runner/fs/selected.rb

@@ -29,10 +29,6 @@ module Ehbrs
 
           protected
 
-          def build_selected_directory(path)
-            path
-          end
-
           def directory_label(directory)
             directory.to_s
           end
@@ -49,7 +45,7 @@ module Ehbrs
           end
 
           def build_dir_uncached
-            parsed.build_dir.if_present(&:to_pathname)
+            parsed.build_dir.if_nil(&:to_pathname)
           end
 
           def run_build?
@@ -58,7 +54,7 @@ module Ehbrs
 
           def selected_directories_uncached
             infom 'Searching selected directories...'
-            selected.found.map { |path| build_selected_directory(path) }
+            selected.found
           end
 
           def selected_uncached

data/lib/ehbrs/tools/runner/music/lyrics.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/fs_cache'
 require 'ehbrs/tools/core_ext'
 require 'ehbrs_ruby_utils/videos/container'
 require 'ultimate_lyrics/provider'
@@ -13,7 +12,7 @@ module Ehbrs
           DEFAULT_PROVIDER = 'lyrics.com'
 
           runner_with :help, :output do
-            arg_opt '-p', '--provider', "Nome do provedor [Nome do #{DEFAULT_PROVIDER}]"
+            arg_opt '-p', '--provider', 'Nome do provedor.', default: DEFAULT_PROVIDER
             pos_arg :file
           end
 
@@ -33,7 +32,7 @@ module Ehbrs
 
           def start_banner
             infov 'File', file
-            %w[artist album track title].each do |attr|
+            %w[artist album track title year].each do |attr|
               infov attr.humanize, container.tag_file.tag.send(attr)
             end
             infov 'Selected provider', provider
@@ -60,7 +59,7 @@ module Ehbrs
           end
 
           def provider_name
-            parsed.provider.if_present(DEFAULT_PROVIDER)
+            parsed.provider
           end
         end
       end

data/lib/ehbrs/tools/runner/music/lyrics_book.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'ehbrs/tools/core_ext'
+require 'ehbrs_ruby_utils/music/lyrics_book'
+require 'ehbrs_ruby_utils/videos/container'
+require 'ultimate_lyrics/provider'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class LyricsBook
+          runner_with :help, :output do
+            arg_opt '-p', '--provider', 'Nome do provedor.',
+                    default: ::EhbrsRubyUtils::Music::LyricsBook::DEFAULT_PROVIDER_NAME
+            pos_arg :source_dir
+          end
+
+          def run
+            start_banner
+            run_output
+          end
+
+          def start_banner
+            infov 'Source directory', book.source_dir
+            infov 'Selected provider', book.provider
+          end
+
+          def book_uncached
+            ::EhbrsRubyUtils::Music::LyricsBook.new(parsed.source_dir,
+                                                    provider_name: parsed.provider)
+          end
+
+          def output_content
+            book.output
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/music/selected.rb

@@ -10,16 +10,16 @@ module Ehbrs
         class Selected < ::Ehbrs::Tools::Runner::Fs::Selected
           protected
 
-          def build_selected_directory(path)
-            ::Ehbrs::Music::Album.new(path)
-          end
-
           def directory_label(directory)
-            directory.to_label
+            path_to_album(directory).to_label
           end
 
           def directory_target_basename(directory)
-            directory.id
+            path_to_album(directory).id
+          end
+
+          def path_to_album(path)
+            ::Ehbrs::Music::Album.new(path)
           end
         end
       end

data/lib/ehbrs/tools/runner/vg/wii.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/fs/traversable'
+require 'eac_fs/traversable'
 require 'ehbrs/vg/wii/file_move'
 require 'ehbrs/vg/wii/game_file'
 
@@ -10,7 +10,7 @@ module Ehbrs
     class Runner
       class Vg
         class Wii
-          include ::EacRubyUtils::Fs::Traversable
+          include ::EacFs::Traversable
 
           runner_with :help do
             desc 'Manipulação de imagens de jogo Wii.'

data/lib/ehbrs/tools/runner/videos/series/rename.rb

@@ -11,7 +11,7 @@ module Ehbrs
       class Videos
         class Series
           class Rename
-            include ::EacRubyUtils::Fs::Traversable
+            include ::EacFs::Traversable
 
             runner_with :help do
               desc 'Renomeia arquivos de séries.'

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.27.0'
+    VERSION = '0.28.3'
   end
 end

data/lib/ehbrs/user_dirs.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/filesystem_cache'
+require 'eac_fs/cache'
 require 'eac_ruby_utils/simple_cache'
 
 module Ehbrs
@@ -15,7 +15,7 @@ module Ehbrs
       private
 
       def user_home_dir_uncached
-        ::EacRubyUtils::FilesystemCache.new(ENV['HOME'])
+        ::EacFs::Cache.new(ENV['HOME'])
       end
 
       def cache_uncached

data/lib/ehbrs/videos/unsupported/search.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/fs/traversable'
+require 'eac_fs/traversable'
 require 'eac_ruby_utils/core_ext'
 require 'ehbrs/videos/unsupported/file'
 
@@ -8,7 +8,7 @@ module Ehbrs
   module Videos
     module Unsupported
       class Search
-        include ::EacRubyUtils::Fs::Traversable
+        include ::EacFs::Traversable
         enable_speaker
         enable_simple_cache
 

data/spec/lib/ehbrs/tools/runner/fs/used_space_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_fs/cache'
 require 'eac_ruby_utils/fs/temp'
 require 'ehbrs/tools/runner'
 require 'ehbrs/tools/runner/fs/used_space'
@@ -8,7 +9,7 @@ require 'ehbrs/observers/with_persistence'
 RSpec.describe ::Ehbrs::Tools::Runner::Fs::UsedSpace do
   let(:target) { ::EacRubyUtils::Fs::Temp.directory }
   let(:user_dir) { ::EacRubyUtils::Fs::Temp.directory }
-  let(:cached_user_dir) { ::EacRubyUtils::FilesystemCache.new(user_dir) }
+  let(:cached_user_dir) { ::EacFs::Cache.new(user_dir) }
   let(:observers_user_dir) { cached_user_dir.child('observers') }
   let(:observer_path) do
     observers_user_dir.child(target.to_s.parameterize).content_path.to_pathname

data/vendor/aranha-parsers/aranha-parsers.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable', '~> 2.7'
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_ruby_utils', '~> 0.74'
+  s.add_dependency 'faraday_middleware'
   s.add_dependency 'httpclient', '~> 2.8', '>= 2.8.3'
   s.add_dependency 'nokogiri', '~> 1.12', '>= 1.12.4'
   s.add_dependency 'ofx-parser', '~> 1.1.0'

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

@@ -11,7 +11,9 @@ module Aranha
       class << self
         def from_content(content)
           ::EacRubyUtils::Fs::Temp.on_file do |path|
-            path.write(content)
+            ::File.open(path.to_s, 'w:UTF-8') do |f|
+              f.write content.force_encoding('UTF-8')
+            end
             r = new(path.to_path)
             r.content
             r

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

@@ -0,0 +1,70 @@
+# 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
+            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
+
+            def us_decimal_value(node, xpath)
+              parse_us_decimal(node, xpath, true)
+            end
+
+            def us_decimal_optional_value(node, xpath)
+              parse_us_decimal(node, xpath, false)
+            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
+
+            def parse_us_decimal(node, xpath, required)
+              s = string_value(node, xpath)
+              m = /\d+(?:[\.\,](\d+))?/.match(s)
+              if m
+                m[0].delete(',').to_f
+              elsif required
+                raise "US decimal value not found in \"#{s}\""
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/aranha-parsers/lib/aranha/parsers/html/node/default/string_support.rb

@@ -0,0 +1,77 @@
+# 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 StringSupport
+            def quoted_value(node, xpath)
+              s = string_value(node, xpath)
+              return '' unless s
+
+              m = /\"([^\"]+)\"/.match(s)
+              return m[1] if m
+
+              ''
+            end
+
+            def regxep(node, xpath, pattern)
+              s = string_value(node, xpath)
+              m = pattern.match(s)
+              return m if m
+
+              raise "Pattern \"#{pattern}\" not found in string \"#{s}\""
+            end
+
+            def string_value(node, xpath)
+              if node.at_xpath(xpath)
+                sanitize_string(node.at_xpath(xpath).text)
+              else
+                ''
+              end
+            end
+
+            def string_recursive_value(node, xpath, required = true)
+              root = node.at_xpath(xpath)
+              if root.blank?
+                return nil unless required
+
+                raise "No node found (Xpath: #{xpath})"
+              end
+              result = string_recursive(root)
+              return result if result.present?
+              return nil unless required
+
+              raise "String blank (Xpath: #{xpath})"
+            end
+
+            def string_recursive_optional_value(node, xpath)
+              string_recursive_value(node, xpath, false)
+            end
+
+            private
+
+            def sanitize_string(obj)
+              obj.to_s.tr("\u00A0", ' ').strip
+            end
+
+            def string_recursive(node)
+              return sanitize_string(node.text) if node.is_a?(::Nokogiri::XML::Text)
+
+              s = ''
+              node.children.each do |child|
+                child_s = string_recursive(child)
+                s += ' ' + child_s if child_s.present?
+              end
+              sanitize_string(s)
+            end
+          end
+        end
+      end
+    end
+  end
+end