tzispa_rig 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85460707b768aacfda498419acc54745d5c16023
-  data.tar.gz: fed21c4359870abf3c347166777b6cf6fe63693d
+  metadata.gz: 4cd09f61d15166b4d143e917b9aa1d28957685b4
+  data.tar.gz: 17264385d89f93c1ff1cd3b387ca5499a352545c
 SHA512:
-  metadata.gz: b7f6c00dbab72e985feb68dc402f1b37d8af52f2893380d224a758125ab5e955ff9c11e0d17259c883af1a811042a4d09da2dce90e7c59a700648fa7704b2b50
-  data.tar.gz: 9851c3d85331cb4436faeeae19dd603fe8e2dfe05dfc940d84af88abac60142ba28eb8974bf48798533b36aafa2fd553df68740e9dbd345d3c7845d594172ca6
+  metadata.gz: 5b4e9b77f6e96c2b746fad05846b1f235a47682bb3d3e65c2c6fce7c873a07409627b3e07bd370f8ef6f0a49bdf4f4d35a9e1dbef2c7bfab5468dbe7b1abacee
+  data.tar.gz: b4ee7c671154e99818d103334cec470526a11cc0e06e8b98aed5378ca5b61bc654c15e348ec0504684f2cdc868ce78f54ca51ec422a55252af0d697bc4932a42

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Tzispa Rig
 
 Rig templates implementation
 
+## v0.4.2
+- add support for metavars in purl/url tag id
+
 ## v0.4.1
 - add inter-app calls for url and api tags
 

data/lib/tzispa/rig/parsernext.rb

@@ -103,11 +103,11 @@ module Tzispa
 
     class ParsedUrl < ParsedEntity
 
-      attr_reader :path_id, :params, :app_name
+      attr_reader :layout, :params, :app_name
 
-      def initialize(parser, type, path_id, params, app_name = nil)
+      def initialize(parser, type, layout, params, app_name = nil)
         super(parser, type)
-        @path_id = path_id.to_sym
+        @layout = layout
         @params = params
         @app_name = app_name
       end
@@ -116,18 +116,26 @@ module Tzispa
         b_params = @params.dup.gsub(RE_ANCHOR) { |match|
           parser.the_parsed.select { |p| p.anchor == match}.first.render(binder)
         } if @params
+        b_layout = bind_value(@layout.dup, binder).to_sym
         case type
         when :purl
           app_name ?
-            binder.context.app_path(app_name, @path_id, Parameters.new(b_params).tp_h) :
-            binder.context.path(@path_id, Parameters.new(b_params).to_h)
+            binder.context.app_layout_path(app_name, b_layout, Parameters.new(b_params).tp_h) :
+            binder.context.layout_path(b_layout, Parameters.new(b_params).to_h)
         when :url
           app_name ?
-            binder.context.app_canonical_url(app_name, @path_id, Parameters.new(b_params).to_h) :
-            binder.context.canonical_url(@path_id, Parameters.new(b_params).to_h)
+            binder.context.app_layout_canonical_url(app_name, b_layout, Parameters.new(b_params).to_h) :
+            binder.context.layout_canonical_url(b_layout, Parameters.new(b_params).to_h)
         end
       end
 
+      def bind_value(value, binder)
+        value.gsub(RE_ANCHOR) { |match|
+          parser.the_parsed.select { |p| p.anchor == match}.first.render(binder)
+        }
+      end
+
+
     end
 
 

data/lib/tzispa/rig/syntax.rb

@@ -12,7 +12,7 @@ module Tzispa
       }.freeze
 
       RIG_URL_BUILDER = {
-        :url  => /<(url|purl)(@\w+)?:(\w+(?:\.\w+)?)(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])?\/>/,
+        :url  => /<(url|purl)(@\w+)?:([^\[\.\/]+(?:\.[^\[\/]+)?)(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])?\/>/,
         :api  => /<(api|sapi)(@\w+)?:([^:\.]+(?:\.[^:]+)?):([^:\/]+)(?::([^:\/]+))?(?::([^\/]+))?\/>/
       }.freeze
 

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
     GEM_NAME = 'tzispa_rig'
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_rig
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_helpers