jb 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59eb01a4bdc65f57ef3be62f4d48adf07bfba844153648ed67d99040524b6574
-  data.tar.gz: 32ea214a1d1d0a0cc1cf8d066e13788d0427313d44ef0719d6e2f229efe03628
+  metadata.gz: 59c07bc2a0d9dd1b6e304a1f6c3037ccd2234cda1a5273ff8f0d12bb1e814270
+  data.tar.gz: 545f3b027f587ab30de9d2e93fad5b3ea399ad8a6695b9090d3e7b55085ab505
 SHA512:
-  metadata.gz: de7988c0db6f46a64562f9dbb3b072887fb0120157e853b92819008674ca4ebaff564adf6c635b6885074e8dfea2769bf34cb34db7d659af038073362cd02398
-  data.tar.gz: a8a754d42c80ea3db3bed9d55b63f704b16531ba0ed16ce6fa9bfa15af18599958743f4c3dff836a464345a3e6c3868cb0e1f4385a193da049985e1dfba2a4c1
+  metadata.gz: b9ef88b516a5bee2132af07f394a00f03bfda2928764b538189aa061d9af1c60c4942cb874d416e5d36265839bac1df8463cb5c8e795536000a903bbbecadc25
+  data.tar.gz: e0b272e833109cd995104fa033208eca904922a3ef66148dcbe583665917393efd99120800605ae9c35c3527f2530ee96762ee5bb991f650538f7dd0c896fab7

data/.github/workflows/main.yml

@@ -0,0 +1,63 @@
+name: Ruby
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '26 13 * * *'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        ruby_version: [ruby-head, '3.2', '3.1', '3.0', '2.7']
+        rails_version: [edge, '7.0', '6.1']
+
+        include:
+          - ruby_version: '3.0'
+            rails_version: '6.0'
+
+          - ruby_version: '2.7'
+            rails_version: '6.0'
+
+          - ruby_version: '2.6'
+            rails_version: '6.1'
+          - ruby_version: '2.6'
+            rails_version: '6.0'
+          - ruby_version: '2.6'
+            rails_version: '5.2'
+          - ruby_version: '2.6'
+            rails_version: '5.1'
+          - ruby_version: '2.6'
+            rails_version: '5.0'
+          - ruby_version: '2.6'
+            rails_version: '4.2'
+            bundler_version: '1'
+
+          - ruby_version: '2.5'
+            rails_version: '5.2'
+          - ruby_version: '2.5'
+            rails_version: '4.2'
+            bundler_version: '1'
+
+          - ruby_version: '2.4'
+            rails_version: '5.2'
+          - ruby_version: '2.4'
+            rails_version: '4.2'
+            bundler_version: '1'
+
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler: ${{ matrix.bundler_version }}
+          bundler-cache: true
+        continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.allow_failures == 'true') }}
+      - run: bundle exec rake
+        continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.allow_failures == 'true') }}

data/Gemfile

@@ -5,5 +5,18 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in jb.gemspec
 gemspec
 
+if ENV['RAILS_VERSION'] == 'edge'
+  gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'main'
+elsif ENV['RAILS_VERSION']
+  gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
+else
+  gem 'rails'
+end
+
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+gem 'loofah', RUBY_VERSION < '2.5' ? '< 2.21.0' : '>= 0'
+gem 'selenium-webdriver'
+gem 'net-smtp' if RUBY_VERSION >= '3.1'
+
 # For benchmarking
 gem 'action_args'

data/README.md

@@ -21,19 +21,34 @@ Put a template file named `*.jb` in your Rails app's `app/views/*` directory, an
 
 ## Features
 
-* No ugly builder syntax
+* No original builder syntax that you have to learn
 * No `method_missing` calls
 * `render_partial` with :collection option actually renders the collection (unlike Jbuilder)
 
 
 ## Syntax
 
-A `.jb` template should contain Ruby code that returns any Ruby Object that responds_to `to_json` (generally Hash or Array).
-Then the return value will be `to_json`ed to a JSON String.
+A `.jb` template should contain Ruby code that returns any Ruby Object that responds\_to `to_json` (generally Hash or Array). Then the return value will be `to_json`ed to a JSON String.
 
 
 ## Examples
 
+Let's start with a very simple one. Just write a Ruby Hash as a template:
+
+``` ruby
+{language: 'Ruby', author: {name: 'Matz'}}
+```
+
+This renders the following JSON text:
+
+``` javascript
+{"language": "Ruby", "author": {"name": "Matz"}}
+```
+
+Note that modern Ruby Hash syntax pretty much looks alike JSON syntax. It's super-straight forward. Who needs a DSL to do this?
+
+Next one is a little bit advanced usage. The template doesn't have to be a single literal but can be any code that returns a Hash object:
+
 ``` ruby
 # app/views/messages/show.json.jb
 
@@ -97,18 +112,17 @@ This will build the following structure:
 }
 ```
 
-To define attribute and structure names dynamically, just use Ruby Hash.
-Note that modern Ruby Hash syntax pretty much looks alike JSON syntax.
-It's super-straight forward. Who needs a DSL to do this?
+If you want to define attribute and structure names dynamically, of course you still can do this with a Ruby Hash literal.
 
 ``` ruby
-{author: {name: 'Matz'}}
+# model_name, column_name = :author, :name
+
+{model_name => {column_name => 'Matz'}}
 
 # => {"author": {"name": "Matz"}}
 ```
 
-Top level arrays can be handled directly.  Useful for index and other collection actions.
-And you know, Ruby is such a powerful language for manipulating collections:
+Top level arrays can be handled directly. Useful for index and other collection actions. And you know, Ruby is such a powerful language for manipulating collections:
 
 ``` ruby
 # @comments = @post.comments
@@ -136,11 +150,7 @@ Jb has no special DSL method for extracting attributes from array directly, but
 # => [{"id": 1, "name": "Matz"}, {"id": 2, "name": "Nobu"}]
 ```
 
-You can use Jb directly as an Action View template language.
-When required in Rails, you can create views ala show.json.jb.
-You'll notice in the following example that the `.jb` template
-doesn't have to be one big Ruby Hash literal as a whole
-but it can be any Ruby code that finally returns a Hash instance.
+You can use Jb directly as an Action View template language. When required in Rails, you can create views ala `show.json.jb`. You'll notice in the following example that the `.jb` template doesn't have to be one big Ruby Hash literal as a whole but it can be any Ruby code that finally returns a Hash instance.
 
 ``` ruby
 # Any helpers available to views are available in the template
@@ -163,10 +173,7 @@ end
 json
 ```
 
-You can use partials as well.  The following will render the file
-`views/comments/_comments.json.jb`, and set a local variable
-`comments` with all this message's comments, which you can use inside
-the partial.
+You can use partials as well.  The following will render the file `views/comments/_comments.json.jb`, and set a local variable `comments` with all this message's comments, which you can use inside the partial.
 
 ```ruby
 render 'comments/comments', comments: @message.comments
@@ -178,8 +185,7 @@ It's also possible to render collections of partials:
 render partial: 'posts/post', collection: @posts, as: :post
 ```
 
-> NOTE: Don't use `render @post.comments` because if the collection is empty,
-`render` will return `nil` instead of an empty array.
+> 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.
 
@@ -211,8 +217,7 @@ end
 
 
 ## The Generator
-Jb extends the default Rails scaffold generator and adds some .jb templates.
-If you don't need them, please configure like so.
+Jb extends the default Rails scaffold generator and adds some `.jb` templates. If you don't need them, please configure like so.
 
 ```ruby
 Rails.application.config.generators.jb false

data/jb.gemspec

@@ -21,12 +21,11 @@ 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'
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'action_args'
-  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'debug'
+  spec.add_development_dependency 'selenium-webdriver'
 end

data/lib/jb/action_view_legacy_monkeys.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# Mokey-patches for Action View 4 and 5
+# Monkey-patches for Action View 4 and 5
 
 module Jb
   module PartialRenderer
@@ -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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# Mokey-patches for Action View 6+
+# Monkey-patches for Action View 6+
 
 module Jb
   # A monkey-patch that converts non-partial result to a JSON String
@@ -7,13 +7,41 @@ 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 7.1+: A monkey-patch not to stringify rendered object from JB templates
+  module BaseToSCanceller
+    def _run(method, template, *, **)
+      val = super
+      if template.respond_to?(:handler) && (template.handler == Jb::Handler)
+        def val.to_s
+          self
+        end
+      end
+      val
+    end
+  end
+
+  # 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 +58,10 @@ module Jb
 end
 
 ::ActionView::TemplateRenderer.prepend ::Jb::TemplateRenderer::JSONizer
-::ActionView::PartialRenderer.prepend ::Jb::PartialRendererExtension
+::ActionView::Base.prepend ::Jb::BaseToSCanceller if (ActionView::VERSION::MAJOR >= 7) && (ActionView::VERSION::MINOR >= 1)
+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.1'
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: jb
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-04 00:00:00.000000000 Z
+date: 2023-09-16 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,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         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: action_args
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,11 +125,6 @@ files:
 - 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
 - jb.gemspec
 - lib/generators/rails/jb_generator.rb
 - lib/generators/rails/scaffold_controller_generator.rb
@@ -145,7 +140,7 @@ homepage: https://github.com/amatsuda/jb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +155,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.5.0.dev
+signing_key:
 specification_version: 4
 summary: Faster and simpler Jbuilder alternative
 test_files: []

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.7.0
-  - 2.6.5
-  - 2.5.7
-
-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.0
-      gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails_51.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails_50.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails_42.gemfile

data/gemfiles/rails_42.gemfile

@@ -1,8 +0,0 @@
-# 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

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

data/gemfiles/rails_51.gemfile

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

data/gemfiles/rails_52.gemfile

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

data/gemfiles/rails_60.gemfile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-gem 'rails', '~> 6.0.0.beta3'
-gem 'selenium-webdriver'