liquidoc 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 215dbf8660c2a4ed7689ce7db31e945bc15ddfe5
-  data.tar.gz: 6b119022ec3949db974ae0595c2d539ab6279213
+  metadata.gz: d93d2ba43725019138268b7cbc3e90df6a8edf7f
+  data.tar.gz: 4ae07aca59730f64a1e9769d9c2c2c964027d0ba
 SHA512:
-  metadata.gz: 49a70aca7fdb170ef2e5b65c3ebe50c0a0a1eb203139fb34ccd73f0080e8c0f53de3dc3d590994992d810f0965fc723db9445b1e6351b780430a48cb7e4183df
-  data.tar.gz: 8609f7d60cb0929ff16c6af3d07308fa0e5d6e3890cb09cd018e13de9ff97fc4144571f8c27772e0431fa67e489667d9adca37f75c620d26396d9194d21c8338
+  metadata.gz: 94f1db1b4a534a2ac0630290286ed98e133d4412fc2a42e4121c4733a751219f76713c7992e8bf4bb128d30667c5343edc658f1729b5dd48557652ec69bac2f0
+  data.tar.gz: 0a5fbaf300323cc475ca61ab1b2ddb475b9a4ca91944bdadf34c10a83373e9a7f462efc4dc39c3fed3755fb575c680c7c408e607703e28e4127ceacd06ca5762

data/lib/liquidoc.rb

@@ -92,7 +92,6 @@ def iterate_build cfg
       copy_assets(step.source, step.target, inclusive)
     when "render"
       if defined?(step.data) # if we're passing attributes as a YAML file, let's ingest that up front
-        validate_file_input(step.data, "data")
         attrs = ingest_attributes(step.data)
       else
         attrs = {}
@@ -290,28 +289,21 @@ class DataSrc
   # initialization means establishing a proper hash for the 'data' param
   def initialize datasrc
     @datasrc = {}
-    if datasrc.is_a? String # create a hash out of the filename
-      begin
-        @datasrc['file'] = datasrc
-        @datasrc['ext'] = File.extname(datasrc)
-        @datasrc['type'] = false
-        @datasrc['pattern'] = false
-      rescue
-        raise "InvalidDataFilename"
+    @datasrc['file'] = datasrc
+    @datasrc['ext'] = File.extname(datasrc)
+    @datasrc['type'] = false
+    @datasrc['pattern'] = false
+    if datasrc.is_a? Hash # data var is a hash, so add 'ext' to it by extracting it from filename
+      @datasrc['file'] = datasrc['file']
+      @datasrc['ext'] = File.extname(datasrc['file'])
+      if (defined?(datasrc['pattern']))
+        @datasrc['pattern'] = datasrc['pattern']
       end
-    else
-      if datasrc.is_a? Hash # data var is a hash, so add 'ext' to it by extracting it from filename
-        @datasrc['file'] = datasrc['file']
-        @datasrc['ext'] = File.extname(datasrc['file'])
-        if (defined?(datasrc['pattern']))
-          @datasrc['pattern'] = datasrc['pattern']
-        end
-        if (defined?(datasrc['type']))
-          @datasrc['type'] = datasrc['type']
-        end
-      else # datasrc is neither String nor Hash
-        raise "InvalidDataSource"
+      if (defined?(datasrc['type']))
+        @datasrc['type'] = datasrc['type']
       end
+    else # datasrc is neither String nor Hash
+      raise "InvalidDataSource"
     end
   end
 
@@ -396,20 +388,20 @@ def ingest_data datasrc
   case datasrc.type
   when "yml"
     begin
-      return YAML.load_file(datasrc.file)
+      data = YAML.load_file(datasrc.file)
     rescue Exception => ex
       @logger.error "There was a problem with the data file. #{ex.message}"
     end
   when "json"
     begin
-      return JSON.parse(File.read(datasrc.file))
+      data = JSON.parse(File.read(datasrc.file))
     rescue Exception => ex
       @logger.error "There was a problem with the data file. #{ex.message}"
     end
   when "xml"
     begin
       data = Crack::XML.parse(File.read(datasrc.file))
-      return data['root']
+      data = data['root']
     rescue Exception => ex
       @logger.error "There was a problem with the data file. #{ex.message}"
     end
@@ -422,13 +414,13 @@ def ingest_data datasrc
         i = i+1
       end
       output = {"data" => output}
-      return output
+      data = output
     rescue
       @logger.error "The CSV format is invalid."
     end
   when "regex"
     if datasrc.pattern
-      return parse_regex(datasrc.file, datasrc.pattern)
+      data = parse_regex(datasrc.file, datasrc.pattern)
     else
       @logger.error "You must supply a regex pattern with your free-form data file."
       raise "MissingRegexPattern"
@@ -533,16 +525,40 @@ end
 # RENDER-type procs
 # ===
 
-# Gather attributes from a fixed attributes file
-# Use _data/attributes.yml or designate as -a path/to/filename.yml
-def ingest_attributes attributes_file
-  validate_file_input(attributes_file, "attributes")
-  begin
-    attributes = YAML.load_file(attributes_file)
-    return attributes
-  rescue
-    @logger.warn "Attributes file invalid."
+# Gather attributes from one or more fixed attributes files
+def ingest_attributes attr_file
+  file_array = attr_file.split(",")
+  attrs = {}
+  for f in file_array
+    if f.include? ":"
+      file = f.split(":")
+      filename = file[0]
+      block_name = file[1]
+    else
+      filename = f
+      block_name = false
+    end
+    validate_file_input(filename, "attributes")
+    begin
+      new_attrs = YAML.load_file(filename)
+      if block_name
+        begin
+          new_attrs = new_attrs[block_name]
+        rescue
+          raise "InvalidAttributesBlock"
+        end
+      end
+    rescue Exception => ex
+      @logger.error "Attributes block invalid. #{ex.class}: #{ex.message}"
+      raise "AttributeBlockError"
+    end
+    begin
+      attrs.merge!new_attrs
+    rescue Exception => ex
+      raise "AttributesMergeError #{ex.message}"
+    end
   end
+  return attrs
 end
 
 def derive_backend type, out_file
@@ -593,7 +609,7 @@ def asciidocify doc, build
       verbose: @verbose,
       mkdirs: true
     )
-  else # For PDFs, we're calling the asciidoctor-pdf CLI, as the main dependency does not seem to perform the same way
+  else # For PDFs, we're calling the asciidoctor-pdf CLI, as the main dependency doesn't seem to perform the same way
     attributes = '-a ' + doc.attributes.map{|k,v| "#{k}='#{v}'"}.join(' -a ')
     command = "asciidoctor-pdf -o #{to_file} -b pdf -d #{build.doctype} -S unsafe #{attributes} -a no-header-footer --trace #{doc.index}"
     @logger.debug "Running #{command}"
@@ -646,34 +662,14 @@ module CustomFilters
     end
   end
 
-  # From Slate Studio's fork of Locomotive CMS engine
-  # https://github.com/slate-studio/engine/blob/master/lib/locomotive/core_ext.rb
-  def slugify(options = {})
-    options = { :sep => '_', :without_extension => false, :downcase => false, :underscore => false }.merge(options)
-    # replace accented chars with ther ascii equivalents
-    s = ActiveSupport::Inflector.transliterate(self).to_s
-    # No more than one slash in a row
-    s.gsub!(/(\/[\/]+)/, '/')
-    # Remove leading or trailing space
-    s.strip!
-    # Remove leading or trailing slash
-    s.gsub!(/(^[\/]+)|([\/]+$)/, '')
-    # Remove extensions
-    s.gsub!(/(\.[a-zA-Z]{2,})/, '') if options[:without_extension]
+  def slugify input
     # Downcase
-    s.downcase! if options[:downcase]
     # Turn unwanted chars into the seperator
-    s.gsub!(/[^a-zA-Z0-9\-_\+\/]+/i, options[:sep])
-    # Underscore
-    s.gsub!(/[\-]/i, '_') if options[:underscore]
+    s = input.to_s.downcase
+    s.gsub!(/[^a-zA-Z0-9\-_\+\/]+/i, "-")
     s
   end
-  def slugify!(options = {})
-    replace(self.slugify(options))
-  end
-  def parameterize!(sep = '_')
-    replace(self.parameterize(sep))
-  end
+
 end
 
 # register custom Liquid filters

data/lib/liquidoc/version.rb

@@ -1,3 +1,3 @@
 module Liquidoc
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidoc
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Brian Dominick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler