jbuilder 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4b4939ae1d814cadb9d44ab80a4489d59b4c8a5
-  data.tar.gz: ae232631e1f37a815ae5e46cb45c88706c803da8
+  metadata.gz: 480dacfaafb41be4517c97fe4feaac06ca419a0a
+  data.tar.gz: 743ad605818ab2e8c7d1fe9656ce417f6ac19db6
 SHA512:
-  metadata.gz: b0e4fb3d778a25514a6b82f6bdca2519690fe85719a902ec95c72ae5f7016f796e7567ca847cc369752077525d47f38344edff9f97d03a3a9dbe47b195c88d39
-  data.tar.gz: 24e1713528b9d0bfaa2d90c32f1432440c58acb7e6619c75d1956d23c041ef66672162dc97888af8f7558cd17024f33234102a285001a3188ba97bf39e6fd5ef
+  metadata.gz: d87af4a001cd83a919991616c7f5ed825ec84c80a2552c1b7e135b154f758ba62155acc343b0ff6a4fe97ce670f46f093468a86a84335679afeff319d0ecc278
+  data.tar.gz: 7156d387cd06d96bde5ae5f0fe1768eb283868e4e964a88c1b138357ddfeda1b51ca1eecba7f2bde75bbf157773c02fa117f722ee3a4bdb0281ecd054ff441e1

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 2.1
   - 2.2.5
   - 2.3.1
+  - 2.4.0
   - ruby-head
   - jruby-19mode
   - rbx
@@ -39,6 +40,16 @@ matrix:
       gemfile: gemfiles/rails_5_0.gemfile
     - rvm: rbx
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_1.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_2.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4_1.gemfile
 
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
+2.6.2
+-----
+
+* Fix thor warnings
+
 2.6.1
 -----
 
-* [Optimize root caches with cache_root!][https://github.com/rails/jbuilder/pull/370]
+* [Optimize root caches with cache_root!](https://github.com/rails/jbuilder/pull/370)
 
 2.6.0
 -----

data/README.md

@@ -124,7 +124,7 @@ company.to_builder.target!
 ```
 
 You can either use Jbuilder stand-alone or directly as an ActionView template
-language. When required in Rails, you can create views ala show.json.jbuilder
+language. When required in Rails, you can create views a la show.json.jbuilder
 (the json is already yielded):
 
 ``` ruby

data/gemfiles/rails_4_2.gemfile

@@ -9,5 +9,6 @@ gem "pry"
 gem "railties", "~> 4.2.0"
 gem "actionpack", "~> 4.2.0"
 gem "activemodel", "~> 4.2.0"
+gem "nokogiri", "< 1.7" if RUBY_VERSION < "2.1"
 
 gemspec :path => "../"

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.6.1'
+  s.version  = '2.6.2'
   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/scaffold_controller_generator.rb

@@ -6,7 +6,7 @@ module Rails
     class ScaffoldControllerGenerator
       source_paths << File.expand_path('../templates', __FILE__)
 
-      hook_for :jbuilder, default: true
+      hook_for :jbuilder, type: :boolean, default: true
     end
   end
 end

data/lib/generators/rails/templates/index.json.jbuilder

@@ -1 +1 @@
-json.array! @<%= plural_table_name %>, partial: '<%= plural_table_name %>/<%= singular_table_name %>', as: :<%= singular_table_name %>
+json.array! @<%= plural_table_name %>, partial: '<%= plural_table_name %>/<%= singular_table_name %>', as: :<%= singular_table_name %>

data/lib/generators/rails/templates/partial.json.jbuilder

@@ -1,2 +1,2 @@
 json.extract! <%= singular_table_name %>, <%= attributes_list_with_timestamps %>
-json.url <%= singular_table_name %>_url(<%= singular_table_name %>, format: :json)
+json.url <%= singular_table_name %>_url(<%= singular_table_name %>, format: :json)

data/lib/generators/rails/templates/show.json.jbuilder

@@ -1 +1 @@
-json.partial! "<%= plural_table_name %>/<%= singular_table_name %>", <%= singular_table_name %>: @<%= singular_table_name %>
+json.partial! "<%= plural_table_name %>/<%= singular_table_name %>", <%= singular_table_name %>: @<%= singular_table_name %>

data/lib/jbuilder/jbuilder_template.rb

@@ -11,6 +11,7 @@ class JbuilderTemplate < Jbuilder
 
   def initialize(context, *args)
     @context = context
+    @cached_root = nil
     super(*args)
   end
 

data/test/jbuilder_template_test.rb

@@ -307,18 +307,6 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_equal %w[a b c], result
   end
 
-  test "fragment caching works with previous version of cache digests" do
-    undef_context_methods :cache_fragment_name
-
-    @context.expects :fragment_name_with_digest
-
-    jbuild <<-JBUILDER
-      json.cache! "cachekey" do
-        json.name "Cache"
-      end
-    JBUILDER
-  end
-
   test "fragment caching works with current cache digests" do
     undef_context_methods :fragment_name_with_digest
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL