tzispa_rig 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 953838ad7ff4dc81e2d53ab993ea62f1f61dcfad
-  data.tar.gz: ae90857aed0a33de9ca50e7d88a7deb53c9ab989
+  metadata.gz: d7bcd3c23e2bd1422bb4063c90fb5f2c13ad89c0
+  data.tar.gz: 0ae585b5ee37682149e6f20a760c73f5306bafc6
 SHA512:
-  metadata.gz: da5cf6bbeb89a01411e741fdf07ba4ee4af9a88f3a01ad0bc3345203fc41b6ccecdbe5b15518cb3df497166a00276e3753a36fccbc04814d56ca2baf1cf444ec
-  data.tar.gz: 73d8d78d7a2177af5693e9c393f3686bfdba6113ec5dec1ea6fd0b354363c9395c52d79dcd726ae18ad9ca375b26888858618d7c16d21fdb792217952179cc22
+  metadata.gz: 2b19ba2bb38467fd667744d9ae63f9f7b914b25f9cdeb109681b95822702bfa7cc04f2d67269bad1bc0424a5b0b2cf4a4443b89c1beb17df3766d25635576f18
+  data.tar.gz: 361177bf1bb749c7653c767ebbaaeefdc02c9989091bf23a0a2d3c19bd6087fc34624eb33bc651d88896b78427f2ae3203a3a54abbb3638a6efa645e9db1e0b1

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Tzispa Rig
 
 Rig templates implementation
 
+## v0.4.4
+- add session,router_params,not_found&logger delegators to make template binders less contextized
+- remove unused gem dependencies and code (old parser)
+
 ## v0.4.3
 - add config and repository delegators into context
 - updated rig templates documentation

data/lib/tzispa/rig/binder.rb

@@ -14,15 +14,16 @@ module Tzispa
     class Binder
       extend Forwardable
 
-      attr_reader :context, :dataStruct, :tags, :parser
+      attr_reader :context, :data_struct, :tags, :parser
       def_delegators :@parser, :attribute_tags
-      def_delegators :@context, :app, :request, :response, :repository, :config
+      def_delegators :@context, :app, :request, :response, :session, :router_params, :not_found
+      def_delegators :app, :repository, :config, :logger
 
 
       def initialize(parser, context)
         @parser = parser
         @context = context
-        @dataStruct = attribute_tags.count > 0 ? Struct.new(*attribute_tags) : Struct.new(nil)
+        @data_struct = attribute_tags.count > 0 ? Struct.new(*attribute_tags) : Struct.new(nil)
       end
 
       alias :tags :attribute_tags
@@ -69,7 +70,7 @@ module Tzispa
       end
 
       def data(**params)
-        (@data ||= @dataStruct.new).tap { |d|
+        (@data ||= @data_struct.new).tap { |d|
           params.each{ |k,v|
             raise UnknownTag.new "#{k} is not a tag in #{self.class.name}" unless tags.include? k
             d[k] = v
@@ -123,7 +124,7 @@ module Tzispa
 
       def initialize(binder)
         @context = binder.context
-        @data = binder.dataStruct.new
+        @data = binder.data_struct.new
       end
 
     end

data/lib/tzispa/rig/template.rb

@@ -173,11 +173,11 @@ module Tzispa
 
       def create_binder
         ::File.open("#{domain.path}/#{binder_require}.rb", "w") { |f|
-          f.puts new_binder_code
+          f.puts write_binder_code
         } if @type == :block
       end
 
-      def new_binder_code
+      def write_binder_code
         Tzispa::Utils::Indenter.new(2).tap { |binder_code|
           binder_code << "require 'tzispa/rig/binder'\n\n"
           level = 0

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
     GEM_NAME = 'tzispa_rig'
 
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_rig
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: tzispa_helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +51,6 @@ files:
 - lib/tzispa/rig/binder.rb
 - lib/tzispa/rig/engine.rb
 - lib/tzispa/rig/parameters.rb
-- lib/tzispa/rig/parser.rb
 - lib/tzispa/rig/parsernext.rb
 - lib/tzispa/rig/syntax.rb
 - lib/tzispa/rig/template.rb

data/lib/tzispa/rig/parser.rb

@@ -1,165 +0,0 @@
-# frozen_string_literal: true
-
-require 'tzispa/rig/engine'
-require 'tzispa/rig/formatter'
-require 'tzispa/helpers/security'
-
-module Tzispa
-  module Rig
-    class Parser
-
-      include Tzispa::Helpers::Security
-
-      EMPTY_STRING = ''.freeze
-
-      attr_reader :text
-
-      RIG_SYNTAX = {
-        :re_flags   => /<flags:(\[(\w+=[^,\]]+(,\w+=[^,\]]+)*?)\])\/>/.freeze,
-        :blk        => /<(blk):(\w+(?:\.\w+)?)(?:\[(\w+=[^,\]]+(?:,\w+=[^,\]]+)*)\])?\/>/.freeze,
-        :iblk       => /<(iblk):(\w+):(\w+(?:\.\w+)?)(?:\[(\w+=[^,\]]+(?:,\w+=[^,\]]+)*)\])?:(\w+(?:\.\w+)?)(?:\[(\w+=[^,\]]+(?:,\w+=[^,\]]+)*)\])?\/>/.freeze,
-        :static     => /<(static):(\w+(?:\.\w+)?)(?:\[(\w+=[^,\]]+(?:,\w+=[^,\]]+)*)\])?\/>/.freeze,
-        :re_var     => /<var(\[%[A-Z]?[0-9]*[a-z]\])?:(\w+)\/>/.freeze,
-        :re_metavar => /\{%([^%]+?)%\}/.freeze,
-        :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     => /<sapi:(\w+(?:\.\w+)?):(\w+)(?::([^:]+))?(?::([^\/]+))?\/>/.freeze
-      }
-
-      def initialize(engine, binder=nil, text=nil)
-        @engine = engine
-        @binder = binder || engine.binder
-        @context = engine.context
-        @text = text
-      end
-
-      def parse!
-        @text ||= @engine.content
-        @binder.bind! if @binder && @binder.respond_to?( :bind! )
-        if @engine.type == :block
-          parseStatement
-          parseExpression
-        end
-        parseBlock
-        self
-      end
-
-
-    private
-
-      def parseExpression
-        parseMetavar
-        parseVar
-        parsePurl
-        parseAPI
-      end
-
-      def parseStatement
-        parseLoop
-        parseIfe
-      end
-
-      def parseFlags
-        @text.gsub!(RIG_SYNTAX[:re_flags]) { |match|
-          flags = Regexp.last_match(1)
-          @engine.flags = flags
-          EMPTY_STRING
-        }
-      end
-
-      def parseLoop
-        @text.gsub!(RIG_SYNTAX[:re_loop]) { |match|
-          loopid = Regexp.last_match(1)
-          loopbody = Regexp.last_match(2)
-          lenrig = @binder.respond_to?("#{loopid}") ? @binder.send("#{loopid}") : []
-          lenrig.respond_to?(:map) ? lenrig.map { |item| Parser.new(@engine, item, loopbody.dup).parse!.text }.join : String.new.freeze
-        }
-      end
-
-      def parseIfe
-        @text.gsub!(RIG_SYNTAX[:re_ife]) { |match|
-          ifetest = Regexp.last_match(1)
-          test = @binder.respond_to?("#{ifetest}") ? @binder.send("#{ifetest}") : false
-          ifebody = Regexp.last_match(2)
-          elsebody = Regexp.last_match(4)
-          Parser.new(@engine, @binder, test ? "#{ifebody}" : "#{elsebody}").parse!.text
-        }
-      end
-
-      def parseMetavar
-        @text.gsub!(RIG_SYNTAX[:re_metavar]) { |match|
-          varid = Regexp.last_match(1)
-          if @context.respond_to?(varid)
-            @context.send(varid)
-          elsif !@context.env.nil? and !@context.env[varid].nil?
-            @context.env[varid]
-          elsif @binder.respond_to?(varid)
-            @binder.send(varid)
-          else
-            Formatter.unknown(varid)
-          end
-        }
-      end
-
-      def parseVar
-        @text.gsub!(RIG_SYNTAX[:re_var]) { |match|
-          fmt = Regexp.last_match(1)
-          varid = Regexp.last_match(2)
-          value = @binder.respond_to?(varid) ? @binder.send(varid) : Formatter.unknown(varid)
-          Formatter.rigvar(value, fmt)
-        }
-      end
-
-      def parsePurl
-        @text.gsub!(RIG_SYNTAX[:re_purl]) { |match|
-          urlid = Regexp.last_match[1]
-          urlparams = Parameters.new(Regexp.last_match[3])
-          @engine.app.router_path urlid.to_sym, urlparams.data
-        }
-      end
-
-      def parseAPI
-        @text.gsub!(RIG_SYNTAX[:re_api]) { |match|
-          handler, verb, predicate, sufix = Regexp.last_match[1], Regexp.last_match[2], Regexp.last_match[3], Regexp.last_match[4]
-          sign = Parser.sign_array [handler, verb, predicate], @engine.app.config.salt
-          @engine.app.router_path :api, {handler: handler, verb: verb, predicate: predicate, sign: sign, sufix: sufix}
-        }
-      end
-
-      def parseBlock
-        reBlocks = Regexp.new(RIG_SYNTAX[:re_blk].to_s + '|' + RIG_SYNTAX[:re_iblk].to_s + '|' + RIG_SYNTAX[:re_static].to_s)
-
-        @text.gsub!(reBlocks) {
-          strtype = (Regexp.last_match[2] || '') << (Regexp.last_match[7] || '') << (Regexp.last_match[16] || '')
-          case strtype
-            when 'blk'
-              rigtype = :block
-              rigname = Regexp.last_match[3]
-              rigparams = Regexp.last_match[5]
-            when 'iblk'
-              rigtype = :block
-              rigtest = Regexp.last_match[8]
-              if (@binder.respond_to?("#{rigtest}?") ? @binder.send("#{rigtest}?") : false)
-                rigname = Regexp.last_match[9]
-                rigparams = Regexp.last_match[11]
-              else
-                rigname = Regexp.last_match[12]
-                rigparams = Regexp.last_match[14]
-              end
-            when 'static'
-              rigtype = :static
-              rigname = Regexp.last_match[17]
-              rigparams = Regexp.last_match[19]
-            else
-              raise ArgumentError.new("Unknown Rig type: #{strtype}")
-          end
-          engine = Engine.new(name: rigname, type: rigtype, parent: @engine, params: rigparams)
-          engine.render!
-          engine.text
-        }
-      end
-
-    end
-  end
-end