breezy_template 0.2.0 → 0.3.0

data/lib/breezy_template/search_extension.rb

@@ -1,4 +1,6 @@
-module BreezyTemplate
+require 'breezy_template/breezy_template'
+
+class BreezyTemplate
   module SearchExtension
     def found!
       found = @found
@@ -67,7 +69,6 @@ module BreezyTemplate
     def set!(key, value = BLANK, *args)
       return if @found
       options = args.first || {}
-      options = _normalize_options(options)
 
       if @search_path && !@search_path.empty?
         if key.to_s == @search_path.first
@@ -80,7 +81,6 @@ module BreezyTemplate
               yield self
             elsif _partial_options?(options)
               without_track = args.dup
-              # without_track.first.delete(:track)
               super(key, value, *without_track)
             else
               ::Kernel.raise 'This should not happen'

data/test/dependency_tracker_test.rb

@@ -1,66 +1,82 @@
 # # taken from jbuilder's jbuilder_dependency_tracker_test.rb
 #
-# require 'test_helper'
-# require 'breezy_template/dependency_tracker'
-# require 'mocha'
-#
-# class FakeTemplate
-#   attr_reader :source, :handler
-#   def initialize(source, handler = :jbuilder)
-#     @source, @handler = source, handler
-#   end
-# end
-#
-#
-# class BreezyTemplateDependencyTrackerTest < ActiveSupport::TestCase
-#   def make_tracker(name, source)
-#     template = FakeTemplate.new(source)
-#     BreezyTemplate::DependencyTracker.new(name, template)
-#   end
-#
-#   def track_dependencies(source)
-#     make_tracker('breezy_template', source).dependencies
-#   end
-#
-#   test 'jbuilder direct partial! feature are not allowed' do
-#     dependencies = track_dependencies <<-RUBY
-#       json.partial! 'path/to/partial', foo: bar
-#       json.partial! 'path/to/another/partial', :fizz => buzz
-#     RUBY
-#
-#     assert_equal [], dependencies
-#   end
-#
-#   test 'detects partial with options (1.9 style)' do
-#     dependencies = track_dependencies <<-RUBY
-#       json.content hello: 'world', partial: 'path/to/partial', foo: :bar
-#     RUBY
-#
-#     assert_equal %w[path/to/partial], dependencies
-#   end
-#
-#   test 'detects partial with options (1.8 style)' do
-#     dependencies = track_dependencies <<-RUBY
-#       json.content :hello => 'world', :partial => 'path/to/partial', :foo => :bar
-#     RUBY
-#
-#     assert_equal %w[path/to/partial], dependencies
-#   end
-#
-#   test 'detects partial in indirect collecton calls' do
-#     dependencies = track_dependencies <<-RUBY
-#       json.comments @post.comments, partial: 'comments/comment', as: :comment
-#     RUBY
-#
-#     assert_equal %w[comments/comment], dependencies
-#   end
-#
-#   test 'detects explicit depedency' do
-#     dependencies = track_dependencies <<-RUBY
-#       # Template Dependency: path/to/partial
-#       json.foo 'bar'
-#     RUBY
-#
-#     assert_equal %w[path/to/partial], dependencies
-#   end
-# end
+require 'test_helper'
+require 'breezy_template/dependency_tracker'
+require 'mocha'
+
+class FakeTemplate
+  attr_reader :source, :handler
+  def initialize(source, handler = :jbuilder)
+    @source, @handler = source, handler
+  end
+end
+
+
+class BreezyTemplateDependencyTrackerTest < ActiveSupport::TestCase
+  def make_tracker(name, source)
+    template = FakeTemplate.new(source)
+    BreezyTemplate::DependencyTracker.new(name, template)
+  end
+
+  def track_dependencies(source)
+    make_tracker('breezy_template', source).dependencies
+  end
+
+  test 'jbuilder direct partial! feature are not allowed' do
+    dependencies = track_dependencies <<-RUBY
+      json.partial! 'path/to/partial', foo: bar
+      json.partial! 'path/to/another/partial', :fizz => buzz
+    RUBY
+
+    assert_equal [], dependencies
+  end
+
+  test 'detects partial with no options (1.9 style)' do
+    dependencies = track_dependencies <<-RUBY
+      json.content hello: 'world', partial: 'path/to/partial'
+    RUBY
+
+    assert_equal %w[path/to/partial], dependencies
+  end
+
+  test 'detects partial with no options (1.8 style)' do
+    dependencies = track_dependencies <<-RUBY
+      json.content :hello => 'world', :partial => 'path/to/partial'
+    RUBY
+
+    assert_equal %w[path/to/partial], dependencies
+  end
+
+  test 'detects partial with options (1.9 style)' do
+    dependencies = track_dependencies <<-RUBY
+      json.content hello: 'world', partial: ['path/to/partial', foo: :bar]
+    RUBY
+
+    assert_equal %w[path/to/partial], dependencies
+  end
+
+  test 'detects partial with options (1.8 style)' do
+    dependencies = track_dependencies <<-RUBY
+      json.content :hello => 'world', :partial => ['path/to/partial', :foo => :bar]
+    RUBY
+
+    assert_equal %w[path/to/partial], dependencies
+  end
+
+  test 'detects partial in indirect collecton calls' do
+    dependencies = track_dependencies <<-RUBY
+      json.comments @post.comments, partial: ['comments/comment', as: :comment]
+    RUBY
+
+    assert_equal %w[comments/comment], dependencies
+  end
+
+  test 'detects explicit depedency' do
+    dependencies = track_dependencies <<-RUBY
+      # Template Dependency: path/to/partial
+      json.foo 'bar'
+    RUBY
+
+    assert_equal %w[path/to/partial], dependencies
+  end
+end

data/test/{breezy_template_test.rb → extensions_test.rb}

@@ -297,7 +297,7 @@ class BreezyTemplateTest < ActionView::TestCase
     Rails.cache.clear
 
     result = jbuild(<<-JBUILDER)
-      json.post @post, partial: "blog_post", as: :blog_post, joint: :header
+      json.post @post, partial: ["blog_post", as: :blog_post, joint: :header]
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -317,6 +317,58 @@ class BreezyTemplateTest < ActionView::TestCase
     assert_equal expected, result
   end
 
+  test "renders a partial with implicit joint" do
+    result = jbuild(<<-JBUILDER)
+      json.footer nil, partial: ["footer", joint: true]
+    JBUILDER
+
+    expected = strip_format(<<-JS)
+      (function(){
+        var joints={};
+        var cache={};
+        var defers=[];
+        joints['footer'] ||= []; joints['footer'].push('footer');
+        return ({"data":{"footer":{"terms":"You agree"}},"joints":joints,"defers":defers});
+      })()
+    JS
+    assert_equal expected, result
+  end
+
+  test "renders a partial with explicit joint" do
+    result = jbuild(<<-JBUILDER)
+      json.footer nil, partial: ["footer", joint: 'hello']
+    JBUILDER
+
+    expected = strip_format(<<-JS)
+      (function(){
+        var joints={};
+        var cache={};
+        var defers=[];
+        joints['hello'] ||= []; joints['hello'].push('footer');
+        return ({"data":{"footer":{"terms":"You agree"}},"joints":joints,"defers":defers});
+      })()
+    JS
+    assert_equal expected, result
+  end
+
+  test "render array of partials with unique joints" do
+    result = jbuild(<<-JBUILDER)
+      json.array! [1,2], partial: ["footer", joint: ->(x){"somefoo"+x.to_s}]
+    JBUILDER
+
+    expected = strip_format(<<-JS)
+      (function(){
+        var joints={};
+        var cache={};
+        var defers=[];
+        joints['somefoo1'] ||= []; joints['somefoo1'].push('0');joints['somefoo2'] ||= []; joints['somefoo2'].push('1');
+        return ({"data":[{"terms":"You agree"},{"terms":"You agree"}],"joints":joints,"defers":defers});
+      })()
+    JS
+
+    assert_equal expected, result
+  end
+
   test "renders a partial with no locals" do
     result = jbuild(<<-JBUILDER)
       json.footer nil, partial: "footer"
@@ -335,7 +387,7 @@ class BreezyTemplateTest < ActionView::TestCase
 
   test "renders a partial with locals" do
     result = jbuild(<<-JBUILDER)
-      json.profile nil, partial: "profile", locals: {email: "test@test.com"}
+      json.profile nil, partial: ["profile", locals: {email: "test@test.com"}]
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -351,8 +403,11 @@ class BreezyTemplateTest < ActionView::TestCase
 
   test "renders a partial with locals and caches" do
     result = jbuild(<<-JBUILDER)
-      json.wrap! :cache, 'cachekey'
-      json.profile 32, partial: "profile", locals: {email: "test@test.com"}
+      opts = {
+        cache: 'cachekey',
+        partial: ["profile", locals: {email: "test@test.com"}]
+      }
+      json.profile 32, opts
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -370,7 +425,7 @@ class BreezyTemplateTest < ActionView::TestCase
 
   test "renders a partial even without a :as to the value, this usage is rare" do
     result = jbuild(<<-JBUILDER)
-      json.profile 32, partial: "profile", locals: {email: "test@test.com"}
+      json.profile 32, partial: ["profile", locals: {email: "test@test.com"}]
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -404,8 +459,7 @@ class BreezyTemplateTest < ActionView::TestCase
 
   test "render array of partials without an :as to a member and cache" do
     result = jbuild(<<-JBUILDER)
-      json.wrap! :cache, ->(i){ ['a', i] }
-      json.array! [1,2], partial: "footer"
+      json.array! [1,2], partial: "footer", cache: ->(i){ ['a', i] }
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -424,7 +478,7 @@ class BreezyTemplateTest < ActionView::TestCase
 
   test "render array of partials" do
     result = jbuild(<<-JBUILDER)
-      json.array! BLOG_POST_COLLECTION, partial: "blog_post", as: :blog_post
+      json.array! BLOG_POST_COLLECTION, partial: ["blog_post", as: :blog_post]
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -452,7 +506,7 @@ class BreezyTemplateTest < ActionView::TestCase
 
   test "renders array of partials as empty array with nil-collection" do
     result = jbuild(<<-JBUILDER)
-      json.array! nil, partial: "blog_post", as: :blog_post
+      json.array! nil, partial: ["blog_post", as: :blog_post]
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -487,8 +541,10 @@ class BreezyTemplateTest < ActionView::TestCase
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
 
     result = jbuild(<<-JBUILDER)
-      json.wrap! :cache, ['b', 'c']
-      json.hello 32
+      opts = {
+        cache: [['b', 'c']]
+      }
+      json.hello 32, opts
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -509,8 +565,10 @@ class BreezyTemplateTest < ActionView::TestCase
 
     result = jbuild(<<-JBUILDER)
       json.hello do
-        json.wrap! :cache, ->(i){ ['a', i] }
-        json.array! [4,5] do |x|
+        opts = {
+          cache: ->(i){ ['a', i] }
+        }
+        json.array! [4,5], opts do |x|
           json.top "hello" + x.to_s
         end
       end
@@ -534,14 +592,11 @@ class BreezyTemplateTest < ActionView::TestCase
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
 
     result = jbuild(<<-JBUILDER)
-      json.wrap! :cache, ['a', 'b']
-      json.hello do
-        json.wrap! :cache, ['d', 'z']
-        json.content  do
+      json.hello cache: [['a', 'b']] do
+        json.content cache: [['d', 'z']] do
           json.subcontent 'inner'
         end
-        json.wrap! :cache, ['e', 'z']
-        json.other do
+        json.other cache: [['e', 'z']] do
           json.subcontent 'other'
         end
       end
@@ -612,15 +667,15 @@ class BreezyTemplateTest < ActionView::TestCase
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
 
     jbuild(<<-JBUILDER)
-      json.wrap! :cache, ['cachekey']
-      json.post do
+      opts = {cache: ['cachekey']}
+      json.post opts do
         json.name "Cache"
       end
     JBUILDER
 
     result = jbuild(<<-JBUILDER)
-      json.wrap! :cache, ['cachekey']
-      json.post do
+      opts = {cache: ['cachekey']}
+      json.post opts do
         json.name "Miss"
       end
     JBUILDER
@@ -642,8 +697,7 @@ class BreezyTemplateTest < ActionView::TestCase
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
 
     result = jbuild <<-JBUILDER
-      json.wrap! :cache, "cachekey"
-      json.content do
+      json.content cache: "cachekey" do
         json.array! %w[a b c]
       end
     JBUILDER
@@ -674,8 +728,7 @@ class BreezyTemplateTest < ActionView::TestCase
     @context.expects :fragment_name_with_digest
 
     jbuild <<-JBUILDER
-      json.wrap! :cache, 'cachekey'
-      json.content do
+      json.content cache: 'cachekey' do
         json.name "Cache"
       end
     JBUILDER
@@ -688,36 +741,34 @@ class BreezyTemplateTest < ActionView::TestCase
     ActiveSupport::Cache.expects :expand_cache_key
 
     jbuild <<-JBUILDER
-      json.wrap! :cache, 'cachekey'
-      json.content do
+      json.content cache: 'cachekey' do
         json.name "Cache"
       end
     JBUILDER
   end
 
-  test "current cache digest option accepts options through the last element hash" do
-    undef_context_methods :fragment_name_with_digest
-
-    @context.expects(:cache_fragment_name)
-      .with("cachekey", skip_digest: true)
-      .returns("cachekey")
-
-    ActiveSupport::Cache.expects :expand_cache_key
-
-    jbuild <<-JBUILDER
-      json.wrap! :cache, 'cachekey', skip_digest: true
-      json.content do
-        json.name "Cache"
-      end
-    JBUILDER
-  end
+  # test "current cache digest option accepts options through the last element hash" do
+  #   undef_context_methods :fragment_name_with_digest
+  #
+  #   @context.expects(:cache_fragment_name)
+  #     .with("cachekey", skip_digest: true)
+  #     .returns("cachekey")
+  #
+  #   ActiveSupport::Cache.expects :expand_cache_key
+  #
+  #   jbuild <<-JBUILDER
+  #     json.wrap! :cache, 'cachekey', skip_digest: true
+  #     json.content do
+  #       json.name "Cache"
+  #     end
+  #   JBUILDER
+  # end
 
   test "does not perform caching when controller.perform_caching is false" do
     controller.perform_caching = false
 
     result = jbuild <<-JBUILDER
-      json.wrap! :cache, 'cachekey'
-      json.content do
+      json.content cache: 'cachekey' do
         json.name "Cache"
       end
     JBUILDER
@@ -738,8 +789,7 @@ class BreezyTemplateTest < ActionView::TestCase
     @post = BLOG_POST_COLLECTION.first
 
     result = jbuild(<<-JBUILDER)
-      json.wrap! :cache, ['a', 'b']
-      json.post @post, partial: "blog_post", as: :blog_post
+      json.post @post, partial: ["blog_post", as: :blog_post], cache: [['a', 'b']]
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -762,13 +812,21 @@ class BreezyTemplateTest < ActionView::TestCase
     @miss = BlogPost.new(2, "miss", "John Smith")
 
     cat =  jbuild(<<-JBUILDER)
-      json.wrap! :cache, ['a', 'b']
-      json.post @hit, partial: "blog_post", as: :blog_post
+      opts = {
+        cache: [['a', 'b']],
+        partial: ["blog_post", as: :blog_post]
+      }
+
+      json.post @hit, opts
     JBUILDER
 
     result = jbuild(<<-JBUILDER)
-      json.wrap! :cache, ['a', 'b']
-      json.post @miss, partial: "blog_post", as: :blog_post
+      opts = {
+        cache: [['a', 'b']],
+        partial: ["blog_post", as: :blog_post]
+      }
+
+      json.post @miss, opts
     JBUILDER
 
     expected = strip_format(<<-JS)
@@ -787,8 +845,11 @@ class BreezyTemplateTest < ActionView::TestCase
 
   test "render array of partials and caches" do
     result = jbuild(<<-JBUILDER)
-      json.wrap! :cache, ->(d){ ['a', d.id] }
-      json.array! BLOG_POST_COLLECTION, partial: "blog_post", as: :blog_post
+      opts = {
+        cache: (->(d){ ['a', d.id] }),
+        partial: ["blog_post", as: :blog_post]
+      }
+      json.array! BLOG_POST_COLLECTION, opts
     JBUILDER
     Rails.cache.clear
 
@@ -929,8 +990,7 @@ class BreezyTemplateTest < ActionView::TestCase
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
     result = jbuild(<<-JBUILDER, breezy_filter: 'hit.hit2')
       json.hit do
-        json.wrap! :cache, ['a']
-        json.hit2 do
+        json.hit2 cache: 'a' do
           json.greeting 'hello world'
         end
       end
@@ -955,14 +1015,14 @@ class BreezyTemplateTest < ActionView::TestCase
   test "filtering for a node of a AR relation in a tree by id via an appended where clause" do
     result = jbuild(<<-JBUILDER, breezy_filter: 'hit.hit2.id=1')
       post = Post.create
-      post.comments.create title: 'first'
-      post.comments.create title: 'second'
+      post.notes.create title: 'first'
+      post.notes.create title: 'second'
 
-      post.comments.expects(:where).once().with('id'=>1).returns([{id: 1, title: 'first'}])
+      post.notes.expects(:where).once().with('id'=>1).returns([{id: 1, title: 'first'}])
 
       json.hit do
         json.hit2 do
-          json.array! post.comments do |x|
+          json.array! post.notes do |x|
             raise 'this should be be called' if x[:title] == 'second'
             json.title x[:title]
           end
@@ -989,15 +1049,15 @@ class BreezyTemplateTest < ActionView::TestCase
   test "filtering for a node of a AR relation in a tree by index via an appended where clause" do
     result = jbuild(<<-JBUILDER, breezy_filter: 'hit.hit2.0')
       post = Post.create
-      post.comments.create title: 'first'
-      post.comments.create title: 'second'
+      post.notes.create title: 'first'
+      post.notes.create title: 'second'
 
-      offset = post.comments.offset(0)
-      post.comments.expects(:offset).once().with(0).returns(offset)
+      offset = post.notes.offset(0)
+      post.notes.expects(:offset).once().with(0).returns(offset)
 
       json.hit do
         json.hit2 do
-          json.array! post.comments do |x|
+          json.array! post.notes do |x|
             raise 'this should be be called' if x[:title] == 'second'
             json.title x[:title]
           end
@@ -1080,8 +1140,7 @@ class BreezyTemplateTest < ActionView::TestCase
 
     result = jbuild(<<-JBUILDER, request: req)
       json.hit do
-        json.wrap! :defer, :auto
-        json.hit2 do
+        json.hit2(defer: :auto)do
           json.hit3 do
             json.greeting 'hello world'
           end
@@ -1111,8 +1170,7 @@ class BreezyTemplateTest < ActionView::TestCase
 
     result = jbuild(<<-JBUILDER, request: req)
       json.hit do
-        json.wrap! :defer, :manual
-        json.hit2 do
+        json.hit2 defer: :manual do
           json.hit3 do
             json.greeting 'hello world'
           end
@@ -1144,8 +1202,7 @@ class BreezyTemplateTest < ActionView::TestCase
         json.hit2 do
           data = [{id: 1, name: 'foo'}, {id: 2, name: 'bar'}]
           json.array! data, key: :id do
-            json.wrap! :defer, :auto
-            json.greeting do
+            json.greeting defer: :auto do
               json.gree 'hi'
             end
           end
@@ -1174,7 +1231,6 @@ class BreezyTemplateTest < ActionView::TestCase
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
 
     result = jbuild(<<-JBUILDER)
-      json.wrap! :defer, :auto
       json.hello(32, defer: :auto)
     JBUILDER
 
@@ -1193,7 +1249,6 @@ class BreezyTemplateTest < ActionView::TestCase
   test 'deferment is disabled when filtering by keypath' do
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
     result = jbuild(<<-JBUILDER, breezy_filter: 'hello.world')
-      json.wrap! :defer, :auto
       json.hello defer: :auto do
         json.world 32
       end
@@ -1215,10 +1270,8 @@ class BreezyTemplateTest < ActionView::TestCase
   test 'deferment is enabled at the end of a keypath when filtering' do
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
     result = jbuild(<<-JBUILDER, breezy_filter: 'hello')
-      json.wrap! :defer, :auto
       json.hello do
-        json.wrap! :defer, :auto
-        json.content do
+        json.content defer: :auto do
           json.world 32
         end
       end