jbuilder 2.3.2 → 2.9.1

data/test/jbuilder_test.rb

@@ -49,7 +49,7 @@ end
 
 
 class JbuilderTest < ActiveSupport::TestCase
-  setup do
+  teardown do
     Jbuilder.send :class_variable_set, '@@key_formatter', nil
   end
 
@@ -75,7 +75,7 @@ class JbuilderTest < ActiveSupport::TestCase
     end
 
     assert result.has_key?('content')
-    assert_equal nil, result['content']
+    assert_nil result['content']
   end
 
   test 'multiple keys' do
@@ -686,4 +686,40 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test "throws MergeError when trying to merge array with non-empty hash" do
+    assert_raise Jbuilder::MergeError do
+      jbuild do |json|
+        json.name "Daniel"
+        json.merge! []
+      end
+    end
+  end
+
+  test "throws MergeError when trying to merge hash with array" do
+    assert_raise Jbuilder::MergeError do
+      jbuild do |json|
+        json.array!
+        json.merge!({})
+      end
+    end
+  end
+
+  test "throws MergeError when trying to merge invalid objects" do
+    assert_raise Jbuilder::MergeError do
+      jbuild do |json|
+        json.name "Daniel"
+        json.merge! "Nope"
+      end
+    end
+  end
+
+  if RUBY_VERSION >= "2.2.10"
+    test "respects JSON encoding customizations" do
+      # Active Support overrides Time#as_json for custom formatting.
+      # Ensure we call #to_json on the final attributes instead of JSON.dump.
+      result = JSON.load(Jbuilder.encode { |json| json.time Time.parse("2018-05-13 11:51:00.485 -0400") })
+      assert_equal "2018-05-13T11:51:00.485-04:00", result["time"]
+    end
+  end
 end

data/test/scaffold_api_controller_generator_test.rb

@@ -6,7 +6,7 @@ if Rails::VERSION::MAJOR > 4
 
   class ScaffoldApiControllerGeneratorTest < Rails::Generators::TestCase
     tests Rails::Generators::ScaffoldControllerGenerator
-    arguments %w(Post title body:text --api)
+    arguments %w(Post title body:text images:attachments --api)
     destination File.expand_path('../tmp', __FILE__)
     setup :prepare_destination
 
@@ -15,7 +15,7 @@ if Rails::VERSION::MAJOR > 4
 
       assert_file 'app/controllers/posts_controller.rb' do |content|
         assert_instance_method :index, content do |m|
-          assert_match /@posts = Post\.all/, m
+          assert_match %r{@posts = Post\.all}, m
         end
 
         assert_instance_method :show, content do |m|
@@ -23,23 +23,36 @@ if Rails::VERSION::MAJOR > 4
         end
 
         assert_instance_method :create, content do |m|
-          assert_match /@post = Post\.new\(post_params\)/, m
-          assert_match /@post\.save/, m
-          assert_match /render :show, status: :created, location: @post/, m
-          assert_match /render json: @post\.errors, status: :unprocessable_entity/, m
+          assert_match %r{@post = Post\.new\(post_params\)}, m
+          assert_match %r{@post\.save}, m
+          assert_match %r{render :show, status: :created, location: @post}, m
+          assert_match %r{render json: @post\.errors, status: :unprocessable_entity}, m
         end
 
         assert_instance_method :update, content do |m|
-          assert_match /render :show, status: :ok, location: @post/, m
-          assert_match /render json: @post.errors, status: :unprocessable_entity/, m
+          assert_match %r{render :show, status: :ok, location: @post}, m
+          assert_match %r{render json: @post.errors, status: :unprocessable_entity}, m
         end
 
         assert_instance_method :destroy, content do |m|
-          assert_match /@post\.destroy/, m
+          assert_match %r{@post\.destroy}, m
         end
 
-        assert_match(/def post_params/, content)
-        assert_match(/params\.require\(:post\)\.permit\(:title, :body\)/, content)
+        assert_match %r{def post_params}, content
+        if Rails::VERSION::MAJOR >= 6
+          assert_match %r{params\.require\(:post\)\.permit\(:title, :body, images: \[\]\)}, content
+        else
+          assert_match %r{params\.require\(:post\)\.permit\(:title, :body, :images\)}, content
+        end
+      end
+    end
+
+    test 'dont use require and permit if there are no attributes' do
+      run_generator %w(Post --api)
+
+      assert_file 'app/controllers/posts_controller.rb' do |content|
+        assert_match %r{def post_params}, content
+        assert_match %r{params\.fetch\(:post, \{\}\)}, content
       end
     end
   end

data/test/scaffold_controller_generator_test.rb

@@ -4,7 +4,7 @@ require 'generators/rails/scaffold_controller_generator'
 
 class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   tests Rails::Generators::ScaffoldControllerGenerator
-  arguments %w(Post title body:text)
+  arguments %w(Post title body:text images:attachments)
   destination File.expand_path('../tmp', __FILE__)
   setup :prepare_destination
 
@@ -13,7 +13,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
 
     assert_file 'app/controllers/posts_controller.rb' do |content|
       assert_instance_method :index, content do |m|
-        assert_match /@posts = Post\.all/, m
+        assert_match %r{@posts = Post\.all}, m
       end
 
       assert_instance_method :show, content do |m|
@@ -21,7 +21,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       end
 
       assert_instance_method :new, content do |m|
-        assert_match /@post = Post\.new/, m
+        assert_match %r{@post = Post\.new}, m
       end
 
       assert_instance_method :edit, content do |m|
@@ -29,29 +29,42 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       end
 
       assert_instance_method :create, content do |m|
-        assert_match /@post = Post\.new\(post_params\)/, m
-        assert_match /@post\.save/, m
-        assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully created\.' \}/, m
-        assert_match /format\.json \{ render :show, status: :created, location: @post \}/, m
-        assert_match /format\.html \{ render :new \}/, m
-        assert_match /format\.json \{ render json: @post\.errors, status: :unprocessable_entity \}/, m
+        assert_match %r{@post = Post\.new\(post_params\)}, m
+        assert_match %r{@post\.save}, m
+        assert_match %r{format\.html \{ redirect_to @post, notice: 'Post was successfully created\.' \}}, m
+        assert_match %r{format\.json \{ render :show, status: :created, location: @post \}}, m
+        assert_match %r{format\.html \{ render :new \}}, m
+        assert_match %r{format\.json \{ render json: @post\.errors, status: :unprocessable_entity \}}, m
       end
 
       assert_instance_method :update, content do |m|
-        assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully updated\.' \}/, m
-        assert_match /format\.json \{ render :show, status: :ok, location: @post \}/, m
-        assert_match /format\.html \{ render :edit \}/, m
-        assert_match /format\.json \{ render json: @post.errors, status: :unprocessable_entity \}/, m
+        assert_match %r{format\.html \{ redirect_to @post, notice: 'Post was successfully updated\.' \}}, m
+        assert_match %r{format\.json \{ render :show, status: :ok, location: @post \}}, m
+        assert_match %r{format\.html \{ render :edit \}}, m
+        assert_match %r{format\.json \{ render json: @post.errors, status: :unprocessable_entity \}}, m
       end
 
       assert_instance_method :destroy, content do |m|
-        assert_match /@post\.destroy/, m
-        assert_match /format\.html \{ redirect_to posts_url, notice: 'Post was successfully destroyed\.' \}/, m
-        assert_match /format\.json \{ head :no_content \}/, m
+        assert_match %r{@post\.destroy}, m
+        assert_match %r{format\.html \{ redirect_to posts_url, notice: 'Post was successfully destroyed\.' \}}, m
+        assert_match %r{format\.json \{ head :no_content \}}, m
       end
 
-      assert_match(/def post_params/, content)
-      assert_match(/params\.require\(:post\)\.permit\(:title, :body\)/, content)
+      assert_match %r{def post_params}, content
+      if Rails::VERSION::MAJOR >= 6
+        assert_match %r{params\.require\(:post\)\.permit\(:title, :body, images: \[\]\)}, content
+      else
+        assert_match %r{params\.require\(:post\)\.permit\(:title, :body, :images\)}, content
+      end
+    end
+  end
+
+  test 'dont use require and permit if there are no attributes' do
+    run_generator %w(Post)
+
+    assert_file 'app/controllers/posts_controller.rb' do |content|
+      assert_match %r{def post_params}, content
+      assert_match %r{params\.fetch\(:post, \{\}\)}, content
     end
   end
 end

data/test/test_helper.rb

@@ -1,14 +1,34 @@
 require "bundler/setup"
+
 require "active_support"
+require "active_support/core_ext/array/access"
+require "active_support/cache/memory_store"
+require "active_support/json"
+require "active_model"
+require "action_view"
 require "rails/version"
 
-if Rails::VERSION::STRING > "4.0"
-  require "active_support/testing/autorun"
-else
-  require "test/unit"
+require "jbuilder"
+
+require "active_support/testing/autorun"
+require "mocha/setup"
+
+ActiveSupport.test_order = :random
+
+class << Rails
+  def cache
+    @cache ||= ActiveSupport::Cache::MemoryStore.new
+  end
 end
 
+class Post < Struct.new(:id, :body, :author_name); end
 
-if ActiveSupport.respond_to?(:test_order=)
-  ActiveSupport.test_order = :random
+class Racer < Struct.new(:id, :name)
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
 end
+
+ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
+
+ActionView::Base.remove_possible_method :fragment_name_with_digest
+ActionView::Base.remove_possible_method :cache_fragment_name

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.9.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
-- Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,38 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 4.2.0
 description: 
-email:
-- david@37signals.com
-- pavel@pravosud.com
+email: david@basecamp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -62,19 +39,19 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_3_0.gemfile
-- gemfiles/rails_3_1.gemfile
-- gemfiles/rails_3_2.gemfile
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
-- gemfiles/rails_edge.gemfile
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_head.gemfile
 - jbuilder.gemspec
 - lib/generators/rails/jbuilder_generator.rb
 - lib/generators/rails/scaffold_controller_generator.rb
 - lib/generators/rails/templates/api_controller.rb
 - lib/generators/rails/templates/controller.rb
 - lib/generators/rails/templates/index.json.jbuilder
+- lib/generators/rails/templates/partial.json.jbuilder
 - lib/generators/rails/templates/show.json.jbuilder
 - lib/jbuilder.rb
 - lib/jbuilder/blank.rb
@@ -110,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL

data/gemfiles/rails_3_0.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake"
-gem "mocha", :require => false
-gem "appraisal"
-gem "pry"
-gem "test-unit"
-gem "railties", "~> 3.0.0"
-gem "actionpack", "~> 3.0.0"
-gem "activemodel", "~> 3.0.0"
-
-gemspec :path => "../"

data/gemfiles/rails_3_1.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake"
-gem "mocha", :require => false
-gem "appraisal"
-gem "pry"
-gem "test-unit"
-gem "railties", "~> 3.1.0"
-gem "actionpack", "~> 3.1.0"
-gem "activemodel", "~> 3.1.0"
-
-gemspec :path => "../"

data/gemfiles/rails_3_2.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake"
-gem "mocha", :require => false
-gem "appraisal"
-gem "pry"
-gem "test-unit"
-gem "railties", "~> 3.2.0"
-gem "actionpack", "~> 3.2.0"
-gem "activemodel", "~> 3.2.0"
-
-gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake"
-gem "mocha", :require => false
-gem "appraisal"
-gem "pry"
-gem "railties", "~> 4.0.0"
-gem "actionpack", "~> 4.0.0"
-gem "activemodel", "~> 4.0.0"
-
-gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake"
-gem "mocha", :require => false
-gem "appraisal"
-gem "pry"
-gem "railties", "~> 4.1.0"
-gem "actionpack", "~> 4.1.0"
-gem "activemodel", "~> 4.1.0"
-
-gemspec :path => "../"

data/gemfiles/rails_edge.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake"
-gem "mocha", :require => false
-gem "appraisal"
-gem "pry"
-gem "rails", ">= 5.0.0.alpha", :github => "rails/rails"
-gem "arel", ">= 7.0.0.alpha", :github => "rails/arel"
-gem "rack", ">= 2.0.0.alpha", :github => "rack/rack"
-
-gemspec :path => "../"