opulent 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb989f9b5f0876f4af2c6951f7ddb013f03f2b83
-  data.tar.gz: 56271859c6703789c2b56157817fca15044256a9
+  metadata.gz: fbda9fcfae11aa802dd630503537fe4ad6e68208
+  data.tar.gz: 7d9f569b65d0a043c6fdb831992eb17860cd9d01
 SHA512:
-  metadata.gz: bb801aa49723ef35738eff275ca1b96edc3db5c2080292b13c9e0ff96c9600cb5f5ebe9cb0a63ece21824814b2700be25d348565fbcc63f44e728dc855cac59b
-  data.tar.gz: 82cffc61c9c99d51583b7050ef37bb394358de4ae94927b6b595edea121efb50cb76fbab18e0cbc7430ac423465af137654a59e78db2f86ff6e99d90abd18394
+  metadata.gz: 48323906c8fd7463558c599b7bdb2aa3d4799b6544fb51d5ad284903d11869bd00f24b96ade47edaf90a34c13fe0b36dedd8b8a43ca855ee5d65586ba76bd242
+  data.tar.gz: 10cee6d1c1153a20d15acbcf591a7404722ee7dde668d40d7d0cb118719b8360f1061bc013411cf345c5fabfafc7fe2131714a39e88a3059959e2a15c3046e8c

data/lib/opulent/compiler.rb

@@ -2,6 +2,7 @@ require_relative 'compiler/block.rb'
 require_relative 'compiler/comment.rb'
 require_relative 'compiler/control.rb'
 require_relative 'compiler/define.rb'
+require_relative 'compiler/doctype.rb'
 require_relative 'compiler/eval.rb'
 require_relative 'compiler/filter.rb'
 require_relative 'compiler/node.rb'

data/lib/opulent/compiler/comment.rb

@@ -11,9 +11,10 @@ module Opulent
     def comment(node, indent, context)
       indentation = " " * indent
 
-      value = context.evaluate "\"#{node[@value]}\""
+      # Escaping double quotes is required in order to avoid any conflicts with the eval quotes.
+      value = indent_lines context.evaluate('"' + node[@value].gsub('"', '\\"') + '"'), " " * indent
 
-      comment_tag = "#{indentation}<!-- #{value} -->\n"
+      comment_tag = "#{"\n" if node[@options][:newline]}#{indentation}<!-- #{value.strip} -->\n"
 
       @node_stack << :comment
       @code += comment_tag

data/lib/opulent/compiler/control.rb

@@ -23,6 +23,27 @@ module Opulent
       end
     end
 
+    # Generate the code for a unless-else control structure
+    #
+    # @param node [Array] Node code generation data
+    # @param indent [Fixnum] Size of the indentation to be added
+    # @param context [Context] Processing environment data
+    #
+    def unless_node(node, indent, context)
+      # Check if we have any condition met, or an else branch
+      index = node[@value].index do |value|
+        value.empty? || !context.evaluate(value)
+      end
+
+      # If we have a branch that meets the condition, generate code for the
+      # children related to that specific branch
+      if index
+        node[@children][index].each do |child|
+          root child, indent, context
+        end
+      end
+    end
+
     # Generate the code for a case-when-else control structure
     #
     # @param node [Array] Node code generation data
@@ -126,11 +147,12 @@ module Opulent
 
       # Create a new context based on the parent context and progressively update
       # variables in the new context
-      each_context = Context.new Hash.new, context.binding.clone
+      block = context.block.clone if context.block
+      each_context = Context.new Hash.new, &block
       each_context.parent = context
 
       # Evaluate the iterable object
-      enumerable = each_context.evaluate(node[@value][1])
+      enumerable = context.evaluate(node[@value][1])
 
       # Check if input can be iterated
       self.error :enumerable, node[@value][1] unless enumerable.respond_to? :each

data/lib/opulent/compiler/define.rb

@@ -71,7 +71,6 @@ module Opulent
       end
 
       # Set variable to determine available blocks
-      #
       arguments[:blocks] = Hash[@block_stack[-1].keys.map{|key| [key, true]}]
 
       # Create local variables from argument variables
@@ -82,6 +81,7 @@ module Opulent
         root child, indent, definition_context
       end
 
+      # Remove last set of blocks from the block stack
       @block_stack.pop
     end
   end

data/lib/opulent/compiler/doctype.rb

@@ -0,0 +1,42 @@
+
+# @Opulent
+module Opulent
+  # @Compiler
+  class Compiler
+    # Generate the code for a while control structure
+    #
+    # @param node [Array] Node code generation data
+    # @param indent [Fixnum] Size of the indentation to be added
+    # @param context [Context] Processing environment data
+    #
+    def doctype_node(node, indent, context)
+      indentation = " " * indent
+
+      value = case node[@value]
+      when :"", :"html", :"5"
+        "!DOCTYPE html"
+      when :"1.1"
+        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"'
+      when :strict
+        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"'
+      when :frameset
+        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"'
+      when :mobile
+        '!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd"'
+      when :basic
+        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd"'
+      when :transitional
+        '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"'
+      when :xml
+        '?xml version="1.0" encoding="utf-8" ?'
+      when :'xml ISO-8859-1'
+        '?xml version="1.0" encoding="iso-8859-1" ?'
+      end
+
+      doctype_tag = "#{indentation}<#{value}>\n"
+
+      @node_stack << :doctype
+      @code += doctype_tag
+    end
+  end
+end

data/lib/opulent/compiler/node.rb

@@ -210,19 +210,21 @@ module Opulent
           attribute_value = value.join '_'
         end
 
-        attribute_code += " #{key}"
-        attribute_code += "=\"#{attribute_value}\"" unless attribute_value.empty?
+        unless attribute_value.empty?
+          attribute_code += " #{key}"
+          attribute_code += "=\"#{attribute_value.strip}\""
+        end
       when Hash
         value.each do |k,v|
           if v
             attribute_code += " #{key}-#{k}"
-            attribute_code += "=\"#{v.to_s}\"" unless v == true
+            attribute_code += "=\"#{v.to_s.strip}\"" unless v == true
           end
         end
       else
         if value
           attribute_code += " #{key}"
-          attribute_code += "=\"#{value.to_s}\"" unless value == true
+          attribute_code += "=\"#{value.to_s.strip}\"" unless value == true
         end
       end
 

data/lib/opulent/context.rb

@@ -20,7 +20,7 @@ module Opulent
       @binding = if @block
         @block.binding.clone
       else
-        Binding.new
+        Binding.new.get
       end
 
       extend_locals locals
@@ -80,7 +80,7 @@ module Opulent
 
   # @Binding
   class Binding
-    def self.new
+    def get
       return binding
     end
   end

data/lib/opulent/engine.rb

@@ -17,7 +17,7 @@ module Opulent
     # @param overwrite [Boolean] Write changes directly to the parent binding
     #
     def initialize(settings = {})
-      @definitions = settings[:definitions] || {}
+      @definitions = {}
       @overwrite = settings.delete :overwrite
 
       Settings.update_settings settings unless settings.empty?
@@ -48,7 +48,7 @@ module Opulent
       @code = read input
 
       # Get the nodes tree
-      @nodes = Parser.new(@file).parse @code
+      @nodes, @definitions = Parser.new(@file, @definitions).parse @code
 
       # @TODO
       # Implement precompiled template handling

data/lib/opulent/parser.rb

@@ -2,6 +2,7 @@ require_relative 'parser/block.rb'
 require_relative 'parser/comment.rb'
 require_relative 'parser/control.rb'
 require_relative 'parser/define.rb'
+require_relative 'parser/doctype.rb'
 require_relative 'parser/eval.rb'
 require_relative 'parser/expression.rb'
 require_relative 'parser/filter.rb'
@@ -21,7 +22,7 @@ module Opulent
     #
     # [:node_type, :value, :attributes, :children, :indent]
     #
-    def initialize(file)
+    def initialize(file, definitions)
       # Convention accessors
       @type = 0
       @value = 1
@@ -34,7 +35,7 @@ module Opulent
       @dir = File.dirname @file
 
       # Initialize definitions for the parser
-      @definitions = {}
+      @definitions = definitions
     end
 
     # Initialize the parsing process by splitting the code into lines and
@@ -57,6 +58,8 @@ module Opulent
       # Get all nodes starting from the root element and return output
       # nodes and definitions
       root @root
+
+      return @root, @definitions
     end
 
     # Check and accept or reject a given token as long as we have tokens

data/lib/opulent/parser/comment.rb

@@ -17,7 +17,14 @@ module Opulent
         # create a new comment element. Otherwise, we ignore the current
         # gathered text and we simply begin the root parsing again
         if buffer[0] == '!'
-          parent[@children] << [:comment, buffer[1..-1].strip, {}, nil, indent]
+          offset = 1; options = {}
+
+          # Allow leading comment newline
+          if buffer[1] == '^'
+            offset = 2; options[:newline] = true
+          end
+
+          parent[@children] << [:comment, buffer[offset..-1].strip, options, nil, indent]
         end
 
         return parent

data/lib/opulent/parser/doctype.rb

@@ -0,0 +1,15 @@
+# @Opulent
+module Opulent
+  # @Parser
+  class Parser
+    # Match one line or multiline comments
+    #
+    def doctype(parent, indent)
+      if (accept :doctype)
+        buffer = accept(:line_feed)
+
+        parent[@children] << [:doctype, buffer.strip.to_sym, {}, nil, indent]
+      end
+    end
+  end
+end

data/lib/opulent/parser/node.rb

@@ -78,8 +78,11 @@ module Opulent
           error :self_enclosing_children, line
         end
 
+        # Create a clone of the definition model. Cloning the options is also
+        # necessary because it's a shallow copy
         if @definitions.keys.include? node_name
           model = @definitions[node_name].clone
+          model[@options] = {}.merge model[@options]
           model[@options][:call] = current_node
 
           parent[@children] << model

data/lib/opulent/parser/root.rb

@@ -37,7 +37,8 @@ module Opulent
                         filter(parent, indent)      ||
                         block_yield(parent, indent) ||
                         block(parent, indent)       ||
-                        require_file(parent, indent)
+                        require_file(parent, indent)||
+                        doctype(parent, indent)
 
         # Throw an error if we couldn't find a valid node
         error :unknown_node_type unless current_node

data/lib/opulent/tokens.rb

@@ -1,6 +1,6 @@
 module Opulent
   # Opulent Keywords
-  Keywords = %i(def block yield require if else elsif unless case when each while until)
+  Keywords = %i(def block yield require if else elsif unless case when each while until doctype)
 
   # @Tokens
   class Tokens
@@ -29,6 +29,9 @@ module Opulent
       # Definition
       def: /\Adef +/,
 
+      # Definition
+      doctype: /\Adoctype +/,
+
       # Require file
       require: /\Arequire +/,
 

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.1.0"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Alex Grozav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - lib/opulent/compiler/comment.rb
 - lib/opulent/compiler/control.rb
 - lib/opulent/compiler/define.rb
+- lib/opulent/compiler/doctype.rb
 - lib/opulent/compiler/eval.rb
 - lib/opulent/compiler/filter.rb
 - lib/opulent/compiler/node.rb
@@ -158,6 +159,7 @@ files:
 - lib/opulent/parser/comment.rb
 - lib/opulent/parser/control.rb
 - lib/opulent/parser/define.rb
+- lib/opulent/parser/doctype.rb
 - lib/opulent/parser/eval.rb
 - lib/opulent/parser/expression.rb
 - lib/opulent/parser/filter.rb
@@ -190,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Intelligent Templating Engine for Creative Web Developers.