tzispa_rig 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34c29a6d0cb71518ba08bf0c7c3274ac6a1cad35
-  data.tar.gz: 23a5a9a18a5d22e871a51b5085d730b47f4676ff
+  metadata.gz: 09e80ff368915af834b5d85df68834d5d373a6bd
+  data.tar.gz: 4919330b471c6970c2e7939fee29b9f56e4ea689
 SHA512:
-  metadata.gz: 2780edabd2cbf6d049860a10eb04363c094a9b851a5ec95fd3b394cb34389b483cb4613418f7430bc791f942c9b3d55143d73853cd985402207be25e5deceb59
-  data.tar.gz: 8bbffe98a3a17c8a33d646980bc95f1ce3e7828f8779d323230c95b51d1897b335b3b5c2b67c5fc18b525085f94770ea0778b8c6def762b34028df2e88d71914
+  metadata.gz: 4641da9ff01bdb47eb4fd750d4185f444299d5204eac978eb1c707e98cd1c578ebab185598fbf40ea74a2af80d0b335731f0df391c4cf9dc85fcc047eff08bab
+  data.tar.gz: 8dd5f5669ea8f3ebeefdd969b53ff903b351758d8da38a346d11fcd603a97f6a09b324690a542fb3cf0d1d4c1bb9e44d21ae0748b248d6ebfbbab9898d146b4e

data/CHANGELOG.md

@@ -2,20 +2,23 @@ Tzispa Rig
 
 Rig templates implementation
 
-## 0.3.4
+## v0.4.0
+- add suport for signed/unsigned api calls
+
+## v0.3.4
 - fix template cache returning empty template sometimes
 
-## 0.3.3
+## v0.3.3
 - Raise a custom exception when a binder tag does not exists in the template
 - Raise custom exception when there are duplicated loops in binder
 
-## 0.3.2
+## v0.3.2
 - Fix error bad format parameter when engine template cache is disabled
 
-## 0.3.1
+## v0.3.1
 - Fix error in engine template cache that was losing template params when a template was recovered from cache
 
-## 0.3.0
+## v0.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

data/README.md

@@ -66,8 +66,7 @@ private
 attr_reader :idb
 
 def load_brand
-  context.repository.use :ecomm_shop
-  brand = context.repository[:brand][idb]
+  brand = context.repository[:brand, :ecomm_shop][idb]
   data(
     idb: brand.id,
     name: brand.name,
@@ -109,8 +108,7 @@ In the binder you must define customer_exist
 
 def bind!
   idc = context.router_params[:id0]
-  context.repository.use :ecomm_shop
-  customer = context.repository[:customer][idb]
+  customer = context.repository[:customer, :ecomm_shop][idb]
   data.customer_exist = !customer.nil?
 end
 
@@ -131,7 +129,7 @@ To repeat a part in the template use loop tag
   <td><var:name/></td>
   <td class='text-right'>
     <a href='<purl:site[layout=brand_edit,title=edit-brand,id0={%id%}]/>'><i class='fa fa-edit'></i></a>
-    <a href='javascript:delete_brand("<api:brand:delete:{%id%}/>")'><i class='fa fa-trash'></i></a>
+    <a href='javascript:delete_brand("<sapi:brand:delete:{%id%}/>")'><i class='fa fa-trash'></i></a>
   </td>
 <tr>
 </loop:lbrands>
@@ -148,8 +146,7 @@ private
 
 def load_brands
   Proc.new {
-    context.repository.use :ecomm_shop
-    context.repository[:brand].list.map { |b|
+    context.repository[:brand, :ecomm_shop].list.map { |b|
       loop_item(
         id: b.id,
         skey: b.skey,
@@ -184,14 +181,14 @@ The route_id's area defined in the start.ru file
 Api urls: used to provide urls to the application Api
 
 ```
-<api:handler:verb/>
-<api:handler:verb:predicate/>
+<sapi:handler:verb/>
+<sapi:handler:verb:predicate/>
 ```
 
 ```html
-<api:customer:add:address/>
+<sapi:customer:add:address/>
 
-<api:brand:{%verb%}/>
+<sapi:brand:{%verb%}/>
 ```
 
 ## Building templates
@@ -236,7 +233,6 @@ You can also use template subdomains using dot notation in the name
 In the folder binder you can access template parameters
 ```ruby
 def bind!
-  context.repository.use :quality_dok
   @doctype = params[:doc]
 end
 ```

data/lib/tzispa/rig/parser.rb

@@ -24,7 +24,7 @@ module Tzispa
         :re_loop    => /<loop:(\w+)>(.*?)<\/loop:\1>/m.freeze,
         :re_ife     => /<ife:(\w+)>(.*?)(<else:\1\/>(.*?))?<\/ife:\1>/m.freeze,
         :re_purl    => /<purl:(\w+)(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])?\/>/.freeze,
-        :re_api     => /<api:(\w+(?:\.\w+)?):(\w+)(?::([^:]+))?(?::([^\/]+))?\/>/.freeze
+        :re_api     => /<sapi:(\w+(?:\.\w+)?):(\w+)(?::([^:]+))?(?::([^\/]+))?\/>/.freeze
       }
 
       def initialize(engine, binder=nil, text=nil)

data/lib/tzispa/rig/parsernext.rb

@@ -29,11 +29,9 @@ module Tzispa
         when :var
           ParsedVar.new parser, type, match[1], match[2]
         when :url
-          ParsedUrl.new parser, type, match[1], match[3]
-        when :purl
-          ParsedPurl.new parser, type, match[1], match[3]
+          ParsedUrl.new parser, match[1].to_sym, match[2], match[4]
         when :api
-          ParsedApi.new parser, type, match[1], match[2], match[3], match[4]
+          ParsedApi.new parser, match[1].to_sym, match[2], match[3], match[4], match[5]
         when :loop
           ParsedLoop.new parser, type, match[3], match[4]
         when :ife
@@ -103,24 +101,6 @@ module Tzispa
     end
 
 
-    class ParsedPurl < ParsedEntity
-
-      def initialize(parser, type, path_id, params)
-        super(parser, type)
-        @path_id = path_id.to_sym
-        @params = params
-      end
-
-      def render(binder)
-        b_params = @params.dup.gsub(RE_ANCHOR) { |match|
-          parser.the_parsed.select { |p| p.anchor == match}.first.render(binder)
-        } if @params
-        binder.context.path @path_id, Parameters.new(b_params).data
-      end
-
-    end
-
-
     class ParsedUrl < ParsedEntity
 
       def initialize(parser, type, path_id, params)
@@ -133,13 +113,17 @@ module Tzispa
         b_params = @params.dup.gsub(RE_ANCHOR) { |match|
           parser.the_parsed.select { |p| p.anchor == match}.first.render(binder)
         } if @params
-        binder.context.canonical_url @path_id, Parameters.new(b_params).data
+        case type
+        when :purl
+          binder.context.path @path_id, Parameters.new(b_params).data
+        when :url
+          binder.context.canonical_url @path_id, Parameters.new(b_params).data
+        end
       end
 
     end
 
 
-
     class ParsedApi < ParsedEntity
 
       attr_reader :handler, :verb, :predicate
@@ -157,7 +141,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.api b_handler, b_verb, b_predicate, b_sufix
+        binder.context.send(type.to_sym, b_handler, b_verb, b_predicate, b_sufix)
       end
 
       private

data/lib/tzispa/rig/syntax.rb

@@ -11,10 +11,9 @@ module Tzispa
         :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:([^:\.]+(?:\.[^:]+)?):([^:\/]+)(?::([^:\/]+))?(?::([^\/]+))?\/>/
+      RIG_URL_BUILDER = {        
+        :url  => /<(url|purl):(\w+(?:\.\w+)?)(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])?\/>/,
+        :api  => /<(api|sapi):([^:\.]+(?:\.[^:]+)?):([^:\/]+)(?::([^:\/]+))?(?::([^\/]+))?\/>/
       }.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.3.4'
+    VERSION = '0.4.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.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_helpers