bade 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b9d41889101a2207790a83bb4ae4900892e766b
-  data.tar.gz: 5d3019af48cbd0119a6b8c4d44f2d74b76e86c84
+  metadata.gz: f928ce45234b7edbf5fa3c8e3531688c8bf4bc11
+  data.tar.gz: 532eac47aa229d5a4b9a2d16740eef9f0e5e38d7
 SHA512:
-  metadata.gz: cd6c63f0df98925562ebb9d9624c7e13542a5a6f1d76c8ef236b74cccfe1376065ec8e53e2c802f44177c9b67c88fa7218baef70f33dfac3e59505f0370dfbf2
-  data.tar.gz: 72225de15eeb899be67127bd9331b690529843e03be7c7fcf4402554551332a525b07bd9313c28e9ce578ac4eb31640a318ca87388d7a62163dd89c5391607a2
+  metadata.gz: 6a879c59dc4422f94d3190028a0636a0dd643b5af8f5172f0f0bfd119533015f706b55dafcb37bad13a6eb440c92ff7fda243641013d13b9ce6bb9ffc181d28f
+  data.tar.gz: 6949c8a7edfe07c552a4bc169d6b4dcfc439b8502fcf84dc839eb2248fc95916c9cfee8f897fc690f8c2e3931114f0efc4d6c01fa9979008927f8c6f9aa21239

data/lib/bade.rb

@@ -6,4 +6,5 @@ module Bade
   require_relative 'bade/parser'
   require_relative 'bade/generator'
   require_relative 'bade/renderer'
+  require_relative 'bade/optimizer'
 end

data/lib/bade/generator.rb

@@ -18,20 +18,21 @@ module Bade
     #
     # @return [String]
     #
-    def self.document_to_lambda_string(document)
+    def self.document_to_lambda_string(document, optimize: false)
       generator = new
-      generator.generate_lambda_string(document)
+      generator.generate_lambda_string(document, optimize: optimize)
     end
 
     # @param [Bade::AST::Document] document
     #
     # @return [String] string to parse with Ruby
     #
-    def generate_lambda_string(document)
+    def generate_lambda_string(document, optimize: false)
       @document = document
       @buff = []
       @indent = 0
       @code_indent = 0
+      @optimize = optimize
 
       buff_code '# frozen_string_literal: true' # so it can be faster on Ruby 2.3+
       buff_code ''
@@ -86,7 +87,15 @@ module Bade
       end
 
       buff_code("# ----- start file #{document.file_path}") unless document.file_path.nil?
-      visit_node(document.root)
+
+      new_root = if @optimize
+                   Optimizer.new(document.root).optimize
+                 else
+                   document.root
+                 end
+
+      visit_node(new_root)
+
       buff_code("# ----- end file #{document.file_path}") unless document.file_path.nil?
     end
 

data/lib/bade/optimizer.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+
+module Bade
+  class Optimizer
+    # @param [Bade::AST::Node] root_node
+    #
+    def initialize(root_node)
+      @root_node = root_node
+
+      @new_root = Marshal.load(Marshal.dump(root_node))
+    end
+
+    # @return [Bade::Node]
+    #
+    def optimize
+      optimize_static_texts
+
+      @root_node
+    end
+
+    def optimize_static_texts
+      traverse(@root_node) do |tr_node|
+        iterate(tr_node) do |node, previous_node, _parent|
+          if previous_node && previous_node.type == :static_text && node.type == :static_text
+            previous_node.value += node.value
+            true
+          end
+        end
+      end
+    end
+
+    # @param [Bade::AST::Node] node
+    #
+    def traverse(node, &block)
+      yield node
+
+      node.children.each do |subnode|
+        traverse(subnode, &block)
+      end
+    end
+
+    # @param [Bade::AST::Node] node
+    #
+    def iterate(node)
+      previous = nil
+
+      node.children.delete_if do |subnode|
+        returned = yield subnode, previous, node
+
+        previous = subnode unless returned
+
+        returned
+      end
+    end
+  end
+end

data/lib/bade/precompiled.rb

@@ -27,6 +27,8 @@ module Bade
              end
 
       hash = YAML.load(file)
+      raise LoadError, 'YAML file is not in valid format' unless hash.is_a?(Hash)
+
       file_path = hash[:source_file_path]
       content = hash[:code_string]
 

data/lib/bade/renderer.rb

@@ -29,6 +29,10 @@ module Bade
       end
     end
 
+    def initialize
+      @optimize = false
+    end
+
     TEMPLATE_FILE_NAME = '(__template__)'.freeze
 
     # @return [String]
@@ -51,6 +55,10 @@ module Bade
     #
     attr_accessor :render_binding
 
+    # @return [Bool]
+    #
+    attr_accessor :optimize
+
 
     # ----------------------------------------------------------------------------- #
     # Internal attributes
@@ -122,6 +130,11 @@ module Bade
       self
     end
 
+    def optimized
+      self.optimize = true
+      self
+    end
+
 
     # ----------------------------------------------------------------------------- #
     # Getters
@@ -139,7 +152,8 @@ module Bade
     # @return [Precompiled]
     #
     def precompiled
-      @precompiled ||= Precompiled.new(Generator.document_to_lambda_string(root_document), file_path)
+      @precompiled ||=
+        Precompiled.new(Generator.document_to_lambda_string(root_document, optimize: @optimize), file_path)
     end
 
     # @return [String]

data/lib/bade/runtime/render_binding.rb

@@ -80,6 +80,8 @@ module Bade
       # @return [String]
       #
       def __html_escaped(text)
+        return nil if text.nil?
+
         text.gsub('&', '&')
             .gsub('<', '&lt;')
             .gsub('>', '&gt;')

data/lib/bade/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bade
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Roman Kříž
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - lib/bade/ast/node_registrator.rb
 - lib/bade/ast/string_serializer.rb
 - lib/bade/generator.rb
+- lib/bade/optimizer.rb
 - lib/bade/parser.rb
 - lib/bade/parser/parser_constants.rb
 - lib/bade/parser/parser_lines.rb