opulent 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76bdc4c7325218912ef5e71007f9d64f7342b0e9
-  data.tar.gz: 79d52447ddcbaa17c138998e278a270febf2cff5
+  metadata.gz: eb391e9dc419cbe3860f6439e74f4af66fb0bb2f
+  data.tar.gz: 7a6314283b3e23907a04b6f3ed36669f26431c05
 SHA512:
-  metadata.gz: ad0e14bd3dddc7e32ebcabcccf0696aed4cdfd79e790cdd65f866c967d3559b2da7ace8c21ce0b25a5dfe28f5dc32c3247b0d13b83d583c7a65049685971279f
-  data.tar.gz: d0ecfc90dfb792a0410fc50d7b44d6bfec78eb135b19edf6e0abdbbbc10548e0edf3d93bede9bd48225e80c4273d63cbe4a614997bc4d0b714244471fff92085
+  metadata.gz: ad945c888025afb1ecfff5bc45e71de36bfdf13602386a636f6bde25b4fa6b524954e460f56be94f3d740da986fb86d44b7c229b772b1160b1c213895d351e08
+  data.tar.gz: b8c67846a876db18702f33b80c9f1832c37d1321571e86d3dcd45fbafce58dfa4fbcc5d0df2320dcebc2cde5e45a8a24a4608248ac38e50d915f8c154663076c

data/.gitignore

@@ -8,3 +8,5 @@
 /spec/reports/
 /tmp/
 *.DS_Store
+node_modules/*
+src/*

data/README.md

@@ -1,12 +1,11 @@
-# Opulent
+# Opulent [http://opulent.io](http://opulent.io)
 [![Build Status](https://travis-ci.org/opulent/opulent.svg?branch=master)](https://travis-ci.org/opulent/opulent)
 
-Opulent is an __Intelligent Web Templating Engine__ created for extremely fast and efficient Web Development. Based on the idea of lightweight and reusable __Web Components__, Opulent greatly increases your development speed for any project.
+Opulent is a templating engine which strives to make page markup as beautiful and expressive as it should be. It's blazing fast, offers useful reusable component definitions and encourages well organised front end code. Opulent provides the cleanliness, readability and development speed you need for your project.
 
-[Read the Documentation](docs/reference.md)
+[Visit Homepage](http://opulent.io/)
 
 ## Syntax
-
 Opulent has a beautiful, minimalistic syntax: no tags, indentation based, optional brackets, inline text, inline children and in page definitions.
 
 __Page Markup__
@@ -24,14 +23,24 @@ html
       With Opulent, you can do anything.
 ```
 
-__Web Component__
+__Reusable Component__
 ```
 def hello(place)
   p Hello #{place}
-
+  
 hello place="World"
 ```
 
+```
+def content
+  #content
+    yield
+  
+content 
+  h1 I'll replace yield!
+```
+
+
 __Control Structures__
 ```
 ul.navbar
@@ -41,9 +50,21 @@ ul.navbar
     li > a href=link_to_register Sign Up
 ```
 
-__Starting to feel it?__ There's so much more you can do with Opulent.
+### Elegant
+Markup should beautiful and clean. Opulent makes markup a pleasant experience.
+
+### Reusable
+Completely DRY, in opulent you can define reusable markup elements easily.
 
-[Read the Documentation](docs/reference.md)
+### Full Featured
+Everything you need, right from the start. Ready for all the major Ruby frameworks.
+
+### Performant
+Opulent is lightweight, blazing fast. Performance is measured with every release.
+
+__Like it?__ There's so much more you can do with Opulent.
+
+[Read the Documentation](http://opulent.io/documentation/)
 
 
 
@@ -70,35 +91,23 @@ And then execute:
 
 Using Opulent to render a file is as easy as including it in your application and using the render method.
 
-[Read the Documentation](docs/usage.md)
+[Read the Documentation](http://opulent.io/documentation/)
 
 ```ruby
 require 'opulent'
 
-Opulent.new.render_file :index
+engine = Opulent.new(:index)
+output = engine.render
 ```
 
-<!--
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
--->
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/opulent/opulent. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
-#### Under Development
-Opulent is currently in the Beta Phase. It has serious potential to becoming the next generation of Templating Engines for Ruby, therefore any contribution is more than welcome.
+#### Production Ready
+Opulent is production ready and has serious potential to becoming the next generation of Templating Engines for Ruby, therefore any contribution is more than welcome.
 
-It still has development going on the following subjects:
 
-* Template amble (preamble, cache, postamble) generation
-* More block yielding tests
-* Multiple page layouts
-* More to come
 
 ## License
 

data/lib/opulent/compiler.rb

@@ -59,7 +59,7 @@ module Opulent
       @block_stack = []
 
       # Remember last compiled node, required for pretty printing purposes
-      @sibling_stack = [[[:root, nil]]]
+      @sibling_stack = [[[:root, nil]], []]
 
       # Set parent node, required for pretty printing
       @parent_stack = []

data/lib/opulent/compiler/comment.rb

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

data/lib/opulent/compiler/doctype.rb

@@ -33,6 +33,7 @@ module Opulent
 
       @node_stack << :doctype
       buffer_freeze "<#{value}>"
+      buffer_freeze "\n" if @settings[:pretty]
     end
   end
 end

data/lib/opulent/compiler/node.rb

@@ -15,19 +15,21 @@ module Opulent
         inline = Settings::INLINE_NODE.include? node[@value]
 
         if inline
-          if @sibling_stack[-1][-1][0] == :plain
+          if @sibling_stack[-1][-1] && @sibling_stack[-1][-1][0] == :plain
             buffer_remove_trailing_whitespace
+          elsif @sibling_stack[-1].length == 1
+            buffer_freeze indentation
           end
         else
           buffer_freeze indentation
         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
-      buffer_freeze ' ' if node[@options][:leading_whitespace] 
+      buffer_freeze ' ' if node[@options][:leading_whitespace]
       buffer_freeze "<#{node[@value]}"
 
       # Evaluate node extension in the current context
@@ -67,7 +69,10 @@ module Opulent
 
         # Pretty print
         if @settings[:pretty]
-          buffer_freeze "\n" if node[@children].size > 0 and !inline
+          if node[@children].length > 0
+            buffer_freeze "\n" unless inline
+          end
+          # @sibling_stack << [[node[@type], node[@value]]]
         end
 
         # Process each child element recursively, increasing indentation
@@ -77,7 +82,8 @@ module Opulent
 
         # Pretty print
         if @settings[:pretty]
-          if node[@children].size > 1 &&
+          if node[@children].length > 1 &&
+            @sibling_stack[-1][-1] &&
             (@sibling_stack[-1][-1][0] == :plain ||
               Settings::INLINE_NODE.include?(@sibling_stack[-1][-1][1]))
             buffer_freeze "\n"

data/lib/opulent/compiler/text.rb

@@ -14,7 +14,8 @@ module Opulent
       # Pretty print
       if @settings[:pretty]
         indentation = ' ' * indent
-        inline = @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
@@ -22,10 +23,14 @@ module Opulent
 
         # If we have a text on multiple lines and the text isn't supposed to be
         # inline, indent all the lines of the text
-        if !inline || value.split("\n").size > 1
-          value.gsub!(/^(?!$)/, indentation)
+        if node[@value] == :text
+          if !inline
+            value.gsub!(/^(?!$)/, indentation)
+          else
+            value.strip!
+          end
         else
-          value.strip!
+          buffer_freeze indentation
         end
       end
 

data/lib/opulent/engine.rb

@@ -17,9 +17,8 @@ module Opulent
 
     # Update render settings
     #
+    # @param input [Symbol/String] Input code or file
     # @param settings [Hash] Opulent settings override
-    # @param def [Hash] def from previously parsed files
-    # @param overwrite [Boolean] Write changes directly to the parent binding
     #
     def initialize(input, settings = {})
       # Update default settings with user settings

data/lib/opulent/parser/root.rb

@@ -6,7 +6,7 @@ module Opulent
     # In case no match was found, throw an exception.
     # In special cases, modify the token hash.
     #
-    # @param nodes [Array] Parent node to which we append to
+    # @param parent [Array] Parent node to which we append to
     #
     def root(parent = @root, min_indent = -1)
       while (@line = @code[(@i += 1)])

data/lib/opulent/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Alex Grozav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Intelligent Templating Engine for Creative Web Developers.