jb 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb74db932925f1909325449f10a2ac2351ef0bb3b1a010828167d72455971f95
-  data.tar.gz: 7164ea018d3efa679e7dcb87dd99c5c5747c04786abc970a8aa6a00144d36ed1
+  metadata.gz: '09fa54e898f00cadade145bbad06c48b3a110d780cb7caa61f652f3b5b9f91d4'
+  data.tar.gz: 8f7d703998d358b7be99b5a3dec6779b816ef135cd33c434aad95bf151205c13
 SHA512:
-  metadata.gz: 723fe0582c315422cc15b0852ad5a3ddbefcad568aa0d98d1d0a2812bc293ca25a420e9111c15925c92ac9be1f848b63f00c0d0867ec60ba83c44940d434d607
-  data.tar.gz: f7b76dadc834f0aefca888e502c641792eb7824e864bcf63374f162d38916f9a285a34f0463af37e4a3c507bb46b9dcd4ae7ac6cf0c7765a4d5a6442650108f1
+  metadata.gz: b1ccca7074f5b936db1d12e164404adaee0916255f4ee0bc2d92f080d5948e7d0cd661a18feaf29895842424377992f05807a9f498244af7617fef9d0722812c
+  data.tar.gz: 8564a73f19b09a5a9a75e4f07e92811a90b924de039832e4642ebb5b119403cb20a5c05023004b446ea8331f30b1129747cbc87db8af0aaa75183a1e5e11f063

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+gemfiles/*.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -1,5 +1,33 @@
-sudo: false
 language: ruby
+
 rvm:
-  - 2.4.1
-before_install: gem update bundler
+  - 2.7.2
+  - 2.6.6
+  - 2.5.8
+
+gemfile:
+  - gemfiles/rails_60.gemfile
+  - gemfiles/rails_52.gemfile
+  - gemfiles/rails_51.gemfile
+  - gemfiles/rails_50.gemfile
+  - gemfiles/rails_42.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.7.2
+      gemfile: gemfiles/rails_52.gemfile
+    - rvm: 2.7.2
+      gemfile: gemfiles/rails_51.gemfile
+    - rvm: 2.7.2
+      gemfile: gemfiles/rails_50.gemfile
+    - 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/Gemfile

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in jb.gemspec
 gemspec
 
 # For benchmarking
-gem 'jbuilder'
-gem 'benchmark-ips'
 gem 'action_args'

data/README.md

@@ -176,12 +176,11 @@ It's also possible to render collections of partials:
 
 ```ruby
 render partial: 'posts/post', collection: @posts, as: :post
-
-# or
-
-render @post.comments
 ```
 
+> NOTE: Don't use `render @post.comments` because if the collection is empty,
+`render` will return `nil` instead of an empty array.
+
 You can pass any objects into partial templates with or without `:locals` option.
 
 ```ruby
@@ -194,7 +193,7 @@ render 'sub_template', user: user
 
 You can of course include Ruby `nil` as a Hash value if you want. That would become `null` in the JSON.
 
-To prevent Jb from including null values in the output, Active Support provides `Hash#compact!` method for you:
+You can use `Hash#compact`/`!` method to prevent including `null` values in the output:
 
 ```ruby
 {foo: nil, bar: 'bar'}.compact

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/bin/benchmark.sh

@@ -2,4 +2,4 @@
 
 cd $(dirname "$0")/../test/dummy_app
 
-BUNDLE_GEMFILE=../../Gemfile bundle e rails r bin/bench.rb
+BUNDLE_GEMFILE=../../gemfiles/benchmark.gemfile bundle e rails r bin/bench.rb

data/gemfiles/benchmark.gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'rails'
+
+gem 'jbuilder'
+gem 'benchmark-ips'
+gem 'action_args'

data/gemfiles/rails_42.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 4.2.0'
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'

data/gemfiles/rails_50.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 5.0.0'

data/gemfiles/rails_51.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 5.1.0'

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 5.2.0'

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+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

@@ -1,5 +1,6 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jb/version'
@@ -20,11 +21,10 @@ 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", "~> 1.12"
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'test-unit-rails'
   spec.add_development_dependency 'rails'
-  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'action_args'
+  spec.add_development_dependency 'byebug'
 end

data/lib/generators/rails/jb_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rails/generators/named_base'
 require 'rails/generators/resource_helpers'
 

data/lib/generators/rails/scaffold_controller_generator.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
 module Rails
   module Generators
     class ScaffoldControllerGenerator
-      hook_for :jb, default: true
+      hook_for :jb, type: :boolean, default: true
     end
   end
 end

data/lib/jb.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 require "jb/version"
 require 'jb/railtie'

data/lib/jb/action_view_legacy_monkeys.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+# Mokey-patches for Action View 4 and 5
+
+module Jb
+  module PartialRenderer
+    module JbTemplateDetector
+      # A monkey-patch to inject StrongArray module to Jb partial renderer
+      private def find_partial(*)
+        template = super
+        extend RenderCollectionExtension if template && (template.handler == Jb::Handler)
+        template
+      end
+    end
+
+    # A horrible monkey-patch to prevent rendered collection from being converted to String
+    module StrongArray
+      def join(*)
+        self
+      end
+
+      def html_safe
+        self
+      end
+    end
+
+    # A monkey-patch strengthening rendered collection
+    module RenderCollectionExtension
+      private def collection_with_template
+        super.extend StrongArray
+      end
+
+      private def collection_without_template
+        super.extend StrongArray
+      end
+
+      private def render_collection
+        return [] if @collection.blank?
+        super
+      end
+    end
+  end
+
+  # A monkey-patch that converts non-partial result to a JSON String
+  module TemplateRenderer
+    module JSONizer
+      def render_template(template, *)
+        template.respond_to?(:handler) && (template.handler == Jb::Handler) ? super.to_json : super
+      end
+    end
+  end
+end
+
+::ActionView::PartialRenderer.prepend ::Jb::PartialRenderer::JbTemplateDetector
+::ActionView::TemplateRenderer.prepend ::Jb::TemplateRenderer::JSONizer

data/lib/jb/action_view_monkeys.rb

@@ -1,54 +1,53 @@
 # frozen_string_literal: true
-require 'multi_json'
+# Mokey-patches for Action View 6+
 
 module Jb
-  module PartialRenderer
-    module JbTemplateDetector
-      # A monkey-patch to inject StrongArray module to Jb partial renderer
-      private def find_partial
-        template = super
-        extend RenderCollectionExtension if template && (template.handler == Jb::Handler)
-        template
-      end
-    end
-
-    # A horrible monkey-patch to prevent rendered collection from being converted to String
-    module StrongArray
-      def join(*)
-        self
-      end
-
-      def html_safe
-        self
+  # A monkey-patch that converts non-partial result to a JSON String
+  module TemplateRenderer
+    module JSONizer
+      def render_template(_view, template, *)
+        rendered_template = super
+        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 strengthening rendered collection
-    module RenderCollectionExtension
-      private def collection_with_template
-        super.extend StrongArray
-      end
-
-      private def collection_without_template
-        super.extend StrongArray
-      end
-
-      private def render_collection
-        return [] if @collection.blank?
-        super
+  # 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
 
-  # A monkey-patch that converts non-partial result to a JSON String
-  module TemplateRenderer
-    module JSONizer
-      def render_template(template, *)
-        template.respond_to?(:handler) && (template.handler == Jb::Handler) ? MultiJson.dump(super) : super
+  # 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
+      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
 end
 
-::ActionView::PartialRenderer.prepend ::Jb::PartialRenderer::JbTemplateDetector
 ::ActionView::TemplateRenderer.prepend ::Jb::TemplateRenderer::JSONizer
+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/handler.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 module Jb
   class Handler
     class_attribute :default_format
     self.default_format = :json
 
-    def self.call(template)
-      template.source
+    def self.call(template, source=nil)
+      source || template.source
     end
 
     def self.handles_encoding?

data/lib/jb/railtie.rb

@@ -1,14 +1,34 @@
 # frozen_string_literal: true
+
 module Jb
   class Railtie < ::Rails::Railtie
     initializer 'jb' do
       ActiveSupport.on_load :action_view do
-        require 'jb/action_view_monkeys'
+        if Rails::VERSION::MAJOR >= 6
+          require 'jb/action_view_monkeys'
+        else
+          require 'jb/action_view_legacy_monkeys'
+        end
         require 'jb/handler'
         ::ActionView::Template.register_template_handler :jb, Jb::Handler
       end
     end
 
+    if Rails::VERSION::MAJOR >= 5
+      module ::ActionController
+        module ApiRendering
+          include ActionView::Rendering
+        end
+      end
+
+      ActiveSupport.on_load :action_controller do
+        if self == ActionController::API
+          include ActionController::Helpers
+          include ActionController::ImplicitRender
+        end
+      end
+    end
+
     generators do |app|
       Rails::Generators.configure! app.config.generators
       Rails::Generators.hidden_namespaces.uniq!

data/lib/jb/version.rb

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

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: jb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: action_args
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,12 +110,20 @@ files:
 - bin/benchmark.sh
 - bin/console
 - bin/setup
+- gemfiles/benchmark.gemfile
+- gemfiles/rails_42.gemfile
+- gemfiles/rails_50.gemfile
+- 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
 - lib/generators/rails/templates/index.json.jb
 - lib/generators/rails/templates/show.json.jb
 - lib/jb.rb
+- lib/jb/action_view_legacy_monkeys.rb
 - lib/jb/action_view_monkeys.rb
 - lib/jb/handler.rb
 - lib/jb/railtie.rb
@@ -124,7 +132,7 @@ homepage: https://github.com/amatsuda/jb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,9 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Faster and simpler Jbuilder alternative
 test_files: []