opulent 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b59b4c5e2bf15d9811ed9d884408670ba01ea886
-  data.tar.gz: 1b5bfb6dc4b4ab45977b927c25ffb8da14f0890c
+  metadata.gz: a6c5d6d50befc28fa099ba8dc76859816d590fc4
+  data.tar.gz: 05e2764b0e1aeb3e7f457769bf4f883805a37e79
 SHA512:
-  metadata.gz: cb0efc02944e95e2f92d07679b5d4d626ed535c5e860e65f4430c2e0cd21b01080069093541ddcfac5f1be236480564b7705b8da57baf2860c24cf24e905c177
-  data.tar.gz: 2e16fb13de65c3914eb51bc7424f84b20a98c8d16dedf954d35d3d9ec2b80801122e6630a9d5e692a73affc8b195c9dee136b64dda8be0df9290fc67b89f5a8c
+  metadata.gz: 48cdc428d01132ce3fb26d0823701a10bd5f3a9aa3816c00774c87a434674eae6627c0c4395b0e5d5617576841cc69e3995f5ffab03d2a8abd8eefb981045162
+  data.tar.gz: 9e977e449021c5dc7c3ab9099b512445ab611f5b26b08c33767215f31dd9af79b99e64fbcafb65be122284cd328bb27de6417e481c8a3c5e9eb1c9ee09ca29ce

data/benchmarks/run-benchmarks.rb

@@ -9,7 +9,7 @@ require 'benchmark'
 require 'benchmark/ips'
 
 require 'tilt'
-require '../lib/opulent'
+require_relative '../lib/opulent'
 require 'erubis'
 require 'erb'
 require 'haml'

data/lib/opulent/compiler/buffer.rb

@@ -332,7 +332,7 @@ module Opulent
           if escape
             buffer code
           else
-            buffer_escape code[1..-2]
+            buffer_escape code
           end
         when /\A([\\#]?[^#\\]*([#\\][^\\#\{][^#\\]*)*)/
           string_remaining = $'
@@ -340,7 +340,7 @@ module Opulent
 
           # Static text
           if escape && string_current =~ Utils::ESCAPE_HTML_PATTERN
-            buffer_escape "\'#{string_current}\'"
+            buffer_escape "\"#{string_current.gsub '"', '\"'}\""
           else
             buffer_freeze string_current
           end

data/lib/opulent/engine.rb

@@ -67,8 +67,14 @@ module Opulent
       end
 
       # Set input local variables in current scope
-      locals.each do |key, value|
-        scope.local_variable_set key, value
+      if RUBY_VERSION.start_with?('1.9', '2.0')
+        locals.each do |key, value|
+          eval "#{key} = #{value.inspect}", scope
+        end
+      else
+        locals.each do |key, value|
+          scope.local_variable_set key, value
+        end
       end
 
       # Evaluate the template in the given scope (context)

data/lib/opulent/parser.rb

@@ -55,7 +55,7 @@ module Opulent
     #
     def parse(code)
       # Split the code into lines and parse them one by one
-      @code = code.lines
+      @code = code.lines.to_a
 
       # Current line index
       @i = -1
@@ -110,7 +110,7 @@ module Opulent
       end
 
       # Apply definitions to each case of the control node
-      if %i(if unless case).include? node[@type]
+      if [:if, :unless, :case].include? node[@type]
         node[@children].each do |array|
           process_definitions[array]
         end

data/lib/opulent/settings.rb

@@ -6,7 +6,7 @@ module Opulent
     BUFFER = :@_opulent_buffer
 
     # Default Opulent file extension
-    FILE_EXTENSION = '.op'
+    FILE_EXTENSION = '.op'.freeze
 
     # Default yield target which is used for child block replacements
     DEFAULT_EACH_KEY = :key
@@ -15,19 +15,20 @@ module Opulent
     DEFAULT_EACH_VALUE = :value
 
     # List of self enclosing node elements
-    SELF_ENCLOSING = %i(
-      img link input meta br hr area base col command embed keygen param source
-      track wbr
-    )
+    SELF_ENCLOSING = [
+      :img, :link, :input, :meta, :br, :hr, :area, :base, :col, :command,
+      :embed, :keygen, :param, :source, :track, :wbr
+    ].freeze
 
     # List of inline node parents which can be either inline or have complex
     # structures inside of them, such as anchor tags
-    MULTI_NODE = %i(a)
+    MULTI_NODE = [:a].freeze
 
     # List of inline node names
-    INLINE_NODE = %i(
-      text a span strong em br i b small label sub sup abbr var code kbd
-    )
+    INLINE_NODE = [
+      :text, :a, :span, :strong, :em, :br, :i, :b, :small, :label, :sub, :sup,
+      :abbr, :var, :code, :kbd
+    ].freeze
 
     # Check whether text should or shouldn't be evaluated
     INTERPOLATION_CHECK = /(?<!\\)\#\{.*\}/
@@ -46,11 +47,10 @@ module Opulent
       :'.' => :class,
       :'#' => :id,
       :'&' => :name
-    }
+    }.freeze
 
     # Opulent runtime settings
     DEFAULTS = {
-      # dependency_manager: true, # Soon to be implemented
       indent: 2,
       layouts: false,
       pretty: false,

data/lib/opulent/template.rb

@@ -16,6 +16,7 @@ module Opulent
     #
     def prepare
       # Set up the rendering engine
+      @options[:file] = eval_file
       @engine = ::Opulent.new @data, @options
     end
 

data/lib/opulent/tokens.rb

@@ -1,9 +1,10 @@
 # @Opulent
 module Opulent
   # Opulent KEYWORDS
-  KEYWORDS = %i(
-    def yield include if else elsif unless case when each while until doctype
-  )
+  KEYWORDS = [
+    :def, :yield, :include, :if, :else, :elsif, :unless, :case, :when, :each,
+    :while, :until, :doctype
+  ].freeze
 
   # @Tokens
   class Tokens

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = '1.7.6'
+  VERSION = '1.7.7'
 end

metadata

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