jb 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59eb01a4bdc65f57ef3be62f4d48adf07bfba844153648ed67d99040524b6574
-  data.tar.gz: 32ea214a1d1d0a0cc1cf8d066e13788d0427313d44ef0719d6e2f229efe03628
+  metadata.gz: '09fa54e898f00cadade145bbad06c48b3a110d780cb7caa61f652f3b5b9f91d4'
+  data.tar.gz: 8f7d703998d358b7be99b5a3dec6779b816ef135cd33c434aad95bf151205c13
 SHA512:
-  metadata.gz: de7988c0db6f46a64562f9dbb3b072887fb0120157e853b92819008674ca4ebaff564adf6c635b6885074e8dfea2769bf34cb34db7d659af038073362cd02398
-  data.tar.gz: a8a754d42c80ea3db3bed9d55b63f704b16531ba0ed16ce6fa9bfa15af18599958743f4c3dff836a464345a3e6c3868cb0e1f4385a193da049985e1dfba2a4c1
+  metadata.gz: b1ccca7074f5b936db1d12e164404adaee0916255f4ee0bc2d92f080d5948e7d0cd661a18feaf29895842424377992f05807a9f498244af7617fef9d0722812c
+  data.tar.gz: 8564a73f19b09a5a9a75e4f07e92811a90b924de039832e4642ebb5b119403cb20a5c05023004b446ea8331f30b1129747cbc87db8af0aaa75183a1e5e11f063

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.7.0
-  - 2.6.5
-  - 2.5.7
+  - 2.7.2
+  - 2.6.6
+  - 2.5.8
 
 gemfile:
   - gemfiles/rails_60.gemfile
@@ -14,11 +14,20 @@ gemfile:
 
 matrix:
   exclude:
-    - rvm: 2.7.0
+    - rvm: 2.7.2
       gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.7.0
+    - rvm: 2.7.2
       gemfile: gemfiles/rails_51.gemfile
-    - rvm: 2.7.0
+    - rvm: 2.7.2
       gemfile: gemfiles/rails_50.gemfile
-    - rvm: 2.7.0
+    - rvm: 2.7.2
       gemfile: gemfiles/rails_42.gemfile
+
+  include:
+    - rvm: 2.7.2
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_edge.gemfile
+
+  allow_failures:
+    - rvm: ruby-head

data/gemfiles/rails_60.gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
-gem 'rails', '~> 6.0.0.beta3'
+gem 'rails', '~> 6.0.0'
 gem 'selenium-webdriver'

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+github 'rails/rails' do
+  gem 'rails'
+end
+
+gem 'selenium-webdriver'

data/jb.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'multi_json'
-
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'test-unit-rails'

data/lib/jb/action_view_legacy_monkeys.rb

@@ -44,7 +44,7 @@ module Jb
   module TemplateRenderer
     module JSONizer
       def render_template(template, *)
-        template.respond_to?(:handler) && (template.handler == Jb::Handler) ? MultiJson.dump(super) : super
+        template.respond_to?(:handler) && (template.handler == Jb::Handler) ? super.to_json : super
       end
     end
   end

data/lib/jb/action_view_monkeys.rb

@@ -7,13 +7,28 @@ module Jb
     module JSONizer
       def render_template(_view, template, *)
         rendered_template = super
-        rendered_template.instance_variable_set :@body, MultiJson.dump(rendered_template.body) if template.respond_to?(:handler) && (template.handler == Jb::Handler)
+        rendered_template.instance_variable_set :@body, rendered_template.body.to_json if template.respond_to?(:handler) && (template.handler == Jb::Handler)
         rendered_template
       end
     end
   end
 
-  # A monkey-patch for jb template collection result's `body` not to return a String but an Array
+  # Rails 6.1+: A monkey-patch for jb template collection result's `body` not to return a String but an Array
+  module CollectionRendererExtension
+    private def render_collection(_collection, _view, _path, template, _layout, _block)
+      obj = super
+      if template.respond_to?(:handler) && (template.handler == Jb::Handler)
+        if ActionView::AbstractRenderer::RenderedCollection::EmptyCollection === obj
+          def obj.body; []; end
+        else
+          def obj.body; @rendered_templates.map(&:body); end
+        end
+      end
+      obj
+    end
+  end
+
+  # Rails 6.0: A monkey-patch for jb template collection result's `body` not to return a String but an Array
   module PartialRendererExtension
     private def render_collection(_view, template)
       obj = super
@@ -30,4 +45,9 @@ module Jb
 end
 
 ::ActionView::TemplateRenderer.prepend ::Jb::TemplateRenderer::JSONizer
-::ActionView::PartialRenderer.prepend ::Jb::PartialRendererExtension
+begin
+  # ActionView::CollectionRenderer is a newly added class since 6.1
+  ::ActionView::CollectionRenderer.prepend ::Jb::CollectionRendererExtension
+rescue NameError
+  ::ActionView::PartialRenderer.prepend ::Jb::PartialRendererExtension
+end

data/lib/jb/railtie.rb

@@ -4,7 +4,6 @@ module Jb
   class Railtie < ::Rails::Railtie
     initializer 'jb' do
       ActiveSupport.on_load :action_view do
-        require 'multi_json'
         if Rails::VERSION::MAJOR >= 6
           require 'jb/action_view_monkeys'
         else

data/lib/jb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jb
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jb
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-04 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +116,7 @@ files:
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
 - gemfiles/rails_60.gemfile
+- gemfiles/rails_edge.gemfile
 - jb.gemspec
 - lib/generators/rails/jb_generator.rb
 - lib/generators/rails/scaffold_controller_generator.rb
@@ -145,7 +132,7 @@ homepage: https://github.com/amatsuda/jb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Faster and simpler Jbuilder alternative
 test_files: []