tzispa_rig 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6afaf56cd198b00340644368828a0727b3da7bb8
-  data.tar.gz: ebb745a0b564a73834c87b51d992c1db2726e818
+  metadata.gz: 708d90bb94a81f1397c06164861b26975526e3ef
+  data.tar.gz: 57f5d6f6f9d76deac46e8290450d317f695c7746
 SHA512:
-  metadata.gz: 6c702cc00b5efcc7850ee465003c147b87790c13b30b0ed84f1d53254cf97a16544e3bdb3dd41de9b8545faa15c7fb40e92244690fcd3c4dd9c3778e205b0549
-  data.tar.gz: c4b39a521c21fc2ba7e6fba446d079ed207555d76e407f16523c6a831cf1c6f95f07867ff6f0262890c64ee41b18aaaf64032f6ba8b6786085ee9d6ee667ea34
+  metadata.gz: c141e157fb0cd26f877c63c9ad08558456e4186dabac95fa97beb947ed7cecbf7933c0645f2f13805265d15b8b236ec5b2e386b8ede161cb9afff78d96d6d542
+  data.tar.gz: cc85b3bb9a08de8cc34397ce0bf138ed9e9e9339c9ec1676ecfc9a9a7e55b12876ecdb735bea5c97e8e677fd1d22fb9586fe840f9c59668455d3ea84efd5d3cc

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Tzispa Rig
 
 Rig templates implementation
 
+## 0.3.0
+- Separate engine class into independant ruby file
+- Move rig url builder tags into independant parser category
+- Now static blocks can parse url builder tags: url, purl & api
+
 ## v0.2.9
 - Fix bugs in template cache engine causing modified template files are not reloading
 - Replaces Tzispa::Utils::Cache with lru_redex gem

data/lib/tzispa/rig/engine.rb

@@ -31,13 +31,9 @@ module Tzispa
 
       def rig_template(name, type, tpl_format, params, parent)
         if @cache
-          if @mutex.owned?
-            cache_template(name, type, tpl_format, params, parent)
-          else
-            @mutex.synchronize {
-              cache_template(name, type, tpl_format, params, parent)
-            }
-          end
+          @mutex.owned? ?
+            cache_template(name, type, tpl_format, params, parent) :
+            @mutex.synchronize { cache_template(name, type, tpl_format, params, parent)  }
         else
           Template.new(name: name, type: type, format: format, domain: @app.domain, params: params, parent: parent, engine: self).load!.parse!
         end

data/lib/tzispa/rig/parsernext.rb

@@ -356,6 +356,7 @@ module Tzispa
           parse_statements
           parse_expressions
         end
+        parse_url_builder
         parse_templates
         self
       end
@@ -391,6 +392,16 @@ module Tzispa
         }
       end
 
+      def parse_url_builder
+        RIG_URL_BUILDER.each_key { |kre|
+          @inner_text.gsub!(RIG_URL_BUILDER[kre]) { |match|
+            pe = ParsedEntity.instance(self, kre, Regexp.last_match )
+            @the_parsed << pe
+            pe.anchor
+          }
+        }
+      end
+
       def parse_expressions
         RIG_EXPRESSIONS.each_key { |kre|
           @inner_text.gsub!(RIG_EXPRESSIONS[kre]) { |match|

data/lib/tzispa/rig/syntax.rb

@@ -8,11 +8,14 @@ module Tzispa
 
       RIG_EXPRESSIONS = {
         :meta => /\{%([^%]+?)%\}/,
-        :var  => /<var(\[%[A-Z]?[0-9]*[a-z]\])?:(\w+)\/>/,
+        :var  => /<var(\[%[A-Z]?[0-9]*[a-z]\])?:(\w+)\/>/
+      }.freeze
+
+      RIG_URL_BUILDER = {
         :purl => /<purl:(\w+(?:\.\w+)?)(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])?\/>/,
         :url  => /<url:(\w+(?:\.\w+)?)(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])?\/>/,
         :api  => /<api:([^:\.]+(?:\.[^:]+)?):([^:\/]+)(?::([^:\/]+))?(?::([^\/]+))?\/>/
-      }.freeze
+      }
 
       RIG_STATEMENTS = /(<(loop):(\w+)>(.*?)<\/loop:\3>)|(<(ife):(\w+)>(.*?)(<else:\7\/>(.*?))?<\/ife:\7>)/m
 

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.2.9'
+    VERSION = '0.3.0'
     GEM_NAME = 'tzispa_rig'
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_rig
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_helpers
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: General purpose template engine