opulent 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da21d9a93894954ff539d9c50097e6828e220a45
-  data.tar.gz: dc9280c742fb397a1962ce957eaceda6f8b36cb0
+  metadata.gz: ed644b0ba2857806a88f0da508087a32b31e85cd
+  data.tar.gz: 667cb3bfa83b2ea0786aa9427404ebab524fdb36
 SHA512:
-  metadata.gz: 8a2bb3c28e90352de4f78a6d4a56fc1f558fd6d72564b53d5e061dee635831dc26d7d7a900233bc7ff85adb5a1050e4fb38888b2f53dd19b82683333f3e78fd5
-  data.tar.gz: 69d0e218da3c4f5620c4c2148a65b96092da54abd24a80716691ee8b6996d0f324e5ef3fe3ac9524c95c8009bb30961d3b848a1a05b5c4491b8aa4500abe65aa
+  metadata.gz: 55567d695622a6b7c50b45334b851474db72a43b9b7afc2f854125da0b0a6b45f7c06ee2b39f8f3202fba29999b7e36903b9506f6a2fd6b6700e6a0c17ed92cf
+  data.tar.gz: eae525a670999e15c25ac8e7859d5ec7ca934c0c8d2bbcb001c08eb89608f80851aa2a957bf5aa89ef040141b5b37a94dcab8f672e4323440ad6a2fbe56efec6

data/README.md

@@ -72,7 +72,16 @@ Using Opulent to render a file is as easy as including it in your application an
 ```ruby
 require 'opulent'
 
-Opulent.new.render_file 'file.op'
+Opulent.new.render_file :index
+```
+
+For layouts you can simply use the following code. By default, the layout is set to __layouts/application__.
+
+```ruby
+require 'opulent'
+
+opulent = Opulent.new layouts: true
+opulent.render_file :index, layout: :'path/layout'
 ```
 
 <!--

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+#require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+#RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+#task :default => :spec

data/lib/opulent/context.rb

@@ -13,9 +13,12 @@ module Opulent
     # given as arguments
     #
     # @param locals [Hash] Binding extension
-    # @param bind [Binding] Call environment binding
+    # @param block [Binding] Call environment block
+    # @param content [Binding] Content yielding
     #
-    def initialize(locals = {}, &block)
+    def initialize(locals = {}, block, &content)
+      @content = content
+
       @block = block
       @binding = if @block
         @block.binding.clone
@@ -41,7 +44,7 @@ module Opulent
     # Call given input block and return the output
     #
     def evaluate_yield
-      @block.call if @block
+      @content.call if @content
     end
 
     # Extend the call context with a Hash, String or other Object
@@ -71,10 +74,6 @@ module Opulent
       bind.eval('self.class.class_variables').each do |var|
         @binding.eval('self').class_variable_set var, bind.eval(var.to_s)
       end
-      #
-      # bind.eval('self.class.constants').each do |var|
-      #   @binding.eval('self').const_set var, bind.eval(var.to_s)
-      # end
     end
   end
 

data/lib/opulent/engine.rb

@@ -1,5 +1,9 @@
 # @Opulent
 module Opulent
+  # Debug enable
+  #
+  DEBUG = false
+
   # Module method wrapper for creating a new engine instance
   #
   def Opulent.new(settings = {})
@@ -18,7 +22,6 @@ module Opulent
     #
     def initialize(settings = {})
       @definitions = {}
-      @overwrite = settings.delete :overwrite
 
       Settings.update_settings settings unless settings.empty?
     end
@@ -36,6 +39,27 @@ module Opulent
       render file, locals, &block
     end
 
+    # Avoid code duplication when layouting is set. When we have a layout, look
+    # in layouts/application by default.
+    #
+    # @param file [String] The file that needs to be analyzed
+    # @param locals [Hash] Render call local variables
+    # @param block [Proc] Processing environment data
+    #
+    def render(input, locals = {}, &block)
+      # If a layout is set, get the specific layout, otherwise, set the default
+      # one. If a layout is set to false, the page will be render as it is.
+      if Settings[:layouts]
+        layout = locals.has_key?(:layout) ? locals.delete(:layout) : Settings[:default_layout]
+
+        get layout, locals, block do
+          get input, locals, block
+        end
+      else
+        get input, locals, block
+      end
+    end
+
     # Analyze the input code and check for matching tokens. In case no match was
     # found, throw an exception. In special cases, modify the token hash.
     #
@@ -43,7 +67,7 @@ module Opulent
     # @param locals [Hash] Render call local variables
     # @param block [Proc] Processing environment data
     #
-    def render(input, locals = {}, &block)
+    def get(input, locals, block, &content)
       # Get input code
       @code = read input
 
@@ -55,16 +79,18 @@ module Opulent
       @preamble = @nodes.inspect.inspect
 
       # Create a new context based on our rendering environment
-      @context = Context.new locals, &block
+      @context = Context.new locals, block, &content
 
       # Compile our syntax tree using input context
       @output = Compiler.new.compile @nodes, @context
 
-      # puts "Nodes\n---\n"
-      # pp @nodes
-      #
-      # puts "\n\nCode\n---\n"
-      # puts @output
+      if DEBUG
+        #puts "Nodes\n---\n"
+        #pp @nodes
+
+        # puts "\n\nCode\n---\n"
+        # pp @output
+      end
 
       return @output
     end
@@ -77,7 +103,8 @@ module Opulent
     #
     def read(input)
       if @mode == :file
-        @file = File.expand_path input; @mode = nil
+        @file = File.expand_path "#{input}.op"
+        @mode = nil unless Settings[:layouts]
         return File.read @file
       else
         @file = File.expand_path __FILE__

data/lib/opulent/settings.rb

@@ -43,7 +43,10 @@ module Opulent
       Defaults = {
         pretty: true,
         indent: 2,
-        dependency_manager: true
+        dependency_manager: true,
+        invert_escaping: true,
+        layouts: false,
+        default_layout: :'layouts/application'
       }
 
       # Set defaults as initial options

data/lib/opulent/template.rb

@@ -17,9 +17,11 @@ module Opulent
       # Enable caching for the current rendered file
       @options[:cache] = true
 
+      # Enable layouts so that we can render with symbols
+      @options[:layouts] = true
+
       # Set up the rendering engine
       @engine = ::Opulent.new @options
-      #@engine.update_options @options
     end
 
     # Execute the compiled template and return the result string. Template
@@ -63,5 +65,5 @@ module Opulent
   end
 
   # Register Opulent to Tilt
-  ::Tilt.register OpulentTemplate, 'op', 'opl', 'opulent'
+  ::Tilt.register OpulentTemplate, 'op'
 end

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Alex Grozav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler