cutaneous 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d90ff3764cf47bc3c932b85e5d9833adbb86edcb
-  data.tar.gz: a996afd411cb3e846cd1237c13b49a9ef4e99e17
+  metadata.gz: 25303ab563759f3b74896f8bb3fc8e5617c30fb7
+  data.tar.gz: d0151644bb6d3d113a01e0136b3d2fc17723fc71
 SHA512:
-  metadata.gz: a01dd50c0274e1fd17d7913d48b0e52913842fbc8ed479442356ff17e83aec31112ae93041b68e47c3c6e4d268f7f33d69c5d4c7975ec6305ee2a5f54abec298
-  data.tar.gz: 8e94956de888f9b8a12a5494245dfc3e242ef33e5ebdf0fd4c61dd443c59a2eb90163fd2890a3fe4e7e188d6a2bda97fd5e664ed7cc4a4d7da0263dbcb660868
+  metadata.gz: 8d8b579189959a783225dc50a5acec4203bcdeec9ed9019a12702ce35a3d08b2b03505e9a79c4f054d106d5caaba852c762b68cdae2251661d0b313192894cbd
+  data.tar.gz: 2db1354cc968d5c8799817f301d6cd26635a898cc55b6e0d9f11121135d0ae198637a4870a94deb7db1699fb3331af2eca5ca7fb253007a88279126eb24e3131

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

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.2.0'
-  s.date              = '2014-01-29'
+  s.version           = '0.3.0'
+  s.date              = '2016-08-16'
   s.rubyforge_project = 'cutaneous'
 
   ## Make sure your summary is short. The description may be as long
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  # s.add_development_dependency('DEVDEPNAME', [">= 1.1.0", "< 2.0.0"])
+  s.add_development_dependency('minitest',  ['~> 4.7.0'])
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE

data/lib/cutaneous.rb

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

data/lib/cutaneous/compiler/expression.rb

@@ -6,7 +6,7 @@ module Cutaneous
       end
 
       def to_script
-        %{__buf << __decode_params((} << @expression << %{)) ; }
+        %{__buf << __decode_params((} << @expression << %{)).to_s ; }
       end
 
       def affect(builder)
@@ -16,7 +16,7 @@ module Cutaneous
 
     class EscapedExpression < Expression
       def to_script
-        %{__buf << escape(__decode_params((} << @expression << %{))) ; }
+        %{__buf << escape(__decode_params((} << @expression << %{)).to_s) ; }
       end
     end
 

data/lib/cutaneous/loader.rb

@@ -39,8 +39,8 @@ module Cutaneous
 
     def path(template_name)
       filename = filename(template_name)
-      return filename if ::File.exists?(filename) # Test for an absolute path
-      @roots.map { |root| ::File.join(root, filename)}.detect { |path| ::File.exists?(path) }
+      return filename if ::File.exist?(filename) # Test for an absolute path
+      @roots.map { |root| ::File.join(root, filename)}.detect { |path| ::File.exist?(path) }
     end
 
     def filename(template_name)
@@ -49,7 +49,7 @@ module Cutaneous
 
     def exists?(template_root, template_name)
       path = ::File.join(template_root, filename(template_name))
-      ::File.exists?(path)
+      ::File.exist?(path)
     end
 
     def location(template_root, template_name)

data/test/test_cache.rb

@@ -55,7 +55,7 @@ describe Cutaneous do
 
     # Ensure that the cached script file is being used by overwriting its contents
     path = template_path("c", "html", "rb")
-    assert ::File.exists?(path), "Template cache should have created '#{path}'"
+    assert ::File.exist?(path), "Template cache should have created '#{path}'"
     File.open(path, "w") do |f|
       f.write("__buf << 'right'")
     end
@@ -78,7 +78,7 @@ describe Cutaneous do
 
     template_path = template_path("c", "html")
     script_path   = template_path("c", "html", "rb")
-    assert ::File.exists?(script_path), "Template cache should have created '#{script_path}'"
+    assert ::File.exist?(script_path), "Template cache should have created '#{script_path}'"
 
     File.open(template_path, "w") { |f| f.write("template") }
     File.utime(now, now, template_path)
@@ -99,7 +99,7 @@ describe Cutaneous do
 
     result1 = engine.render("c", context)
     script_path   = template_path("c", "html", "rb")
-    refute ::File.exists?(script_path), "Template cache should not have created '#{script_path}'"
+    refute ::File.exist?(script_path), "Template cache should not have created '#{script_path}'"
   end
 
   it "doesn't attempt to write a cached script for Proc templates" do

data/test/test_core.rb

@@ -243,6 +243,10 @@ describe Cutaneous do
     refute engine.dynamic_template?("i am not dynamic")
   end
 
+   it "ignores escaped tags when testing for dynamic status" do
+     refute engine.dynamic_template?("i am not \\${dynamic}")
+   end
+
   it "Passes any instance variables & locals between contexts" do
     context = ContextHash(right: "left")
     result1 = engine.render("instance", context)

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cutaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Garry Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
-dependencies: []
+date: 2016-08-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.0
 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
   through blocks.
@@ -71,22 +85,22 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cutaneous
-rubygems_version: 2.2.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 2
 summary: A Ruby templating language with Django style template inheritance