jekyll-locales 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e6fdd0bef170f9bc080d6ed57e256e3d1ace2c0faa9c33fad9073490dd0703
-  data.tar.gz: 4637537e057a944190caaff98070168a24a30cd866da6bd1596d072f42429724
+  metadata.gz: 6b8cd80411bc24509a21502d5972966dd9cb990ec1716aacc19724855e8c957b
+  data.tar.gz: 557fdfd91a846aa99f180076b186ddf21fad118cc0b01de438e66e0a7303c2bd
 SHA512:
-  metadata.gz: '0768e9186dae694e308d7e4b9471543a32de53bd1f3bb45668901241245b75b4ffb38c9134133fec6884effa2b6c164ff109f1682471856e525dc37dd271c63b'
-  data.tar.gz: 367a38099307c74170cd19a88e95a70a6823c73c03a77dbb3bddad1fd8a24442b9dd2ade786670d002c4f63efe58a2d5d6b3b286da1a16f007ce81d687ae4870
+  metadata.gz: 2d3826a63a1f0d581e4c9a0e516680fe012f99c88d6ad62a761e61140a3a25f1c71ca9ea08853155c7a817d3919f32715c0b20dd9d87c1383e052984c55832a5
+  data.tar.gz: 5471c147d18a8bd76445857b4251902c454d09f123e4e64e177fd7df02c0d4b1789b465c465e590ca8f590f9539af9fc35602623579137d8b8acabb161cb2b5f

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock

data/jekyll-locales.gemspec

@@ -35,6 +35,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 0.74'
 end

data/lib/jekyll/locales.rb

@@ -4,3 +4,4 @@ require 'jekyll/site'
 require 'jekyll/locales/site'
 require 'jekyll/locales/site_drop'
 require 'jekyll/locales/hooks/page_post_init'
+require 'jekyll/locales/hooks/cleanup'

data/lib/jekyll/locales/hooks/cleanup.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# We keep a global variable with the site in it because we can't access
+# it from the cleanup hook.
+$site = nil
+
+# Only run on the default locale since it's going to be in the root
+# destination
+Jekyll::Hooks.register :site, :post_render do |site|
+  next unless site.locales?
+  next unless site.default_locale?
+
+  $site = site
+end
+
+# Keep files in other locales since they're not generated by the default
+# locale.
+Jekyll::Hooks.register :clean, :on_obsolete do |obsolete|
+  next if $site.nil?
+
+  $site.locales.each do |locale|
+    next if locale == $site.locale
+
+    obsolete.delete_if do |x|
+      x.sub($site.dest + '/', '').start_with? locale
+    end
+  end
+end

data/lib/jekyll/locales/site.rb

@@ -43,6 +43,23 @@ module Jekyll
       copy_redirector if redirect?
     end
 
+    def locales?
+      locales.length > 1
+    end
+
+    # Get locales from configuration
+    def locales
+      @locales ||= config.fetch('locales', [])
+    end
+
+    def default_locale
+      @default_locale ||= locales.first
+    end
+
+    def default_locale?
+      default_locale == locale
+    end
+
     private
 
     # Redefine #render_docs so it doesn't render the locale collections
@@ -60,10 +77,6 @@ module Jekyll
       end
     end
 
-    def locales?
-      locales.size > 1
-    end
-
     def locale_config
       # XXX: Retrocompatibility
       config['locale'] = config['lang'] = locale
@@ -80,19 +93,6 @@ module Jekyll
       config['baseurl'] = locale_baseurl
     end
 
-    # Get locales from configuration
-    def locales
-      @locales ||= config.fetch('locales', [])
-    end
-
-    def default_locale
-      @default_locale ||= locales.first
-    end
-
-    def default_locale?
-      default_locale == locale
-    end
-
     # Read the other locales as collections but don't render them, only
     # make them available to templates.
     #

data/lib/jekyll/locales/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Locales
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-locales
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - f
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -90,6 +89,7 @@ files:
 - jekyll-locales.gemspec
 - lib/jekyll-locales.rb
 - lib/jekyll/locales.rb
+- lib/jekyll/locales/hooks/cleanup.rb
 - lib/jekyll/locales/hooks/page_post_init.rb
 - lib/jekyll/locales/site.rb
 - lib/jekyll/locales/site_drop.rb

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jekyll-locales (0.1.9)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    jaro_winkler (1.5.3)
-    minitest (5.11.3)
-    parallel (1.17.0)
-    parser (2.6.4.1)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.6)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  jekyll-locales!
-  minitest (~> 5.0)
-  rake (~> 10.0)
-  rubocop (~> 0.74)
-
-BUNDLED WITH
-   2.1.4