jbuilder 1.5.3 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f96d267675b1f3a2c1b8362acec6cb5d6041594a
-  data.tar.gz: 16a89009d403703f5c2bab75b7db39e8a976043e
+  metadata.gz: 3abb8f97fbc68d58021fc1c5bc66fec71d338da7
+  data.tar.gz: 1f5eac2118e6f0762d41d7b6ce1ea559a10feca9
 SHA512:
-  metadata.gz: 03e2efc5e9463f76a49560f1c61db48b02ad2d456399bc5aeed9a2cf47e8c919d59632c79141d696bf33ccd4cc1466fcb17dfab1d2f5f929924c6e386083ee9d
-  data.tar.gz: bcd576dd31be8b43e423612409ffae5051994bec4351f6fac4bd1ba0b1a5cf94ae091cb39570767c8949ea7a0d6f806ab13b2bbca5fbf7bc4bb6af91238717f0
+  metadata.gz: fe7ee8dc65453809938c89bfd35f037ae6113e30f648eb66da2ab844bd9dc0574a9c79c381198ec667077dd648cb30946cf81d433085ff31de2d8acba45a00bd
+  data.tar.gz: bcbf4fa794515f477a809d33b18b9ac7e9df227f3fbe1f708bea2f1b1f90d340439f783ff96f1b40c413c9ec539703f267745183761d9c3d8e945f3288ae20ce

data/.travis.yml

@@ -1,15 +1,10 @@
 language: ruby
 
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - ree
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
   - rbx-19mode
 
 gemfile:
@@ -17,22 +12,10 @@ gemfile:
   - Gemfile
 
 matrix:
-  exclude:
-    # Edge Rails is only compatible with 1.9.3+
-    - gemfile: Gemfile
-      rvm: 1.8.7
-    - gemfile: Gemfile
-      rvm: 1.9.2
-    - gemfile: Gemfile
-      rvm: ree
-    - gemfile: Gemfile
-      rvm: jruby-18mode
-    - gemfile: Gemfile
-      rvm: rbx-18mode
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx-18mode
+    - rvm: jruby-19mode
     - rvm: rbx-19mode
 
 notifications:
-  email: false
+  email: false

data/jbuilder.gemspec

@@ -1,11 +1,13 @@
 Gem::Specification.new do |s|
   s.name    = 'jbuilder'
-  s.version = '1.5.3'
+  s.version = '2.0.0.beta'
   s.author  = 'David Heinemeier Hansson'
   s.email   = 'david@37signals.com'
   s.summary = 'Create JSON structures via a Builder-style DSL'
   s.license = 'MIT'
 
+  s.required_ruby_version = '>= 1.9.3'
+
   s.add_dependency 'activesupport', '>= 3.0.0'
   s.add_dependency 'multi_json',    '>= 1.2.0'
 

data/lib/generators/rails/jbuilder_generator.rb

@@ -24,10 +24,6 @@ module Rails
 
 
       protected
-        def attributes_names
-          [:id] + super
-        end
-
         def filename_with_extensions(name)
           [name, :json, :jbuilder] * '.'
         end

data/lib/generators/rails/templates/controller.rb

@@ -48,7 +48,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       if @<%= orm_instance.update("#{singular_table_name}_params") %>
         format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %> }
-        format.json { head :no_content }
+        format.json { render action: 'show', status: :ok, location: <%= "@#{singular_table_name}" %> }
       else
         format.html { render action: 'edit' }
         format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }

data/lib/jbuilder.rb

@@ -1,8 +1,6 @@
-require 'active_support/ordered_hash'
 require 'active_support/core_ext/array/access'
 require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/hash'
-require 'active_support/cache'
 require 'multi_json'
 
 begin
@@ -22,7 +20,7 @@ class Jbuilder < JbuilderProxy
 
   class KeyFormatter
     def initialize(*args)
-      @format = ::ActiveSupport::OrderedHash.new
+      @format = {}
       @cache = {}
 
       options = args.extract_options!
@@ -58,10 +56,9 @@ class Jbuilder < JbuilderProxy
   @@key_formatter = KeyFormatter.new
   @@ignore_nil    = false
 
-  def initialize(*args, &block)
-    @attributes = ::ActiveSupport::OrderedHash.new
+  def initialize(options = {}, &block)
+    @attributes = {}
 
-    options = args.extract_options!
     @key_formatter = options.fetch(:key_formatter){ @@key_formatter.clone }
     @ignore_nil = options.fetch(:ignore_nil, @@ignore_nil)
     yield self if block
@@ -222,9 +219,7 @@ class Jbuilder < JbuilderProxy
   #
   #   [1,2,3]
   def array!(collection = [], *attributes, &block)
-    @attributes = if block && block.arity == 2
-      _two_arguments_map_collection(collection, &block)
-    elsif block
+    @attributes = if block
       _map_collection(collection, &block)
     elsif attributes.any?
       _map_collection(collection) { |element| extract! element, *attributes }
@@ -280,25 +275,17 @@ class Jbuilder < JbuilderProxy
 
   # Encodes the current builder as JSON.
   def target!
-    ::MultiJson.dump @attributes
+    ::MultiJson.dump(@attributes)
   end
 
   private
 
-    def  _extract_hash_values(object, *attributes)
+    def _extract_hash_values(object, *attributes)
       attributes.each{ |key| _set_value key, object.fetch(key) }
     end
 
     def _extract_method_values(object, *attributes)
-      attributes.each do |method_name|
-        unless object.respond_to?(method_name)
-          message = "Private method #{method_name.inspect} was used to " +
-            'extract value. This will be an error in future versions of Jbuilder'
-        end
-
-        _set_value method_name, object.send(method_name)
-        ::ActiveSupport::Deprecation.warn message if message
-      end
+      attributes.each{ |key| _set_value key, object.public_send(key) }
     end
 
     def _set_value(key, value)
@@ -318,7 +305,7 @@ class Jbuilder < JbuilderProxy
 
     def _scope
       parent_attributes, parent_formatter = @attributes, @key_formatter
-      @attributes = ::ActiveSupport::OrderedHash.new
+      @attributes = {}
       yield
       @attributes
     ensure
@@ -334,26 +321,14 @@ class Jbuilder < JbuilderProxy
       end
     end
 
-    def _two_arguments_map_collection(collection, &block)
-      message = "Passing jbuilder object to block is " \
-        "deprecated and will be removed soon."
-
-      if block.respond_to?(:parameters)
-        arguments  = block.parameters.map(&:last)
-        actual     = "|#{arguments.drop(1) * ', '}|"
-        deprecated = "|#{arguments * ', '}|"
-        message   += "\nUse #{actual} instead of #{deprecated} as block arguments"
-      end
-
-      ::ActiveSupport::Deprecation.warn message, ::Kernel.caller(5)
-
-      _map_collection(collection){ |element| block[self, element] }
-    end
-
     def _mapable_arguments?(value, *args)
       value.respond_to?(:map)
     end
 end
 
 require 'jbuilder/jbuilder_template' if defined?(ActionView::Template)
-require 'jbuilder/railtie' if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR == 4
+
+if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR == 4
+  require 'jbuilder/railtie'
+  require 'jbuilder/dependency_tracker'
+end

data/lib/jbuilder/dependency_tracker.rb

@@ -0,0 +1,50 @@
+require 'jbuilder'
+require 'action_view'
+require 'action_view/dependency_tracker'
+
+class Jbuilder
+  class DependencyTracker < ::ActionView::DependencyTracker::ERBTracker
+    # 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
+
+
+ActiveSupport.on_load :action_view do
+  ActiveSupport.on_load :after_initialize do
+    ActionView::DependencyTracker.register_tracker :jbuilder, Jbuilder::DependencyTracker
+  end
+end

data/lib/jbuilder/jbuilder_template.rb

@@ -1,12 +1,13 @@
 require 'jbuilder'
 require 'action_dispatch/http/mime_type'
+require 'active_support/cache'
 
 class JbuilderTemplate < Jbuilder
   class << self
     attr_accessor :template_lookup_options
   end
 
-  self.template_lookup_options = { :handlers => [:jbuilder] }
+  self.template_lookup_options = { handlers: [:jbuilder] }
 
   def initialize(context, *args, &block)
     @context = context
@@ -20,14 +21,12 @@ class JbuilderTemplate < Jbuilder
       options = name_or_options
     else
       # partial! 'name', foo: 'bar'
-      options = { :partial => name_or_options, :locals => locals }
+      options = { partial: name_or_options, locals: locals }
       as = locals.delete(:as)
       options[:as] = as if as.present?
       options[:collection] = locals[:collection] if locals.key?(:collection)
     end
 
-    options[:collection] ||= [] if options.key?(:collection)
-
     _handle_partial_options options
   end
 
@@ -35,7 +34,7 @@ class JbuilderTemplate < Jbuilder
     options = attributes.extract_options!
 
     if options.key?(:partial)
-      partial! options[:partial], options.merge(:collection => collection)
+      partial! options[:partial], options.merge(collection: collection)
     else
       super
     end
@@ -63,14 +62,15 @@ class JbuilderTemplate < Jbuilder
 
   protected
     def _handle_partial_options(options)
-      options.reverse_merge! :locals => {}
+      options.reverse_merge! locals: {}
       options.reverse_merge! ::JbuilderTemplate.template_lookup_options
-      collection = options.delete(:collection)
       as = options[:as]
 
-      if collection && as
+      if as && options.key?(:collection)
+        collection = options.delete(:collection) || []
         array!(collection) do |member|
-          options[:locals].merge!(as => member, :collection => collection)
+          options[:locals].merge! as => member
+          options[:locals].merge! collection: collection
           _render_partial options
         end
       else
@@ -79,7 +79,7 @@ class JbuilderTemplate < Jbuilder
     end
 
     def _render_partial(options)
-      options[:locals].merge!(:json => self)
+      options[:locals].merge! json: self
       @context.render options
     end
 

data/test/jbuilder_dependency_tracker_test.rb

@@ -0,0 +1,72 @@
+require 'test/unit'
+require 'active_support/test_case'
+require 'jbuilder/dependency_tracker'
+
+
+class FakeTemplate
+    attr_reader :source, :handler
+    def initialize(source, handler = :jbuilder)
+      @source, @handler = source, handler
+    end
+end
+
+
+class JbuilderDependencyTrackerTest < ActiveSupport::TestCase
+    def make_tracker(name, source)
+      template = FakeTemplate.new(source)
+      Jbuilder::DependencyTracker.new(name, template)
+    end
+
+    def track_dependencies(source)
+      make_tracker('jbuilder_template', source).dependencies
+    end
+
+    test 'detects dependency via direct partial! call' do
+      dependencies = track_dependencies <<-RUBY
+        json.partial! 'path/to/partial'
+      RUBY
+
+      assert_equal %w[path/to/partial], dependencies
+    end
+
+    test 'detects dependency via direct partial! call with parens' do
+      dependencies = track_dependencies <<-RUBY
+        json.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.partial! 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.partial! :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/jbuilder_generator_test.rb

@@ -20,12 +20,12 @@ class JbuilderGeneratorTest < Rails::Generators::TestCase
 
     assert_file 'app/views/posts/index.json.jbuilder' do |content|
       assert_match /json\.array!\(@posts\) do \|post\|/, content
-      assert_match /json\.extract! post, :id, :title, :body/, content
+      assert_match /json\.extract! post, :title, :body/, content
       assert_match /json\.url post_url\(post, format: :json\)/, content
     end
 
     assert_file 'app/views/posts/show.json.jbuilder' do |content|
-      assert_match /json\.extract! @post, :id, :title, :body, :created_at, :updated_at/, content
+      assert_match /json\.extract! @post, :title, :body, :created_at, :updated_at/, content
     end
   end
 end

data/test/jbuilder_test.rb

@@ -5,15 +5,6 @@ require 'jbuilder'
 
 Comment = Struct.new(:content, :id)
 
-unless JbuilderProxy.method_defined? :instance_eval
-  # Faking Object#instance_eval for 1.8 and some newer JRubies
-  class JbuilderProxy
-    def instance_eval(code)
-      eval code
-    end
-  end
-end
-
 class NonEnumerable
   def initialize(collection)
     @collection = collection
@@ -73,32 +64,11 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal 32, parsed['age']
   end
 
-  test 'extracting from object using private method' do
-    person = Struct.new(:name) do
-      private
-      def age
-        32
-      end
-    end.new('David')
-
-    message = 'Private method :age was used to extract value. This will be' +
-      ' an error in future versions of Jbuilder'
-
-    ::ActiveSupport::Deprecation.expects(:warn).with(message)
-    json = Jbuilder.encode do |json|
-      json.extract! person, :name, :age
-    end
-  end
-
   test 'extracting from object using call style for 1.9' do
     person = Struct.new(:name, :age).new('David', 32)
 
     json = Jbuilder.encode do |json|
-      if ::RUBY_VERSION > '1.9'
-        instance_eval 'json.(person, :name, :age)'
-      else
-        instance_eval 'json.call(person, :name, :age)'
-      end
+      json.(person, :name, :age)
     end
 
     parsed = MultiJson.load(json)
@@ -241,23 +211,6 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal 'world', parsed['comments'].second['content']
   end
 
-  test 'nesting multiple children from array with inline loop with old api' do
-    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
-
-    json = Jbuilder.encode do |json|
-      ::ActiveSupport::Deprecation.silence do
-        json.comments comments do |json, comment|
-          json.content comment.content
-        end
-      end
-    end
-
-    parsed = MultiJson.load(json)
-    assert_equal ['content'], parsed['comments'].first.keys
-    assert_equal 'hello', parsed['comments'].first['content']
-    assert_equal 'world', parsed['comments'].second['content']
-  end
-
   test 'nesting multiple children from array with inline loop on root' do
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
@@ -272,22 +225,6 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal 'world', parsed.second['content']
   end
 
-  test 'nesting multiple children from array with inline loop on root with old api' do
-    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
-
-    json = Jbuilder.encode do |json|
-      ::ActiveSupport::Deprecation.silence do
-        json.call(comments) do |json, comment|
-          json.content comment.content
-        end
-      end
-    end
-
-    parsed = MultiJson.load(json)
-    assert_equal 'hello', parsed.first['content']
-    assert_equal 'world', parsed.second['content']
-  end
-
   test 'array nested inside nested hash' do
     json = Jbuilder.encode do |json|
       json.author do
@@ -337,24 +274,6 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_not_equal 'hello', MultiJson.load(json)[0]['not_in_json']
   end
 
-  test 'directly set an array nested in another array with old api' do
-    data = [ { :department => 'QA', :not_in_json => 'hello', :names => ['John', 'David'] } ]
-    json = Jbuilder.encode do |json|
-      ::ActiveSupport::Deprecation.silence do
-        json.array! data do |json, object|
-          json.department object[:department]
-          json.names do
-            json.array! object[:names]
-          end
-        end
-      end
-    end
-
-    parsed = MultiJson.load(json)
-    assert_equal 'David', parsed.first['names'].last
-    assert_not_equal 'hello', parsed.first['not_in_json']
-  end
-
   test 'nested jbuilder objects' do
     to_nest = Jbuilder.new
     to_nest.nested_value 'Nested Test'
@@ -484,8 +403,8 @@ class JbuilderTest < ActiveSupport::TestCase
 
   test 'initialize via options hash' do
     jbuilder = Jbuilder.new(:key_formatter => 1, :ignore_nil => 2)
-    assert_equal 1, jbuilder.instance_eval('@key_formatter')
-    assert_equal 2, jbuilder.instance_eval('@ignore_nil')
+    assert_equal 1, jbuilder.instance_eval{ @key_formatter }
+    assert_equal 2, jbuilder.instance_eval{ @ignore_nil }
   end
 
   test 'key_format! with parameter' do

data/test/scaffold_controller_generator_test.rb

@@ -38,7 +38,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
 
       assert_instance_method :update, content do |m|
         assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully updated\.' \}/, m
-        assert_match /format\.json \{ head :no_content \}/, m
+        assert_match /format\.json \{ render action: 'show', status: :ok, location: @post \}/, m
         assert_match /format\.html \{ render action: 'edit' \}/, m
         assert_match /format\.json \{ render json: @post.errors, status: :unprocessable_entity \}/, m
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,8 +58,10 @@ files:
 - lib/generators/rails/templates/index.json.jbuilder
 - lib/generators/rails/templates/show.json.jbuilder
 - lib/jbuilder.rb
+- lib/jbuilder/dependency_tracker.rb
 - lib/jbuilder/jbuilder_template.rb
 - lib/jbuilder/railtie.rb
+- test/jbuilder_dependency_tracker_test.rb
 - test/jbuilder_generator_test.rb
 - test/jbuilder_template_test.rb
 - test/jbuilder_test.rb
@@ -76,20 +78,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL
 test_files:
+- test/jbuilder_dependency_tracker_test.rb
 - test/jbuilder_generator_test.rb
 - test/jbuilder_template_test.rb
 - test/jbuilder_test.rb
 - test/scaffold_controller_generator_test.rb
+has_rdoc: