pakman 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf628523ec0e01ade19c4d0b9967ff96a2e93c70
-  data.tar.gz: d807a80bd056b41af7fcf8727527a9ba9e297c68
+  metadata.gz: 8627dadb6e570d024eada852f7661770864c3238
+  data.tar.gz: 2c8f9252f3bceb14c559d06d7851d23fb11dfe45
 SHA512:
-  metadata.gz: 153efdc52b28be5f10a99e3cda57d52aa2b9409c24040d907793cdcc4737ebb4b41b4a555b075b0a115ef9af668d329fa21b4ba28efc7d9a3d33e984ce5fd33b
-  data.tar.gz: 0706462e1b030112b656624be971eeb66f4db754f37f28917f3351acdc266cbaa50edfa4704f67f9c26e9c47858920256360d491404cabfa8e5061d3309b7e1e
+  metadata.gz: 1d1f9cdab69b5084546f7d52cbb1471a5159e84d591105b9b83198697eca19e415da4943de9a6b69d4804cd7e8b0973116f33c4a3f2e2b77e2d9c3c27131bfb4
+  data.tar.gz: 674ef0df51ad6fe5ffea55cd194ad12fdcaa286d5a432ec16b1d80f1c03d4c255decd15b84ef517ff80bb9db9ce35b9116e746ee6fb2ffe47f470f1818533700

data/Manifest.txt

@@ -26,8 +26,12 @@ test/data/test.yml
 test/erb/pak/test.html.erb
 test/erb/pak/test.txt
 test/helper.rb
+test/liquid/pak/hello.doc
+test/liquid/pak/hello.txt
+test/liquid/pak/s9logo.png
 test/liquid/pak/test.html
 test/liquid/pak/test.txt
+test/liquid/pak/testbin.txt
 test/liquid/test.html
 test/pages/empty.txt
 test/pages/page1.txt
@@ -36,5 +40,6 @@ test/pages/page3.txt
 test/pages/text.txt
 test/test_erb.rb
 test/test_liquid.rb
+test/test_liquid_binaries.rb
 test/test_liquid_drops.rb
 test/test_page.rb

data/lib/pakman/liquid/templater.rb

@@ -7,14 +7,30 @@ class LiquidTemplater
 
   include LogUtils::Logging
 
+
+  ###
+  ## check these file extensions for processing
+  ##   processing (w/ liquid) if front matter header found / present
+
+  EXTS = ['html', 'svg',
+          'js',   'json',
+          'css',
+          'txt',  'text',
+          'md',   'markdown']
+
+  ## convert html to \.html$ (e.g. match end-of-string and leading dot)
+  ##  e.g.  /\.(html|svg|...)$|/ etc.
+  REGEX_EXT = Regexp.new( "\\.(#{EXTS.join('|')})$", Regexp::IGNORECASE )
+
+
   def initialize
   end
 
   ## rename binding/hash to assigns or something more specific - why? why not?
   def merge_pak( manifestsrc, pakpath, binding, name )
-  
+
     start = Time.now
-    
+
     pakname = Pakman.pakname_from_file( manifestsrc )
 
     puts "Merging template pack '#{pakname}'"
@@ -25,11 +41,11 @@ class LiquidTemplater
     manifest.each do |entry|
       dest   = entry[0]
       source = entry[1]
-      
+
       if dest =~ /__file__/   # replace w/ name
         dest = dest.gsub( '__file__', name )
       end
-      
+
       # get full (absolute) path and make sure path exists
       destfull = File.expand_path( dest, pakpath )
       destpath = File.dirname( destfull )
@@ -37,16 +53,29 @@ class LiquidTemplater
 
       logger.debug "destfull=>#{destfull}<"
       logger.debug "destpath=>#{destpath}<"
-   
+
       ###
       # note:
       #  use jekyll convention for now
       #   check if file starts with front matter (yaml block)
       #   if yes, process (with liquid) otherwise copy as is 1:1
 
-      source_page = Page.from_file( source ) 
-      if source_page.headers?
-        puts "  Merging to #{dest}..."
+      ####
+      # note: for now only check files with known source extensions!!!
+      #   do NOT check binaries (e.g. gif, png, ico, etc. -- regex will fail w/ encoding error)
+      #    todo/check:  check how jekyll works e.g. does jekyll check binaries for front-matter etc. ????
+
+      is_source_page = REGEX_EXT.match( source )   # note: returns nil or MatchData - do NOT use check == false or true (will NOT work)
+
+      if is_source_page.nil?
+        puts "    No (pre-)processing for '#{source}' (copy 1:1) - no matching (known) source extension e.g. #{EXTS.join('|')}"
+        source_page = nil
+      else
+        source_page = Page.from_file( source )
+      end
+
+      if source_page && source_page.headers?
+        puts "  Bingo! Front matter (e.g. ---) found. Merging template to #{dest}..."
 
         out = File.new( destfull, 'w+' )
         ## note: only pass along contents (not headers e.g. front matter for now)
@@ -56,11 +85,11 @@ class LiquidTemplater
         out.close
       else
         puts "  Copying to #{dest} from #{source}..."
-        
+
         FileUtils.copy( source, destfull )
       end
     end # each entry in manifest
-    
+
     puts "Done (in #{Time.now-start} s)."
   end # method merge_pak
 

data/lib/pakman/version.rb

@@ -1,4 +1,4 @@
 
 module Pakman
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/test/liquid/pak/hello.doc

@@ -0,0 +1,8 @@
+---
+front matter here
+---
+
+try "unkown extension"
+just some text here
+
+note: front matter will not matter, that is, will get ignored (e.g. not checked)

data/test/liquid/pak/hello.txt

@@ -0,0 +1,3 @@
+
+just some text
+no front matter

data/test/liquid/pak/testbin.txt

@@ -0,0 +1,7 @@
+######
+# test manifest with binary files e.g. graphics
+#   and "unknown" extensions (will get handled like binary e.g. copied 1:1)
+
+s9logo.png
+hello.txt
+hello.doc

data/test/test_liquid_binaries.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_liquid_binaries.rb
+
+
+require 'helper'
+
+
+class TestLiquidBinaries < MiniTest::Test
+
+
+def setup
+  Liquid::Template.error_mode = :strict
+end
+
+
+def test_rx
+    rx = Pakman::LiquidTemplater::REGEX_EXT
+
+    pp rx
+
+    ## todo: check why assert rx.match( 'test.html' ) == true doesn't work
+    ##  (note: regex.match will return MatchData or nil)
+
+    assert rx.match( 'test.html' ).nil? == false
+    assert rx.match( 'TEST.HTML' ).nil? == false
+    assert rx.match( 'test.js' ).nil?   == false
+    assert rx.match( 'test.json' ).nil? == false
+    assert rx.match( 'test.gif' ).nil?  == true
+end
+
+
+def test_merge
+  hash = YAML.load_file( "#{Pakman.root}/test/data/test.yml" )
+  ctx= { 'headers' => hash['headers'], 'slides' => hash['slides'] }
+  pp ctx
+
+  manifestsrc = "#{Pakman.root}/test/liquid/pak/testbin.txt"
+  outpath = "#{Pakman.root}/tmp/#{Time.now.to_i}"    ## pakpath/output path
+
+  Pakman::LiquidTemplater.new.merge_pak( manifestsrc, outpath, ctx, 'test' )
+
+  assert true
+end  # method test_merge
+
+end # class TestLiquidBinaries

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakman
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fetcher
@@ -118,8 +118,12 @@ files:
 - test/erb/pak/test.html.erb
 - test/erb/pak/test.txt
 - test/helper.rb
+- test/liquid/pak/hello.doc
+- test/liquid/pak/hello.txt
+- test/liquid/pak/s9logo.png
 - test/liquid/pak/test.html
 - test/liquid/pak/test.txt
+- test/liquid/pak/testbin.txt
 - test/liquid/test.html
 - test/pages/empty.txt
 - test/pages/page1.txt
@@ -128,6 +132,7 @@ files:
 - test/pages/text.txt
 - test/test_erb.rb
 - test/test_liquid.rb
+- test/test_liquid_binaries.rb
 - test/test_liquid_drops.rb
 - test/test_page.rb
 homepage: https://github.com/rubylibs/pakman