opulent 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9300eb265cbd78d37b3320fa250ef12c91a2d54
-  data.tar.gz: 924c5d00c448dcf16a099273cac90dac1bfbdfdb
+  metadata.gz: e3de4d4452a9fce9f5c1d1917cea3d219e46315c
+  data.tar.gz: ed9f2ce680cdaa2307004f17f25576e10e3fc634
 SHA512:
-  metadata.gz: 6d94c1b6835f811ad431a1eba7c3b2c5913d2c68ed900915343c1608227386f70d90fc92dbca90e2a72ca98bdf5da4057780a08342f82f0ec116a3f41ff03f26
-  data.tar.gz: efa2e8bfc1e6a552b54cf34ba0e67af139cca11751e505d22706631a38da93810ee4e9503d831453da68730564497813844a6275f18b6d4b6ba24224df4eeb21
+  metadata.gz: 7c0c0890404d3a84b89c8d04443d1c89630c6ac7b5d06761b094dadca117595e33c87e16e37e288aef91c2cc54212d329166fad64db13b037ca3c0e6c5217db3
+  data.tar.gz: 54fdd8b31913ceb54705f65e97c9bd9f513c80dd9405450f250bc44d6674e12857720311f2df76823eb489519bebb024895b2ceeeb33573981c6b773cde71ecb

data/lib/opulent/compiler.rb

@@ -99,7 +99,7 @@ module Opulent
       text.lines.inject('') do |_, line|
         indent + line
       end
-    end
+    end 
 
     # Give an explicit error report where an unexpected sequence of tokens
     # appears and give indications on how to solve it

data/lib/opulent/engine.rb

@@ -39,6 +39,10 @@ module Opulent
       @template = Compiler.new.compile @nodes
     end
 
+    # Read input as file or string input
+    #
+    # @param input [Object]
+    #
     def read(input)
       if input.is_a? Symbol
         @file = File.expand_path get_eval_file input
@@ -79,8 +83,9 @@ module Opulent
         scope.local_variable_set key, value
       end
 
+      # Evaluate the template in the given scope (context)
       begin
-        # Evaluate the template in the given scope (context)
+        p "HELLO", @template
         eval @template, scope
       rescue ::SyntaxError => e
         raise SyntaxError, e.message

data/lib/opulent/exec.rb

@@ -81,9 +81,9 @@ module Opulent
         opulent = Opulent.new
         if @layout
           output = proc do
-            opulent.render_file(@layout, @locals) do
+            opulent.render_file(@layout, @locals) {
               opulent.render_file(@input, @locals) {}
-            end
+            }
           end[]
         else
           output = proc do

data/lib/opulent/parser.rb

@@ -64,7 +64,7 @@ module Opulent
       # nodes and definitions
       root @root
 
-      [@root, @definitions]
+      return @root, @definitions
     end
 
     # Check and accept or reject a given token as long as we have tokens
@@ -122,7 +122,7 @@ module Opulent
     # @param token [RegEx] Token to be checked by the parser
     #
     def lookahead_next_line(token)
-      return unless @code[@i + 1]
+      return nil unless @code[@i + 1]
 
       # Check if we match the token to the current line.
       @code[@i + 1].match Tokens[token]
@@ -157,6 +157,7 @@ module Opulent
       text.lines.inject('') do |_, line|
         indent + line
       end
+      text
     end
 
     # Give an explicit error report where an unexpected sequence of tokens

data/lib/opulent/template.rb

@@ -41,7 +41,7 @@ module Opulent
     # support, custom scopes, proper encoding, and support for template
     # compilation.
     #
-    def precompiled_template(locals = {})
+    def precompiled_template(_locals = {})
       @engine.template
     end
   end

data/lib/opulent/tokens.rb

@@ -25,7 +25,7 @@ module Opulent
       trailing_whitespace: /\A(\-\>)/,
 
       # Self enclosing node
-      self_enclosing: %r{\A\/(.*)},
+      self_enclosing: /\A\/(.*)/,
 
       # Definition
       def: /\Adef +/,
@@ -50,7 +50,7 @@ module Opulent
       inline_child: /\A *\> */,
 
       # Comments
-      comment: %r{\A\/},
+      comment: /\A\//,
 
       # Intepreted filters
       filter: /\A\:[a-zA-Z]([\-\_]?[a-zA-Z0-9]+)*/,

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Alex Grozav