htx 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad1aaabd0904124ebc249af10fd5e8e93c11009f0fc0f7cb31f2f8656d4bb47d
-  data.tar.gz: 44e8808f07d173efc4830f07e0732822715e9837764518b780efe300ff08f2e6
+  metadata.gz: 637943258561910b726a2956a9c9e683b1fe2180ab80803a484032ba56fb3101
+  data.tar.gz: b4c6faf31037d5a8e0550e2331e6820d21349e9ca80bed18f9a6611a8004de5b
 SHA512:
-  metadata.gz: 5c7533d1b88bfc3365794cd18b8f26083364a060d4fdc1d4d1b3cef6dcb13af87e2ce4beb06553846da8add2481bda8fae5666a614b1c0ffff8b97d2b5aadd9d
-  data.tar.gz: ef37756cd45b5e7c58ababb1b9350467748816b998f50976055f2541356d282bd15bad20d47325f4ba4a32af1256b7ca407293b45ec496ba23fab494fd4c9f31
+  metadata.gz: 82e119f2932d7e96c17a2a336c6bcb88a27759d6657308ac91c4f1e0b6bd4c38000f5e4e45592b2603f6e9f71e6f1d670a4458745b172b157aa429a843d32970
+  data.tar.gz: b2583375f80f0062ea9f5a73df2c72c34b728cf3e2c7b863fc4feb93e18e94aaf81a689d45933bcac3914f71b86ce16865cecec8cca86ef728d8a038c2b15eba

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2019-2020 Nate Pickens
+Copyright 2019-2021 Nate Pickens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without

data/lib/htx.rb

@@ -6,21 +6,23 @@ require('nokogiri')
 # A Ruby compiler for HTX templates.
 #
 class HTX
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   CHILDLESS = 0b01
   TEXT_NODE = 0b10
   FLAG_BITS = 2
 
+  INDENT_DEFAULT = '  '
   DYNAMIC_KEY_ATTR = 'htx-key'
 
-  LEADING_WHITESPACE = /\A *\n */.freeze
-  TRAILING_WHITESPACE = /\n *\z/.freeze
-  NON_BLANK_NON_FIRST_LINE = /(?<=\n) *(?=\S)/.freeze
-  NEWLINE_NON_BLANK = /\n(?=[^\n]+)/.freeze
+  LEADING_WHITESPACE = /\A[ \t]*\n[ \t]*/.freeze
+  TRAILING_WHITESPACE = /\n[ \t]*\z/.freeze
+  NON_BLANK_NON_FIRST_LINE = /(?<=\n)[ \t]*(?=\S)/.freeze
+  NEWLINE_NON_BLANK = /\n(?=[^\n])/.freeze
+  INDENT_GUESS = /^[ \t]+/.freeze
 
-  END_STATEMENT_END = /(;|\n|\{|\}) *\z/.freeze
-  BEGIN_STATEMENT_END = /\A *(;|\{|\n|\})/.freeze
+  END_STATEMENT_END = /(;|\n|\{|\})[ \t]*\z/.freeze
+  BEGIN_STATEMENT_END = /\A[ \t]*(;|\{|\n|\})/.freeze
   END_WHITESPACE = /\s\z/.freeze
   BEGIN_WHITESPACE = /\A\s/.freeze
 
@@ -51,7 +53,11 @@ class HTX
   end
 
   ##
-  # Compiles the HTX template.
+  # Compiles the HTX template. Options:
+  #
+  # * :indent - Indent output by this number of spaces if Numeric, or by this string if a String (if the
+  #     latter, may only contain space and tab characters).
+  # * :assign_to - Assign the template function to this JavaScript object instead of the `window` object.
   #
   def compile(options = EMPTY_HASH)
     doc = Nokogiri::HTML::DocumentFragment.parse(@template)
@@ -69,12 +75,21 @@ class HTX
     @compiled = ''.dup
     @static_key = 0
 
+    @indent =
+      if options[:indent].kind_of?(Numeric)
+        ' ' * options[:indent]
+      elsif options[:indent].kind_of?(String) && options[:indent] !~ /^[ \t]+$/
+        raise("Invalid :indent value #{options[:indent].inspect}: only spaces and tabs are allowed")
+      else
+        options[:indent] || @template[INDENT_GUESS] || INDENT_DEFAULT
+      end
+
     process(doc)
     @compiled.rstrip!
 
     <<~EOS
       #{options[:assign_to] || 'window'}['#{@name}'] = function(htx) {
-        #{@compiled}
+      #{@indent}#{@compiled}
       }
     EOS
   end
@@ -154,7 +169,7 @@ class HTX
     elsif @compiled !~ END_WHITESPACE && text !~ BEGIN_WHITESPACE
       @compiled << ' '
     elsif @compiled[-1] == "\n"
-      @compiled << '  '
+      @compiled << @indent
     end
 
     @compiled << text
@@ -166,7 +181,7 @@ class HTX
   def indent(text)
     return '' unless text
 
-    text.gsub!(NEWLINE_NON_BLANK, "\n  ")
+    text.gsub!(NEWLINE_NON_BLANK, "\n#{@indent}")
     text
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nate Pickens
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -42,20 +42,26 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.11.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 5.11.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 description: HTX is a full-featured HTML template system that is simple, lightweight,
   and highly performant. This library is a Ruby implementation of the HTX template
   compiler--it converts HTX templates to their compiled JavaScript form.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -70,7 +76,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/npickens/htx
   source_code_uri: https://github.com/npickens/htx
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,15 +84,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A Ruby compiler for HTX templates.
 test_files: []