armadillo 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708c0aa944b119c3a39a0872be76237cfe0e23be
-  data.tar.gz: 30c62970324900dd052ef97c4911b81c1424dcbc
+  metadata.gz: 231f93fa3a2bf653a647967942b864af7ee0895c
+  data.tar.gz: 15972a92f0835b8d4bfaa4e3aecfb1b5aa1e4dc6
 SHA512:
-  metadata.gz: 4f93b5bad07de610b17bb5596c4305b392d1d0415a4cd0244000615bacaefff6458cb38727658a5a4495f5a8a95cbdc05efb17911a2673c844c0fb7de45d8cdb
-  data.tar.gz: b7146c572401f76bc4e74f5796fee206ceccdf2534d284198dc5be9ecaf3ee1822218b902ab68137fed249e523161c5d8579a06731b30a23b68e7c95bf47ed32
+  metadata.gz: 4165787b78d2545fc9ef144d8cb6ec3257af043f684f8c2d11eca2aa00bbd4ddb22343910161b9aa747ae289d5cbc42b830c7937509f32bea52310e4df3538f5
+  data.tar.gz: 3b68737070657b9b6b5d712d362ed3c277263e6b910b7e9abd610a7ae5609cfd265857a026a25d30e62a04e5f07d1a8cf170ab6cf176d6d6a0d0fa0dc84480aa

data/armadillo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "armadillo"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.summary = "Template inheritance with ERB templates"
   s.description = "A small library for Django-like template inheritance adapted for ERB"
   s.authors = ["Sebastian Borrazas"]

data/lib/armadillo.rb

@@ -4,7 +4,7 @@ require "delegate"
 
 module Armadillo
 
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
   DEFAULT_OPTIONS = {
     :default_encoding => Encoding.default_external,
@@ -44,17 +44,18 @@ module Armadillo
     # @param block_name [Symbol]
     # @param block [Block]
     def vlock(block_name, &block)
-      raise "Invalid vlock usage" unless current_frame
-
-      if extends?
-        raise "No block given" unless block_given?
+      if current_frame && extends?
+        # Save child view block to be rendered on the parent
+        raise "No block given on `#{block_name}`" unless block
 
         current_frame[:vlocks][block_name] = block
-      elsif (frame = get_frame(block_name, current_frame))
+      elsif current_frame && (frame = get_frame(block_name, current_frame))
+        # Look for child view block and render it
         temporary_frame(frame[:parent_frame]) do
           frame[:vlocks][block_name].call
         end
-      elsif block_given?
+      elsif block
+        # Render a default block
         block.call
       end
     end

data/spec/template_spec.rb

@@ -104,6 +104,41 @@ describe Armadillo do
         ])
       end
     end
+
+    describe "when providing default blocks" do
+      describe "when default is not overridden" do
+        it "renders the default" do
+          content = Armadillo.render("default_block.text", {}, {
+            :base_path => TEMPLATES_PATH
+          })
+
+          assert_lines_match(content, ["Default"])
+        end
+      end
+
+      describe "when default is overridden" do
+        it "renders the content from the overridden" do
+          content = Armadillo.render("default_block_overridden.text", {}, {
+            :base_path => TEMPLATES_PATH
+          })
+
+          assert_lines_match(content, ["Default Overridden"])
+        end
+      end
+
+      describe "when default is a nested block" do
+        describe "when default is not overridden" do
+          it "renders the default" do
+            content = Armadillo.render("default_block_nested.text", {}, {
+              :base_path => TEMPLATES_PATH
+            })
+
+            assert_lines_match(content, ["Default", "Base"])
+          end
+        end
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armadillo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sebastian Borrazas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis