jbuilder 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d81b1f225c9a1a5434a32b5860caf0c700fc84d
-  data.tar.gz: ae62a5c52ee9a478edbbed2e932c6909430c1959
+  metadata.gz: 2772c97d74b0d758e3c0d5ea5f9a3b4c6e183ca2
+  data.tar.gz: 90cd6541479870d8f980c16efb259610a8f3c84e
 SHA512:
-  metadata.gz: 5623f106449739cdf61722fd4e29953d639290e49b055a3f41a05bbe2db23b7ac82cef05a19ef7d7b04cdb3bab1f7fbaafb3381b21955914ad64443e62daef03
-  data.tar.gz: fa4e9acff1b741491f768fca5aaef394068fc82dee66e98bac904bdeec3d99dc4c1cada77917d36fd0981e0f43a74eaedc9371ba2cde0cab7d3c4f54e26a16b7
+  metadata.gz: ccb161cc31da1151f75abb7d28d9c3c0fcb66945d22ebe6e93442cc2aa6b3be8e95eb53067d6f546ff86f05efa1de304b96b2afeed4424a998b8d52e5285886f
+  data.tar.gz: a2e3d859a9a5fb8909cdfe085f99f9881c2ca24da64c906d804cb7714ad636512e4de12e8a970f9dcf159c7394f9bc2db6f7be90886b5877bd1b5d4f5bb9dc27

data/Appraisals

@@ -38,7 +38,7 @@ appraise "rails-4-2" do
 end
 
 appraise "rails-5-0" do
-  gem "railties", ">= 5.0.0.beta1", "< 5.1"
-  gem "actionpack", ">= 5.0.0.beta1", "< 5.1"
-  gem "activemodel", ">= 5.0.0.beta1", "< 5.1"
+  gem "railties", ">= 5.0.0.beta2", "< 5.1"
+  gem "actionpack", ">= 5.0.0.beta2", "< 5.1"
+  gem "activemodel", ">= 5.0.0.beta2", "< 5.1"
 end

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+2.4.1
+-----
+
+* [Fix controller generators to be Rails 5 compatible](https://github.com/rails/jbuilder/commit/2dc6203c5c4a98701d5b64c2a5200835a48bb533)
+
+2.4.0
+-----
+
+* [Rails 5 compatibility](https://github.com/rails/jbuilder/commit/4aa2cfcc19a4634d65a28ffc75f0ac0cb8304115)
+
 2.3.2
 -----
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015 David Heinemeier Hansson, 37signals
+Copyright (c) 2011-2016 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

data/gemfiles/rails_5_0.gemfile

@@ -6,8 +6,8 @@ gem "rake"
 gem "mocha", :require => false
 gem "appraisal"
 gem "pry"
-gem "railties", ">= 5.0.0.beta1", "< 5.1"
-gem "actionpack", ">= 5.0.0.beta1", "< 5.1"
-gem "activemodel", ">= 5.0.0.beta1", "< 5.1"
+gem "railties", ">= 5.0.0.beta2", "< 5.1"
+gem "actionpack", ">= 5.0.0.beta2", "< 5.1"
+gem "activemodel", ">= 5.0.0.beta2", "< 5.1"
 
 gemspec :path => "../"

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.4.0'
+  s.version  = '2.4.1'
   s.authors  = ['David Heinemeier Hansson', 'Pavel Pravosud']
   s.email    = ['david@37signals.com', 'pavel@pravosud.com']
   s.summary  = 'Create JSON structures via a Builder-style DSL'

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

@@ -54,7 +54,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     # Never trust parameters from the scary internet, only allow the white list through.
     def <%= "#{singular_table_name}_params" %>
       <%- if attributes_names.empty? -%>
-      params[<%= ":#{singular_table_name}" %>]
+      params.fetch(<%= ":#{singular_table_name}" %>, {})
       <%- else -%>
       params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
       <%- end -%>

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

@@ -75,7 +75,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     # Never trust parameters from the scary internet, only allow the white list through.
     def <%= "#{singular_table_name}_params" %>
       <%- if attributes_names.empty? -%>
-      params[<%= ":#{singular_table_name}" %>]
+      params.fetch(<%= ":#{singular_table_name}" %>, {})
       <%- else -%>
       params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
       <%- end -%>

data/test/scaffold_api_controller_generator_test.rb

@@ -42,5 +42,14 @@ if Rails::VERSION::MAJOR > 4
         assert_match(/params\.require\(:post\)\.permit\(:title, :body\)/, content)
       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(/def post_params/, content)
+        assert_match(/params\.fetch\(:post, {}\)/, content)
+      end
+    end
   end
 end

data/test/scaffold_controller_generator_test.rb

@@ -54,4 +54,13 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       assert_match(/params\.require\(:post\)\.permit\(:title, :body\)/, content)
     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(/def post_params/, content)
+      assert_match(/params\.fetch\(:post, {}\)/, content)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,7 +69,6 @@ files:
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
-- gemfiles/rails_edge.gemfile
 - jbuilder.gemspec
 - lib/generators/rails/jbuilder_generator.rb
 - lib/generators/rails/scaffold_controller_generator.rb

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 => "../"