inline_forms 6.0.6 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 54a5764d56a4e64abf5430fd36f3775b81948572
-  data.tar.gz: 8905f7da726c3130ad6b2be767447b6570e4a48d
+SHA256:
+  metadata.gz: b280e63417aebf00d9254f8f565d46136cff645b9853d7e3e92091531583722f
+  data.tar.gz: bfb39dbe69a962a7bbbe721625db46e397a1f99cbe168ad569b9942f20182499
 SHA512:
-  metadata.gz: 73efb75e7a5b9ca0d63925e903036201d4cbffa788dd39d81aff02ecc39ded8cdee0e5f6e5eab0754f8a37927b6b3d7169a9300fbc40c52d22c8670acf2bdde1
-  data.tar.gz: d5fac7a763a91cb96e9be78b83a97d8976b026ff8e38c6ead30c5acd680fa58ef2248a6011d1b600ecdd12b7e69e9b7171e680891baefcefb39a1849d6888e4b
+  metadata.gz: 352aad514005fa9092ea1519c1494df2761bfdfeb2b0ea286dc36c7889939d7458236970ca763cccc43a742157b1fff75ce17b4227293122b59015150c44fea1
+  data.tar.gz: 99a34153380f2d246993f09f36813937c4a7c2348d631ee1f17e3680356c25b00d4bff0f719041d73e3b0ba9e27f163ffa6e46376d6467a362a39f23e03657f3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Ace Suares
+Copyright (c) 2011 - 2021 Ace Suares
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/javascripts/inline_forms/inline_forms.js

@@ -4,6 +4,7 @@
 //= require jquery.timepicker.js
 //= require foundation
 //= require jquery.remotipart
+//= require autocomplete-rails
 
 $(function(){ $(document).foundation(); });
 // initialize datepickers

data/app/controllers/inline_forms_application_controller.rb

@@ -2,7 +2,7 @@
 class InlineFormsApplicationController < ActionController::Base
   protect_from_forgery
   layout 'devise' if :devise_controller?
-  
+
   # limit available locales by setting this. Override in applicaton_controller.
   I18n.available_locales = [ :en, :nl, :pp ]
 
@@ -10,7 +10,7 @@ class InlineFormsApplicationController < ActionController::Base
   def set_locale
     I18n.locale = extract_locale_from_subdomain || I18n.default_locale
   end
-  
+
   # Get locale code from request subdomain (like http://it.application.local:3000)
   def extract_locale_from_subdomain
     locale = request.subdomains.first

data/app/controllers/inline_forms_controller.rb

@@ -95,7 +95,7 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list
     attributes.each do | attribute, name, form_element |
-      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :tree || form_element == :associated || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute))
+      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :tree || form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
     end
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
@@ -180,29 +180,41 @@ class InlineFormsController < ApplicationController
     end
   end
 
-  # :destroy destroys the record, but also shows an undo link (with paper_trail)
+  # :soft_delete
+  def soft_delete
+    @update_span = params[:update]
+    @object = referenced_object
+    # destroy the object
+    @object.soft_delete(current_user)
+    respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
+      format.js { render :close }
+    end
+  end
+
+  # :soft_restore
+  def soft_restore
+    @update_span = params[:update]
+    @object = referenced_object
+    # restore the object
+    @object.soft_restore
+    respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
+      format.js { render :close }
+    end
+  end
+
+  # :destroy destroys the record. There is no undo!
   def destroy
     @update_span = params[:update]
     @object = referenced_object
     if current_user.role? :superadmin
-      if (@object.soft_deletable? rescue false)
-        @object.soft_delete(current_user)
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      elsif
-        @object.destroy
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :show_undo }
-        end
-      end
-    elsif (@object.soft_deletable? rescue false)
-      @object.soft_delete(current_user)
+      # destroy the object
+      @undo_object = @object.versions.last
+      @object.destroy
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :close }
+        format.js { render :record_destroyed }
       end
     end
   end
@@ -211,27 +223,12 @@ class InlineFormsController < ApplicationController
   # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
   def revert
     @update_span = params[:update]
+    @object = referenced_object
     if current_user.role? :superadmin
-      if (@object.soft_deletable? rescue false)
-        @object = referenced_object
-        @object.soft_restore
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      elsif
-        @version = PaperTrail::Version.find(params[:id])
-        @version.reify.save!
-        @object = @Klass.find(@version.item_id)
-        authorize!(:revert, @object) if cancan_enabled?
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      end
-    elsif (@object.soft_deletable? rescue false)
-      @object = referenced_object
-      @object.soft_restore
+      @version = PaperTrail::Version.find(params[:id])
+      @version.reify.save!
+      @object = @Klass.find(@version.item_id)
+      authorize!(:revert, @object) if cancan_enabled?
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }

data/app/helpers/inline_forms_helper.rb

@@ -30,37 +30,44 @@ module InlineFormsHelper
       :title => t('inline_forms.view.close')
   end
 
-  # destroy link
-  def link_to_destroy( object, update_span )
-    if current_user.role? :superadmin
-      if cancan_disabled? || ( can? :delete, object )
-        link_to "<i class='fi-trash'></i>".html_safe,
-          send( object.class.to_s.underscore + '_path',
-          object,
-          :update => update_span ),
-          :method => :delete,
-          :remote => true,
-          :title => t('inline_forms.view.trash')
-      end
-    elsif (object.class.safe_deletable? rescue false)
-      if object.deleted?     && (cancan_disabled? || ( can? :revert, object ))
-        link_to "undelete".html_safe,
-          send( 'revert_' + object.class.to_s.underscore + '_path',
+  # delete link. Mind the difference between delete and destroy.
+  def link_to_soft_delete( object, update_span )
+    soft=''
+    if (object.soft_deletable? rescue false)
+      if object.deleted?     && (cancan_disabled? || ( can? :soft_restore, object ))
+        soft = link_to "<i class='fi-refresh'></i>".html_safe,
+          send( 'soft_restore_' + object.class.to_s.underscore + '_path',
           object,
           :update => update_span ),
           :method => :post,
           :remote => true,
-          :title => t('inline_forms.view.trash')
-      elsif !object.deleted? && (cancan_disabled? || ( can? :delete, object ))
-        link_to "<i class='fi-trash'></i>".html_safe,
-          send( object.class.to_s.underscore + '_path',
-          object,
-          :update => update_span ),
-          :method => :delete,
-          :remote => true,
-          :title => t('inline_forms.view.trash')
+          :title => t('inline_forms.view.undelete')
+      elsif !object.deleted? && (cancan_disabled? || ( can? :soft_delete, object ))
+        soft = link_to "<i class='fi-trash'></i>".html_safe,
+        send( 'soft_delete_' + object.class.to_s.underscore + '_path',
+        object,
+        :update => update_span ),
+        :method => :post,
+        :remote => true,
+        :title => t('inline_forms.view.trash')
       end
     end
+    soft.html_safe
+  end
+
+  # destroy link. Mind the difference between delete and destroy.
+  def link_to_destroy( object, update_span )
+    hard=''
+    if cancan_disabled? || ( can? :destroy, object )
+      hard = link_to "&nbsp;&nbsp;<font color='FF0000'><i class='fi-x'></i></font>".html_safe,
+        send( object.class.to_s.underscore + '_path',
+        object,
+        :update => update_span ),
+        :method => :delete,
+        :remote => true,
+        :title => t('inline_forms.view.trash')
+    end
+    hard.html_safe
   end
 
   # new link
@@ -76,7 +83,7 @@ module InlineFormsHelper
                    :title => t('inline_forms.view.add_new', :model => model.model_name.human )
           )
     if cancan_enabled?
-      if can? :create, model.to_s.pluralize.underscore.to_sym
+      if can? :create, model
         if parent_class.nil?
           raw out
         else
@@ -90,17 +97,19 @@ module InlineFormsHelper
 
   # link to versions list
   def link_to_versions_list(path_to_versions_list, object, update_span, html_class = 'button new_button')
-    out = (link_to "<i class='fi-list'></i>".html_safe,
-                   send(path_to_versions_list,
-                        object,
-                        :update => update_span,
-                       ),
-                   :remote => true,
-                   :class => html_class,
-                   :title => t('inline_forms.view.list_versions')
-          )
-    if can? :list_versions, object.class.name.pluralize.underscore.to_sym
-      raw out
+    if can? :list_versions, object
+      if defined?(PaperTrail) && object.respond_to?(:versions)
+        out = (link_to "<i class='fi-list'></i>".html_safe,
+                       send(path_to_versions_list,
+                            object,
+                            :update => update_span,
+                           ),
+                       :remote => true,
+                       :class => html_class,
+                       :title => t('inline_forms.view.list_versions')
+              )
+        raw out
+      end
     end
   end
 
@@ -123,7 +132,8 @@ module InlineFormsHelper
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
     value = h(attribute_value) + ("&nbsp;" * spaces).html_safe
     css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
-    if cancan_disabled? || ( can? :update, object, attribute )
+    if (cancan_disabled? rescue true) || ( can? :update, object, attribute )
+      # some problem with concerns makes this function not available when called direct. FIXME
       link_to value,
         send( 'edit_' + object.class.to_s.underscore + '_path',
         object,

data/app/views/inline_forms/_close.html.erb

@@ -1,5 +1,6 @@
-<% if cancan_disabled? || ( can? :delete, @object ) %>
+<% if cancan_disabled? || ( can? :soft_delete, @object ) %>
   <div  class="small-1 column">
+    <%= link_to_soft_delete(@object, @update_span) -%>
     <%= link_to_destroy(@object, @update_span) -%>
   </div>
   <div  class="small-11 column">

data/app/views/inline_forms/_header.html.erb

@@ -22,7 +22,7 @@
               <% MODEL_TABS.each do |m| %>
                 <% model = m.singularize.camelcase.constantize rescue nil %>
                   <% unless model.nil? || model.not_accessible_through_html? %>
-                  <% if can? :update, m.to_sym %>
+                  <% if can? :update, model %>
                     <li>
                       <%= link_to model.model_name.human, '/' +  m %>
                     </li>

data/app/views/inline_forms/_list.html.erb

@@ -53,8 +53,9 @@
     <% path_to_object = attribute.to_s.singularize.underscore + "_path" %>
   <% end %>
   <div class="row <%= cycle('odd', 'even') %><%= " top-level" if parent_class.nil? %>" id="<%= css_class_id -%>">
-    <% if cancan_disabled? || ( can? :delete, object ) %>
+    <% if cancan_disabled? || ( can? :soft_delete, object ) %>
       <div  class="small-1 column">
+        <%= link_to_soft_delete(object, css_class_id) -%>
         <%= link_to_destroy(object, css_class_id) -%>
       </div>
       <div  class="small-11 column">

data/app/views/inline_forms/_new.html.erb

@@ -23,7 +23,7 @@
                                                                   :multipart => true, :remote => true, :class  => "edit_form" do -%>
     <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
     <% attributes.each do | attribute, name, form_element | -%>
-      <% unless form_element.to_sym == :associated || form_element.to_sym == :tree || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute)) -%>
+      <% unless form_element.to_sym == :associated || form_element.to_sym == :tree || (cancan_enabled? && cannot?(:read, @object, attribute)) -%>
         <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
         <% if form_element && form_element.to_sym == :header %>
           <div class="row form_element_header" >

data/app/views/inline_forms/_show.html.erb

@@ -115,7 +115,7 @@
         <% end %>
       <% end %>
     <% end %>
-    <% if can? :list_versions, @object.class.name.pluralize.underscore.to_sym  %>
+    <% if can? :list_versions, @object  %>
       <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_versions" -%>
       <div id="<%= css_class_id -%>">
         <%= render 'versions' %>

data/app/views/inline_forms/_versions_list.html.erb

@@ -44,11 +44,14 @@
       <div class="small-1 column">
         <%= version.event -%>
       </div>
+      <div  class="small-2 column">
+        <%= version.created_at -%>
+      </div>
       <div  class="small-2 column">
         <%= version_modified_by version.whodunnit -%>
       </div>
-      <div  class="small-8 column">
-        <% if version.changeset.empty? %>
+      <div  class="small-6 column">
+        <% if version.changeset.nil? || version.changeset.empty? %>
           <em>empty</em>
         <% else %>
           <% version.changeset.each do |attribute, value| %>

data/app/views/inline_forms/record_destroyed.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').fadeOut("slow")

data/bin/inline_forms_installer_core.rb

@@ -1,57 +1,60 @@
 GENERATOR_PATH = File.dirname(File.expand_path(__FILE__)) +  '/../'
 
-create_file 'Gemfile', "# created by inline_forms #{ENV['inline_forms_version']} on {Date.today}\n"
+create_file 'Gemfile', "# created by inline_forms #{ENV['inline_forms_version']} on #{Date.today}\n"
 
 add_source 'https://rubygems.org'
 
-gem 'cancancan', '~> 2.0'
-gem 'carrierwave'
-gem 'ckeditor', git: 'https://github.com/galetahub/ckeditor'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 #gem 'bootsnap', require: false
-gem 'coffee-rails'
 #gem 'compass-rails'
+# gem 'modernizr-rails'
+
+gem 'cancancan'
+gem 'carrierwave'
+gem 'ckeditor', github: 'galetahub/ckeditor'
+gem 'coffee-rails'
+gem 'devise-i18n', :git => 'https://github.com/acesuares/devise-i18n.git'
 gem 'devise'
 gem 'foundation-icons-sass-rails'
 gem 'foundation-rails', '~> 5.5'
-gem 'i18n-active_record', git: 'https://github.com/acesuares/i18n-active_record.git'
-gem 'inline_forms', '>=5'
+gem 'i18n-active_record', :git => 'https://github.com/acesuares/i18n-active_record.git'
+gem 'inline_forms', '~> 6.2'
 gem 'jquery-rails'
 gem 'jquery-timepicker-rails'
 gem 'jquery-ui-sass-rails'
 gem 'mini_magick'
 gem 'mysql2'
 gem 'paper_trail'
-gem 'rails-i18n'
-gem 'rails', '~> 5.2.1'
+gem 'rails-i18n', :git => 'https://github.com/svenfuchs/rails-i18n.git'  # since https://github.com/svenfuchs/rails-i18n/pull/794 we don't have to maintain 'https://github.com/acesuares/rails-i18n.git' anymore!
+gem 'rails-jquery-autocomplete'
+gem 'rails', '6.1.3.1'
 gem 'rake'
 gem 'remotipart', '~> 1.0'
 gem 'rvm'
 gem 'sass-rails'
-gem 'tabs_on_rails'
-gem 'therubyracer'
-gem 'uglifier'
-gem 'figaro'
+gem 'tabs_on_rails', :git => 'https://github.com/acesuares/tabs_on_rails.git', :branch => 'update_remote_before_action'
 gem 'unicorn'
 gem 'validation_hints'
 gem 'will_paginate' #, git: 'https://github.com/acesuares/will_paginate.git'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
 
 gem_group :development do
-  gem 'bundler'
+  gem 'capistrano-bundler', require: false
+  gem 'capistrano-rails', require: false
+  gem 'capistrano', require: false
+  gem 'capistrano3-unicorn'
   gem 'listen'
-  gem 'rspec-rails'
-  gem 'rspec'
-  gem 'seed_dump', git: 'https://github.com/acesuares/seed_dump.git'
-  gem 'shoulda'
+  gem 'rvm-capistrano', :require => false
+  gem 'rvm1-capistrano3', require: false
+  gem 'seed_dump', '~> 0.5.3'
   gem 'sqlite3'
   gem 'switch_user'
+  gem 'thin'
   gem 'yaml_db'
-  gem 'capistrano', '~> 3.6', require: false
-  gem 'capistrano-rails', '~> 1.3', require: false
-  gem 'capistrano-bundler', '~> 1.3', require: false
-  gem 'rvm1-capistrano3', require: false
-  gem "capistrano3-unicorn"
+end
+
+gem_group :production do
+  gem 'mini_racer'
+  gem 'uglifier'
 end
 
 say "- Running bundle..."
@@ -86,9 +89,6 @@ append_file "config/database.yml", <<-END_DATABASEYML.strip_heredoc
     password: <%= ENV["DATABASE_PASSWORD"] %>
 END_DATABASEYML
 
-say "- Add rails 5.2 defaults to application.rb..."
-gsub_file "config/application.rb", /6\.0/, '5.2'
-
 say "- Devise install..."
 run "bundle exec rails g devise:install"
 
@@ -291,12 +291,9 @@ copy_file File.join(GENERATOR_PATH, 'lib/generators/templates/application_record
 say "- Install ckeditor..."
 generate "ckeditor:install --orm=active_record --backend=carrierwave"
 
-say "- Add ckeditor autoload_paths to application.rb..."
-application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)"
-
-# see https://github.com/galetahub/ckeditor/issues/579
-#say "- Set languages for ckeditor to ['en', 'nl'] in config/initializers/ckeditor.rb..."
-#insert_into_file "config/initializers/ckeditor.rb", "  config.assets_languages = ['en', 'nl']\n", :after => "config.assets_languages = ['en', 'uk']\n"
+# precompile config.js
+say "- Precompile ckeditor config.js"
+append_file "config/initializers/assets.rb", "  Rails.application.config.assets.precompile += %w[ckeditor/config.js]\n"
 
 say "- Paper_trail install..."
 generate "paper_trail:install --with-changes"
@@ -366,17 +363,23 @@ create_file "app/controllers/application_controller.rb", <<-END_APPCONTROLLER.st
   class ApplicationController < InlineFormsApplicationController
     protect_from_forgery
 
-    # Comment next line if you don't want Devise authentication
-    before_action :authenticate_user!
+    # add whodunnit
+    before_action :set_paper_trail_whodunnit
 
-    # Comment next 6 lines if you do not want CanCan authorization
+    # Comment next lines if you don't want Devise authentication
+    before_action :authenticate_user!
     check_authorization unless: :devise_controller?
 
     rescue_from CanCan::AccessDenied do |exception|
-      redirect_to root_path, alert: exception.message
+      respond_to do |format|
+        format.json { head :forbidden, content_type: 'text/html' }
+        format.html { redirect_to main_app.root_url, notice: exception.message }
+        format.js   { head :forbidden, content_type: 'text/html' }
+      end
     end
+    # Comment previous lines if you don't want Devise authentication
 
-    ActionView::CompiledTemplates::MODEL_TABS = %w()
+    #ActionView::CompiledTemplates::MODEL_TABS = %w()
 
     # Uncomment next line if you want I18n (based on subdomain)
     # before_action :set_locale
@@ -422,75 +425,8 @@ create_file "app/models/ability.rb", <<-END_ABILITY.strip_heredoc
   end
 END_ABILITY
 
-say "- Generating test files", :green
-
-create_file "spec/spec_helper.rb", <<-END_TEST_HELPER.strip_heredoc
-  # This file is copied to spec/ when you run 'rails generate rspec:install'
-  ENV["RAILS_ENV"] ||= 'development' # this need to be changed to test ???
-  require File.expand_path("../../config/environment", __FILE__)
-  require 'capybara/rspec'
-  require 'rspec/rails'
-  require 'rspec/autorun'
-  require 'carrierwave/test/matchers'
-
-
-  # Requires supporting ruby files with custom matchers and macros, etc,
-  # in spec/support/ and its subdirectories.
-  Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-
-  RSpec.configure do |config|
-    config.include FactoryGirl::Syntax::Methods
-    # ## Mock Framework
-    #
-    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-    #
-    # config.mock_with :mocha
-    # config.mock_with :flexmock
-    # config.mock_with :rr
-
-    # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-    config.fixture_path = Rails.root + "/spec/fixtures"
-
-    # If you're not using ActiveRecord, or you'd prefer not to run each of your
-    # examples within a transaction, remove the following line or assign false
-    # instead of true.
-    config.use_transactional_fixtures = true
-
-    # If true, the base class of anonymous controllers will be inferred
-    # automatically. This will be the default behavior in future versions of
-    # rspec-rails.
-    config.infer_base_class_for_anonymous_controllers = false
-
-    # Run specs in random order to surface order dependencies. If you find an
-    # order dependency and want to debug it, you can fix the order by providing
-    # the seed, which is printed after each run.
-    #     --seed 1234
-    config.order = "random"
-  end
-END_TEST_HELPER
-
-say 'copy test image into rspec folder'
-copy_file File.join(GENERATOR_PATH,'lib/otherstuff/fixtures/rails.png'), "spec/fixtures/images/rails.png"
-say '- Creating factory_girl file'
-create_file "spec/factories/inline_forms.rb", <<-END_FACTORY_GIRL.strip_heredoc
-  FactoryGirl.define do
-    factory :apartment do
-      name "Luxe House in Bandabou 147A" #string
-      title "A dream house in a dream place" # string
-      description "A beatiful House at the edge of the <strong>sea</strong>" #text
-    end
-    factory :large_text do
-      name "Luxe House in Bandabou 147A" #string
-      title "A dream house in a dream place" # string
-      description "A beatiful House at the edge of the <strong>sea</strong>" #text
-    end
-  end
-END_FACTORY_GIRL
-remove_file 'spec/factories/users.rb'
-remove_file 'spec/models/user_spec.rb'
-
 # precompile devise.css
-say "- Precompile devise.css in environments/production.rb... (Since Rails 5 in config/initializers/assets.rb !)"
+say "- Precompile devise.css"
 append_file "config/initializers/assets.rb", "  Rails.application.config.assets.precompile += %w( inline_forms_devise.css )\n"
 
 # devise mailer stuff
@@ -539,36 +475,9 @@ copy_file File.join(GENERATOR_PATH,'lib/generators/templates/capistrano/Capfile'
 say "- Unicorn Config..."
 copy_file File.join(GENERATOR_PATH,'lib/generators/templates/unicorn/production.rb'), "config/unicorn/production.rb"
 
-
 # Git
-say "- Initializing git..."
-run 'git init'
-
-insert_into_file ".gitignore", <<-GITIGNORE.strip_heredoc, :after => "/tmp\n"
-  # remotipart uploads
-  public/uploads
-  # Figaro secrets
-  config/application.yml
-GITIGNORE
-
-say "- Installing Figaro..."
-run 'bundle exec figaro install'
-remove_file "config/application.yml"
-copy_file File.join(GENERATOR_PATH,'lib/generators/templates/application.yml.blank'), "config/application.yml"
-copy_file File.join(GENERATOR_PATH,'lib/generators/templates/application.yml.blank'), "config/application.yml.blank"
-
-say "- Installing config/secrets.yml..."
-remove_file "config/secrets.yml"
-create_file "config/secrets.yml", <<-END_SECRETS_YML.strip_heredoc
-  development:
-    secret_key_base: #{SecureRandom.hex(64)}
-
-  test:
-    secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
-
-  production:
-    secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
-END_SECRETS_YML
+say "- adding and committing to git..."
+# run 'git init' # this is already done by rails!
 
 run 'git add .'
 run 'git commit -a -m " * Initial"'

data/inline_forms.gemspec

@@ -23,12 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rvm')
   s.add_dependency('thor')
   s.add_dependency('validation_hints')
-  s.add_dependency('rails', '>= 6.0')
+  s.add_dependency('rails', '6.1.3.1')
   s.add_dependency('rails-i18n')
 
-  s.add_development_dependency(%q<rspec-rails>)
-  s.add_development_dependency(%q<shoulda>)
-  s.add_development_dependency(%q<bundler>)
-  s.add_development_dependency(%q<jeweler>)
-
 end

data/lib/generators/templates/capistrano/Capfile

@@ -1,8 +1,3 @@
-# Load ENV vars via Figaro
-require 'figaro'
-Figaro.application = Figaro::Application.new(environment: 'production', path: File.expand_path('../config/application.yml', __FILE__))
-Figaro.load
-
 # Load DSL and set up stages
 require "capistrano/setup"
 

data/lib/generators/templates/migration.erb

@@ -1,4 +1,4 @@
-class InlineFormsCreate<%= table_name.camelize %> < ActiveRecord::Migration[5.0]
+class InlineFormsCreate<%= table_name.camelize %> < ActiveRecord::Migration[6.1]
 
   def self.up
     create_table :<%= table_name + @primary_key_option %> do |t|

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "6.0.6"
+  VERSION = "6.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.2.1
 platform: ruby
 authors:
 - Ace Suares
@@ -10,132 +10,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: validation_hints
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  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'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  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: Inline Forms aims to ease the setup of forms that provide inline editing.
@@ -149,9 +93,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .vscode/settings.json
+- ".document"
+- ".gitignore"
+- ".vscode/settings.json"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -246,6 +190,7 @@ files:
 - app/views/inline_forms/extract_translations.erb
 - app/views/inline_forms/list.js.erb
 - app/views/inline_forms/new.js.erb
+- app/views/inline_forms/record_destroyed.js.erb
 - app/views/inline_forms/show.js.erb
 - app/views/inline_forms/show_element.js.erb
 - app/views/inline_forms/show_undo.js.erb
@@ -264,8 +209,6 @@ files:
 - lib/generators/assets/stylesheets/inline_forms_devise.css
 - lib/generators/inline_forms_generator.rb
 - lib/generators/templates/_inline_forms_tabs.html.erb
-- lib/generators/templates/abstract_mysql2_adapter.rb
-- lib/generators/templates/application.yml.blank
 - lib/generators/templates/application_record.rb
 - lib/generators/templates/capistrano/Capfile
 - lib/generators/templates/capistrano/deploy.rb
@@ -273,7 +216,6 @@ files:
 - lib/generators/templates/controller.erb
 - lib/generators/templates/migration.erb
 - lib/generators/templates/model.erb
-- lib/generators/templates/paper_trail.rb
 - lib/generators/templates/test.erb
 - lib/generators/templates/unicorn/production.rb
 - lib/inline_forms.rb
@@ -282,9 +224,6 @@ files:
 - lib/locales/inline_forms.nl.yml
 - lib/otherstuff/20120310065554_inline_forms_create_view_for_translations.rb
 - lib/otherstuff/add_roles.sql
-- lib/otherstuff/bump
-- lib/otherstuff/diffie
-- lib/otherstuff/fixtures/rails.png
 - lib/otherstuff/mkiftrans
 - lib/otherstuff/mkrole
 - lib/otherstuff/roles_users.sql
@@ -299,17 +238,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: inline_forms
-rubygems_version: 2.6.14
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Inline editing of forms.

data/lib/generators/templates/abstract_mysql2_adapter.rb

@@ -1,3 +0,0 @@
-class ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
-end

data/lib/generators/templates/application.yml.blank

@@ -1,59 +0,0 @@
-DEVISE_SECRET_KEY:
-SECRET_TOKEN:
-
-DEPLOY_USER:
-DEPLOY_HOST:
-DEPLOY_APPLICATION:
-DEPLOY_REPO_URL:
-DEPLOY_DIRECTORY:
-
-development:
-  ACTION_MAILER_SMTP_SETTINGS_ADDRESS:
-  ACTION_MAILER_SMTP_SETTINGS_PASSWORD:
-  ACTION_MAILER_SMTP_SETTINGS_USERNAME:
-
-  DATABASE_NAME:
-  DATABASE_USER:
-  DATABASE_PASSWORD:
-
-  FACEBOOK_APP_ID:
-  FACEBOOK_APP_SECRET:
-
-  GITHUB_CLIENT_ID:
-  GITHUB_CLIENT_SECRET:
-
-  SECRET_KEY_BASE:
-
-production:
-  ACTION_MAILER_SMTP_SETTINGS_ADDRESS:
-  ACTION_MAILER_SMTP_SETTINGS_PASSWORD:
-  ACTION_MAILER_SMTP_SETTINGS_USERNAME:
-
-  DATABASE_NAME:
-  DATABASE_USER:
-  DATABASE_PASSWORD:
-
-  FACEBOOK_APP_ID:
-  FACEBOOK_APP_SECRET:
-
-  GITHUB_CLIENT_ID:
-  GITHUB_CLIENT_SECRET:
-
-  SECRET_KEY_BASE:
-
-test:
-  ACTION_MAILER_SMTP_SETTINGS_ADDRESS:
-  ACTION_MAILER_SMTP_SETTINGS_PASSWORD:
-  ACTION_MAILER_SMTP_SETTINGS_USERNAME:
-
-  DATABASE_NAME:
-  DATABASE_USER:
-  DATABASE_PASSWORD:
-
-  FACEBOOK_APP_ID:
-  FACEBOOK_APP_SECRET:
-
-  GITHUB_CLIENT_ID:
-  GITHUB_CLIENT_SECRET:
-
-  SECRET_KEY_BASE:

data/lib/generators/templates/paper_trail.rb

@@ -1,7 +0,0 @@
-PaperTrail.config.track_associations = false
-
-PaperTrail::Version.class_eval do
-  def author
-    User.find(whodunnit) if whodunnit
-  end
-end

data/lib/otherstuff/bump

@@ -1,13 +0,0 @@
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/GEM_NAME/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end

data/lib/otherstuff/diffie

@@ -1,2 +0,0 @@
-diff -ru /var/lib/gems/1.8/gems/inline_forms-0.9.16 inline_forms|grep ^diff -ru|sed "s/ inline_/ > inline_/"|sed "s/^diff -ru/cat/" > mkup
-