opulent 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb391e9dc419cbe3860f6439e74f4af66fb0bb2f
-  data.tar.gz: 7a6314283b3e23907a04b6f3ed36669f26431c05
+  metadata.gz: cd8db65730c87a9220e739b5863cc7b1054129f3
+  data.tar.gz: 25c0887712f3ac678719b13487368781a2854c6b
 SHA512:
-  metadata.gz: ad945c888025afb1ecfff5bc45e71de36bfdf13602386a636f6bde25b4fa6b524954e460f56be94f3d740da986fb86d44b7c229b772b1160b1c213895d351e08
-  data.tar.gz: b8c67846a876db18702f33b80c9f1832c37d1321571e86d3dcd45fbafce58dfa4fbcc5d0df2320dcebc2cde5e45a8a24a4608248ac38e50d915f8c154663076c
+  metadata.gz: 61534b13b508dd60b494d3e5ddf7254f86830a6c2dbd223790e59c1fcdad3a8b9c11778ae18d96cb1f07110d49750287f8a1ea597da67b39f81cdea9f160faed
+  data.tar.gz: a37b62028da6f5dfab4064899305b0492271c53eed205773c33b34d7680cee1d3f8d46e54cdedfe2815a03c93761af5e55f20b271a367711a662df43579d1ebb

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# Changelog
+
+## v1.8.2 26/07/2016  
+- Added pretty print to elements inside definitions

data/lib/opulent/compiler.rb

@@ -63,6 +63,9 @@ module Opulent
 
       # Set parent node, required for pretty printing
       @parent_stack = []
+
+      # Flag to determine whether we're inside a definition
+      @in_definition = false
     end
 
     # Compile input nodes, replace them with their definitions and

data/lib/opulent/compiler/buffer.rb

@@ -64,12 +64,20 @@ module Opulent
     # @param type [Symbol] Remove only if last buffer part is of this type
     # @param n [Fixnum] Number of characters to be removed
     #
-    def buffer_remove_trailing_whitespace(type = :freeze)
+    def buffer_remove_trailing_newline(type = :freeze)
       if @template[-1][0] == type
-        n = @template[-1][1][/\s$/]
-        return if n.nil?
+        @template[-1][1].gsub! /\s*\n+\s*$/, ''
+      end
+    end
 
-        @template[-1][1] = @template[-1][1][0..-1 - n.size]
+    # Remove last n characters from the most recent template item
+    #
+    # @param type [Symbol] Remove only if last buffer part is of this type
+    # @param n [Fixnum] Number of characters to be removed
+    #
+    def buffer_remove_trailing_whitespace(type = :freeze)
+      if @template[-1][0] == type
+        @template[-1][1].rstrip!
       end
     end
 

data/lib/opulent/compiler/comment.rb

@@ -9,7 +9,13 @@ module Opulent
     #
     def comment(node, indent)
       buffer_freeze "\n" if node[@options][:newline]
-      buffer_freeze " " * indent if @settings[:pretty]
+      if @settings[:pretty]
+        if @in_definition
+          buffer "' ' * (indent + #{indent})"
+        else
+          buffer_freeze " " * indent
+        end
+      end
       buffer_freeze '<!-- '
       buffer_split_by_interpolation node[@value].strip, false
       buffer_freeze ' -->'

data/lib/opulent/compiler/define.rb

@@ -16,15 +16,18 @@ module Opulent
         parameters << "#{key} = #{value[@value]}"
       end
       parameters << 'attributes = {}'
+      parameters << 'indent'
       parameters << '&block'
       definition += '(' + parameters.join(', ') + ')'
 
       buffer_eval 'instance_eval do'
       buffer_eval definition
 
+      @in_definition = true
       node[@children].each do |child|
         root child, 0
       end
+      @in_definition = false
 
       buffer_eval 'end'
       buffer_eval 'end'
@@ -56,6 +59,11 @@ module Opulent
         end
         arguments << '{}'
 
+        if @in_definition
+          arguments << "(indent ? indent + #{indent} : #{indent})"
+        else
+          arguments << indent
+        end
         method_call += '(' + arguments.join(', ') + ')'
         method_call += ' do' unless node[@children].empty?
 
@@ -105,7 +113,7 @@ module Opulent
 
         arguments << call_attributes
 
-        call = "#{key}(#{arguments.join ', '})"
+        call = "#{key}(#{arguments.join ', '}, #{indent})"
         call += ' do' unless node[@children].empty?
 
         buffer_eval call

data/lib/opulent/compiler/node.rb

@@ -14,18 +14,30 @@ module Opulent
         indentation = ' ' * indent
         inline = Settings::INLINE_NODE.include? node[@value]
 
+        indentate = proc do
+          if @in_definition
+            buffer "' ' * (indent + #{indent})"
+          else
+            buffer_freeze indentation
+          end
+        end
+
         if inline
+          inline_last_sibling = @sibling_stack[-1][-1] ? Settings::INLINE_NODE.include?(@sibling_stack[-1][-1][1]) : true
+
           if @sibling_stack[-1][-1] && @sibling_stack[-1][-1][0] == :plain
-            buffer_remove_trailing_whitespace
-          elsif @sibling_stack[-1].length == 1
-            buffer_freeze indentation
+            buffer_remove_trailing_newline
+          end
+
+          if @in_definition || @sibling_stack[-1].length == 1 || !inline_last_sibling
+            indentate[]
           end
         else
-          buffer_freeze indentation
+          indentate[]
         end
 
         @sibling_stack[-1] << [node[@type], node[@value]]
-        @sibling_stack << [ [node[@type], node[@value]] ]
+        @sibling_stack << [[node[@type], node[@value]]]
       end
 
       # Add the tag opening, with leading whitespace to the code buffer
@@ -80,17 +92,18 @@ module Opulent
           root child, indent + @settings[:indent]
         end
 
+        inline_last_child = @sibling_stack[-1][-2] &&
+                            (@sibling_stack[-1][-2][0] == :plain ||
+                              Settings::INLINE_NODE.include?(@sibling_stack[-1][-2][1]))
+
         # Pretty print
         if @settings[:pretty]
-          if node[@children].length > 1 &&
-            @sibling_stack[-1][-1] &&
-            (@sibling_stack[-1][-1][0] == :plain ||
-              Settings::INLINE_NODE.include?(@sibling_stack[-1][-1][1]))
+          if node[@children].length > 1 && inline_last_child
             buffer_freeze "\n"
           end
 
-          if node[@children].size > 0 and !inline
-            buffer_freeze indentation
+          if node[@children].size > 0 && !inline
+            indentate[]
           end
         end
 
@@ -100,7 +113,7 @@ module Opulent
 
         # Pretty print
         if @settings[:pretty]
-          buffer_freeze "\n" unless inline
+          buffer_freeze "\n" if !inline || @in_definition
         end
       end
 

data/lib/opulent/compiler/text.rb

@@ -15,7 +15,8 @@ module Opulent
       if @settings[:pretty]
         indentation = ' ' * indent
 
-        inline = @sibling_stack[-1][-1] && @sibling_stack[-1][-1][0] == :node &&
+        inline = @sibling_stack[-1][-1] &&
+                 @sibling_stack[-1][-1][0] == :node &&
                  Settings::INLINE_NODE.include?(@sibling_stack[-1][-1][1])
 
         # Add current node to the siblings stack
@@ -27,6 +28,7 @@ module Opulent
           if !inline
             value.gsub!(/^(?!$)/, indentation)
           else
+            buffer_remove_trailing_whitespace
             value.strip!
           end
         else
@@ -50,7 +52,7 @@ module Opulent
 
       # Pretty print
       if @settings[:pretty]
-        buffer_freeze "\n" unless inline
+        buffer_freeze "\n" if !inline or node[@value] == :print
       end
     end
   end

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Alex Grozav
@@ -91,6 +91,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.md