jekyll-local-theme 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d080caecf9a43d8bf69b4e1117620f3b790ee3e714d37616237bcfb403588c89
-  data.tar.gz: 542dc8ded09c21e065fe0ac0154a9818597d19a7ddf6b5e938f60cb89f452d8d
+  metadata.gz: 00fef92712fd20dc68176d7ed08c8c96946d042395b266518d2ff6f5404447a6
+  data.tar.gz: 68c8bc9195f6a3036acaa70bfa44385ce9717f791a3ea3065d33226bf67e7b13
 SHA512:
-  metadata.gz: 93ed8a85669b9f13302c39e9254b7823f3f8e9c0de9ce8fb49b5fe2953f2e1cc449f08b85512f41c1afe768b07ed66a7a1ee74fa4f28896f2e1518a0004a97bf
-  data.tar.gz: 7c35b092ebd1650a1bdf61bfc770ab107fadd9bd5c24bd75d44cd5941cc2d597ea72e39163742697da797a05557e6a52bc634b20abc35192afaa47929fdb5462
+  metadata.gz: 612620c55a760df07041cfb4fea45418f6ac042aada3cb9f1e9084b5824410f6006b35340c56cfea247d8d5290c3c02464384f896616f61d0e83e2d0051f2974
+  data.tar.gz: aa755030aa4b8b5a9bc0cd0ebfdae6e436b31ad49a66f775043ef52e5550b4aba3968e1381ea5671261aa37ed865bdba193fa88646fe24d896c99bf74c8edb4d

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 なつき
+Copyright (c) 2024 なつき
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/jekyll/local_theme/theme.rb

@@ -6,19 +6,19 @@ module Jekyll
   module LocalTheme
     # The local {Theme} on file system.
     class Theme < Jekyll::Theme
-      JEKYLL_THEME_PREFIX = 'jekyll-theme-'
+      def initialize(root)
+        gemspec = Gem::Util.glob_files_in_dir(Bundler::Source::Path::DEFAULT_GLOB, root)
+                           .min_by { |p| -p.split(File::SEPARATOR).size }
 
-      private_constant :JEKYLL_THEME_PREFIX
+        if gemspec
+          @gemspec = Bundler.load_gemspec_uncached(gemspec)
+          @gemspec.full_gem_path = File.dirname(gemspec)
+        else
+          @gemspec = Gem::Specification.new(File.basename(root))
+          @gemspec.full_gem_path = root
+        end
 
-      def initialize(name, root)
-        name = name.delete_prefix(JEKYLL_THEME_PREFIX)
-        gemspec = [
-          File.expand_path("#{name}.gemspec", root),
-          File.expand_path("#{JEKYLL_THEME_PREFIX}#{name}.gemspec", root)
-        ].find { |file| File.exist?(file) }
-        @gemspec = MockGemSpecification.new(root,
-                                            gemspec ? Bundler.load_gemspec_uncached(gemspec).runtime_dependencies : [])
-        super(name)
+        super(@gemspec.name)
       end
     end
 

data/lib/jekyll/local_theme/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module LocalTheme
-    VERSION = '0.2.2'
+    VERSION = '1.0.0'
   end
 end

data/lib/jekyll/local_theme.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'local_theme/mock_gem_specification'
 require_relative 'local_theme/theme'
 require_relative 'local_theme/version'
 
@@ -10,13 +9,14 @@ module Jekyll
     module_function
 
     def init(site)
-      name = site.config['local_theme']
-      return unless name
+      path = site.config['local_theme']
+      return unless path
 
-      site.config['theme'] = name
-      site.theme = Theme.new(name, Jekyll.sanitized_path(Jekyll.sanitized_path(site.source, '_themes'), name))
+      theme = Theme.new(Jekyll.sanitized_path(Jekyll.sanitized_path(site.source, '_themes'), path))
+      site.theme = theme
+      site.config['theme'] = theme.name
 
-      Jekyll.logger.info 'Local theme:', site.theme.root
+      Jekyll.logger.info 'Local theme:', theme.root
 
       site.send(:configure_include_paths)
       site.plugin_manager.require_theme_deps

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-local-theme
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,6 @@ files:
 - README.md
 - lib/jekyll-local-theme.rb
 - lib/jekyll/local_theme.rb
-- lib/jekyll/local_theme/mock_gem_specification.rb
 - lib/jekyll/local_theme/theme.rb
 - lib/jekyll/local_theme/version.rb
 homepage: https://github.com/ntkme/jekyll-local-theme
@@ -57,8 +56,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/ntkme/jekyll-local-theme/issues
-  documentation_uri: https://rubydoc.info/gems/jekyll-local-theme/0.2.2
-  source_code_uri: https://github.com/ntkme/jekyll-local-theme/tree/v0.2.2
+  documentation_uri: https://rubydoc.info/gems/jekyll-local-theme/1.0.0
+  source_code_uri: https://github.com/ntkme/jekyll-local-theme/tree/v1.0.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: 
@@ -74,9 +73,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Jekyll plugin for building Jekyll sites with any local theme

data/lib/jekyll/local_theme/mock_gem_specification.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module LocalTheme
-    # The mock for {Gem::Specification}.
-    class MockGemSpecification
-      attr_reader :full_gem_path, :runtime_dependencies
-
-      def initialize(full_gem_path, runtime_dependencies)
-        @full_gem_path = full_gem_path
-        @runtime_dependencies = runtime_dependencies
-      end
-    end
-
-    private_constant :MockGemSpecification
-  end
-end