opulent 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed644b0ba2857806a88f0da508087a32b31e85cd
-  data.tar.gz: 667cb3bfa83b2ea0786aa9427404ebab524fdb36
+  metadata.gz: 596ef0227f053f8528322c84b30f62f9cda06106
+  data.tar.gz: c8f7380d83175b6eccc89ea6c7145ec99fe0db6a
 SHA512:
-  metadata.gz: 55567d695622a6b7c50b45334b851474db72a43b9b7afc2f854125da0b0a6b45f7c06ee2b39f8f3202fba29999b7e36903b9506f6a2fd6b6700e6a0c17ed92cf
-  data.tar.gz: eae525a670999e15c25ac8e7859d5ec7ca934c0c8d2bbcb001c08eb89608f80851aa2a957bf5aa89ef040141b5b37a94dcab8f672e4323440ad6a2fbe56efec6
+  metadata.gz: 664437050fa5a2d6e802ba6858a8c3056a8d8e69add2dd1187858d61c80a97ed06f6a291c0bf0e06665a3d5d033fa411a889a9920fc5736f4d3a55a7f9a9e32e
+  data.tar.gz: 0c74ec3b919fdca5cca863c9fd99b59442a94938f139d6183d848106ebc37e3d2723ce7de063152d8deab8fabcbd61f88fb4f6563e4b254199737f18c28226f6

data/lib/opulent/engine.rb

@@ -26,19 +26,6 @@ module Opulent
       Settings.update_settings settings unless settings.empty?
     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.
-    #
-    # @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_file(file, locals = {}, &block)
-      @mode = :file
-
-      render file, locals, &block
-    end
-
     # Avoid code duplication when layouting is set. When we have a layout, look
     # in layouts/application by default.
     #
@@ -52,11 +39,11 @@ module Opulent
       if Settings[:layouts]
         layout = locals.has_key?(:layout) ? locals.delete(:layout) : Settings[:default_layout]
 
-        get layout, locals, block do
-          get input, locals, block
+        process layout, locals, block do
+          process input, locals, block
         end
       else
-        get input, locals, block
+        process input, locals, block
       end
     end
 
@@ -67,9 +54,18 @@ module Opulent
     # @param locals [Hash] Render call local variables
     # @param block [Proc] Processing environment data
     #
-    def get(input, locals, block, &content)
-      # Get input code
-      @code = read input
+    def process(input, locals, block, &content)
+      # Read input parameter based on opening mode. If we have a file mode, we
+      # get its path and read the code. We need to reset the mode in case the next
+      # render call is on code, not on a file.
+      @code = case input
+      when Symbol
+        @file = File.expand_path "#{input}.op"
+        File.read @file
+      else
+        @file = File.expand_path __FILE__
+        input
+      end
 
       # Get the nodes tree
       @nodes, @definitions = Parser.new(@file, @definitions).parse @code
@@ -94,22 +90,5 @@ module Opulent
 
       return @output
     end
-
-    # Read input parameter based on opening mode. If we have a file mode, we
-    # get its path and read the code. We need to reset the mode in case the next
-    # render call is on code, not on a file.
-    #
-    # @param input [String] Input file or code
-    #
-    def read(input)
-      if @mode == :file
-        @file = File.expand_path "#{input}.op"
-        @mode = nil unless Settings[:layouts]
-        return File.read @file
-      else
-        @file = File.expand_path __FILE__
-        return input
-      end
-    end
   end
 end

data/lib/opulent/template.rb

@@ -18,7 +18,7 @@ module Opulent
       @options[:cache] = true
 
       # Enable layouts so that we can render with symbols
-      @options[:layouts] = true
+      #@options[:layouts] = true
 
       # Set up the rendering engine
       @engine = ::Opulent.new @options

data/lib/opulent/version.rb

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

metadata

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