cutaneous 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 702a4ccd825a31c0136fba20ad088b14e6594252
-  data.tar.gz: a1719c431d6f5b5c4c18575acab709d70082878e
+  metadata.gz: 9969ba7375a7a48961d9643edce1886e87d17881
+  data.tar.gz: 815bce78af65ee6ff6625ccc1666d5a758d6d74e
 SHA512:
-  metadata.gz: 13a594778df91b6a0dc7524f7611982a198243646dc507317e227fb3f5ad7edd4530eb4496e8e2850a54eefe3b351a5da23b4abd1a2974993048e4492af73cf6
-  data.tar.gz: 7d792d27a5416f83787e4e860cfcb9d4ea3972c2b8afe578aee69df68a8557e508a572b0e4b9a5af3201afb0b2531db902e1823c12a81933da518a2fc3963b8a
+  metadata.gz: b0a18c961d9fcd217ec41a819cbeb8710995bb77dd53cae261ec87b34d470db7246ef1e25c07fb227e26587b487ce04d3e4cb76980b7168a434b8072a0a63adf
+  data.tar.gz: d0f055699ba068ad627b6dc3a71aea6b721ebc892e2ea3297d73a33630679ef3704a3034f1b9b427a37dc58c89e7b97d6c9d8cb106e2e137ccd2509fb4067224

data/cutaneous.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'cutaneous'
-  s.version           = '0.1.4'
-  s.date              = '2013-08-17'
+  s.version           = '0.1.5'
+  s.date              = '2013-08-22'
   s.rubyforge_project = 'cutaneous'
 
   ## Make sure your summary is short. The description may be as long

data/lib/cutaneous/engine.rb

@@ -39,6 +39,14 @@ module Cutaneous
       file_loader(format).exists?(root, relative_path)
     end
 
+    def convert(template, to_syntax, format = default_format)
+      file_loader(format).convert(template, to_syntax)
+    end
+
+    def convert_string(template_string, to_syntax, format = default_format)
+      string_loader(format).convert(template_string, to_syntax)
+    end
+
     protected
 
     def file_loader_instance(format)

data/lib/cutaneous/lexer.rb

@@ -14,6 +14,16 @@ module Cutaneous
       @tokens ||= parse
     end
 
+    def convert(to_syntax)
+      template = ""
+      tags = to_syntax.tags
+      tokens.each do |token|
+        open, close = tags[token[0]]
+        template << open.to_s << token[1] << close.to_s
+      end
+      template
+    end
+
     # def script
     #   @script ||= compile
     # end

data/lib/cutaneous/loader.rb

@@ -14,6 +14,10 @@ module Cutaneous
       template(template).render(context)
     end
 
+    def convert(template, to_syntax)
+      template(template).convert(to_syntax)
+    end
+
     def template(template)
       return proc_template(template) if template.is_a?(Proc)
       template_path = path(template)

data/lib/cutaneous/template.rb

@@ -15,6 +15,10 @@ module Cutaneous
       context.instance_eval(&template_proc)
     end
 
+    def convert(to_syntax)
+      lexer.convert(to_syntax)
+    end
+
     def template_proc
       @template_proc ||= eval(template_proc_src, nil, path || "(cutaneous)").tap do |proc|
         @lexer = nil # release any memory used by the lexer, we don't need it anymore

data/lib/cutaneous.rb

@@ -7,7 +7,7 @@ require 'cutaneous/lexer'
 require 'cutaneous/compiler'
 
 module Cutaneous
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   class CompilationError < Exception; end
 

data/test/fixtures/statements1.html.cut

@@ -1,3 +1,3 @@
 %{ 3.times do |n| }
-This is ${ right } ${ n }
+This is ${ right } $${ n }
 %{ end }

data/test/fixtures/statements2.html.cut

@@ -1,3 +1,3 @@
 {% 3.times do |n| %}
-This is {{ right }} {{ n }}
+This is {{{ right }}} {{ n }}
 {% end %}

data/test/test_core.rb

@@ -1,62 +1,99 @@
 require File.expand_path('../helper', __FILE__)
 
-describe "First pass parser" do
+describe "Parsers" do
   let(:template_root) { File.expand_path("../fixtures", __FILE__)                     }
-  subject { Cutaneous::Engine.new(template_root, Cutaneous::FirstPassSyntax, "html") }
-
-  it "will parse & execute a simple template with expressions" do
-    context = ContextHash(right: "right", code: "<tag/>")
-    result = subject.render("expressions1", context)
-    result.must_equal "This is right &lt;tag/&gt;\n"
+  def read_template(template)
+    File.read(File.join(template_root, template))
   end
 
-  it "will parse & execute a simple template with statements" do
-    context = ContextHash(right: "right")
-    result = subject.render("statements1", context)
-    result.must_equal "\nThis is right 0\n\nThis is right 1\n\nThis is right 2\n\n"
-  end
+  describe "First pass parser" do
 
-  it "will parse & execute a simple template with comments" do
-    context = ContextHash(right: "right")
-    result = subject.render("comments1", context)
-    result.must_equal "\n"
-  end
+    subject { Cutaneous::Engine.new(template_root, Cutaneous::FirstPassSyntax, "html") }
 
-  it "will remove whitespace after tags with a closing '-'" do
-    context = ContextHash(right: "right")
-    result = subject.render("whitespace1", context)
-    expected = ["aa", "here 0", "here 1", "here 2\n", "ac\n", "ad\n", "ae\n", "af\n", "ag\n"].join("\n")
-    result.must_equal expected
-  end
-end
+    it "will parse & execute a simple template with expressions" do
+      context = ContextHash(right: "right", code: "<tag/>")
+      result = subject.render("expressions1", context)
+      result.must_equal "This is right &lt;tag/&gt;\n"
+    end
 
-describe "Second pass parser" do
-  let(:template_root) { File.expand_path("../fixtures", __FILE__)                     }
-  subject { Cutaneous::Engine.new(template_root, Cutaneous::SecondPassSyntax, "html") }
+    it "will parse & execute a simple template with statements" do
+      context = ContextHash(right: "right")
+      result = subject.render("statements1", context)
+      result.must_equal "\nThis is right 0\n\nThis is right 1\n\nThis is right 2\n\n"
+    end
 
-  it "will parse & execute a simple template with expressions" do
-    context = ContextHash(right: "right", code: "<tag/>")
-    result = subject.render("expressions2", context)
-    result.must_equal "This is right &lt;tag/&gt; <tag/>\n"
-  end
+    it "will parse & execute a simple template with comments" do
+      context = ContextHash(right: "right")
+      result = subject.render("comments1", context)
+      result.must_equal "\n"
+    end
 
-  it "will parse & execute a simple template with statements" do
-    context = ContextHash(right: "right")
-    result = subject.render("statements2", context)
-    result.must_equal "\nThis is right 0\n\nThis is right 1\n\nThis is right 2\n\n"
-  end
+    it "will remove whitespace after tags with a closing '-'" do
+      context = ContextHash(right: "right")
+      result = subject.render("whitespace1", context)
+      expected = ["aa", "here 0", "here 1", "here 2\n", "ac\n", "ad\n", "ae\n", "af\n", "ag\n"].join("\n")
+      result.must_equal expected
+    end
 
-  it "will parse & execute a simple template with comments" do
-    context = ContextHash(right: "right")
-    result = subject.render("comments2", context)
-    result.must_equal "\n"
+    it "can convert a template to another syntax" do
+      result = subject.convert('statements1', Cutaneous::SecondPassSyntax)
+      result.must_equal read_template('statements2.html.cut')
+    end
+
+    it "can convert a template string to another syntax" do
+      result = subject.convert_string(read_template('statements1.html.cut'), Cutaneous::SecondPassSyntax)
+      result.must_equal read_template('statements2.html.cut')
+    end
+
+    it "can convert a template proc to another syntax" do
+      result = subject.convert(proc { read_template('statements1.html.cut') }, Cutaneous::SecondPassSyntax)
+      result.must_equal read_template('statements2.html.cut')
+    end
   end
 
-  it "will remove whitespace after tags with a closing '-'" do
-    context = ContextHash(right: "right")
-    result = subject.render("whitespace2", context)
-    expected = ["here 0", "here 1", "here 2\n"].join("\n")
-    result.must_equal expected
+  describe "Second pass parser" do
+    let(:template_root) { File.expand_path("../fixtures", __FILE__)                     }
+    subject { Cutaneous::Engine.new(template_root, Cutaneous::SecondPassSyntax, "html") }
+
+    it "will parse & execute a simple template with expressions" do
+      context = ContextHash(right: "right", code: "<tag/>")
+      result = subject.render("expressions2", context)
+      result.must_equal "This is right &lt;tag/&gt; <tag/>\n"
+    end
+
+    it "will parse & execute a simple template with statements" do
+      context = ContextHash(right: "right")
+      result = subject.render("statements2", context)
+      result.must_equal "\nThis is right 0\n\nThis is right 1\n\nThis is right 2\n\n"
+    end
+
+    it "will parse & execute a simple template with comments" do
+      context = ContextHash(right: "right")
+      result = subject.render("comments2", context)
+      result.must_equal "\n"
+    end
+
+    it "will remove whitespace after tags with a closing '-'" do
+      context = ContextHash(right: "right")
+      result = subject.render("whitespace2", context)
+      expected = ["here 0", "here 1", "here 2\n"].join("\n")
+      result.must_equal expected
+    end
+
+    it "can convert a template to another syntax" do
+      result = subject.convert('statements2', Cutaneous::FirstPassSyntax)
+      result.must_equal read_template('statements1.html.cut')
+    end
+
+    it "can convert a template string to another syntax" do
+      result = subject.convert_string(read_template('statements2.html.cut'), Cutaneous::FirstPassSyntax)
+      result.must_equal read_template('statements1.html.cut')
+    end
+
+    it "can convert a template proc to another syntax" do
+      result = subject.convert(proc { read_template('statements2.html.cut') }, Cutaneous::FirstPassSyntax)
+      result.must_equal read_template('statements1.html.cut')
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cutaneous
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Garry Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies: []
 description: Cutaneous is the Ruby templating language designed for use with Spontaneous
   CMS. It has a simple syntax but powerful features such as Djano style template inheritance
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cutaneous
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 2
 summary: A Ruby templating language with Django style template inheritance