avm 0.59.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e515ae3c2a7c5ce6fa8d620589e359aeb2568edd75b554932adb0a666f0ff8f
-  data.tar.gz: 0ca8ac3456a4f99106d7e91d9429936365707b9ff68e20c0f8f36ba19074fc39
+  metadata.gz: 8ee7bf9c423e00a5bbd0e070ab0f1a191f338e80c794fde0609a3463c7307d78
+  data.tar.gz: cdb1a486aadcb408fee1123c133f54c5d46fa912be903f49ed547166027b62a2
 SHA512:
-  metadata.gz: c3afecc85ab9c116a136758af1a0e8dbf889665eb09a6348f6be0c0e62da42bbd1073c64c19b4c3cece99bc57aae1d40faf645810c2f00fa9d2b9256ffc9d815
-  data.tar.gz: 9771384b7caf46ad06478e2dc6d3d6a1a1f525baf66fdef65fb4e49e22fa4be258bc786372208e9ed8b572bb978c33ad11b9a8f8ae605522c0dbc1deab194213
+  metadata.gz: d1a37030086636976394fe3392a2681c4065cb8dbabd32fc1f702193b581372372519ef099b254c7c126f3818cff4715dc1597f2ecab1c65a9953044a20362a0
+  data.tar.gz: 2a72c35e69480aabe07bc71a00ec8cfaf30854ced09da08b423f88c9229f59e42275a902d9797f12a23ec5305c4893803770425b439035a96e70d3f45be30060

data/lib/avm/file_formats/base.rb

@@ -8,6 +8,7 @@ module Avm
   module FileFormats
     class Base
       enable_abstract_methods
+      compare_by :class
 
       def apply(files)
         old_content = Hash[files.map { |f| [f, File.read(f)] }]
@@ -15,6 +16,12 @@ module Avm
         files.map { |f| build_file_result(f, old_content[f]) }
       end
 
+      # @param path [Pathname]
+      # @return [Avm::FileFormats::FileWith]
+      def file_resource_name(path)
+        path.to_pathname.to_path
+      end
+
       def name
         self.class.name.demodulize
       end

data/lib/avm/file_formats/search_formatter.rb

@@ -50,19 +50,9 @@ module Avm
         @result = []
       end
 
+      # @return [Avm::FileFormats::Base, nil]
       def find_format(file)
-        formats.each do |c|
-          return c if c.match?(file)
-        end
-        nil
-      end
-
-      def formats_uncached
-        formats_from_registry
-      end
-
-      def formats_from_registry
-        ::Avm::Registry.file_formats.available.reverse.map(&:new)
+        ::Avm::Registry.file_formats.detect_optional(file)
       end
 
       def search_files

data/lib/avm/registry/file_formats.rb

@@ -5,6 +5,10 @@ require 'avm/registry/from_gems'
 module Avm
   module Registry
     class FileFormats < ::Avm::Registry::FromGems
+      # @return [Avm::FileFormats::Base]
+      def class_detect(klass, detect_args)
+        klass.new if klass.new.match?(detect_args.first)
+      end
     end
   end
 end

data/lib/avm/rspec/setup.rb

@@ -7,8 +7,8 @@ module Avm
   module Rspec
     module Setup
       require_sub __FILE__
-      EXAMPLES = %w[avm_file_formats_with_fixtures avm_source_generated entries_values
-                    in_avm_registry not_in_avm_registry].freeze
+      EXAMPLES = %w[avm_file_formats_with_fixtures avm_file_format_file_resource_name
+                    avm_source_generated entries_values in_avm_registry not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples

data/lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'avm_file_format_file_resource_name' do |input_expected|
+  describe '#file_resource_name' do
+    input_expected.each do |path, expected_resource_name|
+      context "when path is \"#{path}\"" do
+        let(:instance) { described_class.new }
+
+        it { expect(instance.file_resource_name(path)).to eq(expected_resource_name) }
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/file_resource_name.rb

@@ -7,13 +7,14 @@ module Avm
     module AutoCommit
       class FileResourceName
         require_sub __FILE__, include_modules: true
+        enable_simple_cache
         common_constructor :source_root, :path do
           self.source_root = source_root.to_pathname
           self.path = path.to_pathname
         end
 
         def class_name
-          ruby_class_name || relative_path.to_path
+          file_format.file_resource_name(path)
         end
 
         def commit_message
@@ -25,6 +26,13 @@ module Avm
         def relative_path
           path.expand_path.relative_path_from(source_root.expand_path)
         end
+
+        private
+
+        # @return [Avm::FileFormats::Base]
+        def file_format_uncached
+          ::Avm::Registry.file_formats.detect(path)
+        end
       end
     end
   end

data/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.59.0'
+  VERSION = '0.60.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
@@ -369,6 +369,7 @@ files:
 - lib/avm/rspec/setup.rb
 - lib/avm/rspec/setup/launcher.rb
 - lib/avm/rspec/setup/source_generator.rb
+- lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb
 - lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb
 - lib/avm/rspec/shared_examples/avm_source_generated.rb
 - lib/avm/rspec/shared_examples/entries_values.rb
@@ -378,7 +379,6 @@ files:
 - lib/avm/scms.rb
 - lib/avm/scms/auto_commit.rb
 - lib/avm/scms/auto_commit/file_resource_name.rb
-- lib/avm/scms/auto_commit/file_resource_name/ruby.rb
 - lib/avm/scms/auto_commit/for_file.rb
 - lib/avm/scms/auto_commit/rules.rb
 - lib/avm/scms/auto_commit/rules/base.rb

data/lib/avm/scms/auto_commit/file_resource_name/ruby.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Scms
-    module AutoCommit
-      class FileResourceName
-        module Ruby
-          RUBY_CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z},
-                                      %r{app/[^/]+/(.+)\.rb\z}].freeze
-
-          def ruby_class_name
-            RUBY_CLASS_NAME_PATTERNS.each do |pattern|
-              pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
-            end
-            nil
-          end
-        end
-      end
-    end
-  end
-end