ehbrs-tools 0.16.5 → 0.17.0

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb

@@ -2,6 +2,7 @@
 
 require 'active_support/callbacks'
 require 'eac_ruby_utils/arguments_consumer'
+require 'eac_ruby_utils/common_constructor/class_initialize'
 require 'ostruct'
 
 module EacRubyUtils
@@ -76,111 +77,13 @@ module EacRubyUtils
     end
 
     def setup_class_initialize(klass)
-      common_constructor = self
       klass.include(::ActiveSupport::Callbacks)
       klass.define_callbacks :initialize
-      klass.send(:define_method, :initialize) do |*args|
-        Initialize.new(common_constructor, args, self).run
-        super(*SuperArgs.new(common_constructor, args, self).result)
-      end
+      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).run
     end
 
     def super_args
       options[:super_args]
     end
-
-    class Initialize
-      attr_reader :common_constructor, :args, :object
-
-      def initialize(common_constructor, args, object)
-        @common_constructor = common_constructor
-        @args = args
-        @object = object
-      end
-
-      def run
-        validate_args_count
-        object.run_callbacks :initialize do
-          object_attributes_set
-          object_after_callback
-        end
-      end
-
-      private
-
-      def arg_value(arg_name)
-        arg_index = common_constructor.args.index(arg_name)
-        if arg_index < args.count
-          args[arg_index]
-        else
-          common_constructor.default_values[arg_index - common_constructor.args_count_min]
-        end
-      end
-
-      def object_after_callback
-        return unless common_constructor.after_set_block
-
-        object.instance_eval(&common_constructor.after_set_block)
-      end
-
-      def object_attributes_set
-        common_constructor.args.each do |arg_name|
-          object.send("#{arg_name}=", arg_value(arg_name))
-        end
-      end
-
-      def validate_args_count
-        return if common_constructor.args_count.include?(args.count)
-
-        raise ArgumentError, "#{object.class}.initialize: wrong number of arguments" \
-          " (given #{args.count}, expected #{common_constructor.args_count})"
-      end
-    end
-
-    class SuperArgs
-      attr_reader :common_constructor, :args, :object
-
-      def initialize(common_constructor, args, object)
-        @common_constructor = common_constructor
-        @args = args
-        @object = object
-      end
-
-      def auto_result
-        r = []
-        sub_args.each do |name, value|
-          i = super_arg_index(name)
-          r[i] = value if i
-        end
-        r
-      end
-
-      def result
-        result_from_options || auto_result
-      end
-
-      def result_from_options
-        return unless common_constructor.super_args
-
-        object.instance_exec(&common_constructor.super_args)
-      end
-
-      def sub_args
-        common_constructor.args.each_with_index.map do |name, index|
-          [name, args[index]]
-        end.to_h
-      end
-
-      def super_arg_index(name)
-        super_method.parameters.each_with_index do |arg, index|
-          return index if arg[1] == name
-        end
-        nil
-      end
-
-      def super_method
-        object.class.superclass ? object.class.superclass.instance_method(:initialize) : nil
-      end
-    end
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_initialize.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/common_constructor/instance_initialize'
+require 'eac_ruby_utils/common_constructor/super_args'
+
+module EacRubyUtils
+  class CommonConstructor
+    class ClassInitialize
+      attr_reader :common_constructor, :klass
+
+      def initialize(common_constructor, klass)
+        @common_constructor = common_constructor
+        @klass = klass
+      end
+
+      def run
+        class_initialize = self
+        klass.send(:define_method, :initialize) do |*args|
+          ::EacRubyUtils::CommonConstructor::InstanceInitialize.new(
+            class_initialize.common_constructor, args, self
+          ).run
+          super(*::EacRubyUtils::CommonConstructor::SuperArgs.new(
+            class_initialize, args, self
+          ).result)
+        end
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/instance_initialize.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class CommonConstructor
+    class InstanceInitialize
+      attr_reader :common_constructor, :args, :object
+
+      def initialize(common_constructor, args, object)
+        @common_constructor = common_constructor
+        @args = args
+        @object = object
+      end
+
+      def run
+        validate_args_count
+        object.run_callbacks :initialize do
+          object_attributes_set
+          object_after_callback
+        end
+      end
+
+      private
+
+      def arg_value(arg_name)
+        arg_index = common_constructor.args.index(arg_name)
+        if arg_index < args.count
+          args[arg_index]
+        else
+          common_constructor.default_values[arg_index - common_constructor.args_count_min]
+        end
+      end
+
+      def object_after_callback
+        return unless common_constructor.after_set_block
+
+        object.instance_eval(&common_constructor.after_set_block)
+      end
+
+      def object_attributes_set
+        common_constructor.args.each do |arg_name|
+          object.send("#{arg_name}=", arg_value(arg_name))
+        end
+      end
+
+      def validate_args_count
+        return if common_constructor.args_count.include?(args.count)
+
+        raise ArgumentError, "#{object.class}.initialize: wrong number of arguments" \
+          " (given #{args.count}, expected #{common_constructor.args_count})"
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/super_args.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/delegation'
+
+module EacRubyUtils
+  class CommonConstructor
+    class SuperArgs
+      attr_reader :class_initialize, :args, :object
+      delegate :common_constructor, to: :class_initialize
+
+      def initialize(class_initialize, args, object)
+        @class_initialize = class_initialize
+        @args = args
+        @object = object
+      end
+
+      def auto_result
+        r = []
+        sub_args.each do |name, value|
+          i = super_arg_index(name)
+          r[i] = value if i
+        end
+        r
+      end
+
+      def result
+        result_from_options || auto_result
+      end
+
+      def result_from_options
+        return unless common_constructor.super_args
+
+        object.instance_exec(&common_constructor.super_args)
+      end
+
+      def sub_args
+        common_constructor.args.each_with_index.map do |name, index|
+          [name, args[index]]
+        end.to_h
+      end
+
+      def super_arg_index(name)
+        super_method.parameters.each_with_index do |arg, index|
+          return index if arg[1] == name
+        end
+        nil
+      end
+
+      def super_method
+        class_initialize.klass.superclass&.instance_method(:initialize)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb

@@ -38,7 +38,7 @@ module EacRubyUtils
         def run_with_subcommand
           if subcommand_name
             check_valid_subcommand
-            subcommand.run
+            subcommand_run
           else
             run_without_subcommand
           end
@@ -52,6 +52,15 @@ module EacRubyUtils
           )
         end
 
+        def subcommand_run
+          if !subcommand.is_a?(::EacRubyUtils::Console::DocoptRunner) &&
+             subcommand.respond_to?(:run_run)
+            subcommand.run_run
+          else
+            subcommand.run
+          end
+        end
+
         def target_doc
           super.gsub(SUBCOMMANDS_MACRO,
                      "#{target_doc_subcommand_arg} [#{SUBCOMMAND_ARGS_ARG}...]") +

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/template.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/templates/searcher'
+
+class Module
+  def template
+    @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'eac_ruby_utils/templates/searcher'
+require 'eac_ruby_utils/patches/module/template'
 
 class Object
-  class << self
-    def template
-      @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
-    end
-  end
-
   def template
     self.class.template
   end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.56.0'
+  VERSION = '0.57.0'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb

@@ -14,10 +14,18 @@ module EacRubyUtils
         ::YAML.dump(sanitize(object))
       end
 
+      def dump_file(path, object)
+        ::File.write(path.to_s, dump(object))
+      end
+
       def load(string)
         ::YAML.safe_load(string, permitted_classes)
       end
 
+      def load_file(path)
+        load(::File.read(path.to_s))
+      end
+
       def permitted_classes
         DEFAULT_PERMITTED_CLASSES
       end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_concern_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
 
       module InstanceMethods # rubocop:disable RSpec/LeakyConstantDeclaration
         def my_instance_method
-          'instance'
+          'from_module'
         end
       end
     end
@@ -31,8 +31,8 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
         attr_accessor :valor
       end
 
-      def method1
-        'from_stub_module'
+      def my_instance_method
+        'from_class'
       end
     end
   end
@@ -48,7 +48,17 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
       stub_class.include stub_module
     end
 
-    it { expect(stub_class_instance.my_instance_method).to eq('instance') }
+    it { expect(stub_class_instance.my_instance_method).to eq('from_class') }
+    it { expect(stub_class_instance.class.my_class_method).to eq('class') }
+    it { expect(stub_class_instance.class.valor).to eq('changed') }
+  end
+
+  context 'when prepended' do
+    before do
+      stub_class.prepend stub_module
+    end
+
+    it { expect(stub_class_instance.my_instance_method).to eq('from_module') }
     it { expect(stub_class_instance.class.my_class_method).to eq('class') }
     it { expect(stub_class_instance.class.valor).to eq('changed') }
   end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb

@@ -92,4 +92,34 @@ RSpec.describe ::EacRubyUtils::CommonConstructor do
       end
     end
   end
+
+  context 'with class hierarchy mixed with and without common_constructor' do
+    let(:klass_0) do
+      described_class.new(:a_param).setup_class(::Class.new)
+    end
+
+    let(:klass_1) do
+      ::Class.new(klass_0) do
+        def initialize(a_param)
+          super(a_param)
+        end
+      end
+    end
+
+    let(:klass_2) do
+      ::Class.new(klass_1)
+    end
+
+    let(:klass_3) do
+      described_class.new(:a_param).setup_class(::Class.new(klass_2))
+    end
+
+    4.times.each do |i|
+      context "wit #{i}-th class" do
+        let(:class_instance) { send("klass_#{i}").new(:a) }
+
+        it { expect(class_instance.a_param).to eq(:a) }
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.17.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -116,6 +116,16 @@ files:
 - Gemfile
 - exe/ehbrs
 - lib/ehbrs.rb
+- lib/ehbrs/cooking_book.rb
+- lib/ehbrs/cooking_book/build.rb
+- lib/ehbrs/cooking_book/build/base_page.rb
+- lib/ehbrs/cooking_book/build/index_page.rb
+- lib/ehbrs/cooking_book/build/recipe_page.rb
+- lib/ehbrs/cooking_book/project.rb
+- lib/ehbrs/cooking_book/recipe.rb
+- lib/ehbrs/cooking_book/recipe/ingredient.rb
+- lib/ehbrs/cooking_book/recipe/measure.rb
+- lib/ehbrs/cooking_book/recipe/part.rb
 - lib/ehbrs/executables.rb
 - lib/ehbrs/fs.rb
 - lib/ehbrs/fs/compressed_package.rb
@@ -126,7 +136,12 @@ files:
 - lib/ehbrs/observers.rb
 - lib/ehbrs/observers/base.rb
 - lib/ehbrs/observers/with_persistence.rb
+- lib/ehbrs/patches/module/erb_template.rb
+- lib/ehbrs/patches/object/erb_template.rb
+- lib/ehbrs/patches/object/template.rb
 - lib/ehbrs/runner.rb
+- lib/ehbrs/runner/cooking_book.rb
+- lib/ehbrs/runner/cooking_book/build.rb
 - lib/ehbrs/runner/finances.rb
 - lib/ehbrs/runner/finances/bb_browser.rb
 - lib/ehbrs/runner/fs.rb
@@ -152,6 +167,7 @@ files:
 - lib/ehbrs/self/observers/used_space.rb
 - lib/ehbrs/self/observers/with_persistence.rb
 - lib/ehbrs/tools.rb
+- lib/ehbrs/tools/application.rb
 - lib/ehbrs/tools/version.rb
 - lib/ehbrs/user_dirs.rb
 - lib/ehbrs/vg.rb
@@ -202,6 +218,10 @@ files:
 - lib/ehbrs/videos/unsupported/profiles/samsung.rb
 - lib/ehbrs/videos/unsupported/search.rb
 - lib/ehbrs/videos/unsupported/track.rb
+- template/ehbrs/cooking_book/build/base_page/layout.html.erb
+- template/ehbrs/cooking_book/build/index_page/inner.html.erb
+- template/ehbrs/cooking_book/build/recipe_page/inner.html.erb
+- template/ehbrs/cooking_book/build/recipe_page/part.html.erb
 - vendor/aranha-parsers/Gemfile
 - vendor/aranha-parsers/aranha-parsers.gemspec
 - vendor/aranha-parsers/lib/aranha/parsers.rb
@@ -308,6 +328,15 @@ files:
 - vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec_files/stub_docker_image/Dockerfile
 - vendor/eac_docker/spec/rubocop_spec.rb
 - vendor/eac_docker/spec/spec_helper.rb
+- vendor/eac_ruby_base0/Gemfile
+- vendor/eac_ruby_base0/eac_ruby_base0.gemspec
+- vendor/eac_ruby_base0/lib/eac_ruby_base0.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner/test_all.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb
+- vendor/eac_ruby_base0/spec/rubocop_spec.rb
+- vendor/eac_ruby_base0/spec/spec_helper.rb
 - vendor/eac_ruby_utils/Gemfile
 - vendor/eac_ruby_utils/MIT-LICENCE
 - vendor/eac_ruby_utils/README.rdoc
@@ -322,6 +351,9 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/class_setup.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/module_setup.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_initialize.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/instance_initialize.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/super_args.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/base.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb
@@ -411,6 +443,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/template.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/debug.rb