jbuilder 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47936732d4887c511042bf1504e9b8062c1ee555
-  data.tar.gz: 13b65badc0d39e8a282b8294462fbe55e194d5a2
+  metadata.gz: 3141e1a87d6a858eed1e1744e0d3f77dfd1f2285
+  data.tar.gz: 20846381277c1288b86db8fb0c7bfd53421ce484
 SHA512:
-  metadata.gz: 331760ba6d93c905f70fbc6a25378e1cf6b055dce8703a204540bdc9745dd56402c9cbe0fc1d6b8a5ed86fb2c5d957e737460667621a1f0ff718c9367aa1c9aa
-  data.tar.gz: dbc9629031037315974d03f4def0a541522c2a85774a42ba56edc41df26acee927304756c267f3fce0130f9529b2a25533ca9bd907906a2a21cb7398dde0b677
+  metadata.gz: 90cef844168896f3deef2cd9b83dfea34b3080687e33b412acc884e76f66f1e4b5994f71302712097f47028eba0482c57ac43dcf07e16b18956ddaa93a777f1d
+  data.tar.gz: d4c479bdf1b91218a821cf10ae3823c1f3bf8fafd7df54605d724510ea69a4da276112cbb71d54e0ee8b5dfab2538f64835189d0f023c359ed5e62f9c9465865

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.0.0'
+  s.version  = '2.0.1'
   s.author   = 'David Heinemeier Hansson'
   s.email    = 'david@37signals.com'
   s.summary  = 'Create JSON structures via a Builder-style DSL'

data/lib/jbuilder.rb

@@ -328,8 +328,5 @@ class Jbuilder < JbuilderProxy
 end
 
 require 'jbuilder/jbuilder_template' if defined?(ActionView::Template)
-
-if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR == 4
-  require 'jbuilder/railtie'
-  require 'jbuilder/dependency_tracker'
-end
+require 'jbuilder/dependency_tracker'
+require 'jbuilder/railtie' if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR == 4

data/lib/jbuilder/dependency_tracker.rb

@@ -1,9 +1,21 @@
 require 'jbuilder'
-require 'action_view'
-require 'action_view/dependency_tracker'
 
-class Jbuilder
-  class DependencyTracker < ::ActionView::DependencyTracker::ERBTracker
+dependency_tracker = false
+
+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
+
+if dependency_tracker
+  dependency_tracking_module = Module.new do
     # Matches:
     #   json.partial! "messages/message"
     #   json.partial!('messages/message')
@@ -40,11 +52,8 @@ class Jbuilder
       source.scan(INDIRECT_RENDERS).map(&:second)
     end
   end
-end
-
 
-ActiveSupport.on_load :action_view do
-  ActiveSupport.on_load :after_initialize do
-    ActionView::DependencyTracker.register_tracker :jbuilder, Jbuilder::DependencyTracker
-  end
+  ::Jbuilder::DependencyTracker = Class.new(dependency_tracker::ERBTracker)
+  ::Jbuilder::DependencyTracker.send :include, dependency_tracking_module
+  dependency_tracker.register_tracker :jbuilder, ::Jbuilder::DependencyTracker
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport