curly-templates 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb1dc47e32f2363e33bf4115534e745fc2eabd36
-  data.tar.gz: 11b280643f7a7aa455e574555a6a26420c2eeb45
+  metadata.gz: cdd7bc20cc76f95d2375221dcd42a0b195df7757
+  data.tar.gz: 3ad84f498e084560f579bbe91fde2684bbb7c53b
 SHA512:
-  metadata.gz: 863377bbaccc8028eb5d6adb6ab76b3184f87544bc584c2a12e296bf4b38790eca0e66f526356cb971e92ebfc9cabc77310aa42d6414fb0e52d84a0ea709f0a8
-  data.tar.gz: 5399c66c98a2065ebe1ee97c36d516c88a1d08d70c5924c07047aafd566084bcb1493ffc0a4a1836f11dbdf94be144dbcebeaa737c9b2fb4f073099eefb1cf3c
+  metadata.gz: 3998fc0caa17d607e4a13a3adc5bc17da44c6d8530d5c1910b273f16fca3ede99e352f2ddc44c318bda5040fa9a4f2b92eebb806f600b47679f937dcdd28c0f0
+  data.tar.gz: 126b53d760f5b3c10e99e16b219b7f76f9f842bbc289d4b9e4848d716fc5ba038796bc7f0bbffaa1af17a325fa8dfe8841855187675261b2136a2e44bc58f034

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ### Unreleased
 
+### Curly 2.3.1 (January 7, 2015)
+
+* Fix an issue with nested context blocks.
+
+  *Daniel Schierbeck*
+
+* Make `respond_to_missing?` work with presenter objects.
+
+  *Jeremy Rodi*
+
 ### Curly 2.3.0 (December 22, 2014)
 
 * Add support for Rails 4.2.

data/Gemfile

@@ -8,6 +8,6 @@ platform :ruby do
   gem 'redcarpet'
   gem 'github-markup'
   gem 'coveralls', require: false
-  gem 'rails', '~> 4.1.0', require: false
+  gem 'rails', '~> 4.2.0', require: false
   gem 'rspec-rails', require: false
 end

data/circle.yml

@@ -0,0 +1,9 @@
+machine:
+  ruby:
+    version: 2.1.5
+dependencies:
+  post:
+    - bundle install
+test:
+  override:
+    - bundle exec rspec

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.3.0'
-  s.date              = '2014-12-22'
+  s.version           = '2.3.1'
+  s.date              = '2015-01-07'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     Gemfile
     README.md
     Rakefile
+    circle.yml
     curly-templates.gemspec
     lib/curly-templates.rb
     lib/curly.rb
@@ -92,6 +93,7 @@ Gem::Specification.new do |s|
     spec/integration/collection_blocks_spec.rb
     spec/integration/context_blocks_spec.rb
     spec/integration/partials_spec.rb
+    spec/matchers/have_structure.rb
     spec/parser_spec.rb
     spec/presenter_spec.rb
     spec/scanner_spec.rb

data/lib/curly.rb

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

data/lib/curly/compiler.rb

@@ -65,6 +65,7 @@ module Curly
     def code
       <<-RUBY
         buffer = ActiveSupport::SafeBuffer.new
+        buffers = []
         presenters = []
         #{@parts.join("\n")}
         buffer
@@ -151,9 +152,10 @@ module Curly
 
       output <<-RUBY
         presenters << presenter
-        old_buffer, buffer = buffer, ActiveSupport::SafeBuffer.new
-        old_buffer << #{method_call} do |item|
+        buffers << buffer
+        buffer << #{method_call} do |item|
           options = options.merge("#{name}" => item)
+          buffer = ActiveSupport::SafeBuffer.new
           presenter = #{item_presenter_class}.new(self, options)
       RUBY
 
@@ -162,8 +164,9 @@ module Curly
       @presenter_classes.pop
 
       output <<-RUBY
+          buffer
         end
-        buffer = old_buffer
+        buffer = buffers.pop
         presenter = presenters.pop
       RUBY
     end

data/lib/curly/presenter.rb

@@ -307,5 +307,10 @@ module Curly
     def method_missing(method, *args, &block)
       @_context.public_send(method, *args, &block)
     end
+
+    # Tells ruby (and developers) what methods we can accept.
+    def respond_to_missing?(method, include_private = false)
+      @_context.respond_to?(method, false)
+    end
   end
 end

data/spec/compiler/context_blocks_spec.rb

@@ -19,8 +19,18 @@ describe Curly::Compiler do
     Class.new(Curly::Presenter) do
       presents :form
 
-      def text
-        @form.upcase
+      def text_field(&block)
+        block.call(@form)
+      end
+    end
+  end
+
+  let(:inner_context_presenter_class) do
+    Class.new(Curly::Presenter) do
+      presents :text_field
+
+      def field
+        %(<input type="text" value="#{@text_field.upcase}">).html_safe
       end
     end
   end
@@ -30,10 +40,11 @@ describe Curly::Compiler do
 
   before do
     stub_const("FormPresenter", context_presenter_class)
+    stub_const("TextFieldPresenter", inner_context_presenter_class)
   end
 
   it "compiles context blocks" do
-    evaluate('{{@form}}{{text}}{{/form}}').should == '<form>YO</form>'
+    evaluate('{{@form}}{{@text_field}}{{field}}{{/text_field}}{{/form}}').should == '<form><input type="text" value="YO"></form>'
   end
 
   it "fails if the component is not a context block" do

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

@@ -3,3 +3,5 @@
     <b>{{label}}</b> {{input}}
   {{/name_field}}
 {{/form}}
+
+<p>Thank you!</p>

data/spec/integration/context_blocks_spec.rb

@@ -1,20 +1,23 @@
 require 'spec_helper'
+require 'matchers/have_structure'
 
 describe "Context blocks", type: :request do
   example "A context block" do
     get '/new'
 
-    response.body.should == <<-HTML.strip_heredoc
+    response.body.should have_structure <<-HTML.strip_heredoc
       <html>
       <head>
         <title>Dummy app</title>
       </head>
       <body>
-      <form accept-charset="UTF-8" action="/new" method="post"><div style="display:none"><input name="utf8" type="hidden" value="&#x2713;" /></div>
+      <form accept-charset="UTF-8" action="/new" method="post"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="field">
           <b>Name</b> <input id="dashboard_name" name="dashboard[name]" type="text" value="test" />
         </div>
       </form>
+
+      <p>Thank you!</p>
       </body>
       </html>
     HTML

data/spec/matchers/have_structure.rb

@@ -0,0 +1,29 @@
+require 'rspec/expectations'
+require 'nokogiri'
+
+RSpec::Matchers.define(:have_structure) do |expected|
+  match do |actual|
+    normalized(actual).should == normalized(expected)
+  end
+
+  failure_message_for_should do |actual|
+    "Expected\n\n#{actual}\n\n" \
+      "to have the same structure as\n\n#{expected}"
+  end
+
+  failure_message_for_should_not do |actual|
+    "Expected\n\n#{actual}\n\n" \
+      "to NOT have the same canonicalized structure as\n\n#{expected}"
+  end
+
+  def normalized(text)
+    document = Nokogiri::XML("<snippet>#{text}</snippet>")
+    document.traverse do |node|
+      node.content = node.text.strip if node.text?
+    end
+
+    document.canonicalize do |node, parent|
+      !(node.text? && node.text.empty?)
+    end
+  end
+end

data/spec/presenter_spec.rb

@@ -56,6 +56,26 @@ describe Curly::Presenter do
     end
   end
 
+  describe "#method_missing" do
+    let(:context) { double("context") }
+    subject {
+      CircusPresenter.new(context,
+        midget: "Meek Harolson",
+        clown: "Bubbles")
+    }
+
+    it "delegates calls to the context" do
+      context.should receive(:undefined).once
+      subject.undefined
+    end
+
+    it "allows method calls on context-defined methods" do
+      context.should receive(:respond_to?).
+        with(:undefined, false).once.and_return(true)
+      subject.method(:undefined)
+    end
+  end
+
   describe ".presenter_for_path" do
     it "returns the presenter class for the given path" do
       presenter = double("presenter")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -103,6 +103,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- circle.yml
 - curly-templates.gemspec
 - lib/curly-templates.rb
 - lib/curly.rb
@@ -162,6 +163,7 @@ files:
 - spec/integration/collection_blocks_spec.rb
 - spec/integration/context_blocks_spec.rb
 - spec/integration/partials_spec.rb
+- spec/matchers/have_structure.rb
 - spec/parser_spec.rb
 - spec/presenter_spec.rb
 - spec/scanner_spec.rb