bhf 1.0.0.beta7 → 1.0.0.beta8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -2
  3. data/Gemfile.lock +129 -117
  4. data/VERSION +1 -1
  5. data/app/assets/javascripts/bhf/application.js +1 -0
  6. data/app/assets/javascripts/bhf/trix.js +1 -0
  7. data/app/assets/stylesheets/bhf/application.sass +38 -0
  8. data/app/controllers/bhf/entries_controller.rb +2 -2
  9. data/app/helpers/bhf/application_helper.rb +1 -1
  10. data/app/views/bhf/form/column/_rich_text.html.haml +2 -0
  11. data/app/views/layouts/bhf/application.haml +1 -0
  12. data/bhf.gemspec +12 -13
  13. data/lib/bhf.rb +3 -3
  14. metadata +17 -19
  15. data/app/views/bhf/form/column/_activestorage_attachments.html.haml +0 -0
  16. data/app/views/bhf/form/column/_paperclip.html.haml +0 -19
  17. data/app/views/bhf/table/column/_paperclip.html.haml +0 -6
data/app/helpers/bhf/application_helper.rb CHANGED
@@ -32,7 +32,7 @@ module Bhf
32
32
  end
33
33
 
34
34
  def type_is_image?(type)
35
- Bhf.configuration.paperclip_image_types.include?(type)
35
+ Bhf.configuration.image_types.include?(type)
36
36
  end
37
37
 
38
38
  def bhf_main_logo(area)
data/app/views/bhf/form/column/_rich_text.html.haml ADDED
@@ -0,0 +1,2 @@
1
+ = node f, field do
2
+ = f.rich_text_area field.name, class: 'default_input'
data/app/views/layouts/bhf/application.haml CHANGED
@@ -10,6 +10,7 @@
10
10
  = stylesheet_link_tag css
11
11
  - Bhf.configuration.js.each do |js|
12
12
  = javascript_include_tag js
13
+
13
14
  %body
14
15
 
15
16
  = render partial: 'bhf/helper/flash', locals: {flash: flash}
data/bhf.gemspec CHANGED
@@ -2,16 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: bhf 1.0.0.beta7 ruby lib
5
+ # stub: bhf 1.0.0.beta8 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "bhf".freeze
9
- s.version = "1.0.0.beta7"
9
+ s.version = "1.0.0.beta8"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib".freeze]
13
13
  s.authors = ["Anton Pawlik".freeze]
14
- s.date = "2018-08-09"
14
+ s.date = "2019-12-27"
15
15
  s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid.".freeze
16
16
  s.email = "anton.pawlik@gmail.com".freeze
17
17
  s.extra_rdoc_files = [
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
57
57
  "app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js",
58
58
  "app/assets/javascripts/bhf/mootools-more-1.5.0.js",
59
59
  "app/assets/javascripts/bhf/mootools_ujs.js",
60
+ "app/assets/javascripts/bhf/trix.js",
60
61
  "app/assets/stylesheets/bhf/MooEditable.scss",
61
62
  "app/assets/stylesheets/bhf/application.sass",
62
63
  "app/assets/stylesheets/bhf/functions.sass",
@@ -82,7 +83,6 @@ Gem::Specification.new do |s|
82
83
  "app/views/bhf/form/belongs_to/_select.html.haml",
83
84
  "app/views/bhf/form/belongs_to/_static.html.haml",
84
85
  "app/views/bhf/form/column/_activestorage_attachment.html.haml",
85
- "app/views/bhf/form/column/_activestorage_attachments.html.haml",
86
86
  "app/views/bhf/form/column/_array.html.haml",
87
87
  "app/views/bhf/form/column/_boolean.html.haml",
88
88
  "app/views/bhf/form/column/_date.html.haml",
@@ -93,8 +93,8 @@ Gem::Specification.new do |s|
93
93
  "app/views/bhf/form/column/_markdown.html.haml",
94
94
  "app/views/bhf/form/column/_multiple_fields.html.haml",
95
95
  "app/views/bhf/form/column/_number.html.haml",
96
- "app/views/bhf/form/column/_paperclip.html.haml",
97
96
  "app/views/bhf/form/column/_password.html.haml",
97
+ "app/views/bhf/form/column/_rich_text.html.haml",
98
98
  "app/views/bhf/form/column/_static.html.haml",
99
99
  "app/views/bhf/form/column/_string.html.haml",
100
100
  "app/views/bhf/form/column/_text.html.haml",
@@ -129,7 +129,6 @@ Gem::Specification.new do |s|
129
129
  "app/views/bhf/table/column/_hash.html.haml",
130
130
  "app/views/bhf/table/column/_image.html.haml",
131
131
  "app/views/bhf/table/column/_number.html.haml",
132
- "app/views/bhf/table/column/_paperclip.html.haml",
133
132
  "app/views/bhf/table/column/_primary_key.html.haml",
134
133
  "app/views/bhf/table/column/_string.html.haml",
135
134
  "app/views/bhf/table/column/_text.html.haml",
@@ -173,29 +172,29 @@ Gem::Specification.new do |s|
173
172
  ]
174
173
  s.homepage = "http://antpaw.github.io/bhf".freeze
175
174
  s.licenses = ["MIT".freeze]
176
- s.rubygems_version = "2.7.6".freeze
175
+ s.rubygems_version = "3.0.6".freeze
177
176
  s.summary = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user.".freeze
178
177
 
179
178
  if s.respond_to? :specification_version then
180
179
  s.specification_version = 4
181
180
 
182
181
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
183
- s.add_runtime_dependency(%q<rails>.freeze, [">= 4.2"])
182
+ s.add_runtime_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
183
+ s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 6"])
184
184
  s.add_runtime_dependency(%q<turbolinks>.freeze, [">= 2"])
185
185
  s.add_runtime_dependency(%q<kaminari>.freeze, [">= 0"])
186
186
  s.add_runtime_dependency(%q<haml-rails>.freeze, [">= 0"])
187
- s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 5"])
188
187
  s.add_development_dependency(%q<shoulda>.freeze, [">= 3"])
189
188
  s.add_development_dependency(%q<rdoc>.freeze, [">= 3"])
190
189
  s.add_development_dependency(%q<bundler>.freeze, [">= 1"])
191
190
  s.add_development_dependency(%q<jeweler>.freeze, [">= 2"])
192
191
  s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
193
192
  else
194
- s.add_dependency(%q<rails>.freeze, [">= 4.2"])
193
+ s.add_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
194
+ s.add_dependency(%q<sass-rails>.freeze, [">= 6"])
195
195
  s.add_dependency(%q<turbolinks>.freeze, [">= 2"])
196
196
  s.add_dependency(%q<kaminari>.freeze, [">= 0"])
197
197
  s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
198
- s.add_dependency(%q<sass-rails>.freeze, [">= 5"])
199
198
  s.add_dependency(%q<shoulda>.freeze, [">= 3"])
200
199
  s.add_dependency(%q<rdoc>.freeze, [">= 3"])
201
200
  s.add_dependency(%q<bundler>.freeze, [">= 1"])
@@ -203,11 +202,11 @@ Gem::Specification.new do |s|
203
202
  s.add_dependency(%q<simplecov>.freeze, [">= 0"])
204
203
  end
205
204
  else
206
- s.add_dependency(%q<rails>.freeze, [">= 4.2"])
205
+ s.add_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
206
+ s.add_dependency(%q<sass-rails>.freeze, [">= 6"])
207
207
  s.add_dependency(%q<turbolinks>.freeze, [">= 2"])
208
208
  s.add_dependency(%q<kaminari>.freeze, [">= 0"])
209
209
  s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
210
- s.add_dependency(%q<sass-rails>.freeze, [">= 5"])
211
210
  s.add_dependency(%q<shoulda>.freeze, [">= 3"])
212
211
  s.add_dependency(%q<rdoc>.freeze, [">= 3"])
213
212
  s.add_dependency(%q<bundler>.freeze, [">= 1"])
data/lib/bhf.rb CHANGED
@@ -1,5 +1,4 @@
1
1
  require 'haml'
2
- require 'sass'
3
2
  require 'turbolinks'
4
3
  require 'kaminari'
5
4
 
@@ -24,8 +23,9 @@ module Bhf
24
23
  end
25
24
 
26
25
  initializer 'bhf.assets.precompile' do |app|
27
- app.config.assets.precompile += %w( bhf/logo_bhf.svg )
26
+ app.config.assets.precompile += %w( bhf/application.css bhf/application.js bhf/logo_bhf.svg )
28
27
  end
28
+
29
29
  end
30
30
 
31
31
 
@@ -48,7 +48,7 @@ module Bhf
48
48
  config_accessor(:css) { ['bhf/application'] }
49
49
  config_accessor(:js) { ['bhf/application'] }
50
50
  config_accessor(:abstract_settings) { [] }
51
- config_accessor(:paperclip_image_types) {
51
+ config_accessor(:image_types) {
52
52
  ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png',
53
53
  'image/tif', 'image/gif']
54
54
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bhf
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.beta7
4
+ version: 1.0.0.beta8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anton Pawlik
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-08-09 00:00:00.000000000 Z
11
+ date: 2019-12-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,44 +16,44 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '4.2'
19
+ version: 5.2.2.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '4.2'
26
+ version: 5.2.2.1
27
27
  - !ruby/object:Gem::Dependency
28
- name: turbolinks
28
+ name: sass-rails
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '2'
33
+ version: '6'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '2'
40
+ version: '6'
41
41
  - !ruby/object:Gem::Dependency
42
- name: kaminari
42
+ name: turbolinks
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: '2'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '0'
54
+ version: '2'
55
55
  - !ruby/object:Gem::Dependency
56
- name: haml-rails
56
+ name: kaminari
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - ">="
@@ -67,19 +67,19 @@ dependencies:
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
- name: sass-rails
70
+ name: haml-rails
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: '5'
75
+ version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: '5'
82
+ version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: shoulda
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,7 @@ files:
198
198
  - app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js
199
199
  - app/assets/javascripts/bhf/mootools-more-1.5.0.js
200
200
  - app/assets/javascripts/bhf/mootools_ujs.js
201
+ - app/assets/javascripts/bhf/trix.js
201
202
  - app/assets/stylesheets/bhf/MooEditable.scss
202
203
  - app/assets/stylesheets/bhf/application.sass
203
204
  - app/assets/stylesheets/bhf/functions.sass
@@ -223,7 +224,6 @@ files:
223
224
  - app/views/bhf/form/belongs_to/_select.html.haml
224
225
  - app/views/bhf/form/belongs_to/_static.html.haml
225
226
  - app/views/bhf/form/column/_activestorage_attachment.html.haml
226
- - app/views/bhf/form/column/_activestorage_attachments.html.haml
227
227
  - app/views/bhf/form/column/_array.html.haml
228
228
  - app/views/bhf/form/column/_boolean.html.haml
229
229
  - app/views/bhf/form/column/_date.html.haml
@@ -234,8 +234,8 @@ files:
234
234
  - app/views/bhf/form/column/_markdown.html.haml
235
235
  - app/views/bhf/form/column/_multiple_fields.html.haml
236
236
  - app/views/bhf/form/column/_number.html.haml
237
- - app/views/bhf/form/column/_paperclip.html.haml
238
237
  - app/views/bhf/form/column/_password.html.haml
238
+ - app/views/bhf/form/column/_rich_text.html.haml
239
239
  - app/views/bhf/form/column/_static.html.haml
240
240
  - app/views/bhf/form/column/_string.html.haml
241
241
  - app/views/bhf/form/column/_text.html.haml
@@ -270,7 +270,6 @@ files:
270
270
  - app/views/bhf/table/column/_hash.html.haml
271
271
  - app/views/bhf/table/column/_image.html.haml
272
272
  - app/views/bhf/table/column/_number.html.haml
273
- - app/views/bhf/table/column/_paperclip.html.haml
274
273
  - app/views/bhf/table/column/_primary_key.html.haml
275
274
  - app/views/bhf/table/column/_string.html.haml
276
275
  - app/views/bhf/table/column/_text.html.haml
@@ -330,8 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
330
329
  - !ruby/object:Gem::Version
331
330
  version: 1.3.1
332
331
  requirements: []
333
- rubyforge_project:
334
- rubygems_version: 2.7.6
332
+ rubygems_version: 3.0.6
335
333
  signing_key:
336
334
  specification_version: 4
337
335
  summary: A simple to use Rails-Engine-Gem that offers an admin interface for trusted
data/app/views/bhf/form/column/_paperclip.html.haml DELETED
@@ -1,19 +0,0 @@
1
- - # no file upload on ajax submit :(
2
- - unless @quick_edit
3
- = node f, field do
4
- - file = f.object.send(field.name)
5
- - if file.file?
6
-
7
- - if type_is_image?(file.content_type)
8
- = link_to image_tag(find_smallest_size_url_for_file(file), class: 'uploaded_image'), file.url
9
- - else
10
- = link_to file.original_filename, file.url, class: 'uploaded_file'
11
-
12
- - if f.object.respond_to?(:"#{field.name}_destroy")
13
- .file_delete
14
- = f.check_box "#{field.name}_destroy"
15
- = f.label "#{field.name}_destroy", t('bhf.helpers.file.delete')
16
-
17
- %a.qe_button.ninja_file_field_holder.default_form_align{data: {empty_field_text: t('bhf.helpers.form.file_field.select')}}
18
- %span.h_text= t('bhf.helpers.form.file_field.select')
19
- = f.file_field field.name, class: 'ninja_file_field'
data/app/views/bhf/table/column/_paperclip.html.haml DELETED
@@ -1,6 +0,0 @@
1
- = content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
2
- - file = column_value
3
- - if type_is_image?(file.content_type)
4
- = image_tag find_smallest_size_url_for_file(file), alt: column_value, class: 'preview_image'
5
- - else
6
- = file.original_filename