glim 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c833f6ae8f777fea4bea3921973658abb6d2047e5c8e392551e95af595e0b94
-  data.tar.gz: 20eed39068fed6280b3711a93db863769d7e2dddd56594a50e6325c253b0ff30
+  metadata.gz: 01bacc2f65ddafb3ecb82c6b1fed2931b6e48ded35fbd417c83e1a650076dd6f
+  data.tar.gz: 5353e5cdc32103ce3b372738cba0df2beeaef36559255d38ede8186bfe420d33
 SHA512:
-  metadata.gz: 0d5900a018a77e3840a89e4a7e552d49565ad5c48b7075ce90f9cd53f5068488b6fee8fbfcc9c5793e847c6c5c05ab6e6fe98485afa5f8b82afe19f8ca5ae5fe
-  data.tar.gz: 6a42db7d9f865b6cf444ab4317db99560631a0ad48829ff208d14e7ac63c95f76490ef6b84b48055f8452c3a34c48e5825f3b2f64234d066a99c72044039f599
+  metadata.gz: 22c5bf3b00f89abeabad4dcfcb94023fdd1b206258d4c060a117c94a5326d014f618031c00050c5e80408e3077944d239c1befc593d7840a932ef0c36c459d25
+  data.tar.gz: dfd1a77d34431cff2c0d0ed566f60c9ce59250f9ca9a39b4938b9c7f0a04b97fd44709c9aff970087294ec31a87bc47020587b91259873fab961a2ca11098139

data/bin/glim

@@ -19,8 +19,8 @@ require 'mercenary'
 if File.exists?('Gemfile')
   begin
     require 'bundler/setup'
-  rescue LoadError => e
-    $log.warn("Unable to load Bundler but directory contains a Gemfile")
+  rescue LoadError
+    $log.warn("Unable to load Bundler: Ignoring ./Gemfile")
   end
 end
 
@@ -51,9 +51,13 @@ module Util
 
   def titlecase(input)
     unless input.nil?
-      words  = /\A\p{^Lower}+\z|\b\p{Upper}\p{^Upper}+?\b/
-      upcase = /^([\W\d]*)(\w[-\w]*)|\b((?!(?:else|from|over|then|when)\b)\w[-\w]{3,}|\w[-\w]*[\W\d]*$)/
-      input.gsub(/[ _-]+/, ' ').gsub(words) { $&.downcase }.gsub(upcase) { $1 ? ($1 + $2[0].upcase + $2[1..-1]) : ($&[0].upcase + $&[1..-1]) }
+      input.gsub(/[ _-]+/, ' ').gsub(/(\A)?(\w)(\w*)([^\s]*)(\z)?/) do |match|
+        if $1 || $5 || $3.size > 2
+          $2.upcase + $3 + $4
+        else
+          $&
+        end
+      end
     end
   end
 
@@ -170,14 +174,18 @@ module Glim
     end
 
     def transform(content, page, options)
-      content
+      if options[:filters].empty?
+        content
+      else
+        options[:filters].shift.transform(content, page, options)
+      end
     end
   end
 
   module Filters
     class Liquid < Glim::Filter
       transforms 'liquid' => '*'
-      priority :higher
+      priority :lower
 
       def initialize(site)
         @site, @options = site, {
@@ -220,7 +228,7 @@ module Glim
 
     class Layout < Glim::Filter
       transforms '*' => 'output'
-      priority :lowest
+      priority :lower
 
       def initialize(site)
         @site, @options = site, options = {
@@ -450,7 +458,7 @@ module Glim
     end
 
     def output_ext
-      pipeline.output_ext(self.extname) || self.extname
+      frontmatter? && pipeline.output_ext(self.extname) || self.extname
     end
 
     # ==============
@@ -869,7 +877,7 @@ module Glim
           chunks = items.each_slice(per_page)
           pages = chunks.each_with_index.map do |posts, i|
             paginator = Paginator.new(posts, i + 1)
-            if i == 0
+            if i.zero?
               file.merge_data!({ 'paginator' => paginator })
               file
             else
@@ -1207,7 +1215,7 @@ module Glim
         end
 
         @transformations = temp.sort_by do |filter, from, to|
-          [ -filter.class.priority, (from.partition('.').first != to.partition('.').first ? +1 : -1) ]
+          [ (from == '*' ? +1 : -1), -filter.class.priority, (from.partition('.').first != to.partition('.').first ? +1 : -1) ]
         end
 
         @cache = {}
@@ -1253,8 +1261,16 @@ module Glim
             to
           end
 
-          result_nodes << PipelineNode.new(filter, from, to)
-          transformations.delete(transformation)
+          filters = [ filter ]
+
+          if from.partition('.').first != to.partition('.').first
+            filters = transformations.select { |_, filter_from, filter_to| from == filter_from && to == filter_to }.map { |f, _, _| f }
+            transformations.reject! { |_, filter_from, filter_to| from == filter_from && to = filter_to }
+          else
+            transformations.delete(transformation)
+          end
+
+          result_nodes << PipelineNode.new(filters, from, to)
         end
         result_nodes
       end
@@ -1262,18 +1278,19 @@ module Glim
       class PipelineNode
         attr_reader :from_format, :to_format
 
-        def initialize(filter, from_format, to_format)
-          @filter, @from_format, @to_format = filter, from_format, to_format
+        def initialize(filters, from_format, to_format)
+          @filters, @from_format, @to_format = filters, from_format, to_format
         end
 
         def dup
-          PipelineNode.new(@filter, @from_format, @to_format)
+          PipelineNode.new(@filters, @from_format, @to_format)
         end
 
         def transform(content, page, options)
           if @cache.nil?
-            Profiler.group(@filter.class.name) do
-              @cache = @filter.transform(content, page, options).freeze
+            filter, *filters = @filters
+            Profiler.group(filter.class.name) do
+              @cache = filter.transform(content, page, options.merge({ :filters => filters })).freeze
             end
           end
           @cache

data/lib/commands.rb

@@ -28,20 +28,20 @@ module Glim
 
       [ [ 'Created', created ], [ 'Deleted', deleted ], [ 'Updated', updated ] ].each do |label, files|
         unless files.empty?
-          STDERR.puts "==> #{label} #{files.count} #{files.count == 1 ? 'File' : 'Files'}"
+          STDERR.puts "==> #{label} #{files.size} #{files.size == 1 ? 'File' : 'Files'}"
           STDERR.puts files.map { |path| Util.relative_path(path, output_dir) }.sort.join(', ')
         end
       end
 
       unless warnings.empty?
-        STDERR.puts "==> #{warnings.count} #{warnings.count == 1 ? 'Warnings' : 'Warning'}"
+        STDERR.puts "==> #{warnings.size} #{warnings.size == 1 ? 'Warning' : 'Warnings'}"
         warnings.each do |message|
           STDERR.puts message
         end
       end
 
       unless errors.empty?
-        STDERR.puts "==> Stopped After #{errors.count} #{errors.count == 1 ? 'Error' : 'Errors'}"
+        STDERR.puts "==> Stopped After #{errors.size} #{errors.size == 1 ? 'Error' : 'Errors'}"
         errors.each do |arr|
           arr.each_with_index do |err, i|
             STDERR.puts err.gsub(/^/, '  '*i)
@@ -63,7 +63,7 @@ module Glim
         end
       else
         deleted = delete_items(files, dirs)
-        STDOUT.puts "Deleted #{deleted.count} #{deleted.count == 1 ? 'File' : 'Files'}."
+        STDOUT.puts "Deleted #{deleted.size} #{deleted.size == 1 ? 'File' : 'Files'}."
       end
     end
 
@@ -135,6 +135,8 @@ module Glim
       [ files, dirs ]
     end
 
+    private_class_method :items_in_directory
+
     def self.delete_items(files, dirs, keep: [])
       res = []
 
@@ -150,7 +152,7 @@ module Glim
         end
       end
 
-      dirs.sort.reverse.each do |path|
+      dirs.sort.reverse_each do |path|
         begin
           Dir.rmdir(path)
         rescue Errno::ENOTEMPTY => e
@@ -163,6 +165,8 @@ module Glim
       res
     end
 
+    private_class_method :delete_items
+
     def self.generate(output_dir, number_of_jobs, files, backtrace: false)
       Profiler.run("Creating pages") do
         if number_of_jobs == 1
@@ -173,6 +177,8 @@ module Glim
       end
     end
 
+    private_class_method :generate
+
     def self.generate_async(output_dir, files, number_of_jobs, backtrace: false)
       total  = files.size
       slices = number_of_jobs.times.map do |i|
@@ -224,10 +230,12 @@ module Glim
       [ created, updated, warnings, errors ]
     end
 
+    private_class_method :generate_async
+
     def self.generate_subset(output_dir, files, backtrace: false)
       created, updated, warnings, errors = [], [], [], []
 
-      for file in files do
+      files.each do |file|
         dest = file.output_path(output_dir)
         file_exists = File.exists?(dest)
 
@@ -259,5 +267,7 @@ module Glim
 
       [ created, updated, warnings, errors ]
     end
+
+    private_class_method :generate_subset
   end
 end

data/lib/liquid_ext.rb

@@ -4,6 +4,8 @@ require 'liquid'
 module Glim
   module LiquidFilters
     def markdownify(input)
+      return if input.nil?
+      
       Profiler.group('markdownify') do
         if defined?(MultiMarkdown)
           MultiMarkdown.new("\n" + input, 'snippet', 'no_metadata').to_html
@@ -12,7 +14,7 @@ module Glim
           document = Kramdown::Document.new(input, options)
           @context['warnings'].concat(document.warnings) if options[:show_warnings] && @context['warnings']
           document.to_html
-        end unless input.nil?
+        end
       end
     end
 
@@ -29,18 +31,24 @@ module Glim
     end
 
     def absolute_url(path)
-      unless path.nil?
-        site, page = URI(@context['site']['url']), URI(@context['page']['url'])
-        host, port = @context['site']['host'], @context['site']['port']
-        if page.relative? || (site.host == host && site.port == port)
-          site.merge(URI(path)).to_s
-        else
-          page.merge(URI(path)).to_s
-        end
+      return if path.nil?
+      
+      site, page = URI(@context['site']['url']), URI(@context['page']['url'])
+      host, port = @context['site']['host'], @context['site']['port']
+      
+      if page.relative? || (site.host == host && site.port == port)
+        site.merge(URI(path)).to_s
+      else
+        page.merge(URI(path)).to_s
       end
     end
 
     def relative_url(other)
+      return if other.nil?
+      
+      site, page = URI(@context['site']['url']), URI(@context['page']['url'])
+      host, port = @context['site']['host'], @context['site']['port']
+      
       helper = lambda do |base, other|
         base_url, other_url = URI(base), URI(other)
         if other_url.absolute? && base_url.host == other_url.host
@@ -49,24 +57,22 @@ module Glim
           other
         end
       end
-
-      unless other.nil?
-        site, page = URI(@context['site']['url']), URI(@context['page']['url'])
-        host, port = @context['site']['host'], @context['site']['port']
-        if page.relative? || (site.host == host && site.port == port)
-          helper.call(@context['site']['url'], other)
-        else
-          helper.call(@context['page']['url'], other)
-        end
+      
+      if page.relative? || (site.host == host && site.port == port)
+        helper.call(@context['site']['url'], other)
+      else
+        helper.call(@context['page']['url'], other)
       end
     end
 
     def path_to_url(input)
+      return if input.nil?
+      
       if file = Jekyll.sites.last.links[input]
         file.url
       else
         raise Glim::Error.new("path_to_url: No file found for: #{input}")
-      end unless input.nil?
+      end
     end
 
     def date_to_xmlschema(input)
@@ -104,17 +110,15 @@ module Glim
     end
 
     def group_by_exp(input, variable, expression)
-      if input.respond_to?(:group_by)
-        parsed_expr = Liquid::Variable.new(expression, Liquid::ParseContext.new)
-        @context.stack do
-          groups = input.group_by do |item|
-            @context[variable] = item
-            parsed_expr.render(@context)
-          end
-          groups.map { |key, value| { "name" => key, "items" => value, "size" => value.size } }
+      return input unless input.respond_to?(:group_by)
+      
+      parsed_expr = Liquid::Variable.new(expression, Liquid::ParseContext.new)
+      @context.stack do
+        groups = input.group_by do |item|
+          @context[variable] = item
+          parsed_expr.render(@context)
         end
-      else
-        input
+        groups.map { |key, value| { "name" => key, "items" => value, "size" => value.size } }
       end
     end
 

data/lib/local_server.rb

@@ -80,7 +80,7 @@ module WebSocket
                 running = false
                 break
               end
-              $log.debug("Send ‘#{message}’ to #{connections.count} WebSocket #{connections.count == 1 ? 'client' : 'clients'}") unless connections.empty?
+              $log.debug("Send ‘#{message}’ to #{connections.size} WebSocket #{connections.size == 1 ? 'client' : 'clients'}") unless connections.empty?
               connections.each do |conn|
                 begin
                   conn.puts(message)

data/lib/log_and_profile.rb

@@ -100,13 +100,13 @@ class Profiler
       STDERR.puts indent(level) + (@format % @duration)
 
       if @groups
-        @groups.sort_by { |group, info| info[:duration] }.reverse.each do |group, info|
+        @groups.sort_by { |group, info| info[:duration] }.reverse_each do |group, info|
           STDERR.puts indent(level+1) + "[#{group}: %.3f seconds, called #{info[:count]} time(s), %.3f seconds/time]" % [ info[:duration], info[:duration] / info[:count] ]
         end
       end
 
       if @children
-        @children.sort_by { |child| child.duration }.reverse.each do |child|
+        @children.sort_by { |child| child.duration }.reverse_each do |child|
           child.dump(level + 1)
         end
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Glim
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glim
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Allan Odgaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2018-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary