tml 5.6.4 → 5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b79b000f32fc2506faf178e1ee5aa2698d658d
-  data.tar.gz: b73c45a3564d1ed704d5e93ea4d7ea34325a8ad4
+  metadata.gz: c34d0e6209b1b34c4143f0b16ecbc73aec7a5324
+  data.tar.gz: 20f9c409c786a9a67cb76e74eb3cdbe285f9eb3a
 SHA512:
-  metadata.gz: c46fef311a0a7aab52e62a254792292e7dce66d9db03c2e809bd44b45a4c9d3287807642814d24273073c34299da2d158b5c66e8cff12eb1c248b3b6df80ac52
-  data.tar.gz: 275625ecae6e94b25f8dba5687a92bad91fd43b73211e4013822e123bc79094ef0e6c5b7bfb4c2cedd129a955bbcabce12a20623b6a0cbeef33a41d476632f5d
+  metadata.gz: 8ee0f8b41b9d66d8d1f05172df2318eade8f05c408f299137fb45e791b3cd03b0ac20da55e8c28cda300faa08c736c8f0d9dfdec49fbae47dfc4094cef5bf2dc
+  data.tar.gz: 690f0c2581fcdc822a8e63c45265fdcce2eb2a4b9298a700dd9845b9429ef1911395acf1995946bbcd9aa7d91764e638277db9dc404d438421c16c9c3334e2af

data/lib/tml/config.rb

@@ -156,7 +156,7 @@ module Tml
             regex: /(&[^;]*;)/
           },
           date: {
-            enabled: true,
+            enabled: false,
             formats: [
               [/((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+\d+,\s+\d+)/, "{month} {day}, {year}"],
               [/((January|February|March|April|May|June|July|August|September|October|November|December)\s+\d+,\s+\d+)/, "{month} {day}, {year}"],
@@ -166,12 +166,12 @@ module Tml
             name: 'date'
           },
           rules: [
-            {enabled: true, name: 'time',     regex: /(\d{1,2}:\d{1,2}\s+([A-Z]{2,3}|am|pm|AM|PM)?)/},
-            {enabled: true, name: 'phone',    regex: /((\d{1}-)?\d{3}-\d{3}-\d{4}|\d?\(\d{3}\)\s*\d{3}-\d{4}|(\d.)?\d{3}.\d{3}.\d{4})/},
-            {enabled: true, name: 'email',    regex: /([-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|io|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?)/},
-            {enabled: true, name: 'price',    regex: /(\$\d*(,\d*)*(\.\d*)?)/},
-            {enabled: true, name: 'fraction', regex: /(\d+\/\d+)/},
-            {enabled: true, name: 'num',      regex: /(\b\d*(,\d*)*(\.\d*)?%?\b)/}
+            {enabled: false, name: 'time',     regex: /(\d{1,2}:\d{1,2}\s+([A-Z]{2,3}|am|pm|AM|PM)?)/},
+            {enabled: false, name: 'phone',    regex: /((\d{1}-)?\d{3}-\d{3}-\d{4}|\d?\(\d{3}\)\s*\d{3}-\d{4}|(\d.)?\d{3}.\d{3}.\d{4})/},
+            {enabled: false, name: 'email',    regex: /([-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|io|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?)/},
+            {enabled: false, name: 'price',    regex: /(\$\d*(,\d*)*(\.\d*)?)/},
+            {enabled: false, name: 'fraction', regex: /(\d+\/\d+)/},
+            {enabled: false, name: 'num',      regex: /(\b\d*(,\d*)*(\.\d*)?%?\b)/}
           ]
         }
       }

data/lib/tml/tokenizers/dom.rb

@@ -103,6 +103,8 @@ module Tml
 
       def translate_tml(tml)
         return tml if empty_string?(tml)
+        pp tml
+
         tml = generate_data_tokens(tml)
 
         if option('split_sentences')
@@ -147,9 +149,9 @@ module Tml
         value = sanitize_value(buffer)
 
         return '{' + token + '}' if self_closing_node?(node)
-        return '[' + token + ': ' + value + ']' if short_token?(token, value)
+        # return '[' + token + ': ' + value + ']' if short_token?(token, value)
 
-        '[' + token + ']' + value + '[/' + token + ']'
+        '<' + token + '>' + value + '</' + token + '>'
       end
 
       def option(name)
@@ -162,8 +164,12 @@ module Tml
       end
 
       def empty_string?(tml)
-        tml = tml.gsub(/[\s\n\r\t]/, '')
-        tml == ''
+        tml = tml.gsub(/[\s\n\r\t]/, '').gsub(/[\u0080-\u00ff]/, '')
+        return true if tml == ''
+        return true if tml.match(/\A\$\{[^\}]+\}\z/)  # ignore variables ${var_name}
+        return true if tml.match(/\A\$?\d+\.?\d+\z/) # ignore prices and numbers
+
+        false
       end
 
       def reset_context

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.6.4'
+  VERSION = '5.6.5'
 
   def self.full_version
     "tml-ruby v#{Tml::VERSION} (Faraday v#{Faraday::VERSION})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 5.6.4
+  version: 5.6.5
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday