hocus_pocus 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50f4663cf52a24e1af23e866e8ba90564c9ae6cd041c8a2aef7d8e6fc636ccf
-  data.tar.gz: 219f63589b0736115d11e761df2c88502243da4b43b81e554926a8a13fd4189e
+  metadata.gz: 9e189194e1124be04610db4649e328ae71703fcf95ca1edfe2e40998735c424d
+  data.tar.gz: 972c0c72e3dd81a238def68e3437e192c3fb39f39749998ecf76b344faea07bc
 SHA512:
-  metadata.gz: 0dcb97d7aa7d4b53fb39ff5561dcb1e07b6cb0b863569ebb257ab813ccb92d0d431b25b488bc8173e3701ec872a073e77fa68a2678cad2c3bbdb048e989563a3
-  data.tar.gz: 598eff9be126b971a5de919c78878a598196d7a86dfed0f870c25bcb559ca8d7689624d4164d2b0f1b3a276f3f644054b34d21f07da4aec8860fd0b0e91d2e59
+  metadata.gz: 93cc9018f7b274afd9019a119ad44b2aa9a2ce1c3efdb0008e6942ded92f10adc4ed03735dc6f641380c5ee6c61c0ad0bff8625d64bad6f9ef4f8b88b3ea11af
+  data.tar.gz: 6e3f75ec3c25584165315454b0137b625a142f484c89799de5633415e31624c4fc477fbbad52dd9fcb335e3d85ed3c2c072a4b5064180e688ddff7a2b889cbb5

data/engines/editor/lib/hocus_pocus/editor/railtie.rb

@@ -7,16 +7,30 @@ module HocusPocus
     PARTIAL_FILENAMES = :__hocus_pocus_partial_filenames__
 
     module PartialRendererExtension
-      def render_partial
-        (Thread.current[HocusPocus::Editor::PARTIAL_FILENAMES] ||= []) << @template unless @view.controller.class.name.starts_with?('HocusPocus::')
-        super
+      if ::ActionView::PartialRenderer.instance_method(:render_partial).arity == 2  # Rails 6
+        def render_partial(view, template)
+          (Thread.current[HocusPocus::Editor::PARTIAL_FILENAMES] ||= []) << template unless view.controller.class.name.starts_with?('HocusPocus::')
+          super
+        end
+      else
+        def render_partial
+          (Thread.current[HocusPocus::Editor::PARTIAL_FILENAMES] ||= []) << @template unless @view.controller.class.name.starts_with?('HocusPocus::')
+          super
+        end
       end
     end
 
     module TemplateRendererExtension
-      def render_template(template, layout_name = nil, locals = {})
-        Thread.current[HocusPocus::Editor::VIEW_FILENAME] = template.virtual_path if @view.controller.try(:request).try(:format).try(:html?) && !@view.controller.class.name.starts_with?('HocusPocus::')
-        super
+      if ::ActionView::TemplateRenderer.instance_method(:render_template).arity == 4  # Rails 6
+        def render_template(view, template, layout_name, locals)
+          Thread.current[HocusPocus::Editor::VIEW_FILENAME] = template.virtual_path if view.controller.try(:request).try(:format).try(:html?) && !view.controller.class.name.starts_with?('HocusPocus::')
+          super
+        end
+      else
+        def render_template(template, layout_name = nil, locals = {})
+          Thread.current[HocusPocus::Editor::VIEW_FILENAME] = template.virtual_path if @view.controller.try(:request).try(:format).try(:html?) && !@view.controller.class.name.starts_with?('HocusPocus::')
+          super
+        end
       end
     end
 

data/engines/generator/app/views/hocus_pocus/generator/generator/index.html.erb

@@ -17,7 +17,7 @@
     <div id="container">
       <div id="generate">
         <h1>Generate Scaffold</h1>
-        <%= form_tag scaffold_generator_path, :remote => true, :id => 'generator_form' do %>
+        <%= form_tag scaffold_generator_path, :remote => true, :id => 'generator_form', authenticity_token: true do %>
           <h2>
             <% if @name.include? '_' %>
               g scaffold

data/lib/hocus_pocus/version.rb

@@ -1,3 +1,3 @@
 module HocusPocus
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocus_pocus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nested_scaffold
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A magical Engine that casts a spell on your Rails 3.1 app