asset_finder 1.6.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1dc0bac12859ae8c078f18e7ced136ff53e7f78e5e1f8246a842c95653d1093
-  data.tar.gz: fe8e0498025196c99593e760c4dfbe8791031b2e8ff64d997694088e614e4bd3
+  metadata.gz: d25517bbac695431afc4943b43d120d5c9c57ae35c670ed87e8dd7200f9ba272
+  data.tar.gz: 6609fdbd827c88f0928797a4dee643456413fc1d6ae8f50bd5538787d9225197
 SHA512:
-  metadata.gz: b749d80652a5fbc9ae05f1f4eb0c6256c953c1ca178bf0ce01516ce36b1c197a8698983748c19047b68332149f25ec37a5b27b78325e05841291777bdb641d6f
-  data.tar.gz: bc8016df114c316c54a302d4a568b055631a67788199fe50ac2a94a56afc254509d10a5831c679894831c6590135043edf20fa8a09d756f2dd61401e35e2aacd
+  metadata.gz: 9eeff6696737e15719527b9a41e89a4d6efcdba53f376c221f38d1cbc91e5687c4189cf8b9b426775139444e1a80edf86356b40b2b95d1939378ae22fc789df0
+  data.tar.gz: 5ad11793f8dc2fa089858413fc2f8261f8a587b69e702f7598eb699173ed420ff9f1fbc93b50f8bca4bb83480a54ac883e59617def6e4c74f9b07c4b86ce1eaf

data/.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release gem
+
+on:
+  workflow_dispatch:
+    inputs:
+      rubygems-otp-code:
+        description: RubyGems OTP code
+        required: true
+
+permissions:
+  contents: write
+
+jobs:
+  release-gem:
+    runs-on: ubuntu-latest
+    env:
+      GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+      GEM_HOST_OTP_CODE: ${{ github.event.inputs.rubygems-otp-code }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # bundle exec rake release で git tag を見るため、tagをfetchするようにしている
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+      - name: Bundle install
+        run: bundle install
+      - name: Setup git config # bundle exec rake release でgit tagが打たれていない場合、タグを打ってpushしてくれるため用意している
+        run: |
+          git config --global user.email "taka0125@gmail.com"
+          git config --global user.name "Takahiro Ooishi"
+      - name: Release gem
+        run: bundle exec rake release

data/.github/workflows/ruby.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7', '3.0', '3.1']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v2

data/.rspec

@@ -1,2 +1,3 @@
+--require spec_helper
 --format documentation
 --color

data/README.md

@@ -4,7 +4,7 @@ Find javascripts and stylesheets for `rake asset:precompile`.
 
 ## Build Status
 
-### master
+### main
 [![Build Status](https://github.com/taka0125/asset_finder/workflows/Ruby/badge.svg)](https://github.com/taka0125/asset_finder/actions)
 
 
@@ -25,6 +25,26 @@ Or install it yourself as:
 
     $ gem install asset_finder
 
+## config file
+
+`config/initializers/asset_finder.rb`
+
+### Sprockets
+
+```ruby
+Rails.application.config.to_prepare do
+  Rails.application.config.assets.precompile += AssetFinder::SprocketsConfigGenerator.new.execute
+end
+```
+
+### dartsass-rails
+
+```ruby
+Rails.application.config.to_prepare do
+  Rails.application.config.dartsass.builds = AssetFinder::Stylesheet::DartsassConfigGenerator.new.execute
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/asset_finder.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'railties', '>= 6.0', '< 7.1'
+  spec.add_dependency 'railties', '>= 6.0'
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/asset_finder/configuration.rb

@@ -1,18 +1,22 @@
 module AssetFinder
   class Configuration
     attr_accessor :javascript_patterns
+    attr_accessor :javascript_root_path
     attr_accessor :stylesheet_patterns
+    attr_accessor :stylesheet_root_path
     attr_accessor :normalize_index_file
 
     DEFAULT = {
       javascript_patterns: [],
+      javascript_root_path: 'app/assets/javascripts/',
       stylesheet_patterns: [],
+      stylesheet_root_path: 'app/assets/stylesheets/',
       normalize_index_file: true
     }.freeze
 
     def initialize(options = {})
-      %i(javascript_patterns stylesheet_patterns normalize_index_file).each do |k|
-        send(:"#{k}=", options[k] || DEFAULT[k])
+      DEFAULT.keys.each do |k|
+        public_send(:"#{k}=", options[k] || DEFAULT[k])
       end
     end
   end

data/lib/asset_finder/javascript/normalizer.rb

@@ -1,28 +1,26 @@
 module AssetFinder
   module Javascript
     class Normalizer
-      DEFAULT_PATTERNS = [
-        /^(.*)\.js\.coffee$/,
-        /^(.*)\.coffee$/,
-        /^(.*)\.js$/
-      ].freeze
-
-      def initialize(root_dir, patterns = [], normalize_index_file: true)
+      def initialize(root_dir:, path_pattern_collection:, normalize_index_file: true)
         @root_dir = root_dir.to_s
-        @patterns = patterns + DEFAULT_PATTERNS
+        @path_pattern_collection = path_pattern_collection
         @normalize_index_file = normalize_index_file
+
+        freeze
       end
 
       def normalize(path)
-        @patterns.each do |pattern|
-          if path.match(pattern)
-            normalized_path = $1.delete_prefix(@root_dir)
-            normalized_path = normalized_path.delete_suffix('/index') if @normalize_index_file
-            return normalized_path + '.js'
-          end
-        end
-        nil
+        match = path_pattern_collection.match(path: path)
+        return unless match
+
+        normalized_path = match[1].delete_prefix(root_dir)
+        normalized_path = normalized_path.delete_suffix('/index') if normalize_index_file
+        normalized_path + '.js'
       end
+
+      private
+
+      attr_reader :root_dir, :path_pattern_collection, :normalize_index_file
     end
   end
 end

data/lib/asset_finder/javascript/path_collector.rb

@@ -0,0 +1,28 @@
+require 'find'
+
+module AssetFinder
+  module Javascript
+    class PathCollector
+      def initialize(root_dir:, path_pattern_collection:)
+        @root_dir = root_dir || File.join(Rails.root, AssetFinder.config.javascript_root_path)
+        @path_pattern_collection = path_pattern_collection || PathPatternCollection.build
+
+        freeze
+      end
+
+      def execute
+        [].tap do |paths|
+          Find.find(root_dir).each do |path|
+            next unless path_pattern_collection.match?(path: path)
+
+            paths << path
+          end
+        end
+      end
+
+      private
+
+      attr_reader :root_dir, :path_pattern_collection
+    end
+  end
+end

data/lib/asset_finder/javascript/path_pattern_collection.rb

@@ -0,0 +1,16 @@
+module AssetFinder
+  module Javascript
+    class PathPatternCollection < AssetFinder::PathPatternCollection
+      DEFAULT_PATTERNS = [
+        /^(.*)\.js\.coffee$/,
+        /^(.*)\.coffee$/,
+        /^(.*)\.js$/
+      ].freeze
+
+      def self.build
+        patterns = AssetFinder.config.javascript_patterns + DEFAULT_PATTERNS
+        new(path_patterns: patterns.map { |pattern| PathPattern.new(pattern: pattern) })
+      end
+    end
+  end
+end

data/lib/asset_finder/javascript/sprockets_config_generator.rb

@@ -0,0 +1,24 @@
+require 'find'
+
+module AssetFinder
+  module Javascript
+    class SprocketsConfigGenerator
+      def initialize(root_dir: nil)
+        @root_dir = root_dir || File.join(Rails.root, AssetFinder.config.javascript_root_path)
+        @path_pattern_collection = PathPatternCollection.build
+        @path_collector = PathCollector.new(root_dir: @root_dir, path_pattern_collection: @path_pattern_collection)
+        @normalizer = Normalizer.new(root_dir: @root_dir, path_pattern_collection: @path_pattern_collection, normalize_index_file: AssetFinder.config.normalize_index_file)
+
+        freeze
+      end
+
+      def execute
+        path_collector.execute.map { |path| normalizer.normalize(path) }.compact
+      end
+
+      private
+
+      attr_reader :root_dir, :path_pattern_collection, :path_collector, :normalizer
+    end
+  end
+end

data/lib/asset_finder/path_pattern.rb

@@ -0,0 +1,19 @@
+module AssetFinder
+  class PathPattern
+    attr_reader :pattern
+
+    def initialize(pattern:)
+      @pattern = pattern
+
+      freeze
+    end
+
+    def match?(path:)
+      path.match?(pattern)
+    end
+
+    def match(path:)
+      path.match(pattern)
+    end
+  end
+end

data/lib/asset_finder/path_pattern_collection.rb

@@ -0,0 +1,30 @@
+module AssetFinder
+  class PathPatternCollection
+    def initialize(path_patterns:)
+      @path_patterns = Array(path_patterns)
+
+      freeze
+    end
+
+    def match?(path:)
+      path_patterns.each do |path_pattern|
+        return true if path_pattern.match?(path: path)
+      end
+
+      false
+    end
+
+    def match(path:)
+      path_patterns.each do |path_pattern|
+        match = path_pattern.match(path: path)
+        return match if match
+      end
+
+      nil
+    end
+
+    private
+
+    attr_reader :path_patterns
+  end
+end

data/lib/asset_finder/railtie.rb

@@ -9,8 +9,6 @@ module AssetFinder
         config.javascript_patterns = Rails.application.config.asset_finder.javascript_patterns
         config.stylesheet_patterns = Rails.application.config.asset_finder.stylesheet_patterns
       end
-
-      Rails.application.config.assets.precompile += AssetFinder::Finder.execute
     end
   end
 end

data/lib/asset_finder/sprockets_config_generator.rb

@@ -0,0 +1,11 @@
+module AssetFinder
+  class SprocketsConfigGenerator
+    def initialize
+      freeze
+    end
+
+    def execute
+      Javascript::SprocketsConfigGenerator.new.execute + Stylesheet::SprocketsConfigGenerator.new.execute
+    end
+  end
+end

data/lib/asset_finder/stylesheet/dartsass_config_generator.rb

@@ -0,0 +1,31 @@
+require 'find'
+
+module AssetFinder
+  module Stylesheet
+    class DartsassConfigGenerator
+      def initialize(root_dir: nil)
+        @root_dir = root_dir || File.join(Rails.root, 'app/assets/stylesheets/')
+        @path_pattern_collection = PathPatternCollection.build
+        @path_collector = PathCollector.new(root_dir: @root_dir, path_pattern_collection: @path_pattern_collection)
+        @normalizer = Normalizer.new(root_dir: @root_dir, path_pattern_collection: @path_pattern_collection)
+
+        freeze
+      end
+
+      def execute
+        {}.tap do |results|
+          path_collector.execute.each do |path|
+            key = path.delete_prefix(root_dir)
+            value = normalizer.normalize(path)
+
+            results[key] = value
+          end
+        end
+      end
+
+      private
+
+      attr_reader :root_dir, :path_pattern_collection, :path_collector, :normalizer
+    end
+  end
+end

data/lib/asset_finder/stylesheet/normalizer.rb

@@ -1,25 +1,23 @@
 module AssetFinder
   module Stylesheet
     class Normalizer
-      DEFAULT_PATTERNS = [
-        /^(.*)\.css\.scss$/,
-        /^(.*)\.css$/,
-        /^(.*)\.scss$/
-      ].freeze
-
-      def initialize(root_dir, patterns = [])
+      def initialize(root_dir:, path_pattern_collection:)
         @root_dir = root_dir.to_s
-        @patterns = patterns + DEFAULT_PATTERNS
+        @path_pattern_collection = path_pattern_collection
+
+        freeze
       end
 
       def normalize(path)
-        @patterns.each do |pattern|
-          if path.match(pattern)
-            return $1.sub(@root_dir, '') + '.css'
-          end
-        end
-        nil
+        match = path_pattern_collection.match(path: path)
+        return unless match
+
+        match[1].sub(root_dir, '') + '.css'
       end
+
+      private
+
+      attr_reader :root_dir, :path_pattern_collection
     end
   end
 end

data/lib/asset_finder/stylesheet/path_collector.rb

@@ -0,0 +1,28 @@
+require 'find'
+
+module AssetFinder
+  module Stylesheet
+    class PathCollector
+      def initialize(root_dir:, path_pattern_collection:)
+        @root_dir = root_dir
+        @path_pattern_collection = path_pattern_collection
+
+        freeze
+      end
+
+      def execute
+        [].tap do |paths|
+          Find.find(root_dir).each do |path|
+            next unless path_pattern_collection.match?(path: path)
+
+            paths << path
+          end
+        end
+      end
+
+      private
+
+      attr_reader :root_dir, :path_pattern_collection
+    end
+  end
+end

data/lib/asset_finder/stylesheet/path_pattern_collection.rb

@@ -0,0 +1,16 @@
+module AssetFinder
+  module Stylesheet
+    class PathPatternCollection < AssetFinder::PathPatternCollection
+      DEFAULT_PATTERNS = [
+        /^(.*)\.css\.scss$/,
+        /^(.*)\.css$/,
+        /^(.*)\.scss$/
+      ].freeze
+
+      def self.build
+        patterns = AssetFinder.config.stylesheet_patterns + DEFAULT_PATTERNS
+        new(path_patterns: patterns.map { |pattern| PathPattern.new(pattern: pattern) })
+      end
+    end
+  end
+end

data/lib/asset_finder/stylesheet/sprockets_config_generator.rb

@@ -0,0 +1,24 @@
+require 'find'
+
+module AssetFinder
+  module Stylesheet
+    class SprocketsConfigGenerator
+      def initialize(root_dir: nil)
+        @root_dir = root_dir || File.join(Rails.root, 'app/assets/stylesheets/')
+        @path_pattern_collection = PathPatternCollection.build
+        @path_collector = PathCollector.new(root_dir: @root_dir, path_pattern_collection: @path_pattern_collection)
+        @normalizer = Normalizer.new(root_dir: @root_dir, path_pattern_collection: @path_pattern_collection)
+
+        freeze
+      end
+
+      def execute
+        path_collector.execute.map { |path| normalizer.normalize(path) }.compact
+      end
+
+      private
+
+      attr_reader :root_dir, :path_pattern_collection, :path_collector, :normalizer
+    end
+  end
+end

data/lib/asset_finder/version.rb

@@ -1,3 +1,3 @@
 module AssetFinder
-  VERSION = "1.6.0"
+  VERSION = "2.1.0"
 end

data/lib/asset_finder.rb

@@ -1,19 +1,29 @@
 require "asset_finder/version"
 require "asset_finder/configuration"
-require "asset_finder/finder"
+require "asset_finder/sprockets_config_generator"
+require "asset_finder/path_pattern"
+require "asset_finder/path_pattern_collection"
+require "asset_finder/javascript/sprockets_config_generator"
 require "asset_finder/javascript/normalizer"
-require "asset_finder/javascript/finder"
+require "asset_finder/javascript/path_collector"
+require "asset_finder/javascript/path_pattern_collection"
+require "asset_finder/stylesheet/dartsass_config_generator"
+require "asset_finder/stylesheet/sprockets_config_generator"
 require "asset_finder/stylesheet/normalizer"
-require "asset_finder/stylesheet/finder"
+require "asset_finder/stylesheet/path_collector"
+require "asset_finder/stylesheet/path_pattern_collection"
 require "asset_finder/railtie" if defined?(::Rails::Railtie)
 
 module AssetFinder
   class << self
-    attr_accessor :configuration
-  end
+    attr_accessor :config
+
+    def config
+      @config ||= Configuration.new
+    end
 
-  def self.configure
-    self.configuration ||= Configuration.new
-    yield(self.configuration)
+    def configure
+      yield config
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset_finder
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Takahiro Ooishi
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -91,18 +86,25 @@ files:
 - bin/setup
 - lib/asset_finder.rb
 - lib/asset_finder/configuration.rb
-- lib/asset_finder/finder.rb
-- lib/asset_finder/javascript/finder.rb
 - lib/asset_finder/javascript/normalizer.rb
+- lib/asset_finder/javascript/path_collector.rb
+- lib/asset_finder/javascript/path_pattern_collection.rb
+- lib/asset_finder/javascript/sprockets_config_generator.rb
+- lib/asset_finder/path_pattern.rb
+- lib/asset_finder/path_pattern_collection.rb
 - lib/asset_finder/railtie.rb
-- lib/asset_finder/stylesheet/finder.rb
+- lib/asset_finder/sprockets_config_generator.rb
+- lib/asset_finder/stylesheet/dartsass_config_generator.rb
 - lib/asset_finder/stylesheet/normalizer.rb
+- lib/asset_finder/stylesheet/path_collector.rb
+- lib/asset_finder/stylesheet/path_pattern_collection.rb
+- lib/asset_finder/stylesheet/sprockets_config_generator.rb
 - lib/asset_finder/version.rb
 homepage: https://github.com/taka0125/asset_finder
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Find javascripts and stylesheets for `rake asset:precompile`.
 test_files: []

data/lib/asset_finder/finder.rb

@@ -1,7 +0,0 @@
-module AssetFinder
-  class Finder
-    def self.execute
-      Javascript::Finder.execute + Stylesheet::Finder.execute
-    end
-  end
-end

data/lib/asset_finder/javascript/finder.rb

@@ -1,24 +0,0 @@
-require 'find'
-
-module AssetFinder
-  module Javascript
-    class Finder
-      def self.execute
-        [].tap do |paths|
-          root_dir = File.join(Rails.root, 'app/assets/javascripts/')
-          normalizer = Normalizer.new(
-            root_dir,
-            AssetFinder.configuration.javascript_patterns,
-            normalize_index_file: AssetFinder.configuration.normalize_index_file
-          )
-
-          Find.find(root_dir).each do |path|
-            normalized_path = normalizer.normalize(path)
-            next if normalized_path.nil?
-            paths << normalized_path
-          end
-        end
-      end
-    end
-  end
-end

data/lib/asset_finder/stylesheet/finder.rb

@@ -1,20 +0,0 @@
-require 'find'
-
-module AssetFinder
-  module Stylesheet
-    class Finder
-      def self.execute
-        [].tap do |paths|
-          root_dir = File.join(Rails.root, 'app/assets/stylesheets/')
-          normalizer = Normalizer.new(root_dir, AssetFinder.configuration.stylesheet_patterns)
-
-          Find.find(root_dir).each do |path|
-            normalized_path = normalizer.normalize(path)
-            next if normalized_path.nil?
-            paths << normalized_path
-          end
-        end
-      end
-    end
-  end
-end