curly-templates 0.11.0 → 0.12.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a564172d0d4f15b3bae6c5f05579d5deb0fe845b
+  data.tar.gz: d28d0cf8d4998251a08d88fb13d3e44250a61a5c
+SHA512:
+  metadata.gz: 6b360305771e280435d7ad2cb0fd07cd982728223e83701af89411037c1f61926f02e0594aee6c7e696da369dae600dcd3aceb437fc82178d2250897bf8a8a67
+  data.tar.gz: 8a16c5647e0059ec808fc48e92a4f843530d4036b7a744cc6aef3f19d52ae149f6d20e27c327f215b4cb2df40522b32d97a1b88d7559f34c84fff6ad9a7f7fdd

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ### Unreleased
 
+* Allow Curly to output Curly syntax by using the `{{{ ... }}` syntax:
+
+  ```
+  {{{curly_example}}
+  ```
+
+  *Daniel Schierbeck and Benjamin Quorning*
+
 ### Curly 0.11.0 (July 31, 2013)
 
 * Make Curly raise an exception when a reference or comment is not closed.

data/README.md

@@ -105,6 +105,11 @@ render collection: post.comments
 ```
 
 
+### Escaping Curly syntax
+
+If you need to have `{{` rendered, you should use `{{{` in your Curly template.
+
+
 Presenters
 ----------
 

data/curly-templates.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'curly-templates'
-  s.version           = '0.11.0'
-  s.date              = '2013-07-31'
+  s.version           = '0.12.0'
+  s.date              = '2013-12-03'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."

data/lib/curly.rb

@@ -26,7 +26,7 @@
 # See Curly::Presenter for more information on presenters.
 #
 module Curly
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 
   # Compiles a Curly template to Ruby code.
   #

data/lib/curly/scanner.rb

@@ -11,6 +11,9 @@ module Curly
   class Scanner
     CURLY_START = /\{\{/
     CURLY_END = /\}\}/
+
+    ESCAPED_CURLY_START = /\{\{\{/
+
     COMMENT_MARKER = /!/
 
     # Scans a Curly template for tokens.
@@ -45,7 +48,13 @@ module Curly
     # Returns a two-element Array, the first element being the Symbol type of
     #   the token and the second being the String value.
     def scan_token
-      scan_curly || scan_text
+      scan_escaped_curly || scan_curly || scan_text
+    end
+
+    def scan_escaped_curly
+      if @scanner.scan(ESCAPED_CURLY_START)
+        [:text, "{{"]
+      end
     end
 
     def scan_curly
@@ -99,7 +108,7 @@ module Curly
     end
 
     def scan_until_end_of_curly
-      if value = @scanner.scan_until(CURLY_END)     
+      if value = @scanner.scan_until(CURLY_END)
         value[0..-3]
       end
     end

data/lib/curly/template_handler.rb

@@ -19,6 +19,26 @@ class Curly::TemplateHandler
       end
     end
 
+    def cache_if_key_is_not_nil(context, presenter)
+      if key = presenter.cache_key
+        if presenter.class.respond_to?(:cache_key)
+          presenter_key = presenter.class.cache_key
+        else
+          presenter_key = nil
+        end
+
+        options = {
+          expires_in: presenter.cache_duration
+        }
+
+        context.cache([key, presenter_key].compact, options) do
+          yield
+        end
+      else
+        yield
+      end
+    end
+
     private
 
     def compile(template)
@@ -40,34 +60,16 @@ class Curly::TemplateHandler
       end
 
       presenter = #{presenter_class}.new(self, options.with_indifferent_access)
-
-      view_function = lambda do
-        #{source}
-      end
-
       presenter.setup!
 
-      if key = presenter.cache_key
-        @output_buffer = ActiveSupport::SafeBuffer.new
-
-        if #{presenter_class}.respond_to?(:cache_key)
-          presenter_key = #{presenter_class}.cache_key
-        else
-          presenter_key = nil
-        end
+      @output_buffer = output_buffer || ActiveSupport::SafeBuffer.new
 
-        options = {
-          expires_in: presenter.cache_duration
-        }
-
-        cache([key, presenter_key].compact, options) do
-          safe_concat(view_function.call)
-        end
-
-        @output_buffer
-      else
-        view_function.call.html_safe
+      Curly::TemplateHandler.cache_if_key_is_not_nil(self, presenter) do
+        result = #{source}
+        safe_concat(result)
       end
+
+      @output_buffer
       RUBY
     end
 

data/spec/scanner_spec.rb

@@ -41,6 +41,24 @@ describe Curly::Scanner, ".scan" do
     ]
   end
 
+  it "allows escaping Curly quotes" do
+    scan('foo {{{ bar').should == [
+      [:text, "foo "],
+      [:text, "{{"],
+      [:text, " bar"]
+    ]
+
+    scan('foo }} bar').should == [
+      [:text, "foo }} bar"]
+    ]
+
+    scan('foo {{{ lala! }} bar').should == [
+      [:text, "foo "],
+      [:text, "{{"],
+      [:text, " lala! }} bar"]
+    ]
+  end
+
   it "treats quotes as text" do
     scan('"').should == [
       [:text, '"']

data/spec/template_handler_spec.rb

@@ -47,6 +47,10 @@ describe Curly::TemplateHandler do
         @clock = 0
       end
 
+      def reset!
+        @output_buffer = ActiveSupport::SafeBuffer.new
+      end
+
       def advance_clock(duration)
         @clock += duration
       end
@@ -179,6 +183,7 @@ describe Curly::TemplateHandler do
 
   def output
     code = Curly::TemplateHandler.call(template)
+    context.reset!
     context.instance_eval(code)
   end
 end

metadata

@@ -1,22 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 0.11.0
-  prerelease: 
+  version: 0.12.0
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
     - - <
@@ -25,9 +23,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
     - - <
@@ -36,9 +33,8 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
     - - <
@@ -47,9 +43,8 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
     - - <
@@ -58,23 +53,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -82,7 +74,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,17 +81,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: genspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A view layer for your Rails apps that separates structure and logic.
@@ -139,29 +128,25 @@ files:
 homepage: https://github.com/zendesk/curly
 licenses:
 - apache2
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1896340551249669380
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 2
 summary: Free your views!