breezy_template 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2b857cf1d23307564ac5087d3326f0aded20ff
-  data.tar.gz: b2f0dfda63e22e889463d4a54aa5d7adf907a4b7
+  metadata.gz: dcc3ba9f23a74e82348d910f9416e89261fbe158
+  data.tar.gz: 915a033140bc98f1a30767d349c511fe4bd4decf
 SHA512:
-  metadata.gz: 592aec8e09ed01ae5f7396c9aa7ef31c078564a2f0137a250cefcf0cb1d6469f2fcc281cf5df56e8a7e1ecdc7a3701b24885b985e3e386ae07e7af475b8cb995
-  data.tar.gz: b5e854fd1f4e205cf1e9c88be3159fe5d74030b5e1feefa2220084e1187bedabe9720593af629e2f94c31d3aef0ea254a4a1a7d57349a792d8b60a8d9a396118
+  metadata.gz: acd0a3eef49b95f992b091e264d464f1de67c7691b50a6aadf04932703d166bbe7de0b2f08e05ea724e2c778ce3fff88c2f8ec6baae5c4d972e0dd8d2722754d
+  data.tar.gz: f309c6efe2251650ae1648bc6cf3959a4ab537ef4df1dcce0b65b013598c3fb00c20d203e4a0dd016a3aacac3e99cef4700fc56aefc0664817a409396b6b8b40

data/lib/breezy_template/active_support.rb

@@ -1,23 +1,15 @@
 # https://github.com/rails/jbuilder/issues/204
-if Rails.version >= '4.1'
-  module ActiveSupport
-    module JSON
-      module Encoding
-        class JSONGemEncoder
-          alias_method :original_jsonify, :jsonify
+module ActiveSupport
+  module JSON
+    module Encoding
+      class JSONGemEncoder
+        alias_method :original_jsonify, :jsonify
 
-          def jsonify(value)
-            if ::BreezyTemplate::Digest === value
-              value
-            elsif ::BreezyTemplate::JointVar === value
-              value
-            elsif ::BreezyTemplate::DeferVar === value
-              value
-            elsif ::BreezyTemplate::Undefined === value
-              value
-            else
-              original_jsonify(value)
-            end
+        def jsonify(value)
+          if ::BreezyTemplate::Var === value
+            value
+          else
+            original_jsonify(value)
           end
         end
       end

data/lib/breezy_template/cache_extension.rb

@@ -2,24 +2,6 @@ require 'breezy_template/breezy_template'
 
 class BreezyTemplate
   module CacheExtension
-    class Digest
-      def initialize(digest)
-        @digest = "cache[\"#{digest}\"]"
-      end
-
-      def to_json(*)
-        @digest
-      end
-
-      def as_json(*)
-        self
-      end
-
-      def encode_json(*)
-        @digest
-      end
-    end
-
     def _result(value, *args)
       options = _cache_options(args[0])
       if options
@@ -154,7 +136,7 @@ class BreezyTemplate
       else
         v = blank_or_value
         @js.push(v)
-        Digest.new(key)
+        ::BreezyTemplate::Var.new("cache[\"#{key}\"]")
       end
     end
 

data/lib/breezy_template/configuration.rb

@@ -2,10 +2,11 @@ require 'breezy_template/breezy_template'
 
 class BreezyTemplate
   class Configuration
-    attr_accessor :track_assets
+    attr_accessor :track_sprockets_assets, :track_pack_assets
 
     def initialize
-      @track_assets = ['application.js', 'application.css']
+      @track_sprockets_assets = ['application.js', 'application.css']
+      @track_pack_assets = ['application.js']
     end
   end
 

data/lib/breezy_template/deferment_extension.rb

@@ -1,24 +1,6 @@
 require 'breezy_template/breezy_template'
 
 class BreezyTemplate
-  class Undefined
-    def initialize
-      @value = "undefined"
-    end
-
-    def to_json(*)
-      @value
-    end
-
-    def as_json(*)
-      self
-    end
-
-    def encode_json(*)
-      @value
-    end
-  end
-
   module DefermentExtension
     ACTIVE_MODES = [:auto, :manual].freeze
 
@@ -28,7 +10,7 @@ class BreezyTemplate
         if _deferment_auto?(options)
           @js.push(_breezy_visit_current(@path))
         end
-        return _set_value key, Undefined.new
+        return _set_value key, ::BreezyTemplate::Var.new('undefined')
       else
         super
       end

data/lib/breezy_template/dependency_tracker.rb

@@ -1,50 +1,39 @@
 # This was taken from jbuilder
 require 'breezy_template/breezy_template'
+require 'action_view'
+require 'action_view/dependency_tracker'
 
-dependency_tracker = false
+dependency_tracker = ::ActionView::DependencyTracker
 
-begin
-  require 'action_view'
-  require 'action_view/dependency_tracker'
-  dependency_tracker = ::ActionView::DependencyTracker
-rescue LoadError
-  begin
-    require 'cache_digests'
-    dependency_tracker = ::CacheDigests::DependencyTracker
-  rescue LoadError
-  end
-end
+class BreezyTemplate
+  module DependencyTrackerMethods
+    # Matches:
+    #   json.partial! partial: "comments/comment"
+    #   json.comments @post.comments, partial: "comments/comment", as: :comment
+    #   json.array! @posts, partial: "posts/post", as: :post
+    #   = render partial: "account"
+    #
+    INDIRECT_RENDERS = /
+      (?::partial\s*=>|partial:)  # partial: or :partial =>
+      \s*                         # optional whitespace
+      \[*                         # optional Bracket
+      \s*                         # optional whitespace
+      (['"])([^'"]+)\1            # quoted value
+    /x
 
-if dependency_tracker
-  class BreezyTemplate
-    module DependencyTrackerMethods
-      # Matches:
-      #   json.partial! partial: "comments/comment"
-      #   json.comments @post.comments, partial: "comments/comment", as: :comment
-      #   json.array! @posts, partial: "posts/post", as: :post
-      #   = render partial: "account"
-      #
-      INDIRECT_RENDERS = /
-        (?::partial\s*=>|partial:)  # partial: or :partial =>
-        \s*                         # optional whitespace
-        \[*                         # optional Bracket
-        \s*                         # optional whitespace
-        (['"])([^'"]+)\1            # quoted value
-      /x
-
-      def dependencies
-        indirect_dependencies + explicit_dependencies
-      end
+    def dependencies
+      indirect_dependencies + explicit_dependencies
+    end
 
-      private
+    private
 
-      def indirect_dependencies
-        source.scan(INDIRECT_RENDERS).map(&:second)
-      end
+    def indirect_dependencies
+      source.scan(INDIRECT_RENDERS).map(&:second)
     end
   end
-
-  ::BreezyTemplate::DependencyTracker = Class.new(dependency_tracker::ERBTracker)
-  ::BreezyTemplate::DependencyTracker.send :include, ::BreezyTemplate::DependencyTrackerMethods
-  dependency_tracker.register_tracker :breezy, ::BreezyTemplate::DependencyTracker
 end
+
+::BreezyTemplate::DependencyTracker = Class.new(dependency_tracker::ERBTracker)
+::BreezyTemplate::DependencyTracker.send :include, ::BreezyTemplate::DependencyTrackerMethods
+
+::ActionView::DependencyTracker.register_tracker :breezy, ::BreezyTemplate::DependencyTracker

data/lib/breezy_template/handler.rb

@@ -21,14 +21,21 @@ class BreezyTemplate
             json.csrf_token form_authenticity_token
           end
 
-          if ::BreezyTemplate.configuration.track_assets.any?
-            json.assets do
-              json.array! (::BreezyTemplate.configuration.track_assets || []).map{|assets|
-                asset_path(assets)
-              }
+          __sprockets_assets = (::BreezyTemplate.configuration.track_sprockets_assets || []).map do |asset|
+            asset_path(asset)
+          end
+
+          __pack_assets = []
+          if defined?(asset_pack_path)
+            __pack_assets = (::BreezyTemplate.configuration.track_pack_assets || []).map do |asset|
+              asset_pack_path(asset)
             end
           end
 
+          if __sprockets_assets.any? || __pack_assets.any?
+            json.assets (__sprockets_assets + __pack_assets)
+          end
+
           if defined?(breezy_filter) && !!breezy_filter
             json.action 'graft'
             json.path breezy_filter
@@ -38,8 +45,8 @@ class BreezyTemplate
             session.delete(:breezy_filter)
           end
 
-          json.joints ::BreezyTemplate::PartialExtension::JointVar.new
-          json.defers ::BreezyTemplate::PartialExtension::DeferVar.new
+          json.joints ::BreezyTemplate::Var.new('joints')
+          json.defers ::BreezyTemplate::Var.new('defers')
 
           json.target!
         end

data/lib/breezy_template/partial_extension.rb

@@ -2,42 +2,6 @@ require 'breezy_template/breezy_template'
 
 class BreezyTemplate
   module PartialExtension
-    class DeferVar
-      def initialize
-        @digest = "defers"
-      end
-
-      def to_json(*)
-        @digest
-      end
-
-      def as_json(*)
-        self
-      end
-
-      def encode_json(*)
-        @digest
-      end
-    end
-
-    class JointVar
-      def initialize
-        @digest = "joints"
-      end
-
-      def to_json(*)
-        @digest
-      end
-
-      def as_json(*)
-        self
-      end
-
-      def encode_json(*)
-        @digest
-      end
-    end
-
     def set!(key, value = BLANK, *args)
       options = args.last || {}
 

data/lib/breezy_template/var.rb

@@ -0,0 +1,19 @@
+class BreezyTemplate
+  class Var
+    def initialize(var)
+      @var = var
+    end
+
+    def to_json(*)
+      @var
+    end
+
+    def as_json(*)
+      self
+    end
+
+    def encode_json(*)
+      @var
+    end
+  end
+end

data/lib/breezy_template.rb

@@ -1,6 +1,7 @@
 require 'breezy_template/breezy_template'
 
 require 'breezy_template/blank'
+require 'breezy_template/var'
 require 'breezy_template/key_formatter'
 require 'breezy_template/errors'
 

data/test/extensions_test.rb

@@ -51,7 +51,8 @@ end
 class BreezyTemplateTest < ActionView::TestCase
   setup do
     self.request_forgery = false
-    BreezyTemplate.configuration.track_assets = []
+    BreezyTemplate.configuration.track_sprockets_assets = []
+    BreezyTemplate.configuration.track_pack_assets = []
 
     # this is a stub. Normally this would be set by the
     # controller locals
@@ -73,6 +74,10 @@ class BreezyTemplateTest < ActionView::TestCase
     @breezy_filter
   end
 
+  def asset_pack_path(asset)
+    return asset
+  end
+
   def request
     @request
   end
@@ -96,7 +101,9 @@ class BreezyTemplateTest < ActionView::TestCase
   end
 
   def action_controller_test_request
-    if ::Rails.version.start_with?('5')
+    if ::Rails.version.start_with?('5.1')
+      ::ActionController::TestRequest.create({})
+    elsif ::Rails.version.start_with?('5')
       ::ActionController::TestRequest.create
     else
       ::ActionController::TestRequest.new
@@ -188,9 +195,10 @@ class BreezyTemplateTest < ActionView::TestCase
 
     assert_equal expected, result
   end
-  #
+
   test "render with asset tracking" do
-    BreezyTemplate.configuration.track_assets = ['test.js', 'test.css']
+    BreezyTemplate.configuration.track_sprockets_assets = ['test.js', 'test.css']
+    BreezyTemplate.configuration.track_pack_assets = ['test_pack.js', 'test_pack.css']
 
     result = jbuild(<<-TEMPLATE)
       json.content "hello"
@@ -201,7 +209,7 @@ class BreezyTemplateTest < ActionView::TestCase
         var joints={};
         var cache={};
         var defers=[];
-        return ({"data":{"content":"hello"},"assets":["/test.js","/test.css"],"joints":joints,"defers":defers});
+        return ({"data":{"content":"hello"},"assets":["/test.js","/test.css","test_pack.js","test_pack.css"],"joints":joints,"defers":defers});
       })()
     JS
 
@@ -231,7 +239,7 @@ class BreezyTemplateTest < ActionView::TestCase
   end
 
   test "wrapping jbuilder contents inside Breezy with additional options" do
-    BreezyTemplate.configuration.track_assets = ['test.js', 'test.css']
+    BreezyTemplate.configuration.track_sprockets_assets = ['test.js', 'test.css']
     self.breezy = { title: 'this is fun' }
 
     result = jbuild(<<-TEMPLATE)
@@ -1013,12 +1021,17 @@ class BreezyTemplateTest < ActionView::TestCase
   end
 
   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.notes.create title: 'first'
-      post.notes.create title: 'second'
+    Post.delete_all
+    Note.delete_all
+
+    post = Post.create
+    first_note = post.notes.create(title: 'first')
+    post.notes.create(title: 'second')
 
-      post.notes.expects(:where).once().with('id'=>1).returns([{id: 1, title: 'first'}])
+    result = jbuild(<<-JBUILDER, breezy_filter: "hit.hit2.id=#{first_note.id}")
+      post = Post.first
+      first_note = Note.where(title: 'first').first
+      post.notes.expects(:where).once().with('id'=>first_note.id).returns([{id: first_note.id, title: 'first'}])
 
       json.hit do
         json.hit2 do
@@ -1031,14 +1044,14 @@ class BreezyTemplateTest < ActionView::TestCase
     JBUILDER
 
     Rails.cache.clear
-
+    id = Note.where(title: 'first').first.id
     expected = strip_format(<<-JS)
       (function(){
         var joints={};
         var cache={};
         var defers=[];
         return (
-          {"data":{"title":"first"},"action":"graft","path":"hit.hit2.id=1","joints":joints,"defers":defers}
+          {"data":{"title":"first"},"action":"graft","path":"hit.hit2.id=#{id}","joints":joints,"defers":defers}
         );
       })()
     JS
@@ -1290,3 +1303,5 @@ class BreezyTemplateTest < ActionView::TestCase
     assert_equal expected, result
   end
 end
+
+

data/test/template_test.rb

@@ -76,7 +76,7 @@ class TemplateTest < ActiveSupport::TestCase
     end
 
     assert result.has_key?('content')
-    assert_equal nil, result['content']
+    assert_nil result['content']
   end
 
   test 'multiple keys' do
@@ -156,7 +156,7 @@ class TemplateTest < ActiveSupport::TestCase
       end
     end
 
-    assert_equal nil, result['author']['name']
+    assert_nil result['author']['name']
     assert_equal 32, result['author']['age']
   end
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breezy_template
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,30 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 description: Breezy Templates for React props
 email: jho406@gmail.com
 executables: []
@@ -86,6 +100,7 @@ files:
 - lib/breezy_template/key_formatter.rb
 - lib/breezy_template/partial_extension.rb
 - lib/breezy_template/search_extension.rb
+- lib/breezy_template/var.rb
 - test/dependency_tracker_test.rb
 - test/extensions_test.rb
 - test/template_test.rb
@@ -102,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="