jbuilder-jpartial 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2f9434cebd1a5017cad21be3ca7fea80c032df
-  data.tar.gz: d2411db16a9402ca9e6c4598cc04369b0c2aba80
+  metadata.gz: 75e8c4257f48d6ef56dcaaf8047bef63df892137
+  data.tar.gz: 4f22e415d52ea9f82f097f5e05e2a42c22200c9a
 SHA512:
-  metadata.gz: f4b7ea3b7df144a67dac206210cba740d1f5bea80c948fde961122243bdb4da4d2f9559b1a2a7b0471a96a3352e0918144ce2868be1c9199c3c4dba6dd02dbc2
-  data.tar.gz: a9778f7acc70ae28acd6421bdfaa29e8341f4578131913e83da817f018a5e168fef69565ebad0b102f53242b018cfcaf5fb67042c12b5f291f16ea28eba3358f
+  metadata.gz: da10106742ea3e98614392ee921e09caf4d8f77d6047632e4b1d4a9a065b01253d704c7409c8045dfb84d5804e411ba97a14b47eb61194e24499a94f0af70238
+  data.tar.gz: 118c304e9eca4ac54df216e59bc8146ca10e427b6dbae58a9e46ed807557cd53b8eea1942cd3e4a04e2487384f257e1d2c992dda09ec627ac1c3af9812acee33

data/lib/jbuilder/jpartial.rb

@@ -20,19 +20,37 @@ class Jbuilder
   module Jpartial
     DangerousMethodName = Class.new(ArgumentError)
 
+    @defined_by_user = []
+
     def self.jpartial(name, &block)
-      Jbuilder.class_eval do
-        if method_defined?(name) || private_method_defined?(name)
-          raise DangerousMethodName, "The method `##{name}` is already defined"\
+      if dangerous_method_name?(name)
+        raise DangerousMethodName, "The method `##{name}` is already defined"\
           ' by Jbuilder. Please choose another name to define your partial'
-        else
+      else
+        Jbuilder.class_eval do
           define_method(name, &block)
         end
+        @defined_by_user << name unless @defined_by_user.include?(name)
       end
     end
 
+    def self.dangerous_method_name?(name)
+      !@defined_by_user.include?(name) &&
+        Jbuilder.method_defined?(name) ||
+        Jbuilder.private_method_defined?(name)
+    end
+
     def self.configure(&block)
       module_eval(&block)
     end
+
+    # Sends all method calls to Jpartial.jpartial for definition
+    class Template
+      def method_missing(method_name, &block)
+        Jpartial.jpartial(method_name, &block)
+      end
+    end
   end
 end
+
+require 'jbuilder/jpartial/railtie' if defined?(Rails)

data/lib/jbuilder/jpartial/railtie.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails/railtie'
+require 'jbuilder/jbuilder_template'
+require 'jbuilder/jpartial'
+
+class Jbuilder
+  module Jpartial
+    # Adds the #json and #jpartial methods to .jbuilder templates
+    class JpartialHandler < ::JbuilderHandler
+      def self.call(template)
+        %{__already_defined = defined?(json); json||=JbuilderTemplate.new(self);
+          jpartial||=Jbuilder::Jpartial::Template.new;
+          #{template.source} json.target! unless
+          (__already_defined && __already_defined != "method")}
+      end
+    end
+
+    # Loads the template handler, overriding the JbuilderTemplate
+    class Railtie < ::Rails::Railtie
+      initializer :jpartial do
+        ActiveSupport.on_load :action_view do
+          ActionView::Template.register_template_handler :jbuilder,
+                                                         JpartialHandler
+        end
+      end
+    end
+  end
+end

data/lib/jbuilder/jpartial/version.rb

@@ -1,5 +1,5 @@
 class Jbuilder
   module Jpartial
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder-jpartial
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - M. Simon Borg
@@ -62,6 +62,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/jbuilder/jpartial.rb
+- lib/jbuilder/jpartial/railtie.rb
 - lib/jbuilder/jpartial/version.rb
 homepage: https://github.com/msimonborg/jbuilder-jpartial
 licenses: