inline_forms 5.0.21 → 5.0.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/inline_forms_installer_core.rb +11 -11
- data/lib/app/controllers/concerns/cancan_concern.rb +25 -0
- data/lib/app/controllers/inline_forms_controller.rb +2 -18
- data/lib/generators/templates/application_record.rb +9 -0
- data/lib/generators/templates/capistrano/Capfile +1 -1
- data/lib/generators/templates/capistrano/deploy.rb +25 -5
- data/lib/inline_forms/version.rb +1 -1
- metadata +28 -27
- data/lib/generators/initializers/human_attribute_name.rb +0 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: acf77cdc0c3da8f53227b0883967be1366219cda
|
4
|
+
data.tar.gz: 620e3b7126d08e38043bd00d1c91b629adb235f9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a1effd59c017e1e0ea79a749c3287f88a959890b721b9c285cf122b15147da18f415e147820df5c1596de748156f157f882437bfebea8f071c2f5bab4d081036
|
7
|
+
data.tar.gz: 6628e7f0d5fd2c3de9ddb1855257652c6bf38e9c47407feeca1bf94456fd16410acb18121597a19a7eadd8ed3f08e68fb94b86d278cbf190ed57d1d99fed06e1
|
@@ -4,7 +4,7 @@ create_file 'Gemfile', "# created by inline_forms #{ENV['inline_forms_version']}
|
|
4
4
|
|
5
5
|
add_source 'https://rubygems.org'
|
6
6
|
|
7
|
-
gem '
|
7
|
+
gem 'cancancan', '~> 2.0'
|
8
8
|
gem 'carrierwave'
|
9
9
|
gem 'ckeditor'
|
10
10
|
gem 'coffee-rails'
|
@@ -47,7 +47,7 @@ gem_group :development do
|
|
47
47
|
gem 'capistrano', '~> 3.6', require: false
|
48
48
|
gem 'capistrano-rails', '~> 1.3', require: false
|
49
49
|
gem 'capistrano-bundler', '~> 1.3', require: false
|
50
|
-
gem '
|
50
|
+
gem 'rvm1-capistrano3', require: false
|
51
51
|
gem "capistrano3-unicorn"
|
52
52
|
end
|
53
53
|
|
@@ -288,8 +288,9 @@ remove_file 'app/assets/javascripts/application.js'
|
|
288
288
|
copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts' , javascript), File.join('app/assets/javascripts' , javascript)
|
289
289
|
end
|
290
290
|
|
291
|
-
say "-
|
292
|
-
|
291
|
+
say "- Add human_attribute_name in app/models/application_record.rb"
|
292
|
+
remove_file 'app/models/application_record.rb' # the one that 'rails new' created
|
293
|
+
copy_file File.join(GENERATOR_PATH, 'lib/generators/templates/application_record.rb'), "app/models/application_record.rb"
|
293
294
|
|
294
295
|
say "- Install ckeditor..."
|
295
296
|
generate "ckeditor:install --orm=active_record --backend=carrierwave"
|
@@ -376,11 +377,10 @@ create_file "app/controllers/application_controller.rb", <<-END_APPCONTROLLER.st
|
|
376
377
|
before_action :authenticate_user!
|
377
378
|
|
378
379
|
# Comment next 6 lines if you do not want CanCan authorization
|
379
|
-
|
380
|
+
check_authorization unless: :devise_controller?
|
380
381
|
|
381
|
-
rescue_from CanCan::
|
382
|
-
|
383
|
-
redirect_to new_user_session_path, :alert => exception.message
|
382
|
+
rescue_from CanCan::AccessDenied do |exception|
|
383
|
+
redirect_to root_path, alert: exception.message
|
384
384
|
end
|
385
385
|
|
386
386
|
ActionView::CompiledTemplates::MODEL_TABS = %w()
|
@@ -413,15 +413,15 @@ create_file "app/models/ability.rb", <<-END_ABILITY.strip_heredoc
|
|
413
413
|
include CanCan::Ability
|
414
414
|
|
415
415
|
def initialize(user)
|
416
|
-
# See the wiki for details: https://github.com/
|
416
|
+
# See the wiki for details: https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
|
417
417
|
|
418
418
|
user ||= User.new # guest user
|
419
419
|
|
420
420
|
# use this if you get stuck:
|
421
421
|
# if user.id == 1 #quick hack
|
422
|
-
# can :
|
422
|
+
# can :manage, :all
|
423
423
|
if user.role? :superadmin
|
424
|
-
can :
|
424
|
+
can :manage, :all
|
425
425
|
else
|
426
426
|
# put restrictions for other users here
|
427
427
|
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
module CancanConcern
|
2
|
+
extend ActiveSupport::Concern
|
3
|
+
|
4
|
+
included do
|
5
|
+
helper_method :cancan_disabled?, :cancan_enabled?
|
6
|
+
end
|
7
|
+
|
8
|
+
class_methods do
|
9
|
+
def cancan_enabled?
|
10
|
+
begin
|
11
|
+
CanCan::Ability && true
|
12
|
+
rescue NameError
|
13
|
+
false
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
def cancan_enabled?
|
19
|
+
self.class.cancan_enabled?
|
20
|
+
end
|
21
|
+
|
22
|
+
def cancan_disabled?
|
23
|
+
! self.class.cancan_enabled?
|
24
|
+
end
|
25
|
+
end
|
@@ -22,25 +22,9 @@
|
|
22
22
|
# @Klass is used in the InlineFormsHelper
|
23
23
|
#
|
24
24
|
class InlineFormsController < ApplicationController
|
25
|
-
|
26
|
-
|
27
|
-
def self.cancan_enabled?
|
28
|
-
begin
|
29
|
-
CanCan::Ability && true
|
30
|
-
rescue NameError
|
31
|
-
false
|
32
|
-
end
|
33
|
-
end
|
25
|
+
include CancanConcern
|
34
26
|
|
35
|
-
|
36
|
-
self.class.cancan_enabled?
|
37
|
-
end
|
38
|
-
|
39
|
-
def cancan_disabled?
|
40
|
-
! self.class.cancan_enabled?
|
41
|
-
end
|
42
|
-
|
43
|
-
helper_method :cancan_disabled?, :cancan_enabled?
|
27
|
+
before_action :getKlass
|
44
28
|
|
45
29
|
load_and_authorize_resource :except => :revert, :no_params => true if cancan_enabled?
|
46
30
|
# :index shows a list of all objects from class @Klass, using will_paginate,
|
@@ -31,7 +31,7 @@ install_plugin Capistrano::SCM::Git
|
|
31
31
|
# https://github.com/capistrano/rails
|
32
32
|
# https://github.com/capistrano/passenger
|
33
33
|
#
|
34
|
-
require
|
34
|
+
require 'rvm1/capistrano3'
|
35
35
|
# require "capistrano/rbenv"
|
36
36
|
# require "capistrano/chruby"
|
37
37
|
require "capistrano/bundler"
|
@@ -7,7 +7,7 @@ set :deploy_to, ENV['DEPLOY_DIRECTORY']
|
|
7
7
|
|
8
8
|
# Default value for :linked_files is []
|
9
9
|
set :linked_files, fetch(:linked_files, [])
|
10
|
-
.push("config/
|
10
|
+
.push("config/application.yml")
|
11
11
|
# Default value for linked_dirs is []
|
12
12
|
set :linked_dirs, fetch(:linked_dirs, [])
|
13
13
|
.push("log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/system", "vendor/bundle")
|
@@ -15,8 +15,14 @@ set :linked_dirs, fetch(:linked_dirs, [])
|
|
15
15
|
# Default value for keep_releases is 5
|
16
16
|
set :keep_releases, 5
|
17
17
|
|
18
|
+
before 'rvm1:install:rvm', 'app:update_rvm_key'
|
19
|
+
after 'rvm1:install:ruby', 'rvm1:install_bundler'
|
20
|
+
|
21
|
+
before 'deploy', 'rvm1:install:rvm' # install/update RVM
|
22
|
+
before 'deploy', 'rvm1:install:ruby' # install/update Ruby
|
23
|
+
|
18
24
|
before 'deploy:check', 'figaro:upload'
|
19
|
-
after
|
25
|
+
after 'deploy:publishing', 'deploy:restart'
|
20
26
|
|
21
27
|
# Restart unicorn
|
22
28
|
namespace :deploy do
|
@@ -30,10 +36,24 @@ namespace :figaro do
|
|
30
36
|
task :upload do
|
31
37
|
on roles(:all) do
|
32
38
|
execute "mkdir -p #{shared_path}/config"
|
33
|
-
|
34
|
-
upload! 'config/secrets.yml', "#{shared_path}/config/secrets.yml"
|
35
|
-
upload! 'config/database.yml', "#{shared_path}/config/database.yml"
|
36
39
|
upload! 'config/application.yml', "#{shared_path}/config/application.yml"
|
37
40
|
end
|
38
41
|
end
|
39
42
|
end
|
43
|
+
|
44
|
+
namespace :app do
|
45
|
+
task :update_rvm_key do
|
46
|
+
roles(:all) do
|
47
|
+
execute :gpg, "--keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3"
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
namespace :rvm1 do # https://github.com/rvm/rvm1-capistrano3/issues/45
|
53
|
+
desc "Install Bundler"
|
54
|
+
task :install_bundler do
|
55
|
+
on release_roles :all do
|
56
|
+
execute "cd #{release_path} && #{fetch(:rvm1_auto_script_path)}/rvm-auto.sh . gem install bundler"
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
data/lib/inline_forms/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: inline_forms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.0.
|
4
|
+
version: 5.0.22
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ace Suares
|
@@ -10,132 +10,132 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2017-
|
13
|
+
date: 2017-12-23 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rvm
|
17
17
|
requirement: !ruby/object:Gem::Requirement
|
18
18
|
requirements:
|
19
|
-
- -
|
19
|
+
- - ">="
|
20
20
|
- !ruby/object:Gem::Version
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
requirements:
|
26
|
-
- -
|
26
|
+
- - ">="
|
27
27
|
- !ruby/object:Gem::Version
|
28
28
|
version: '0'
|
29
29
|
- !ruby/object:Gem::Dependency
|
30
30
|
name: thor
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
32
32
|
requirements:
|
33
|
-
- -
|
33
|
+
- - ">="
|
34
34
|
- !ruby/object:Gem::Version
|
35
35
|
version: '0'
|
36
36
|
type: :runtime
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
|
-
- -
|
40
|
+
- - ">="
|
41
41
|
- !ruby/object:Gem::Version
|
42
42
|
version: '0'
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: validation_hints
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
|
-
- -
|
47
|
+
- - ">="
|
48
48
|
- !ruby/object:Gem::Version
|
49
49
|
version: '0'
|
50
50
|
type: :runtime
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
|
-
- -
|
54
|
+
- - ">="
|
55
55
|
- !ruby/object:Gem::Version
|
56
56
|
version: '0'
|
57
57
|
- !ruby/object:Gem::Dependency
|
58
58
|
name: rails
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
60
60
|
requirements:
|
61
|
-
- -
|
61
|
+
- - ">="
|
62
62
|
- !ruby/object:Gem::Version
|
63
63
|
version: '5.0'
|
64
64
|
type: :runtime
|
65
65
|
prerelease: false
|
66
66
|
version_requirements: !ruby/object:Gem::Requirement
|
67
67
|
requirements:
|
68
|
-
- -
|
68
|
+
- - ">="
|
69
69
|
- !ruby/object:Gem::Version
|
70
70
|
version: '5.0'
|
71
71
|
- !ruby/object:Gem::Dependency
|
72
72
|
name: rails-i18n
|
73
73
|
requirement: !ruby/object:Gem::Requirement
|
74
74
|
requirements:
|
75
|
-
- -
|
75
|
+
- - ">="
|
76
76
|
- !ruby/object:Gem::Version
|
77
77
|
version: '0'
|
78
78
|
type: :runtime
|
79
79
|
prerelease: false
|
80
80
|
version_requirements: !ruby/object:Gem::Requirement
|
81
81
|
requirements:
|
82
|
-
- -
|
82
|
+
- - ">="
|
83
83
|
- !ruby/object:Gem::Version
|
84
84
|
version: '0'
|
85
85
|
- !ruby/object:Gem::Dependency
|
86
86
|
name: rspec-rails
|
87
87
|
requirement: !ruby/object:Gem::Requirement
|
88
88
|
requirements:
|
89
|
-
- -
|
89
|
+
- - ">="
|
90
90
|
- !ruby/object:Gem::Version
|
91
91
|
version: '0'
|
92
92
|
type: :development
|
93
93
|
prerelease: false
|
94
94
|
version_requirements: !ruby/object:Gem::Requirement
|
95
95
|
requirements:
|
96
|
-
- -
|
96
|
+
- - ">="
|
97
97
|
- !ruby/object:Gem::Version
|
98
98
|
version: '0'
|
99
99
|
- !ruby/object:Gem::Dependency
|
100
100
|
name: shoulda
|
101
101
|
requirement: !ruby/object:Gem::Requirement
|
102
102
|
requirements:
|
103
|
-
- -
|
103
|
+
- - ">="
|
104
104
|
- !ruby/object:Gem::Version
|
105
105
|
version: '0'
|
106
106
|
type: :development
|
107
107
|
prerelease: false
|
108
108
|
version_requirements: !ruby/object:Gem::Requirement
|
109
109
|
requirements:
|
110
|
-
- -
|
110
|
+
- - ">="
|
111
111
|
- !ruby/object:Gem::Version
|
112
112
|
version: '0'
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: bundler
|
115
115
|
requirement: !ruby/object:Gem::Requirement
|
116
116
|
requirements:
|
117
|
-
- -
|
117
|
+
- - ">="
|
118
118
|
- !ruby/object:Gem::Version
|
119
119
|
version: '0'
|
120
120
|
type: :development
|
121
121
|
prerelease: false
|
122
122
|
version_requirements: !ruby/object:Gem::Requirement
|
123
123
|
requirements:
|
124
|
-
- -
|
124
|
+
- - ">="
|
125
125
|
- !ruby/object:Gem::Version
|
126
126
|
version: '0'
|
127
127
|
- !ruby/object:Gem::Dependency
|
128
128
|
name: jeweler
|
129
129
|
requirement: !ruby/object:Gem::Requirement
|
130
130
|
requirements:
|
131
|
-
- -
|
131
|
+
- - ">="
|
132
132
|
- !ruby/object:Gem::Version
|
133
133
|
version: '0'
|
134
134
|
type: :development
|
135
135
|
prerelease: false
|
136
136
|
version_requirements: !ruby/object:Gem::Requirement
|
137
137
|
requirements:
|
138
|
-
- -
|
138
|
+
- - ">="
|
139
139
|
- !ruby/object:Gem::Version
|
140
140
|
version: '0'
|
141
141
|
description: Inline Forms aims to ease the setup of forms that provide inline editing.
|
@@ -149,9 +149,9 @@ executables:
|
|
149
149
|
extensions: []
|
150
150
|
extra_rdoc_files: []
|
151
151
|
files:
|
152
|
-
- .document
|
153
|
-
- .gitignore
|
154
|
-
- .vscode/settings.json
|
152
|
+
- ".document"
|
153
|
+
- ".gitignore"
|
154
|
+
- ".vscode/settings.json"
|
155
155
|
- Gemfile
|
156
156
|
- LICENSE.txt
|
157
157
|
- README.rdoc
|
@@ -160,6 +160,7 @@ files:
|
|
160
160
|
- bin/inline_forms_app_template.rb
|
161
161
|
- bin/inline_forms_installer_core.rb
|
162
162
|
- inline_forms.gemspec
|
163
|
+
- lib/app/controllers/concerns/cancan_concern.rb
|
163
164
|
- lib/app/controllers/geo_code_curacao_controller.rb
|
164
165
|
- lib/app/controllers/inline_forms_application_controller.rb
|
165
166
|
- lib/app/controllers/inline_forms_controller.rb
|
@@ -251,11 +252,11 @@ files:
|
|
251
252
|
- lib/generators/assets/stylesheets/devise.scss
|
252
253
|
- lib/generators/assets/stylesheets/foundation_and_overrides.scss
|
253
254
|
- lib/generators/assets/stylesheets/inline_forms.scss
|
254
|
-
- lib/generators/initializers/human_attribute_name.rb
|
255
255
|
- lib/generators/inline_forms_generator.rb
|
256
256
|
- lib/generators/templates/_inline_forms_tabs.html.erb
|
257
257
|
- lib/generators/templates/abstract_mysql2_adapter.rb
|
258
258
|
- lib/generators/templates/application.yml.blank
|
259
|
+
- lib/generators/templates/application_record.rb
|
259
260
|
- lib/generators/templates/capistrano/Capfile
|
260
261
|
- lib/generators/templates/capistrano/deploy.rb
|
261
262
|
- lib/generators/templates/capistrano/production.rb
|
@@ -287,17 +288,17 @@ require_paths:
|
|
287
288
|
- lib
|
288
289
|
required_ruby_version: !ruby/object:Gem::Requirement
|
289
290
|
requirements:
|
290
|
-
- -
|
291
|
+
- - ">="
|
291
292
|
- !ruby/object:Gem::Version
|
292
293
|
version: '0'
|
293
294
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
294
295
|
requirements:
|
295
|
-
- -
|
296
|
+
- - ">="
|
296
297
|
- !ruby/object:Gem::Version
|
297
298
|
version: '0'
|
298
299
|
requirements: []
|
299
300
|
rubyforge_project: inline_forms
|
300
|
-
rubygems_version: 2.
|
301
|
+
rubygems_version: 2.5.1
|
301
302
|
signing_key:
|
302
303
|
specification_version: 4
|
303
304
|
summary: Inline editing of forms.
|