bridgetown-core 1.0.0.alpha1 → 1.0.0.alpha2

data/lib/bridgetown-core/tags/find.rb

@@ -11,12 +11,7 @@ module Bridgetown
 
       def initialize(tag_name, markup, tokens)
         super
-        if markup.strip =~ SYNTAX
-          @new_var_name = Regexp.last_match(1).strip
-          @single_or_group = Regexp.last_match(2)
-          @arr_name = Regexp.last_match(3).strip
-          @conditions = process_conditions(Regexp.last_match(4).strip)
-        else
+        unless markup.strip =~ SYNTAX
           raise SyntaxError, <<~MSG
             Syntax Error in tag 'find' while parsing the following markup:
 
@@ -25,6 +20,11 @@ module Bridgetown
             Valid syntax: find <varname> where|in <array>, <condition(s)>
           MSG
         end
+
+        @new_var_name = Regexp.last_match(1).strip
+        @single_or_group = Regexp.last_match(2)
+        @arr_name = Regexp.last_match(3).strip
+        @conditions = process_conditions(Regexp.last_match(4).strip)
       end
 
       def render(context)

data/lib/bridgetown-core/tags/highlight.rb

@@ -14,10 +14,7 @@ module Bridgetown
 
       def initialize(tag_name, markup, tokens)
         super
-        if markup.strip =~ SYNTAX
-          @lang = Regexp.last_match(1).downcase
-          @highlight_options = parse_options(Regexp.last_match(2))
-        else
+        unless markup.strip =~ SYNTAX
           raise SyntaxError, <<~MSG
             Syntax Error in tag 'highlight' while parsing the following markup:
 
@@ -26,6 +23,9 @@ module Bridgetown
             Valid syntax: highlight <lang> [linenos]
           MSG
         end
+
+        @lang = Regexp.last_match(1).downcase
+        @highlight_options = parse_options(Regexp.last_match(2))
       end
 
       LEADING_OR_TRAILING_LINE_TERMINATORS = %r!\A(\n|\r)+|(\n|\r)+\z!.freeze
@@ -89,7 +89,7 @@ module Bridgetown
           "data-lang=\"#{@lang}\"",
         ].join(" ")
         "<figure class=\"highlight\"><pre><code #{code_attributes}>"\
-        "#{code.chomp}</code></pre></figure>"
+          "#{code.chomp}</code></pre></figure>"
       end
     end
   end

data/lib/bridgetown-core/tags/include.rb

@@ -9,15 +9,18 @@ module Bridgetown
 
       VALID_SYNTAX = %r!
         ([\w-]+)\s*=\s*
-        (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))
+        (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w.-]+))
       !x.freeze
+
+      # rubocop:disable Lint/MixedRegexpCaptureTypes
       VARIABLE_SYNTAX = %r!
-        (?<variable>[^{]*(\{\{\s*[\w\-\.]+\s*(\|.*)?\}\}[^\s{}]*)+)
+        (?<variable>[^{]*(\{\{\s*[\w\-.]+\s*(\|.*)?\}\}[^\s{}]*)+)
         (?<params>.*)
       !mx.freeze
+      # rubocop:enable Lint/MixedRegexpCaptureTypes
 
       FULL_VALID_SYNTAX = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!.freeze
-      VALID_FILENAME_CHARS = %r!^[\w/\.-]+$!.freeze
+      VALID_FILENAME_CHARS = %r!^[\w/.-]+$!.freeze
       INVALID_SEQUENCES = %r![./]{2,}!.freeze
 
       def initialize(tag_name, markup, tokens)
@@ -66,33 +69,33 @@ module Bridgetown
       end
 
       def validate_file_name(file)
-        if INVALID_SEQUENCES.match?(file) || !VALID_FILENAME_CHARS.match?(file)
-          raise ArgumentError, <<~MSG
-            Invalid syntax for include tag. File contains invalid characters or sequences:
+        return unless INVALID_SEQUENCES.match?(file) || !VALID_FILENAME_CHARS.match?(file)
 
-              #{file}
+        raise ArgumentError, <<~MSG
+          Invalid syntax for include tag. File contains invalid characters or sequences:
 
-            Valid syntax:
+            #{file}
 
-              #{syntax_example}
+          Valid syntax:
 
-          MSG
-        end
+            #{syntax_example}
+
+        MSG
       end
 
       def validate_params
-        unless FULL_VALID_SYNTAX.match?(@params)
-          raise ArgumentError, <<~MSG
-            Invalid syntax for include tag:
+        return if FULL_VALID_SYNTAX.match?(@params)
 
-            #{@params}
+        raise ArgumentError, <<~MSG
+          Invalid syntax for include tag:
 
-            Valid syntax:
+          #{@params}
 
-            #{syntax_example}
+          Valid syntax:
 
-          MSG
-        end
+          #{syntax_example}
+
+        MSG
       end
 
       # Grab file read opts in the context

data/lib/bridgetown-core/tags/post_url.rb

@@ -74,19 +74,19 @@ module Bridgetown
 
         site.collections.posts.resources.each do |document|
           return relative_url(document) if @post == document
-        end
-
-        # New matching method did not match, fall back to old method
-        # with deprecation warning if this matches
 
-        site.collections.posts.resources.each do |document|
+          # New matching method did not match, fall back to old method
+          # with deprecation warning if this matches
           next unless @post.deprecated_equality document
 
-          Bridgetown::Deprecator.deprecation_message "A call to "\
+          Bridgetown::Deprecator.deprecation_message(
+            "A call to "\
             "'{% post_url #{@post.name} %}' did not match " \
             "a post using the new matching method of checking name " \
             "(path-date-slug) equality. Please make sure that you " \
             "change this tag to match the post's name exactly."
+          )
+
           return relative_url(document)
         end
 

data/lib/bridgetown-core/tags/render_content.rb

@@ -3,7 +3,7 @@
 module Bridgetown
   module Tags
     class BlockRenderTag < Liquid::Block
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def render(context)
         context.stack({}) do
           # unindent the incoming text
@@ -37,7 +37,7 @@ module Bridgetown
             .render_tag(context, +"")
         end
       end
-      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       private
 

data/lib/bridgetown-core/tasks/bridgetown_tasks.rake

@@ -23,7 +23,7 @@ end
 
 desc "Prerequisite task which loads site and provides automation"
 task :environment do
-  class HammerActions < Thor
+  class HammerActions < Thor # rubocop:disable Lint/ConstantDefinitionInBlock
     include Thor::Actions
     include Bridgetown::Commands::Actions
 

data/lib/bridgetown-core/url.rb

@@ -28,9 +28,9 @@ module Bridgetown
       @placeholders = options[:placeholders] || {}
       @permalink    = options[:permalink]
 
-      if (@template || @permalink).nil?
-        raise ArgumentError, "One of :template or :permalink must be supplied."
-      end
+      return unless (@template || @permalink).nil?
+
+      raise ArgumentError, "One of :template or :permalink must be supplied."
     end
 
     # The generated relative URL of the resource

data/lib/bridgetown-core/utils.rb

@@ -12,7 +12,7 @@ module Bridgetown
 
     # Constants for use in #slugify
     SLUGIFY_MODES = %w(raw default pretty simple ascii latin).freeze
-    SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
+    SLUGIFY_RAW_REGEXP = Regexp.new("\\s+").freeze
     SLUGIFY_DEFAULT_REGEXP = Regexp.new("[^\\p{M}\\p{L}\\p{Nd}]+").freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^\\p{M}\\p{L}\\p{Nd}._~!$&'()+,;=@]+").freeze
     SLUGIFY_ASCII_REGEXP = Regexp.new("[^[A-Za-z0-9]]+").freeze
@@ -203,7 +203,7 @@ module Bridgetown
       slug = replace_character_sequence_with_hyphen(string, mode: mode)
 
       # Remove leading/trailing hyphen
-      slug.gsub!(%r!^\-|\-$!i, "")
+      slug.gsub!(%r!^-|-$!i, "")
 
       slug.downcase! unless cased
 
@@ -316,9 +316,7 @@ module Bridgetown
       lines.map do |line|
         continue_processing = !skip_pre_lines
 
-        if skip_pre_lines
-          skip_pre_lines = false if line.include?("</pre>")
-        end
+        skip_pre_lines = false if skip_pre_lines && line.include?("</pre>")
         if line.include?("<pre")
           skip_pre_lines = true
           continue_processing = false
@@ -340,7 +338,7 @@ module Bridgetown
         else
           line
         end
-      end.join("")
+      end.join
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
 
@@ -448,9 +446,9 @@ module Bridgetown
     end
 
     def merge_default_proc(target, overwrite)
-      if target.is_a?(Hash) && overwrite.is_a?(Hash) && target.default_proc.nil?
-        target.default_proc = overwrite.default_proc
-      end
+      return unless target.is_a?(Hash) && overwrite.is_a?(Hash) && target.default_proc.nil?
+
+      target.default_proc = overwrite.default_proc
     end
 
     def duplicate_frozen_values(target)

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.0.0.alpha1"
+  VERSION = "1.0.0.alpha2"
   CODE_NAME = "Pearl"
 end

data/lib/bridgetown-core/watcher.rb

@@ -116,7 +116,7 @@ module Bridgetown
         rescue ArgumentError
           # Could not find a relative path
         end
-      end.compact + [%r!^\.bridgetown\-metadata!]
+      end.compact + [%r!^\.bridgetown-metadata!]
     end
 
     def sleep_forever
@@ -132,7 +132,7 @@ module Bridgetown
         site.plugin_manager.reload_component_loaders
         site.process
         Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
-                               " #{(Time.now - time).ceil(2)} seconds."
+                                          " #{(Time.now - time).ceil(2)} seconds."
       rescue Exception => e
         Bridgetown.logger.error "Error:", e.message
 

data/lib/bridgetown-core.rb

@@ -249,12 +249,13 @@ end
 
 module Bridgetown
   module Model; end
+
   module Resource
     def self.register_extension(mod)
       if mod.const_defined?(:LiquidResource)
         Bridgetown::Drops::ResourceDrop.include mod.const_get(:LiquidResource)
       end
-      if mod.const_defined?(:RubyResource)
+      if mod.const_defined?(:RubyResource) # rubocop:disable Style/GuardClause
         Bridgetown::Resource::Base.include mod.const_get(:RubyResource)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Bridgetown Team
@@ -340,6 +340,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - ".yardopts"
 - Rakefile
 - bin/bridgetown