tzispa_rig 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09e80ff368915af834b5d85df68834d5d373a6bd
-  data.tar.gz: 4919330b471c6970c2e7939fee29b9f56e4ea689
+  metadata.gz: 85460707b768aacfda498419acc54745d5c16023
+  data.tar.gz: fed21c4359870abf3c347166777b6cf6fe63693d
 SHA512:
-  metadata.gz: 4641da9ff01bdb47eb4fd750d4185f444299d5204eac978eb1c707e98cd1c578ebab185598fbf40ea74a2af80d0b335731f0df391c4cf9dc85fcc047eff08bab
-  data.tar.gz: 8dd5f5669ea8f3ebeefdd969b53ff903b351758d8da38a346d11fcd603a97f6a09b324690a542fb3cf0d1d4c1bb9e44d21ae0748b248d6ebfbbab9898d146b4e
+  metadata.gz: b7f6c00dbab72e985feb68dc402f1b37d8af52f2893380d224a758125ab5e955ff9c11e0d17259c883af1a811042a4d09da2dce90e7c59a700648fa7704b2b50
+  data.tar.gz: 9851c3d85331cb4436faeeae19dd603fe8e2dfe05dfc940d84af88abac60142ba28eb8974bf48798533b36aafa2fd553df68740e9dbd345d3c7845d594172ca6

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Tzispa Rig
 
 Rig templates implementation
 
+## v0.4.1
+- add inter-app calls for url and api tags
+
 ## v0.4.0
 - add suport for signed/unsigned api calls
 

data/lib/tzispa/rig/parameters.rb

@@ -2,18 +2,15 @@
 
 module Tzispa
   module Rig
-    class Parameters
-
 
-      attr_reader :inner
-      attr_reader :outer
-      attr_reader :data
+    class Parameters
 
+      attr_reader :inner, :outer
 
-      def initialize(params=nil, iouter=',', iinner='=')
+      def initialize(params=nil, outer=',', inner='=')
         @data = Hash.new
-        @outer = iouter
-        @inner = iinner
+        @outer = outer
+        @inner = inner
         setData(params) if params
       end
 
@@ -37,6 +34,12 @@ module Tzispa
         @data.map { |k,v| "#{k}#{inner}#{v}" }.join(outer)
       end
 
+      def to_h
+        @data
+      end
+
+      alias_method :data, :to_h
+
       def merge(params)
         setData(params)
       end

data/lib/tzispa/rig/parsernext.rb

@@ -29,9 +29,9 @@ module Tzispa
         when :var
           ParsedVar.new parser, type, match[1], match[2]
         when :url
-          ParsedUrl.new parser, match[1].to_sym, match[2], match[4]
+          ParsedUrl.new parser, match[1].to_sym, match[3], match[5], match[2]&.slice(1..-1)&.to_sym
         when :api
-          ParsedApi.new parser, match[1].to_sym, match[2], match[3], match[4], match[5]
+          ParsedApi.new parser, match[1].to_sym, match[3], match[4], match[5], match[6], match[2]&.slice(1..-1)&.to_sym
         when :loop
           ParsedLoop.new parser, type, match[3], match[4]
         when :ife
@@ -103,10 +103,13 @@ module Tzispa
 
     class ParsedUrl < ParsedEntity
 
-      def initialize(parser, type, path_id, params)
+      attr_reader :path_id, :params, :app_name
+
+      def initialize(parser, type, path_id, params, app_name = nil)
         super(parser, type)
         @path_id = path_id.to_sym
         @params = params
+        @app_name = app_name
       end
 
       def render(binder)
@@ -115,9 +118,13 @@ module Tzispa
         } if @params
         case type
         when :purl
-          binder.context.path @path_id, Parameters.new(b_params).data
+          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)
         when :url
-          binder.context.canonical_url @path_id, Parameters.new(b_params).data
+          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)
         end
       end
 
@@ -126,14 +133,15 @@ module Tzispa
 
     class ParsedApi < ParsedEntity
 
-      attr_reader :handler, :verb, :predicate
+      attr_reader :handler, :verb, :predicate, :app_name
 
-      def initialize(parser, type, handler, verb, predicate, sufix)
+      def initialize(parser, type, handler, verb, predicate, sufix, app_name = nil)
         super(parser, type)
         @handler = handler
         @verb = verb
         @predicate = predicate
         @sufix = sufix
+        @app_name = app_name
       end
 
       def render(binder)
@@ -141,7 +149,7 @@ module Tzispa
         b_verb = bind_value @verb.dup, binder
         b_predicate = bind_value( @predicate.dup, binder ) if @predicate
         b_sufix = bind_value( @sufix.dup, binder ) if @sufix
-        binder.context.send(type.to_sym, b_handler, b_verb, b_predicate, b_sufix)
+        binder.context.send(type.to_sym, b_handler, b_verb, b_predicate, b_sufix, app_name)
       end
 
       private

data/lib/tzispa/rig/syntax.rb

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

data/lib/tzispa/rig/template.rb

@@ -43,6 +43,7 @@ module Tzispa
             while line = f.gets
               @content << line
             end
+            f.close
           }
           @loaded = true
         rescue Errno::ENOENT

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
     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.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_helpers