troy 0.0.34 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc838bf9fc86348d55ed3f93a986c1047924d9a513901e02dafad3f45ddcdcdf
-  data.tar.gz: 544b493ec0e506a3ffb3289ae4215a0d51a0e4a88e374bd263cd3d5b25979000
+  metadata.gz: 232d28c2479e9de14fdd26394f68799351a432c9bb8d0d083e2440023146d218
+  data.tar.gz: f79a7f77e133f99e45fe1c3d72c2a2713687545b18ac3e74814228d28eeee040
 SHA512:
-  metadata.gz: 9078b888d8f31cb059f5ce90e29ccdcf19f240ff990adfd40f7e4fb0d61bc3285ae63d5e416f2ca8e949f5a75f91eaa64103587d6c8b66a4f809a7a232b4a46b
-  data.tar.gz: a092f247955e1864016ce2aeed04cea8628cef875bc23648c8b2d3093b801272d311b8d59a3b1f2889259f68ba76cf172338b51541a3b62e06d1b91fd55022cc
+  metadata.gz: f88b7abf0b3e02e7df2bd6c4dc644b24845c71823245cd3f74b07899f220d8b6f720088f2a505d07096d7aa778ab89bd4baf1f56aee4226034f3129d6bb5e2a8
+  data.tar.gz: 0d200cea534be0da48533ab1208d8ba5c09d18d2d2fd20afc774ad2c94d8eb919513e6154de765ad4514e45636bcb2ab9637c68d482f156480a8531da45726dc

data/.rubocop.yml

@@ -0,0 +1,83 @@
+AllCops:
+  TargetRubyVersion: 2.6
+
+Style/Documentation:
+  Enabled: false
+
+Rails/Delegate:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Layout/SpaceInsideBlockBraces:
+  EnforcedStyle: space
+  EnforcedStyleForEmptyBraces: space
+  SpaceBeforeBlockParameters: false
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+  EnforcedStyleForEmptyBraces: no_space
+
+Layout/FirstArrayElementLineBreak:
+  Enabled: true
+
+Layout/FirstHashElementLineBreak:
+  Enabled: true
+
+Style/SymbolArray:
+  Enabled: true
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    "%": "[]"
+    "%i": "[]"
+    "%q": "[]"
+    "%Q": "[]"
+    "%r": "{}"
+    "%s": "[]"
+    "%w": "[]"
+    "%W": "[]"
+    "%x": "[]"
+
+Metrics/LineLength:
+  Enabled: true
+
+Metrics/MethodLength:
+  Exclude:
+    - db/migrate/**.rb
+    - config/config.rb
+    - test/support/**/*.rb
+
+Metrics/BlockLength:
+  Exclude:
+    - config/config.rb
+    - test/support/**/*.rb
+
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+Layout/IndentFirstArrayElement:
+  EnforcedStyle: consistent
+
+Style/AccessModifierDeclarations:
+  EnforcedStyle: inline
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Lint/Debugger:
+  Exclude:
+    - test/**/*
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+Naming/RescuedExceptionsVariableName:
+    PreferredName: error
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false

data/lib/troy/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   class Cli < Thor
     check_unknown_options!
@@ -15,21 +17,29 @@ module Troy
     end
 
     options assets: :boolean, file: :array
+    option :concurrency, type: :numeric, default: 10
+    option :benchmark, type: :boolean, default: false
     desc "export", "Export files"
     def export
-      if options[:assets]
-        site.export_assets
-        site.export_files
-      end
+      runner = lambda do
+        if options[:assets]
+          site.export_assets
+          site.export_files
+        end
 
-      if options[:file]
-        options[:file].each do |file|
+        options[:file]&.each do |file|
           site.export_pages(file)
         end
+
+        site.export if !options[:assets] && !options[:file]
       end
 
-      if !options[:assets] && !options[:file]
-        site.export
+      if options[:benchmark]
+        require "benchmark"
+        elapsed = Benchmark.realtime(&runner)
+        puts "=> Finished in #{elapsed.round(2)}s"
+      else
+        runner.call
       end
     end
 
@@ -41,14 +51,14 @@ module Troy
     end
 
     desc "version", "Display Troy version"
-    map %w(-v --version) => :version
+    map %w[-v --version] => :version
     def version
       say "Troy #{Troy::VERSION}"
     end
 
     desc "server", "Start a server"
-    option :port, :type => :numeric, :default => 9292, :aliases => "-p"
-    option :host, :type => :string, :default => "0.0.0.0", :aliases => "-b"
+    option :port, type: :numeric, default: 9292, aliases: "-p"
+    option :host, type: :string, default: "0.0.0.0", aliases: "-b"
     def server
       begin
         handler = Rack::Handler::Thin
@@ -57,12 +67,13 @@ module Troy
         handler = Rack::Handler::WEBrick
       end
 
-      handler.run Troy::Server.new(File.join(Dir.pwd, "public")), :Port => options[:port], :Host => options[:host]
+      handler.run Troy::Server.new(File.join(Dir.pwd, "public")), Port: options[:port], Host: options[:host]
     end
 
-    private
-    def site
-      @site ||= Troy::Site.new(Dir.pwd)
+    no_commands do
+      def site
+        @site ||= Troy::Site.new(Dir.pwd, options)
+      end
     end
   end
 end

data/lib/troy/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   ::I18n.enforce_available_locales = false
 
@@ -5,18 +7,18 @@ module Troy
     @configuration ||= Configuration.new
   end
 
-  def self.configure(&block)
+  def self.configure
     yield configuration
   end
 
   class Configuration < OpenStruct
     def assets
-      @assets ||= Configuration.new({
+      @assets ||= Configuration.new(
         compress_html: true,
         compress_css: true,
         compress_js: true,
         precompile: []
-      })
+      )
     end
 
     def i18n

data/lib/troy/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   class Context
     def initialize(options = {})

data/lib/troy/embedded_ruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   class EmbeddedRuby
     # The template content.

data/lib/troy/extension_matcher.rb

@@ -1,15 +1,11 @@
+# frozen_string_literal: true
+
 module Troy
   class ExtensionMatcher
-    #
-    #
     attr_reader :path
 
-    #
-    #
     attr_reader :performed
 
-    #
-    #
     attr_reader :matchers
 
     def initialize(path)
@@ -32,7 +28,7 @@ module Troy
         return handler.call if File.extname(path) == ext
       end
 
-      matchers["default"].call if matchers["default"]
+      matchers["default"]&.call
     end
   end
 end

data/lib/troy/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   # The Troy::Generator class will create a new book structure.
   #
@@ -11,7 +13,7 @@ module Troy
     desc "Generate a new site structure"
 
     def self.source_root
-      File.expand_path("../../../templates", __FILE__)
+      File.expand_path("../../templates", __dir__)
     end
 
     def create_directories

data/lib/troy/hacks.rb

@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 require "digest/sha1"
 
 module HtmlPress
-  CONTENT_CACHE = {}
+  def self.content_cache
+    @content_cache ||= {}
+  end
 
-  def self.js_compressor (text, options = nil)
+  def self.js_compressor(text, options = nil)
     options ||= {}
     options[:output] ||= {inline_script: true}
 
     hash = Digest::SHA1.hexdigest(text)
-    CONTENT_CACHE[hash] ||= MultiJs.compile(text, options).gsub(/;$/,'')
-    CONTENT_CACHE[hash]
+    content_cache[hash] ||= MultiJs.compile(text, options).gsub(/;$/, "")
+    content_cache[hash]
   end
 end

data/lib/troy/helpers.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 module Troy
   module Helpers
     def h(content)
       CGI.escapeHTML(content)
     end
 
-    def t(*args)
-      I18n.t(*args)
+    def t(*args, **kwargs)
+      I18n.t(*args, **kwargs)
     end
 
     def partial(name, locals = {})
+      name = name.to_s
       basename = File.basename(name)
       dirname = File.dirname(name)
-
       partial = []
       partial << dirname unless dirname.start_with?(".")
       partial << "_#{basename}.erb"
@@ -20,7 +22,7 @@ module Troy
       path = site.root.join("partials/#{partial}")
       locals = locals.merge(site: site, page: page)
       EmbeddedRuby.new(path.read, locals).render
-    rescue Exception, StandardError => error
+    rescue Exception => error
       raise "Unable to render #{path}; #{error.message}"
     end
 

data/lib/troy/markdown.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   class Markdown
     # Create a new Redcarpet renderer, that prepares the code block
@@ -31,12 +33,11 @@ module Troy
     end
 
     def renderer
-      @renderer ||= Redcarpet::Markdown.new(Renderer, {
-        autolink: true,
-        space_after_headers: true,
-        fenced_code_blocks: true,
-        footnotes: true
-      })
+      @renderer ||= Redcarpet::Markdown.new(Renderer,
+                                            autolink: true,
+                                            space_after_headers: true,
+                                            fenced_code_blocks: true,
+                                            footnotes: true)
     end
 
     def to_html

data/lib/troy/meta.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Troy
   class Meta
     extend Forwardable
     def_delegators :data, :[], :fetch, :key?
 
-    REGEX = /^---\n(.*?)\n---\n+/m
+    REGEX = /^---\n(.*?)\n---\n+/m.freeze
 
     attr_reader :file
 
@@ -16,14 +18,15 @@ module Troy
     end
 
     def data
-      @data ||= (raw =~ REGEX ? YAML.load(raw[REGEX, 1]) : {})
+      @data ||=
+        raw =~ REGEX ? YAML.unsafe_load(raw[REGEX, 1]) : {}
     end
 
-    def method_missing(name, *args, &block)
+    def method_missing(name, *_args)
       data[name.to_s]
     end
 
-    def respond_to_missing?(method, include_private = false)
+    def respond_to_missing?(_method, _include_private = false)
       true
     end
 

data/lib/troy/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   class Page
     extend Forwardable
@@ -27,33 +29,26 @@ module Troy
       @meta = meta || Meta.new(path)
     end
 
-    #
-    #
     def method_missing(name, *args, &block)
       return meta[name.to_s] if meta.key?(name.to_s)
+
       super
     end
 
-    #
-    #
-    def respond_to_missing?(name, include_private = false)
+    def respond_to_missing?(name, _include_private = false)
       meta.key?(name.to_s)
     end
 
-    #
-    #
     def content
       ExtensionMatcher.new(path)
-        .default { meta.content }
-        .on("builder") { XML.new(meta.content, to_context).to_xml }
-        .on("erb") { EmbeddedRuby.new(meta.content, to_context).render }
-        .on("md") { Markdown.new(meta.content).to_html }
-        .on("txt") { EmbeddedRuby.new(meta.content, to_context).render }
-        .match
+                      .default { meta.content }
+                      .on("builder") { XML.new(meta.content, to_context).to_xml }
+                      .on("erb") { EmbeddedRuby.new(meta.content, to_context).render }
+                      .on("md") { Markdown.new(meta.content).to_html }
+                      .on("txt") { EmbeddedRuby.new(meta.content, to_context).render }
+                      .match
     end
 
-    #
-    #
     def to_context
       {
         page: self,
@@ -61,8 +56,6 @@ module Troy
       }
     end
 
-    #
-    #
     def compress(content)
       content = HtmlPress.press(content) if config.assets.compress_html
       content
@@ -72,38 +65,30 @@ module Troy
     #
     def render
       ExtensionMatcher.new(path)
-        .default { content }
-        .on("html") { compress render_erb }
-        .on("md") { compress render_erb }
-        .on("erb") { compress render_erb }
-        .match
+                      .default { content }
+                      .on("html") { compress render_erb }
+                      .on("md") { compress render_erb }
+                      .on("erb") { compress render_erb }
+                      .match
     end
 
-    #
-    #
     def permalink
       meta.fetch("permalink", File.basename(path).gsub(/\..*?$/, ""))
     end
 
-    #
-    #
     def filename
       ExtensionMatcher.new(path)
-        .default { "#{permalink}.html" }
-        .on("builder") { "#{permalink}.xml" }
-        .on("xml") { "#{permalink}.xml" }
-        .on("txt") { "#{permalink}.txt" }
-        .match
+                      .default { "#{permalink}.html" }
+                      .on("builder") { "#{permalink}.xml" }
+                      .on("xml") { "#{permalink}.xml" }
+                      .on("txt") { "#{permalink}.txt" }
+                      .match
     end
 
-    #
-    #
     def layout
-      site.root.join("layouts/#{meta.fetch("layout", "default")}.erb")
+      site.root.join("layouts/#{meta.fetch('layout', 'default')}.erb")
     end
 
-    #
-    #
     def render_erb
       if layout.exist?
         EmbeddedRuby.new(
@@ -125,25 +110,19 @@ module Troy
       end
     end
 
-    #
-    #
     def output_file
       base = File.dirname(path)
-        .gsub(site.root.join("source").to_s, "")
-        .gsub(%r[^/], "")
+                 .gsub(site.root.join("source").to_s, "")
+                 .gsub(%r{^/}, "")
 
       site.root.join("public", base, filename)
     end
 
-    #
-    #
     def save
       FileUtils.mkdir_p(File.dirname(output_file))
       save_to(output_file)
     end
 
-    #
-    #
     def config
       Troy.configuration
     end

data/lib/troy/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   class Server
     attr_reader :root, :request
@@ -13,7 +15,9 @@ module Troy
 
     def render(status, content_type, path)
       last_modified = path.mtime.httpdate
-      return [304, {}, []] if request.env["HTTP_IF_MODIFIED_SINCE"] == last_modified
+      if request.env["HTTP_IF_MODIFIED_SINCE"] == last_modified
+        return [304, {}, []]
+      end
 
       headers = {
         "Content-Type" => content_type,
@@ -26,7 +30,7 @@ module Troy
     end
 
     def normalized_path
-      path = request.path.gsub(%r[/$], "")
+      path = request.path.gsub(%r{/$}, "")
       path << "?#{request.query_string}" unless request.query_string.empty?
       path
     end
@@ -36,7 +40,7 @@ module Troy
     end
 
     def process
-      path = request.path[%r[^/(.*?)/?$], 1]
+      path = request.path[%r{^/(.*?)/?$}, 1]
       path = "index" if path == ""
       path = root.join(path)
 

data/lib/troy/site.rb

@@ -1,39 +1,34 @@
+# frozen_string_literal: true
+
 module Troy
   class Site
-    attr_accessor :root
+    attr_accessor :root, :options
 
-    def initialize(root)
+    def initialize(root, options)
       @root = Pathname.new(root).realpath
+      @options = options
 
       load_configuration
       load_extensions
       set_locale
     end
 
-    #
-    #
     def load_extensions
       Dir[root.join("config/**/*helpers.rb")].each do |file|
         require file
       end
     end
 
-    #
-    #
     def set_locale
       I18n.load_path += config.i18n.load_path
       I18n.default_locale = config.i18n.locale
       I18n.locale = config.i18n.locale
     end
 
-    #
-    #
     def load_configuration
       load root.join("config/troy.rb")
     end
 
-    #
-    #
     def export
       remove_public_dir
       export_assets
@@ -41,67 +36,81 @@ module Troy
       export_pages
     end
 
-    #
-    #
     def export_files
       assets = root.join("assets")
 
-      assets.entries.each do |entry|
-        basename = entry.to_s
-        next if [".", "..", "javascripts", "stylesheets"].include?(basename)
-        FileUtils.rm_rf root.join("public/#{basename}")
-        FileUtils.cp_r assets.join(entry), root.join("public/#{basename}")
+      assets.entries.each_slice(options[:concurrency]) do |slice|
+        slice.map do |entry|
+          Thread.new { export_file(assets, entry) }
+        end.each(&:join)
       end
     end
 
-    #
-    #
+    def export_file(assets, entry)
+      basename = entry.to_s
+      return if [".", "..", "javascripts", "stylesheets"].include?(basename)
+
+      FileUtils.rm_rf root.join("public/#{basename}")
+      FileUtils.cp_r assets.join(entry), root.join("public/#{basename}")
+    end
+
     def remove_public_dir
       FileUtils.rm_rf root.join("public")
     end
 
-    #
-    #
     def export_pages(file = nil)
       file = File.expand_path(file) if file
 
       pages
         .select {|page| file.nil? || page.path == file }
-        .each(&:save)
+        .each_slice(options[:concurrency]) do |slice|
+          threads = slice.map do |page|
+            Thread.new do
+              page.save
+            end
+          end
+
+          threads.each(&:join)
+        end
     end
 
-    #
-    #
     def export_assets
       sprockets = Sprockets::Environment.new
       sprockets.append_path root.join("assets/javascripts")
       sprockets.append_path root.join("assets/stylesheets")
-      sprockets.css_compressor = Sprockets::SassCompressor if config.assets.compress_css
-      sprockets.js_compressor = Uglifier.new(uglifier_options) if config.assets.compress_js
-
-      config.assets.precompile.each do |asset_name|
-        asset = sprockets[asset_name]
-        output_file = asset.pathname.to_s
-          .gsub(root.join("assets").to_s, "")
-          .gsub(%r[^/], "")
-          .gsub(/\.scss$/, ".css")
-          .gsub(/\.coffee$/, ".js")
-
-        asset.write_to root.join("public/#{output_file}")
+
+      if config.assets.compress_css
+        sprockets.css_compressor = Sprockets::SassCompressor
+      end
+
+      if config.assets.compress_js
+        sprockets.js_compressor = Uglifier.new(uglifier_options)
+      end
+
+      config.assets.precompile.each_slice(options[:concurrency]) do |slice|
+        slice.map do |asset_name|
+          Thread.new { export_asset(sprockets, asset_name) }
+        end.each(&:join)
       end
     end
 
-    #
-    #
-    #
+    def export_asset(sprockets, asset_name)
+      asset = sprockets[asset_name]
+      output_file = asset.filename.to_s
+                         .gsub(root.join("assets").to_s, "")
+                         .gsub(%r{^/}, "")
+                         .gsub(/\.scss$/, ".css")
+                         .gsub(/\.coffee$/, ".js")
+
+      asset.write_to root.join("public/#{output_file}")
+    end
+
     def uglifier_options
       options = Uglifier::DEFAULTS.dup
       options[:output][:comments] = :none
       options
     end
 
-    #
-    #
     def source
       Dir[root.join("source/**/*.{html,erb,md,builder,xml,txt}").to_s]
     end

data/lib/troy/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
-  VERSION = "0.0.34"
+  VERSION = "0.0.38"
 end

data/lib/troy/xml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Troy
   class XML
     # The XML content.

data/lib/troy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Encoding.default_external = "UTF-8"
 Encoding.default_internal = "UTF-8"
 
@@ -14,7 +16,8 @@ require "rack"
 require "uglifier"
 require "html_press"
 
-level, $VERBOSE = $VERBOSE, nil
+level = $VERBOSE
+$VERBOSE = nil
 require "rouge"
 require "rouge/plugins/redcarpet"
 $VERBOSE = level

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: troy
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.38
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -215,6 +215,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -253,7 +254,7 @@ homepage: http://github.com/fnando/troy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -268,9 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A static site generator
 test_files: []