jbuilder 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3141e1a87d6a858eed1e1744e0d3f77dfd1f2285
-  data.tar.gz: 20846381277c1288b86db8fb0c7bfd53421ce484
+  metadata.gz: 1f70e328fa8dca8b3a98c6d5d87102512f624ce9
+  data.tar.gz: 1d99855c2c28b3752b696ae47298663dd8a5f311
 SHA512:
-  metadata.gz: 90cef844168896f3deef2cd9b83dfea34b3080687e33b412acc884e76f66f1e4b5994f71302712097f47028eba0482c57ac43dcf07e16b18956ddaa93a777f1d
-  data.tar.gz: d4c479bdf1b91218a821cf10ae3823c1f3bf8fafd7df54605d724510ea69a4da276112cbb71d54e0ee8b5dfab2538f64835189d0f023c359ed5e62f9c9465865
+  metadata.gz: 9e8b3f0e5f8111b07dbc24fb0fed99bd975358d89dcc1c9fec20fea572c8de756b69c00af85b2b118f85316bdcc78b0c8605c15394692e0829d6178c54fb4063
+  data.tar.gz: 5f599be397203a899995cbe9fcfc67f76b9aaed89a8f9dc50a695adbc805705cf81bae83b431bf83caa9968d96c9d1856946011115bd7a2b6b05e7f0c20956be

data/.travis.yml

@@ -3,9 +3,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
   - jruby-19mode
-  - rbx-19mode
+  - rbx
 
 gemfile:
   - Gemfile.old
@@ -13,9 +14,10 @@ gemfile:
 
 matrix:
   allow_failures:
+    - rvm: 2.1.0
     - rvm: ruby-head
     - rvm: jruby-19mode
-    - rvm: rbx-19mode
+    - rvm: rbx
 
 notifications:
   email: false

data/Gemfile

@@ -5,4 +5,11 @@ gemspec
 gem 'rake'
 gem 'railties',   '~> 4.0.0'
 gem 'actionpack', '~> 4.0.0'
-gem 'mocha', require: false
+gem 'mocha', require: false
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'json', '~> 1.8'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end

data/Gemfile.old

@@ -4,4 +4,11 @@ gemspec
 
 gem 'rake'
 gem 'mocha', :require => false
-gem 'actionpack', '~> 3.0'
+gem 'actionpack', '~> 3.0'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'json', '~> 1.8'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2013 David Heinemeier Hansson, 37signals
+Copyright (c) 2011-2014 David Heinemeier Hansson, 37signals
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/jbuilder.gemspec

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

data/lib/jbuilder/dependency_tracker.rb

@@ -15,45 +15,47 @@ rescue LoadError
 end
 
 if dependency_tracker
-  dependency_tracking_module = Module.new do
-    # Matches:
-    #   json.partial! "messages/message"
-    #   json.partial!('messages/message')
-    #
-    DIRECT_RENDERS = /
-      \w+\.partial!     # json.partial!
-      \(?\s*            # optional parenthesis
-      (['"])([^""]+)\1  # quoted value
-    /x
-
-    # 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
-      (['"])([^'"]+)\1            # quoted value
-    /x
-
-    def dependencies
-      direct_dependencies + indirect_dependencies + explicit_dependencies
-    end
-
-    private
-
-    def direct_dependencies
-      source.scan(DIRECT_RENDERS).map(&:second)
-    end
-
-    def indirect_dependencies
-      source.scan(INDIRECT_RENDERS).map(&:second)
+  class Jbuilder
+    module DependencyTrackerMethods
+      # Matches:
+      #   json.partial! "messages/message"
+      #   json.partial!('messages/message')
+      #
+      DIRECT_RENDERS = /
+        \w+\.partial!     # json.partial!
+        \(?\s*            # optional parenthesis
+        (['"])([^'"]+)\1  # quoted value
+      /x
+
+      # 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
+        (['"])([^'"]+)\1            # quoted value
+      /x
+
+      def dependencies
+        direct_dependencies + indirect_dependencies + explicit_dependencies
+      end
+
+      private
+
+      def direct_dependencies
+        source.scan(DIRECT_RENDERS).map(&:second)
+      end
+
+      def indirect_dependencies
+        source.scan(INDIRECT_RENDERS).map(&:second)
+      end
     end
   end
 
   ::Jbuilder::DependencyTracker = Class.new(dependency_tracker::ERBTracker)
-  ::Jbuilder::DependencyTracker.send :include, dependency_tracking_module
+  ::Jbuilder::DependencyTracker.send :include, ::Jbuilder::DependencyTrackerMethods
   dependency_tracker.register_tracker :jbuilder, ::Jbuilder::DependencyTracker
 end

data/test/jbuilder_dependency_tracker_test.rb

@@ -23,10 +23,11 @@ class JbuilderDependencyTrackerTest < ActiveSupport::TestCase
 
     test 'detects dependency via direct partial! call' do
       dependencies = track_dependencies <<-RUBY
-        json.partial! 'path/to/partial'
+        json.partial! 'path/to/partial', foo: bar
+        json.partial! 'path/to/another/partial', :fizz => buzz
       RUBY
 
-      assert_equal %w[path/to/partial], dependencies
+      assert_equal %w[path/to/partial path/to/another/partial], dependencies
     end
 
     test 'detects dependency via direct partial! call with parens' do

metadata

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