curly-templates 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a7d8e10aa960fd5bea29bd1be907a8da9ac42b7
-  data.tar.gz: 168ddd1df204565e509efc6a51c2bc1836de56f2
+  metadata.gz: c88276c903b21a344ef66730915ad49c862b6b74
+  data.tar.gz: e302028fc3a83e6f39c83ed30d129f432888cb35
 SHA512:
-  metadata.gz: d29a5cb46eda27d7582aecf94eb184178d02be0acbb4549fe5448c753a9d129be1563db0878f44caa9ca999411caec5cae7454b96feb2ce684f41896560ece1b
-  data.tar.gz: a96a20ef10b8e5307086b670beac0bdd351d53ae23317ac079bb2edd9f3b6af383b2cb7138881c3f4611257fe567bda75781a200cb1d3c090f52f87b663b361e
+  metadata.gz: 317419189ff20063face87bb7845da75c4f37e85f60188a745cba7d4079cfdaeb0df3b53f554684a5a611c75af2ff204a06251f6ec718cfe9c8d57cf0180c3dc
+  data.tar.gz: 1a437609e0dd076bf321d430cb43316424b5ca1adeb3ad9704567041d42dc26012fa2161dff8bad804d969fc4c514c878f7a3e9e5a7d98e232142d3358afa45a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ### Unreleased
 
+### Curly 2.1.1 (November 12, 2014)
+
+* Fix a bug where a parent presenter's parameters were not being passed to the
+  child presenter when using context blocks.
+
+  *Daniel Schierbeck*
+
 ### Curly 2.1.0 (November 6, 2014)
 
 * Add support for [context blocks](https://github.com/zendesk/curly#context-blocks).

data/README.md

@@ -1,23 +1,9 @@
 Curly
 =======
 
-Free your views!
-
 Curly is a template language that completely separates structure and logic.
 Instead of interspersing your HTML with snippets of Ruby, all logic is moved
-to a presenter class, with only simple placeholders in the HTML.
-
-While the basic concepts are very similar to [Mustache](http://mustache.github.com/)
-or [Handlebars](http://handlebarsjs.com/), Curly is different in some key ways:
-
-- Instead of the template controlling the variable scope and looping through
-  data, all logic is left to the presenter object. This means that untrusted
-  templates can safely be executed, making Curly a possible alternative to
-  languages like [Liquid](http://liquidmarkup.org/).
-- Instead of implementing its own template resolution mechanism, Curly hooks
-  directly into Rails, leveraging the existing resolvers.
-- Because of its close integration with Rails, with Curly you can easily set
-  up caching for your views and partials.
+to a presenter class.
 
 
 ### Table of Contents

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           = '2.1.0'
-  s.date              = '2014-11-06'
+  s.version           = '2.1.1'
+  s.date              = '2014-11-12'
 
   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 = "2.1.0"
+  VERSION = "2.1.1"
 
   # Compiles a Curly template to Ruby code.
   #

data/lib/curly/compiler.rb

@@ -103,8 +103,8 @@ module Curly
         presenters << presenter
         items = Array(#{method_call})
         items.each_with_index do |item, index|
-          item_options = options.merge(:#{name} => item, :#{counter} => index + 1)
-          presenter = #{item_presenter_class}.new(self, item_options.with_indifferent_access)
+          options = options.merge("#{name}" => item, "#{counter}" => index + 1)
+          presenter = #{item_presenter_class}.new(self, options)
       RUBY
 
       @presenter_classes.push(item_presenter_class)
@@ -153,8 +153,8 @@ module Curly
         presenters << presenter
         old_buffer, buffer = buffer, ActiveSupport::SafeBuffer.new
         old_buffer << #{method_call} do |item|
-          item_options = options.merge(:#{name} => item)
-          presenter = #{item_presenter_class}.new(self, item_options.with_indifferent_access)
+          options = options.merge("#{name}" => item)
+          presenter = #{item_presenter_class}.new(self, options)
       RUBY
 
       @presenter_classes.push(item_presenter_class)

data/lib/curly/presenter.rb

@@ -44,6 +44,8 @@ module Curly
     #
     def initialize(context, options = {})
       @_context = context
+      options.stringify_keys!
+
       self.class.presented_names.each do |name|
         value = options.fetch(name) do
           default_values.fetch(name) do
@@ -263,11 +265,11 @@ module Curly
       def presents(*args)
         options = args.extract_options!
 
-        self.presented_names += args
+        self.presented_names += args.map(&:to_s)
 
         if options.key?(:default)
           default_values = args.each_with_object(Hash.new) do |arg, hash|
-            hash[arg] = options.fetch(:default)
+            hash[arg.to_s] = options.fetch(:default)
           end
 
           self.default_values = self.default_values.merge(default_values)

data/lib/curly/template_handler.rb

@@ -59,7 +59,7 @@ class Curly::TemplateHandler
         options = local_assigns
       end
 
-      presenter = ::#{presenter_class}.new(self, options.with_indifferent_access)
+      presenter = ::#{presenter_class}.new(self, options)
       presenter.setup!
 
       @output_buffer = output_buffer || ActiveSupport::SafeBuffer.new

data/spec/compiler/collections_spec.rb

@@ -72,7 +72,7 @@ describe Curly::Compiler do
 
   let(:list) { double("list", title: "Inventory") }
   let(:context) { double("context") }
-  let(:presenter) { presenter_class.new(context, list: list) }
+  let(:presenter) { presenter_class.new(context, "list" => list) }
 
   before do
     stub_const("ItemPresenter", inner_presenter_class)

data/spec/dummy/app/presenters/dashboards/item_presenter.rb

@@ -8,4 +8,16 @@ class Dashboards::ItemPresenter < Curly::Presenter
   def name
     @name
   end
+
+  def subitems
+    %w[1 2 3]
+  end
+
+  class SubitemPresenter < Curly::Presenter
+    presents :item, :subitem
+
+    def name
+      @subitem
+    end
+  end
 end

data/spec/dummy/app/presenters/dashboards/new_presenter.rb

@@ -8,12 +8,22 @@ class Dashboards::NewPresenter < Curly::Presenter
   class FormPresenter < Curly::Presenter
     presents :form, :name
 
-    def name_label
-      "Name"
+    def name_field(&block)
+      content_tag :div, class: "field" do
+        block.call
+      end
     end
 
-    def name_input
-      @form.text_field :name, value: @name
+    class NameFieldPresenter < Curly::Presenter
+      presents :form, :name
+
+      def label
+        "Name"
+      end
+
+      def input
+        @form.text_field :name, value: @name
+      end
     end
   end
 end

data/spec/dummy/app/views/dashboards/collection.html.curly

@@ -1,5 +1,8 @@
 <ul>
 {{*items}}
   <li>{{item}}</li>
+  <ul>
+    {{*subitems}}<li>{{name}}</li>{{/subitems}}
+  </ul>
 {{/items}}
 </ul>

data/spec/dummy/app/views/dashboards/new.html.curly

@@ -1,3 +1,5 @@
 {{@form}}
-  <b>{{name_label}}</b> {{name_input}}
+  {{@name_field}}
+    <b>{{label}}</b> {{input}}
+  {{/name_field}}
 {{/form}}

data/spec/integration/collection_blocks_spec.rb

@@ -13,10 +13,19 @@ describe "Collection blocks", type: :request do
       <ul>
 
         <li>uno</li>
+        <ul>
+          <li>1</li><li>2</li><li>3</li>
+        </ul>
 
         <li>dos</li>
+        <ul>
+          <li>1</li><li>2</li><li>3</li>
+        </ul>
 
         <li>tres!</li>
+        <ul>
+          <li>1</li><li>2</li><li>3</li>
+        </ul>
 
       </ul>
 

data/spec/integration/context_blocks_spec.rb

@@ -11,9 +11,10 @@ describe "Context blocks", type: :request do
       </head>
       <body>
       <form accept-charset="UTF-8" action="/new" method="post"><div style="display:none"><input name="utf8" type="hidden" value="&#x2713;" /></div>
-        <b>Name</b> <input id="dashboard_name" name="dashboard[name]" type="text" value="test" />
+        <div class="field">
+          <b>Name</b> <input id="dashboard_name" name="dashboard[name]" type="text" value="test" />
+        </div>
       </form>
-
       </body>
       </html>
     HTML

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack