jb 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a34b7b4a0cd8cd4bfd32bc44021c6047f7c78dc77b3bce9fafe43ab0d82830
-  data.tar.gz: de224b08f0492fa32932377cb7c4c4052a5160cb76e5c25b5f75da47be32602d
+  metadata.gz: 9c707621b4d6ba3cbaa4de4b318663845a7b818abf61eb3627b7b00e0528060d
+  data.tar.gz: e5e190db6aef763bacf00c4d172bba4d6e6b12c158e56df7155031dd400d8950
 SHA512:
-  metadata.gz: d7614ee922fd93b2d30fa51e8525da65a395c4a3dc82d26d535e53fe4a78886037b7ef0672bf417e56544242a06c31baec4d389e46385490767144a66038fa1c
-  data.tar.gz: b29639a9d5fbee1e1c0a77218dbfa110744dcf1b9819c26de0ead0b86c5afea3e696cf9122c804bf1e932ce27179cc11c3cd07e29ab614194f07b1c1f7aece76
+  metadata.gz: f038b6e4eaaf94b1a55111943a72a528681326b32e3112c3b010163c806ce146cb19151b319c4677f74873760815db072aba22b9ad53763c0b621289973ce47b
+  data.tar.gz: 3a8318862bc399f9d0e27048b8902ed89f51fe9b9cfa1f832043b089bf5bbee2130672deb965a332631b48142a24140a13c771465db1e57c39dc3cf3fe1ab16b

data/.travis.yml

@@ -1,13 +1,14 @@
 sudo: false
 language: ruby
 
-before_install: gem up --system && gem i bundler -v '<2'
+before_install: "gem uni -x -i /home/travis/.rvm/gems/ruby-2.5.5@global bundler && gem i bundler -v '<2'"
 
 rvm:
-  - 2.6.0
-  - 2.5.3
+  - 2.6.2
+  - 2.5.5
 
 gemfile:
+  - gemfiles/rails_60.gemfile
   - gemfiles/rails_52.gemfile
   - gemfiles/rails_51.gemfile
   - gemfiles/rails_50.gemfile

data/gemfiles/rails_60.gemfile

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

data/jb.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit-rails'
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'action_args'
+  spec.add_development_dependency 'byebug'
 end

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) ? MultiJson.dump(super) : 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,55 +1,33 @@
 # 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
-      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
+  # 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, MultiJson.dump(rendered_template.body) if template.respond_to?(:handler) && (template.handler == Jb::Handler)
+        rendered_template
       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) ? MultiJson.dump(super) : super
+  # 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
+::ActionView::PartialRenderer.prepend ::Jb::PartialRendererExtension

data/lib/jb/railtie.rb

@@ -4,7 +4,12 @@ module Jb
   class Railtie < ::Rails::Railtie
     initializer 'jb' do
       ActiveSupport.on_load :action_view do
-        require 'jb/action_view_monkeys'
+        require 'multi_json'
+        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

data/lib/jb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Faster and simpler JSON renderer for Rails
 email:
 - ronnie@dio.jp
@@ -115,12 +129,14 @@ files:
 - 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
 - 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
@@ -144,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Faster and simpler Jbuilder alternative