awestruct 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cba6d723e3f0004e825f80ea48307f55a87f3377
-  data.tar.gz: e0c2fb8c91294a8af0e5a54e8b81fc4bcbf25bcb
+SHA256:
+  metadata.gz: 87462b3b89d000f6d65eed4d9c92c31376177bb611ae7a206f33bbd23d6739a2
+  data.tar.gz: 0d7820bf17266c7733102ad1d89407f71f580a74bbfedd8f39851a175bed98b9
 SHA512:
-  metadata.gz: 8c9fed3b23b687e4c5b8254258cf4595d4d63baa59394e13a3e820c0b955f530b43cdcfa23114543ae3a72aff8eefcb2f467807c4c05cf715b88c55de2b0874b
-  data.tar.gz: f95216f681a0323168edba565617a2e3e45699ca490761e7c2367fe17e6505cdbe72d4e113130131a7d65399ae7acc1f037c25a35bd48911c85e3d5b7d7bb7f4
+  metadata.gz: f45baef6a198a33465c0359e01338af16bfa854f39a2e10227aa6db740fff14e67f6b40c93de9685dc33eea4d546f0847bbafafdb562a7f2bcc10b81a5f42014
+  data.tar.gz: 8ab966c3a10df83a9844454adc0428f22050fa331676c94081be64b2a119927d324775d89a506d638b62091ae56d09238333466089dfbfe25e37e5bdacac97c7

data/Gemfile

@@ -15,12 +15,10 @@ group :test do
   gem 'coffee-script', '~> 2.2.0'
   gem 'asciidoctor', '1.5.2'
   gem 'compass', '>= 1.0.1'
-  gem 'sassc', '~> 1.6'
+  gem 'sassc', '~> 2.0'
   gem 'slim', '~> 3.0'
-  gem 'kramdown', '~> 1.3.3'
-  gem 'therubyracer', '~> 0.12.1', :platforms => :ruby
+  gem 'kramdown', '~> 2.4.0'
   gem 'therubyrhino', '~> 2.0.3', :platforms => :jruby
-  gem 'less', '~> 2.5.0'
   gem 'org-ruby', '~> 0.9.3'
   gem 'RedCloth', '~> 4.2.9'
   gem 'mustache', '~> 0.99.5'
@@ -28,6 +26,7 @@ group :test do
   gem 'htmlcompressor', '~> 0.0.7'
   gem 'haml-contrib', '~> 1.0.0'
   gem 'sass'
+  gem 'ffi', '~> 1.15.5'
   gem 'bootstrap-sass'
   gem 'zurb-foundation'
   gem 'rspec'

data/awestruct.gemspec

@@ -4,7 +4,7 @@ require 'awestruct/version'
 spec = Gem::Specification.new do |s|
   s.name          = 'awestruct'
   s.version       = Awestruct::VERSION
-  s.date          = '2020-05-24'
+  s.date          = '2023-01-24'
 
   s.authors       = ['Bob McWhirter', 'Jason Porter', 'Lance Ball', 'Dan Allen', 'Torsten Curdt', 'other contributors']
   s.email         = ['bob@mcwhirter.org', 'lightguard.jp@gmail.com', 'lball@redhat.com', 'dan.j.allen@gmail.com', 'tcurdt@vafer.org']
@@ -12,14 +12,11 @@ spec = Gem::Specification.new do |s|
   s.summary       = 'Static site baking and publishing tool'
   s.description   = 'Awestruct is a static site baking and publishing tool. It supports an extensive list of both templating and markup languages via Tilt (Haml, Slim, AsciiDoc, Markdown, Sass via Compass, etc), provides mobile-first layout and styling via Bootstrap or Foundation, offers a variety of deployment options (rsync, git, S3), handles site optimizations (minification, compression, cache busting), includes built-in extensions such as blog post management and is highly extensible.'
 
-  s.rubyforge_project = s.name
-
   s.license       = 'MIT'
 
   s.platform      = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.4.0'
 
-  s.has_rdoc      = true
   s.rdoc_options  = ['--charset=UTF-8']
   s.extra_rdoc_files = 'README.md'
 

data/lib/awestruct/cli/invoker.rb

@@ -97,7 +97,7 @@ module Awestruct
           abort( "No config file at #{site_yaml_file}" )
         end
 
-        site_yaml = YAML.load( ERB.new(File.read( site_yaml_file ), nil, '<>').result )
+        site_yaml = YAML.load( ERB.new(File.read( site_yaml_file ), trim_mode: '<>').result )
 
         if ( !site_yaml )
           abort( "Failed to parse #{site_yaml_file}" )

data/lib/awestruct/cli/manifest.rb

@@ -232,7 +232,7 @@ module Awestruct
         def perform(dir)
 
           begin
-          rendered = ERB.new(File.read(@input_path), nil, '<>').result(
+          rendered = ERB.new(File.read(@input_path), trim_mode: '<>').result(
             OpenStruct.new(@state).instance_eval { binding })
           rescue => e
             $LOG.debug "::DEBUG:: #{e.message} state - #{@state}"

data/lib/awestruct/config.rb

@@ -43,7 +43,7 @@ module Awestruct
 
       # Dir[] doesn't like empty list
       ignore_file = File.join(@dir, ".awestruct_ignore")
-      if File.exists?(ignore_file)
+      if File.exist?(ignore_file)
         ignore_stmts = IO.read(ignore_file).each_line.map(&:strip)
       end
 

data/lib/awestruct/engine.rb

@@ -1,6 +1,7 @@
 require 'awestruct/util/inflector'
 require 'awestruct/util/exception_helper'
 require 'awestruct/util/default_inflections'
+require 'awestruct/util/yaml_load'
 
 require 'awestruct/config'
 require 'awestruct/site'
@@ -181,7 +182,7 @@ module Awestruct
     def load_site_yaml(yaml_path, profile = nil)
       if File.exist?(yaml_path)
         begin
-          data = YAML.load( ERB.new(File.read( yaml_path, :encoding => 'bom|utf-8' ), nil, '<>').result )
+          data = Awestruct.yaml_load( ERB.new(File.read( yaml_path, :encoding => 'bom|utf-8' ), trim_mode: '<>').result)
           if profile
             # JP: Interpolation now turned off by default, turn it per page if needed
             site.interpolate = false
@@ -211,7 +212,7 @@ module Awestruct
 
     def load_yaml(yaml_path)
       begin
-        data = YAML.load( ERB.new(File.read( yaml_path ), nil, '<>').result )
+        data = Awestruct.yaml_load( ERB.new(File.read( yaml_path ), trim_mode: '<>').result )
       rescue Exception => e
         ExceptionHelper.log_building_error e, yaml_path
         ExceptionHelper.mark_failed
@@ -283,7 +284,7 @@ module Awestruct
     def load_pipeline
       ext_dir = File.join( site.config.extension_dir )
       pipeline_file = File.join( ext_dir, 'pipeline.rb' )
-      if File.exists?(pipeline_file)
+      if File.exist?(pipeline_file)
         p = eval(File.read( pipeline_file ), nil, pipeline_file, 1)
         p.before_all_extensions.each do |e|
           pipeline.add_before_extension( e )
@@ -379,7 +380,7 @@ module Awestruct
       end
 
       compass_config_file = File.join(site.config.config_dir, 'compass.rb')
-      if File.exists? compass_config_file
+      if File.exist? compass_config_file
         ::Compass.add_configuration ::Compass::Configuration::FileData.new_from_file(compass_config_file) 
       end 
       ::Compass.configuration # return for use elsewhere

data/lib/awestruct/extensions/data_dir.rb

@@ -1,3 +1,5 @@
+require 'awestruct/util/yaml_load'
+
 module Awestruct
   module Extensions
     class DataDir
@@ -11,18 +13,22 @@ module Awestruct
       end
 
       def execute(site)
-        Dir[ "#{site.dir}/#{@data_dir}/*" ].each do |entry|
-          if ( File.directory?( entry ) )
-            data_key = File.basename( entry )
-            data_map = {}
-            Dir[ "#{entry}/*" ].each do |chunk|
-              File.basename( chunk ) =~ /^([^\.]+)/
-              key = $1.to_sym
-              chunk_page = site.engine.load_page( chunk )
-              data_map[ key ] = chunk_page
+        Dir.glob(File.join(site.dir, @data_dir, '*')).each do |entry|
+          next unless File.directory? entry
+          data_key = File.basename(entry)
+          data_map = {}
+          Dir.glob(File.join(entry, '*')).each do |chunk|
+            File.basename(chunk) =~ /^([^\.]+)/
+            key = $1.to_sym
+            chunk_page = nil
+            if chunk.end_with?('.yml')
+              chunk_page = Awestruct.yaml_load_file(chunk)
+            else
+              chunk_page = site.engine.load_page(chunk)
             end
-            site.send( "#{data_key}=", data_map )
+            data_map[key] = chunk_page
           end
+          site.send("#{data_key}=", data_map)
         end
       end
 

data/lib/awestruct/extensions/partial.rb

@@ -5,7 +5,7 @@ module Awestruct
       def partial(path, params = {})
         filename = File.join( ::Awestruct::Engine.instance.config.dir, '_partials', path )
 
-        if !File.exists?( filename )
+        if !File.exist?( filename )
           $LOG.error "Could not find #{filename}" if $LOG.error?
           return nil
         end

data/lib/awestruct/handlers/asciidoctor_handler.rb

@@ -1,4 +1,5 @@
 require 'awestruct/handler_chain'
+require 'awestruct/util/yaml_load'
 require 'awestruct/handlers/base_tilt_handler'
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/layout_handler'
@@ -136,7 +137,7 @@ module Awestruct
         template = ::Tilt::new(delegate.path.to_s, delegate.content_line_offset + 1, options)
         headers = template.parse_headers(content, /^(?:page|awestruct)\-(?=.)/).inject({'interpolate' => false}) do |hash, (k,v)|
           unless v.nil?
-            hash[k] = v.empty? ? v : YAML.load(v)
+            hash[k] = v.empty? ? v : Awestruct.yaml_load(v)
             if hash[k].kind_of? Time
               # use DateTime to preserve timezone information
               hash[k] = DateTime.parse(v)

data/lib/awestruct/util/yaml_load.rb

@@ -0,0 +1,14 @@
+require 'yaml'
+
+module Awestruct
+  def self.yaml_load(str)
+    return YAML.load(str) unless YAML.method('load').parameters.any? {|k,v| v == :permitted_classes}
+    YAML.load(str, permitted_classes: [Date, Symbol])  
+  end
+
+  def self.yaml_load_file(str)
+    return YAML.load_file(str) unless YAML.method('load_file').parameters.any? {|k,v| v == :permitted_classes}
+    YAML.load_file(str, permitted_classes: [Date, Symbol])
+  end
+
+end

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.6.1'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Bob McWhirter
@@ -10,10 +10,10 @@ authors:
 - Dan Allen
 - Torsten Curdt
 - other contributors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -450,6 +450,7 @@ files:
 - lib/awestruct/util/default_inflections.rb
 - lib/awestruct/util/exception_helper.rb
 - lib/awestruct/util/inflector.rb
+- lib/awestruct/util/yaml_load.rb
 - lib/awestruct/version.rb
 - man/awestruct.1
 - man/awestruct.adoc
@@ -480,7 +481,6 @@ files:
 - spec/awestruct/handlers/interpolation_handler_spec.rb
 - spec/awestruct/handlers/javascript_handler_spec.rb
 - spec/awestruct/handlers/layout_handler_spec.rb
-- spec/awestruct/handlers/less_handler_spec.rb
 - spec/awestruct/handlers/markdown_handler_spec.rb
 - spec/awestruct/handlers/mustache_handler_spec.rb
 - spec/awestruct/handlers/orgmode_handler_spec.rb
@@ -609,7 +609,7 @@ homepage: http://awestruct.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -629,9 +629,8 @@ requirements:
   Any markup languages you are using and its dependencies.
   Haml and Markdown filters are touchy things. Redcarpet or Rdiscount work well if you're running on MRI. JRuby should be using haml 4.0.0+ with Kramdown.
   Compass and sass are no longer hard dependencies. You'll need too add them on your own should you want them. We also should be able to work with sassc.
-rubyforge_project: awestruct
-rubygems_version: 2.6.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Static site baking and publishing tool
 test_files:
@@ -662,7 +661,6 @@ test_files:
 - spec/awestruct/handlers/interpolation_handler_spec.rb
 - spec/awestruct/handlers/javascript_handler_spec.rb
 - spec/awestruct/handlers/layout_handler_spec.rb
-- spec/awestruct/handlers/less_handler_spec.rb
 - spec/awestruct/handlers/markdown_handler_spec.rb
 - spec/awestruct/handlers/mustache_handler_spec.rb
 - spec/awestruct/handlers/orgmode_handler_spec.rb

data/spec/awestruct/handlers/less_handler_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-verify = lambda { |output|
-  output.should =~ /\.class {\n  width: 2;\n}/
-}
-
-theories =
-  [
-    {
-      :page => "less-page.less",
-      :simple_name => "less-page",
-      :syntax => :less,
-      :extension => '.css',
-      :matcher => verify
-    },
-    {
-      :page => "less-page-with-import.less",
-      :simple_name => "less-page-with-import",
-      :syntax => :less,
-      :extension => '.css',
-      :matcher => verify,
-      :unless => {
-        :message => "Tilt 1.3.3 does not forward given options to Less parser. @import won't work unless :paths are set",
-        :exp => lambda { Tilt::VERSION.eql? "1.3.3" }
-      }
-    }
-  ]
-
-describe Awestruct::Handlers::TiltHandler.to_s + "-Less" do
-  
-  it_should_behave_like "a handler", theories
-
-end