remotipart 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f907807b9aca70acccb9e475dce3f63b1f1df778aa02739a6eb88a2d6548c8b
-  data.tar.gz: a1322a4b8c3e797872849c5e00918125781a1d9966adc6e50a66b145736c3061
+  metadata.gz: 6613ef182593408aa806dbc14790a9f5c31717d7096657f9238efec23e102977
+  data.tar.gz: 9f96a7481ff473943ae7b1e5ec745a8b179b8ae8f615809b3790f7683b687f1e
 SHA512:
-  metadata.gz: 8286b71b28af65126061abbe5250809b37a395dad7dfcc98ac974c47966c67cf61095555799e682eceddcf605317d6dfcf9cd08662c494c8c3c6ec9312bdfe78
-  data.tar.gz: f8abfd59c500552d3caeb9fc7095a6e90b8b80a5cd41908e4729b8ec5601055fa2642c36b3903dc4697510016b550377fd5fe289d289bfdb8105154245cd9651
+  metadata.gz: 58567b707f27b4eb40eb5020e8fed6763fbb1d895efacb9ddc4c1252b1073c5373180d668de6f9a2b306a922f807a06617458c9ac78eb3dff1723ee0481df1fb
+  data.tar.gz: e19c0a28fecdfa2a8bdfb5bc0024263a1fc4de5dadb3a9a425af75367de672c0ec0339bcced53c33bceb11100fdb382fee465a86a45e8215405d4cf741d213c8

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'rake'
-  gem 'jeweler'
+  gem 'jeweler', github: 'technicalpickles/jeweler'
   # This conflicts with jeweler gemspec generation,
   # causes dependencies to be added to gemspec recursively
   #gemspec

data/History.rdoc

@@ -1,5 +1,10 @@
 = History
 
+=== 1.4.4 / 2019-12-29
+
+* Fixed Rails 6 autoloading deprecation.
+* Fixed ActiveScaffold incompatibility.
+
 === 1.4.3 / 2019-05-23
 
 * Fixed xhr.responseText not being populated.

data/lib/remotipart/rails/engine.rb

@@ -4,13 +4,17 @@ module Remotipart
 
     class Engine < ::Rails::Engine
       initializer "remotipart.view_helper" do
-        ActionView::Base.send :include, RequestHelper
-        ActionView::Base.send :include, ViewHelper
+        ActiveSupport.on_load :action_view do
+          include RequestHelper
+          include ViewHelper
+        end
       end
 
       initializer "remotipart.controller_helper" do
-        ActionController::Base.send :include, RequestHelper
-        ActionController::Base.send :include, RenderOverrides
+        ActiveSupport.on_load :action_controller do
+          include RequestHelper
+          include RenderOverrides
+        end
       end
 
       initializer "remotipart.include_middelware" do

data/lib/remotipart/rails/version.rb

@@ -1,6 +1,6 @@
 module Remotipart
   module Rails
-    VERSION = "1.4.3"
+    VERSION = "1.4.4"
     IFRAMETRANSPORT_VERSION = "1.0.1.remotipart"
   end
 end

data/lib/remotipart/render_overrides.rb

@@ -7,14 +7,32 @@ module Remotipart
 
     def self.included(base)
       base.class_eval do
-        # Use neither alias_method_chain nor prepend for compatibility
-        alias render_without_remotipart render
-        alias render render_with_remotipart
+        if respond_to? :prepend
+          base.prepend Prependable
+        else
+          base.include Includable
+          # Do not use alias_method_chain for compatibility
+          alias render_without_remotipart render
+          alias render render_with_remotipart
+        end
       end
     end
 
-    def render_with_remotipart(*args, &block)
-      render_return_value = render_without_remotipart(*args, &block)
+    module Prependable
+      def render(*args, &block)
+        treat_render_for_remotipart super(*args, &block)
+      end
+    end
+
+    module Includable
+      def render_with_remotipart(*args, &block)
+        treat_render_for_remotipart render_without_remotipart(*args, &block)
+      end
+    end
+
+    private
+
+    def treat_render_for_remotipart(render_return_value)
       if remotipart_submitted?
         response.body = %{<script type="text/javascript">try{window.parent.document;}catch(err){document.domain=document.domain;}</script><textarea data-type="#{response.content_type}" data-status="#{response.response_code}" data-statusText="#{response.message}"></textarea><script type="text/javascript">document.querySelector("textarea").value="#{escape_javascript(response.body)}";</script>}
         response.content_type = ::Rails.version >= '5' ? Mime[:html] : Mime::HTML

data/remotipart.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: remotipart 1.4.3 ruby lib
+# stub: remotipart 1.4.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "remotipart".freeze
-  s.version = "1.4.3"
+  s.version = "1.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Greg Leppert".freeze, "Steve Schwartz".freeze]
-  s.date = "2019-05-23"
+  s.date = "2019-12-29"
   s.description = "Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jquery-rails.\n    This gem augments the native Rails 3 jQuery-UJS remote form function enabling asynchronous file uploads with little to no modification to your application.\n    ".freeze
   s.email = ["greg@formasfunction.com".freeze, "steve@alfajango.com".freeze]
   s.extra_rdoc_files = [
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
     "remotipart.gemspec",
     "spec/dummy_app/.gitignore",
     "spec/dummy_app/Rakefile",
+    "spec/dummy_app/app/assets/config/manifest.js",
     "spec/dummy_app/app/assets/images/rails.png",
     "spec/dummy_app/app/assets/javascripts/application.js.erb",
     "spec/dummy_app/app/assets/javascripts/comments.js",
@@ -53,6 +54,7 @@ Gem::Specification.new do |s|
     "spec/dummy_app/app/assets/stylesheets/scaffold.css",
     "spec/dummy_app/app/controllers/application_controller.rb",
     "spec/dummy_app/app/controllers/comments_controller.rb",
+    "spec/dummy_app/app/controllers/prepended_controller.rb",
     "spec/dummy_app/app/helpers/application_helper.rb",
     "spec/dummy_app/app/helpers/comments_helper.rb",
     "spec/dummy_app/app/models/comment.rb",
@@ -68,6 +70,7 @@ Gem::Specification.new do |s|
     "spec/dummy_app/app/views/comments/new.html.erb",
     "spec/dummy_app/app/views/comments/show.html.erb",
     "spec/dummy_app/app/views/layouts/application.html.erb",
+    "spec/dummy_app/app/views/prepended/show.html.erb",
     "spec/dummy_app/bin/bundle",
     "spec/dummy_app/bin/rails",
     "spec/dummy_app/bin/rake",
@@ -89,6 +92,7 @@ Gem::Specification.new do |s|
     "spec/dummy_app/db/schema.rb",
     "spec/dummy_app/db/seeds.rb",
     "spec/features/comments_spec.rb",
+    "spec/features/prepended_spec.rb",
     "spec/fixtures/hi.txt",
     "spec/fixtures/qr.jpg",
     "spec/spec_helper.rb",
@@ -99,7 +103,7 @@ Gem::Specification.new do |s|
     "vendor/assets/javascripts/jquery.remotipart.js"
   ]
   s.homepage = "http://opensource.alfajango.com/remotipart/".freeze
-  s.rubygems_version = "2.7.8".freeze
+  s.rubygems_version = "3.0.3".freeze
   s.summary = "Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jquery-rails.".freeze
 
   if s.respond_to? :specification_version then

data/spec/dummy_app/app/assets/config/manifest.js

@@ -0,0 +1,4 @@
+
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy_app/app/controllers/prepended_controller.rb

@@ -0,0 +1,9 @@
+class PrependedController < ApplicationController
+  # order matters, only prepend then include causes the issue
+  prepend Module.new
+  include Remotipart::RenderOverrides
+
+  def show
+    render
+  end
+end

data/spec/dummy_app/app/views/prepended/show.html.erb

@@ -0,0 +1 @@
+<p>prepended</p>

data/spec/dummy_app/config/routes.rb

@@ -2,5 +2,6 @@ DummyApp::Application.routes.draw do
   match 'comments' => 'comments#create', :via => [:put]
   match 'say' => 'comments#say', :via => [:get]
   resources :comments
+  match 'prepended' => 'prepended#show', :via => [:get]
   root :to => "comments#index"
 end

data/spec/features/prepended_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'prepended', type: :feature do
+  context "when another library overrides #render using prepend" do
+    it "does not break" do
+      expect { visit prepended_path }.not_to raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotipart
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Greg Leppert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -149,6 +149,7 @@ files:
 - remotipart.gemspec
 - spec/dummy_app/.gitignore
 - spec/dummy_app/Rakefile
+- spec/dummy_app/app/assets/config/manifest.js
 - spec/dummy_app/app/assets/images/rails.png
 - spec/dummy_app/app/assets/javascripts/application.js.erb
 - spec/dummy_app/app/assets/javascripts/comments.js
@@ -156,6 +157,7 @@ files:
 - spec/dummy_app/app/assets/stylesheets/scaffold.css
 - spec/dummy_app/app/controllers/application_controller.rb
 - spec/dummy_app/app/controllers/comments_controller.rb
+- spec/dummy_app/app/controllers/prepended_controller.rb
 - spec/dummy_app/app/helpers/application_helper.rb
 - spec/dummy_app/app/helpers/comments_helper.rb
 - spec/dummy_app/app/models/comment.rb
@@ -171,6 +173,7 @@ files:
 - spec/dummy_app/app/views/comments/new.html.erb
 - spec/dummy_app/app/views/comments/show.html.erb
 - spec/dummy_app/app/views/layouts/application.html.erb
+- spec/dummy_app/app/views/prepended/show.html.erb
 - spec/dummy_app/bin/bundle
 - spec/dummy_app/bin/rails
 - spec/dummy_app/bin/rake
@@ -192,6 +195,7 @@ files:
 - spec/dummy_app/db/schema.rb
 - spec/dummy_app/db/seeds.rb
 - spec/features/comments_spec.rb
+- spec/features/prepended_spec.rb
 - spec/fixtures/hi.txt
 - spec/fixtures/qr.jpg
 - spec/spec_helper.rb
@@ -218,8 +222,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: Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style