inline_forms 5.0.21 → 5.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e59e18d87dd2a20edd0b3196d9929839b7f5b7b
-  data.tar.gz: b369c07c0a608fd042ef40b0d55fbd0115ef3d4d
+  metadata.gz: acf77cdc0c3da8f53227b0883967be1366219cda
+  data.tar.gz: 620e3b7126d08e38043bd00d1c91b629adb235f9
 SHA512:
-  metadata.gz: 7703368ccb58471d9f86ba1444d51ed8d6d8a15c72edf6ccf3515ede5b47fcac4eff51efb658f23d448f783c035eba3017511a5406ae54723e1c26fe812e5cb2
-  data.tar.gz: 5b9961fecdba9f8b800b7e26649c06a78c1e55b1af077f261ffc7fc5958be5f85c7d28266d1770f086aad1ed63ca7d2e94c56cd8c6af92e9ce44bbca4d9d848f
+  metadata.gz: a1effd59c017e1e0ea79a749c3287f88a959890b721b9c285cf122b15147da18f415e147820df5c1596de748156f157f882437bfebea8f071c2f5bab4d081036
+  data.tar.gz: 6628e7f0d5fd2c3de9ddb1855257652c6bf38e9c47407feeca1bf94456fd16410acb18121597a19a7eadd8ed3f08e68fb94b86d278cbf190ed57d1d99fed06e1

data/bin/inline_forms_installer_core.rb

@@ -4,7 +4,7 @@ create_file 'Gemfile', "# created by inline_forms #{ENV['inline_forms_version']}
 
 add_source 'https://rubygems.org'
 
-gem 'cancan', git: 'https://github.com/acesuares/cancan.git', :branch => '2.0'
+gem 'cancancan', '~> 2.0'
 gem 'carrierwave'
 gem 'ckeditor'
 gem 'coffee-rails'
@@ -47,7 +47,7 @@ gem_group :development do
   gem 'capistrano', '~> 3.6', require: false
   gem 'capistrano-rails', '~> 1.3', require: false
   gem 'capistrano-bundler', '~> 1.3', require: false
-  gem 'capistrano-rvm', require: false
+  gem 'rvm1-capistrano3', require: false
   gem "capistrano3-unicorn"
 end
 
@@ -288,8 +288,9 @@ remove_file 'app/assets/javascripts/application.js'
   copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts' , javascript), File.join('app/assets/javascripts' , javascript)
 end
 
-say "- Monkey patch for human_attribute_name in config/initializers/human_attribute_name.rb"
-copy_file File.join(GENERATOR_PATH, 'lib/generators/initializers/human_attribute_name.rb'), "config/initializers/human_attribute_name.rb"
+say "- Add human_attribute_name in app/models/application_record.rb"
+remove_file 'app/models/application_record.rb' # the one that 'rails new' created
+copy_file File.join(GENERATOR_PATH, 'lib/generators/templates/application_record.rb'), "app/models/application_record.rb"
 
 say "- Install ckeditor..."
 generate "ckeditor:install --orm=active_record --backend=carrierwave"
@@ -376,11 +377,10 @@ create_file "app/controllers/application_controller.rb", <<-END_APPCONTROLLER.st
     before_action :authenticate_user!
 
     # Comment next 6 lines if you do not want CanCan authorization
-    enable_authorization :unless => :devise_controller?
+    check_authorization unless: :devise_controller?
 
-    rescue_from CanCan::Unauthorized do |exception|
-      sign_out :user if user_signed_in?
-      redirect_to new_user_session_path, :alert => exception.message
+    rescue_from CanCan::AccessDenied do |exception|
+      redirect_to root_path, alert: exception.message
     end
 
     ActionView::CompiledTemplates::MODEL_TABS = %w()
@@ -413,15 +413,15 @@ create_file "app/models/ability.rb", <<-END_ABILITY.strip_heredoc
     include CanCan::Ability
 
     def initialize(user)
-      # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
+      # See the wiki for details: https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
 
       user ||= User.new # guest user
 
       # use this if you get stuck:
       # if user.id == 1 #quick hack
-      #   can :access, :all
+      #   can :manage, :all
       if user.role? :superadmin
-        can :access, :all
+        can :manage, :all
       else
         # put restrictions for other users here
       end

data/lib/app/controllers/concerns/cancan_concern.rb

@@ -0,0 +1,25 @@
+module CancanConcern
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :cancan_disabled?, :cancan_enabled?
+  end
+
+  class_methods do
+    def cancan_enabled?
+      begin
+        CanCan::Ability && true
+      rescue NameError
+        false
+      end
+    end
+  end
+
+  def cancan_enabled?
+    self.class.cancan_enabled?
+  end
+
+  def cancan_disabled?
+    ! self.class.cancan_enabled?
+  end
+end

data/lib/app/controllers/inline_forms_controller.rb

@@ -22,25 +22,9 @@
 # @Klass is used in the InlineFormsHelper
 #
 class InlineFormsController < ApplicationController
-  before_action :getKlass
-
-  def self.cancan_enabled?
-    begin
-      CanCan::Ability && true
-    rescue NameError
-      false
-    end
-  end
+  include CancanConcern
 
-  def cancan_enabled?
-    self.class.cancan_enabled?
-  end
-
-  def cancan_disabled?
-    ! self.class.cancan_enabled?
-  end
-
-  helper_method :cancan_disabled?, :cancan_enabled?
+  before_action :getKlass
 
   load_and_authorize_resource :except => :revert, :no_params => true if cancan_enabled?
   # :index shows a list of all objects from class @Klass, using will_paginate,

data/lib/generators/templates/application_record.rb

@@ -0,0 +1,9 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+
+  # Wrapper for @model.human_attribute_name -> Model.human_attribute_name
+  def human_attribute_name(*args)
+    self.class.human_attribute_name(*args)
+  end
+
+end

data/lib/generators/templates/capistrano/Capfile

@@ -31,7 +31,7 @@ install_plugin Capistrano::SCM::Git
 #   https://github.com/capistrano/rails
 #   https://github.com/capistrano/passenger
 #
-require "capistrano/rvm"
+require 'rvm1/capistrano3'
 # require "capistrano/rbenv"
 # require "capistrano/chruby"
 require "capistrano/bundler"

data/lib/generators/templates/capistrano/deploy.rb

@@ -7,7 +7,7 @@ set :deploy_to, ENV['DEPLOY_DIRECTORY']
 
 # Default value for :linked_files is []
 set :linked_files, fetch(:linked_files, [])
-  .push("config/database.yml", "config/secrets.yml", "config/application.yml")
+  .push("config/application.yml")
 # Default value for linked_dirs is []
 set :linked_dirs, fetch(:linked_dirs, [])
   .push("log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/system", "vendor/bundle")
@@ -15,8 +15,14 @@ set :linked_dirs, fetch(:linked_dirs, [])
 # Default value for keep_releases is 5
 set :keep_releases, 5
 
+before 'rvm1:install:rvm', 'app:update_rvm_key'
+after 'rvm1:install:ruby', 'rvm1:install_bundler'
+
+before 'deploy', 'rvm1:install:rvm'  # install/update RVM
+before 'deploy', 'rvm1:install:ruby'  # install/update Ruby
+
 before 'deploy:check', 'figaro:upload'
-after "deploy:publishing", "deploy:restart"
+after 'deploy:publishing', 'deploy:restart'
 
 # Restart unicorn
 namespace :deploy do
@@ -30,10 +36,24 @@ namespace :figaro do
   task :upload do
     on roles(:all) do
       execute "mkdir -p #{shared_path}/config"
-
-      upload! 'config/secrets.yml', "#{shared_path}/config/secrets.yml"
-      upload! 'config/database.yml', "#{shared_path}/config/database.yml"
       upload! 'config/application.yml', "#{shared_path}/config/application.yml"
     end
   end
 end
+
+namespace :app do
+  task :update_rvm_key do
+    roles(:all) do
+      execute :gpg, "--keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3"
+    end
+  end
+end
+
+namespace :rvm1 do # https://github.com/rvm/rvm1-capistrano3/issues/45
+  desc "Install Bundler"
+  task :install_bundler do
+    on release_roles :all do
+      execute "cd #{release_path} && #{fetch(:rvm1_auto_script_path)}/rvm-auto.sh . gem install bundler"
+    end
+  end
+end

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 5.0.21
+  version: 5.0.22
 platform: ruby
 authors:
 - Ace Suares
@@ -10,132 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-12-23 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: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !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 +149,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .vscode/settings.json
+- ".document"
+- ".gitignore"
+- ".vscode/settings.json"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -160,6 +160,7 @@ files:
 - bin/inline_forms_app_template.rb
 - bin/inline_forms_installer_core.rb
 - inline_forms.gemspec
+- lib/app/controllers/concerns/cancan_concern.rb
 - lib/app/controllers/geo_code_curacao_controller.rb
 - lib/app/controllers/inline_forms_application_controller.rb
 - lib/app/controllers/inline_forms_controller.rb
@@ -251,11 +252,11 @@ files:
 - lib/generators/assets/stylesheets/devise.scss
 - lib/generators/assets/stylesheets/foundation_and_overrides.scss
 - lib/generators/assets/stylesheets/inline_forms.scss
-- lib/generators/initializers/human_attribute_name.rb
 - 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
 - lib/generators/templates/capistrano/production.rb
@@ -287,17 +288,17 @@ 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.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Inline editing of forms.

data/lib/generators/initializers/human_attribute_name.rb

@@ -1,7 +0,0 @@
-# Wrapper for @model.human_attribute_name -> Model.human_attribute_name
-#
-class ActiveRecord::Base
-  def human_attribute_name(*args)
-    self.class.human_attribute_name(*args)
-  end
-end