breezy_template 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd735e59d268c9b87e7bc62528a0a5fb848a23c0
-  data.tar.gz: 4064dde7ecda53a3c53564e04001d59389f5e6d5
+  metadata.gz: '098563fc3e08c7eaa01b1dc73cb551ebf4ff8cf7'
+  data.tar.gz: cecb85dfa8df05ba1b4696023382842d55fc767a
 SHA512:
-  metadata.gz: a538e32972a47d82750036f7163c447dd68a964878c591a52f9a16f6ab3cd9693638cd23af36496e61b951bd7e848f9ed9881a274cda3557da9d55813a54b9e0
-  data.tar.gz: 334ff1aa1d34964f882e2ad8b10e91a534edcd934e7ec63c8b7229ce7844bf4429a8675a5f16c7e7473f7db757f8955ca7a22f1c2e960c996c4dea55828e540f
+  metadata.gz: 86749c4dcba84969e0c6171250eb37df44a9b8840e09bbf2d15af538bdc473cf824935f7eaae52b80163552bec2166b61300c615598af39092834b6d9ecfc4b1
+  data.tar.gz: 7b5ab237cba0e99707fe76fd6a5ad069dd1ee186cc85101a3557e67577c9f57acdaf613627356abfac2421864971518c335f12b5c79fa21e8ca2b1887eeb7fcc

data/lib/breezy_template.rb

@@ -17,7 +17,7 @@ require 'breezy_template/search_extension'
 require 'digest/md5'
 require 'action_view'
 require 'active_support'
-require 'multi_json'
+require 'json'
 require 'ostruct'
 
 class BreezyTemplate
@@ -49,7 +49,7 @@ class BreezyTemplate
     yield self if ::Kernel.block_given?
   end
 
-    # Yields a builder and automatically turns the result into a JSON string
+  # Yields a builder and automatically turns the result into a JSON string
   def self.encode(*args, &block)
     new(*args, &block).target!
   end
@@ -63,13 +63,8 @@ class BreezyTemplate
     else
       if _is_collection?(value) && !args.last.is_a?(::Hash)
         _scope{ array! value, *args }
-      # elsif args.empty?
-      #   _result(value, *args)
-      # elsif !args.last.is_a? ::Hash
-      #   _merge_block(key){ extract! value, *args }
       else
         _result(value, *args)
-        # value
       end
     end
 
@@ -144,7 +139,7 @@ class BreezyTemplate
       collection.to_a
     end
 
-    merge! array #remove this depednacy
+    merge! array
   end
 
   def extract!(object, *attributes)
@@ -155,14 +150,6 @@ class BreezyTemplate
     end
   end
 
-  # def call(object, *attributes)
-  #   if ::Kernel.block_given?
-  #     array! object, &::Proc.new
-  #   else
-  #     extract! object, *attributes
-  #   end
-  # end
-
   # Returns the nil JSON.
   def nil!
     @attributes = nil
@@ -276,10 +263,8 @@ class BreezyTemplate
   end
 
   def _args_for_set_with_block(*args)
-    # return args
     key = args[0]
-    # #todo: check this
-    # #
+
     if ::Hash === args[1] && _extended_options?(args[1])
       options = args[1]
       [key, BLANK, options]
@@ -290,16 +275,6 @@ class BreezyTemplate
 
   def _args_for_set(*args)
     return args
-    # if args.length >= 3
-    #   return args
-    #   # key, value, options = args
-    #   #
-    #   # [key, value, options]
-    # else
-    #   key, value = args
-    #
-    #   [key, value]
-    # end
   end
 
   def _extended_options?(value)
@@ -311,7 +286,7 @@ class BreezyTemplate
   end
 
   def _dump(value)
-    ::MultiJson.dump(value)
+    ::JSON.dump(value)
   end
 
   def _logger

data/lib/breezy_template/digestor.rb

@@ -4,28 +4,10 @@ require 'action_view/digestor'
 
 class BreezyTemplate
   module PartialDigestor
-    if ::Rails.version >= '5.0'
-      def _partial_digestor(options)
-        name = options[:name]
-        finder = options[:finder]
-        ::ActionView::Digestor.digest(name: name, finder: finder)
-      end
-    elsif ::Rails.version >= '4.1'
-      def _partial_digestor(options)
-        name = options[:name]
-        finder = options[:finder]
-        ::ActionView::PartialDigestor.new(name: name, finder: finder).digest
-      end
-    elsif ::Rails.version >= '4.0'
-      def _partial_digestor(options={})
-        name = options[:name]
-        finder = options[:finder]
-        ::ActionView::PartialDigestor.new(name, finder.formats.last, finder).digest
-      end
-    else
-      def _partial_digestor(options)
-        options[:name]
-      end
+    def _partial_digestor(options)
+      name = options[:name]
+      finder = options[:finder]
+      ::ActionView::Digestor.digest(name: name, finder: finder)
     end
   end
 end

data/lib/breezy_template/handler.rb

@@ -9,7 +9,8 @@ class BreezyTemplate
       template.identifier.sub("#{Rails.root}/app/views/", "").split('.')[0]
     end
 
-    def self.call(template)
+    def self.call(template, source = nil)
+
       # this juggling is required to keep line numbers right in the error
       %{__already_defined = defined?(json);json||=::BreezyTemplate.new(self);json._set_search_path_once(breezy_filter) if defined?(breezy_filter); json._set_request_url_once(request.fullpath);#{template.source}
         if !(__already_defined && __already_defined != "method")

data/test/cache_extension_test.rb

@@ -3,16 +3,14 @@ require "test_helper"
 
 class CacheExtensionTest < BreezyTemplateTestCase
   test "caching a value at a node" do
-    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
-
-    result = jbuild(<<-JBUILDER)
+    result = jbuild(<<~JBUILDER)
       opts = {
         cache: [['b', 'c']]
       }
       json.hello 32, opts
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -28,9 +26,7 @@ class CacheExtensionTest < BreezyTemplateTestCase
   end
 
   test "caching elements in a list" do
-    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
-
-    result = jbuild(<<-JBUILDER)
+    result = jbuild(<<~JBUILDER)
       json.hello do
         opts = {
           cache: ->(i){ ['a', i] }
@@ -41,7 +37,7 @@ class CacheExtensionTest < BreezyTemplateTestCase
       end
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -58,9 +54,7 @@ class CacheExtensionTest < BreezyTemplateTestCase
   end
 
   test "nested caching generates a depth-first list of cache nodes" do
-    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
-
-    result = jbuild(<<-JBUILDER)
+    result = jbuild(<<~JBUILDER)
       json.hello cache: [['a', 'b']] do
         json.content cache: [['d', 'z']] do
           json.subcontent 'inner'
@@ -71,7 +65,7 @@ class CacheExtensionTest < BreezyTemplateTestCase
       end
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -89,20 +83,18 @@ class CacheExtensionTest < BreezyTemplateTestCase
   end
 
   test "caching an empty block generates no cache and no errors" do
-    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
-
     result = nil
 
     assert_nothing_raised do
-        result = jbuild(<<-JBUILDER)
-          json.hello do
-            json.array! [4,5], cache: ->(i){['a', i]} do |x|
-            end
+      result = jbuild(<<~JBUILDER)
+        json.hello do
+          json.array! [4,5], cache: ->(i){['a', i]} do |x|
           end
-        JBUILDER
+        end
+      JBUILDER
     end
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -117,23 +109,21 @@ class CacheExtensionTest < BreezyTemplateTestCase
   end
 
   test "fragment caching" do
-    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
-
-    jbuild(<<-JBUILDER)
+    jbuild(<<~JBUILDER)
       opts = {cache: ['cachekey']}
       json.post opts do
         json.name "Cache"
       end
     JBUILDER
 
-    result = jbuild(<<-JBUILDER)
+    result = jbuild(<<~JBUILDER)
       opts = {cache: ['cachekey']}
       json.post opts do
         json.name "Miss"
       end
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -149,15 +139,13 @@ class CacheExtensionTest < BreezyTemplateTestCase
   end
 
   test "fragment caching deserializes an array" do
-    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
-
-    result = jbuild <<-JBUILDER
+    result = jbuild <<~JBUILDER
       json.content cache: "cachekey" do
         json.array! %w[a b c]
       end
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -173,47 +161,47 @@ class CacheExtensionTest < BreezyTemplateTestCase
   end
 
   test "fragment caching works with previous version of cache digests" do
-    undef_context_methods :cache_fragment_name
-
-    if !@context.class.method_defined? :fragment_name_with_digest
-      @context.class_eval do
-        def fragment_name_with_digest
-        end
-      end
+    method_was_called = false
+    @view.define_singleton_method(:fragment_name_with_digest) do |key|
+      method_was_called = true
+      key
     end
 
-    @context.expects :fragment_name_with_digest
-
-    jbuild <<-JBUILDER
+    jbuild <<~JBUILDER
       json.content cache: 'cachekey' do
         json.name "Cache"
       end
     JBUILDER
+
+    assert_equal method_was_called, true
   end
 
   test "fragment caching works with current cache digests" do
-    undef_context_methods :fragment_name_with_digest
-
-    @context.expects :cache_fragment_name
-    ActiveSupport::Cache.expects :expand_cache_key
+    method_was_called = false
+    @view.define_singleton_method(:cache_fragment_name) do |key, options|
+      method_was_called = true
+      key
+    end
 
-    jbuild <<-JBUILDER
+    jbuild <<~JBUILDER
       json.content cache: 'cachekey' do
         json.name "Cache"
       end
     JBUILDER
+
+    assert_equal method_was_called, true
   end
 
   test "does not perform caching when controller.perform_caching is false" do
-    controller.perform_caching = false
+    @controller.perform_caching = false
 
-    result = jbuild <<-JBUILDER
+    result = jbuild(<<~JBUILDER, disable_caching: true)
       json.content cache: 'cachekey' do
         json.name "Cache"
       end
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -228,20 +216,22 @@ class CacheExtensionTest < BreezyTemplateTestCase
   end
 
   test "caches and runs a partial exactly once" do
-    jbuild(<<-JBUILDER)
-      json.hit nil, partial: ["raise_if_used", locals: {used: false}], cache: 'once'
-      json.miss nil, partial: ["raise_if_used", locals: {used: true}], cache: 'once'
-    JBUILDER
+    assert_nothing_raised do
+      jbuild(<<~JBUILDER)
+        json.hit nil, partial: ["raise_if_used", locals: {used: false}], cache: 'once'
+        json.miss nil, partial: ["raise_if_used", locals: {used: true}], cache: 'once'
+      JBUILDER
+    end
   end
 
   test "invokes templates via params via set! and caches" do
-    @post = BLOG_POST_COLLECTION.first
+    post = BLOG_POST_COLLECTION.first
 
-    result = jbuild(<<-JBUILDER)
+    result = jbuild(<<~JBUILDER, assigns: {post: post})
       json.post @post, partial: ["blog_post", as: :blog_post], cache: [['a', 'b']]
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -257,12 +247,10 @@ class CacheExtensionTest < BreezyTemplateTestCase
   end
 
   test "shares partial caches (via the partial's digest) across multiple templates" do
-    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
+    hit = BlogPost.new(1, "hit", "John Smith")
+    miss = BlogPost.new(2, "miss", "John Smith")
 
-    @hit = BlogPost.new(1, "hit", "John Smith")
-    @miss = BlogPost.new(2, "miss", "John Smith")
-
-    cat =  jbuild(<<-JBUILDER)
+    cat =  jbuild(<<~JBUILDER, assigns: {hit: hit})
       opts = {
         cache: [['a', 'b']],
         partial: ["blog_post", as: :blog_post]
@@ -271,7 +259,7 @@ class CacheExtensionTest < BreezyTemplateTestCase
       json.post @hit, opts
     JBUILDER
 
-    result = jbuild(<<-JBUILDER)
+    result = jbuild(<<~JBUILDER, assigns: {miss: miss})
       opts = {
         cache: [['a', 'b']],
         partial: ["blog_post", as: :blog_post]
@@ -280,7 +268,7 @@ class CacheExtensionTest < BreezyTemplateTestCase
       json.post @miss, opts
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -295,9 +283,8 @@ class CacheExtensionTest < BreezyTemplateTestCase
     assert_equal expected, result
   end
 
-
   test "render array of partials and caches" do
-    result = jbuild(<<-JBUILDER)
+    result = jbuild(<<~JBUILDER)
       opts = {
         cache: (->(d){ ['a', d.id] }),
         partial: ["blog_post", as: :blog_post]
@@ -306,7 +293,7 @@ class CacheExtensionTest < BreezyTemplateTestCase
     JBUILDER
     Rails.cache.clear
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;

data/test/deferement_test.rb

@@ -2,10 +2,9 @@ require "test_helper"
 
 class DefermentExtensionTest < BreezyTemplateTestCase
   test "rendering with node deferement" do
-    req = action_controller_test_request
-    req.path = '/some_url'
+    @controller.request.path = '/some_url'
 
-    result = jbuild(<<-JBUILDER, request: req)
+    result = jbuild(<<~JBUILDER)
       json.hit do
         json.hit2(defer: :auto)do
           json.hit3 do
@@ -16,7 +15,7 @@ class DefermentExtensionTest < BreezyTemplateTestCase
     JBUILDER
     Rails.cache.clear
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -34,10 +33,9 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   test "rendering with manual node deferement" do
-    req = action_controller_test_request
-    req.path = '/some_url'
+    @controller.request.path = '/some_url'
 
-    result = jbuild(<<-JBUILDER, request: req)
+    result = jbuild(<<~JBUILDER)
       json.hit do
         json.hit2 defer: :manual do
           json.hit3 do
@@ -48,7 +46,7 @@ class DefermentExtensionTest < BreezyTemplateTestCase
     JBUILDER
     Rails.cache.clear
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -65,10 +63,9 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   test "rendering with selective array node deferment" do
-    req = action_controller_test_request
-    req.path = '/some_url'
+    @controller.request.path = '/some_url'
 
-    result = jbuild(<<-JBUILDER, request: req)
+    result = jbuild(<<~JBUILDER)
       keep_first = lambda do |item|
         if item[:id] == 1
           false
@@ -88,7 +85,7 @@ class DefermentExtensionTest < BreezyTemplateTestCase
     JBUILDER
     Rails.cache.clear
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -106,10 +103,9 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   test "rendering with node array partial deferment" do
-    req = action_controller_test_request
-    req.path = '/some_url'
+    @controller.request.path = '/some_url'
 
-    result = jbuild(<<-JBUILDER, request: req)
+    result = jbuild(<<~JBUILDER)
       keep_first = lambda do |item|
         if item[:id] == 1
           false
@@ -127,7 +123,7 @@ class DefermentExtensionTest < BreezyTemplateTestCase
     JBUILDER
     Rails.cache.clear
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -145,10 +141,9 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   test "rendering with node array deferment" do
-    req = action_controller_test_request
-    req.path = '/some_url'
+    @controller.request.path = '/some_url'
 
-    result = jbuild(<<-JBUILDER, request: req)
+    result = jbuild(<<~JBUILDER)
       json.hit do
         json.hit2 do
           data = [{id: 1, name: 'foo'}, {id: 2, name: 'bar'}]
@@ -160,7 +155,7 @@ class DefermentExtensionTest < BreezyTemplateTestCase
     JBUILDER
     Rails.cache.clear
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -179,10 +174,9 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   test "rendering with node array deferment using index" do
-    req = action_controller_test_request
-    req.path = '/some_url'
+    @controller.request.path = '/some_url'
 
-    result = jbuild(<<-JBUILDER, request: req)
+    result = jbuild(<<~JBUILDER)
       json.hit do
         json.hit2 do
           data = [{id: 1, name: 'foo'}, {id: 2, name: 'bar'}]
@@ -194,7 +188,7 @@ class DefermentExtensionTest < BreezyTemplateTestCase
     JBUILDER
     Rails.cache.clear
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -213,10 +207,9 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   test "rendering with node array deferment on nested node" do
-    req = action_controller_test_request
-    req.path = '/some_url'
+    @controller.request.path = '/some_url'
 
-    result = jbuild(<<-JBUILDER, request: req)
+    result = jbuild(<<~JBUILDER)
       json.hit do
         json.hit2 do
           data = [{id: 1, name: 'foo'}, {id: 2, name: 'bar'}]
@@ -230,7 +223,7 @@ class DefermentExtensionTest < BreezyTemplateTestCase
     JBUILDER
     Rails.cache.clear
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -249,13 +242,11 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   test 'deferment does not work on values' do
-    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
-
-    result = jbuild(<<-JBUILDER)
+    result = jbuild(<<~JBUILDER)
       json.hello(32, defer: :auto)
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -270,14 +261,14 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   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')
+    @view.stubs(:breezy_filter).returns('hello.world')
+    result = jbuild(<<~JBUILDER)
       json.hello defer: :auto do
         json.world 32
       end
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;
@@ -293,8 +284,8 @@ class DefermentExtensionTest < BreezyTemplateTestCase
   end
 
   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')
+    @view.stubs(:breezy_filter).returns('hello')
+    result = jbuild(<<~JBUILDER)
       json.hello do
         json.content defer: :auto do
           json.world 32
@@ -302,7 +293,7 @@ class DefermentExtensionTest < BreezyTemplateTestCase
       end
     JBUILDER
 
-    expected = strip_format(<<-JS)
+    expected = strip_format(<<~JS)
       (function(){
         var fragments={};
         var lastFragmentName;