tzispa_rig 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b0801d5dd6d70a7e9787b110ea8ddcd481058b
-  data.tar.gz: fc1e6464c849608c5818cdbd10323de2377cc597
+  metadata.gz: 3e832ffa87f19506e339017eee1aeb22d6664671
+  data.tar.gz: f4365cd9feb40b7e97d23c680e8d379145f132d6
 SHA512:
-  metadata.gz: e5968f3ffc90ead75ffdaa7ea700aeea5089e4efe2f311d8c3c035f25b01ced2b3d86eb67f8d20c2f0dd3d4fae8a7adce7a974b28e7fb7acbe1d53ee7efff60c
-  data.tar.gz: e8c1965acb288ead946bba1d0d90a3f2319a3931747d9563dc2eaaa15d79dbf4c95ec05a0bc1c36f2cbac915e7c73f52ee0c40ec0dd64b66199beab0fcdc6024
+  metadata.gz: b135a0befc2df801b505cf87ec3706c41ca12b70fdbcb286652fb41f3c43ba23bcbb944bf873573bf13b11af9204ffee54f08225a44e4a7cdf074301b5d58fc4
+  data.tar.gz: 447f262807c582167eb1ba9b1756fa8bba284cd4842965a54aa957ec600565394a42efc7fd4e65ca03c66bfdd6f384840f79c2f8b707039acc39c283f6469f69

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Tzispa Rig
 
 Rig templates implementation
 
+## v0.5.5
+- minor code refactory
+- move template creation code to helper module
+
 ## v0.5.4
 - fix nested loops not binding
 

data/lib/tzispa/rig/binder.rb

@@ -50,17 +50,11 @@ module Tzispa
       #
       #    loop_binder(:mylist)
       #
-      # The LoopBinder returned by this funcion is independent of the
-      # parent binder where it is defined, so the template symbols of the parent
-      # binder are not accesible in the loop_binder context. In
-      # other words, in the top example the two 'myvar' symbols are different
-      # and you can not access the first myvar value inside the loop
-      #
       # ==== Parameters
       # loop_id<Symbol>: The id of the template loop to bind
       #
       def loop_binder(loop_id)
-        prl = loop_parser?(loop_id)
+        prl = loop?(loop_id)
         LoopBinder.new(prl, context) if prl
       end
 
@@ -70,14 +64,14 @@ module Tzispa
 
       private
 
-      def loop_parser?(loop_id)
-        lp = @parser.loop_parser loop_id
-        duplicated? lp
-        lp.first if lp.count.positive?
+      def loop?(loop_id)
+        ltk = parser.loop_token loop_id
+        duplicated? ltk
+        ltk.first if ltk.count.positive?
       end
 
-      def duplicated?(loop_parser)
-        raise DuplicatedLoop.new(self.class.name, loop_parser.id) if loop_parser.count > 1
+      def duplicated?(token)
+        raise DuplicatedLoop.new(self.class.name, token.id) if token.count > 1
       end
     end
 

data/lib/tzispa/rig/helpers/template_maker.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'tzispa/utils/string'
+require 'tzispa/utils/indenter'
+
+module Tzispa
+  module Rig
+    module Helpers
+      module TemplateMaker
+
+        using Tzispa::Utils::TzString
+
+        def create(content = '')
+          FileUtils.mkdir_p(path) unless Dir.exist? path
+          super(content)
+          create_binder
+        end
+
+        def binder_require
+          @binder_require ||= "view/#{subdomain || '_'}/#{type}/#{name.downcase}"
+        end
+
+        def binder_namespace
+          @binder_namespace ||= "#{domain.name.to_s.camelize}::#{subdomain&.camelize}View"
+        end
+
+        def binder_class_name
+          @binder_class_name ||= @name.camelize
+        end
+
+        def binder_class
+          @binder_class ||= begin
+            domain.require binder_require
+            "#{binder_namespace}::#{binder_class_name}#{type.to_s.capitalize}".constantize
+          end
+        end
+
+        def create_binder
+          return unless %i[block layout].include?(type)
+          ::File.open("#{domain.path}/#{binder_require}.rb", 'w') do |f|
+            f.puts write_binder_code
+          end
+        end
+
+        def write_binder_code
+          Tzispa::Utils::Indenter.new(2).tap do |binder_code|
+            binder_code << "require 'tzispa/rig/binder'\n\n"
+            level = 0
+            binder_namespace.split('::').each do |ns|
+              binder_code.indent if level.positive?
+              binder_code << "module #{ns}\n"
+              level += 1
+            end
+            binder_code.indent << "\nclass #{binder_class_name} < Tzispa::Rig::TemplateBinder\n\n"
+            binder_code.indent << "def bind!\n"
+            binder_code << "end\n\n"
+            binder_code.unindent << "end\n"
+            binder_namespace.split('::').each { binder_code.unindent << "end\n" }
+          end.to_s
+        end
+      end
+    end
+  end
+end
+

data/lib/tzispa/rig/parsernext.rb

@@ -40,7 +40,6 @@ module Tzispa
           @attribute_tags = nil
           @childrens = []
           @tokens = []
-          @loop_parser = {}
           parse_flags
           if bindable?
             parse_statements
@@ -73,11 +72,11 @@ module Tzispa
                     end
       end
 
-      def loop_parser(id)
+      def loop_token(id)
         lpp = tokens.select { |p| p.type == :loop && p.id == id }
         lpp.concat(
           tokens.select { |p| p.type == :ife }.map do |p|
-            p.loop_parser(id)
+            p.loop_token(id)
           end.flatten.compact
         )
       end

data/lib/tzispa/rig/template.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 require 'forwardable'
-require 'fileutils'
-require 'tzispa/utils/string'
-require 'tzispa/utils/indenter'
 require 'tzispa/rig/parameters'
 require 'tzispa/rig/parsernext'
 require 'tzispa/rig/template_binder'
+require 'tzispa/rig/helpers/template_maker'
 
 module Tzispa
   module Rig
@@ -95,7 +93,9 @@ module Tzispa
     class Template < File
       extend Forwardable
 
-      using Tzispa::Utils::TzString
+      include Tzispa::Rig::Helpers::TemplateMaker
+
+
 
       BASIC_TYPES    = %i[layout block static].freeze
       RIG_EXTENSION  = 'rig'
@@ -122,29 +122,30 @@ module Tzispa
         self
       end
 
-      def modified?
-        super || (parser && parser.childrens.index(&:modified?))
-      end
-
-      def valid?
-        !content.empty? && !parser.empty?
-      end
-
       def render(context, binder = nil)
         parse! unless parser
         binder ||= TemplateBinder.for self, context
-        binder.bound
-        parser.render binder
+        parser.render binder.bound
       end
 
       def path
         @path ||= "#{domain.path}/view/#{subdomain || '_'}/#{type.to_s.downcase}"
       end
 
-      def create(content = '')
-        FileUtils.mkdir_p(path) unless Dir.exist? path
-        super(content)
-        create_binder
+      def params=(value)
+        @params = Parameters.new(value)
+      end
+
+      def params
+        @params.data
+      end
+
+      def modified?
+        super || (parser && parser.childrens.index(&:modified?))
+      end
+
+      def valid?
+        !content.empty? && !parser.empty?
       end
 
       def block?
@@ -163,33 +164,6 @@ module Tzispa
         block? || layout?
       end
 
-      def params=(value)
-        @params = Parameters.new(value)
-      end
-
-      def params
-        @params.data
-      end
-
-      def binder_require
-        @binder_require ||= "view/#{subdomain || '_'}/#{type}/#{name.downcase}"
-      end
-
-      def binder_namespace
-        @binder_namespace ||= "#{domain.name.to_s.camelize}::#{subdomain&.camelize}View"
-      end
-
-      def binder_class_name
-        @binder_class_name ||= @name.camelize
-      end
-
-      def binder_class
-        @binder_class ||= begin
-          domain.require binder_require
-          "#{binder_namespace}::#{binder_class_name}#{type.to_s.capitalize}".constantize
-        end
-      end
-
       private
 
       def build_name(name)
@@ -203,30 +177,6 @@ module Tzispa
         raise ArgumentError("#{value} is not a Rig block") unless BASIC_TYPES.include?(value)
         @type = value
       end
-
-      def create_binder
-        return unless %i[block layout].include?(type)
-        ::File.open("#{domain.path}/#{binder_require}.rb", 'w') do |f|
-          f.puts write_binder_code
-        end
-      end
-
-      def write_binder_code
-        Tzispa::Utils::Indenter.new(2).tap do |binder_code|
-          binder_code << "require 'tzispa/rig/binder'\n\n"
-          level = 0
-          binder_namespace.split('::').each do |ns|
-            binder_code.indent if level.positive?
-            binder_code << "module #{ns}\n"
-            level += 1
-          end
-          binder_code.indent << "\nclass #{binder_class_name} < Tzispa::Rig::TemplateBinder\n\n"
-          binder_code.indent << "def bind!\n"
-          binder_code << "end\n\n"
-          binder_code.unindent << "end\n"
-          binder_namespace.split('::').each { binder_code.unindent << "end\n" }
-        end.to_s
-      end
     end
 
   end

data/lib/tzispa/rig/template_binder.rb

@@ -32,6 +32,7 @@ module Tzispa
         do_before
         bind! if respond_to?(:bind!)
         do_after
+        self
       end
 
       def self.for(template, context)

data/lib/tzispa/rig/token.rb

@@ -11,7 +11,7 @@ module Tzispa
 
       using Tzispa::Utils::TzString
 
-      RE_ANCHOR = /(\$\$\h+\$\$)/
+      RE_ANCHOR = /(\u0010\$\h+\$\u0010)/
 
       attr_reader :type, :parser
       def_delegators :@parser, :domain, :content_type, :template
@@ -23,19 +23,19 @@ module Tzispa
 
       class << self
         def instance(parser, type, match)
-          "Tzispa::Rig::TypeToken::#{type.to_s.capitalize}".constantize.new parser, match
+          "Tzispa::Rig::Tokens::#{type.to_s.capitalize}".constantize.new parser, match
         end
       end
 
       def anchor
-        @anchor ||= "$$#{format '%x', object_id}$$"
+        @anchor ||= "\u0010$#{format '%x', object_id}$\u0010"
       end
     end
 
-    require 'tzispa/rig/type_token/api_url'
-    require 'tzispa/rig/type_token/expression'
-    require 'tzispa/rig/type_token/statement'
-    require 'tzispa/rig/type_token/block'
+    require 'tzispa/rig/tokens/api_url'
+    require 'tzispa/rig/tokens/expression'
+    require 'tzispa/rig/tokens/statement'
+    require 'tzispa/rig/tokens/block'
 
   end
 end

data/lib/tzispa/rig/{type_token → tokens}/api_url.rb

@@ -2,7 +2,7 @@
 
 module Tzispa
   module Rig
-    module TypeToken
+    module Tokens
 
       class Url < Rig::Token
         attr_reader :layout, :params, :app_name

data/lib/tzispa/rig/{type_token → tokens}/block.rb

@@ -2,7 +2,7 @@
 
 module Tzispa
   module Rig
-    module TypeToken
+    module Tokens
 
       class Blk < Rig::Token
         attr_reader :id, :params

data/lib/tzispa/rig/{type_token → tokens}/expression.rb

@@ -4,7 +4,7 @@ require 'tzispa/utils/string'
 
 module Tzispa
   module Rig
-    module TypeToken
+    module Tokens
 
       class Meta < Rig::Token
         attr_reader :id
@@ -41,9 +41,13 @@ module Tzispa
         end
 
         def render(binder)
-          if binder.data.respond_to?(@id)
-            value = binder.data.send(@id).to_s
-            value.send(parser.content_escape_method) rescue value
+          if binder.data.respond_to?(id)
+            value = binder.data.send(id).to_s
+            begin
+              value.send(parser.content_escape_method)
+            rescue
+              value
+            end
           else
             unknown
           end

data/lib/tzispa/rig/{type_token → tokens}/statement.rb

@@ -4,7 +4,7 @@ require 'forwardable'
 
 module Tzispa
   module Rig
-    module TypeToken
+    module Tokens
 
       class Loop < Rig::Token
         extend Forwardable
@@ -67,9 +67,9 @@ module Tzispa
                              end
         end
 
-        def loop_parser(id)
-          lpp = then_parser.loop_parser(id)
-          lpp.concat(else_parser&.loop_parser(id) || [])
+        def loop_token(id)
+          lpp = then_parser.loop_token(id)
+          lpp.concat(else_parser&.loop_token(id) || [])
           lpp.compact.freeze
         end
 

data/lib/tzispa/rig/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Rig
 
-    VERSION = '0.5.4'
+    VERSION = '0.5.5'
     GEM_NAME = 'tzispa_rig'
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_rig
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
@@ -65,16 +65,17 @@ files:
 - lib/tzispa/rig.rb
 - lib/tzispa/rig/binder.rb
 - lib/tzispa/rig/engine.rb
+- lib/tzispa/rig/helpers/template_maker.rb
 - lib/tzispa/rig/parameters.rb
 - lib/tzispa/rig/parsernext.rb
 - lib/tzispa/rig/syntax.rb
 - lib/tzispa/rig/template.rb
 - lib/tzispa/rig/template_binder.rb
 - lib/tzispa/rig/token.rb
-- lib/tzispa/rig/type_token/api_url.rb
-- lib/tzispa/rig/type_token/block.rb
-- lib/tzispa/rig/type_token/expression.rb
-- lib/tzispa/rig/type_token/statement.rb
+- lib/tzispa/rig/tokens/api_url.rb
+- lib/tzispa/rig/tokens/block.rb
+- lib/tzispa/rig/tokens/expression.rb
+- lib/tzispa/rig/tokens/statement.rb
 - lib/tzispa/rig/version.rb
 - lib/tzispa_rig.rb
 - test/engine_test.rb