bhf 1.0.0.beta7 → 1.0.0.beta8

data/app/helpers/bhf/application_helper.rb

@@ -32,7 +32,7 @@ module Bhf
     end
 
     def type_is_image?(type)
-      Bhf.configuration.paperclip_image_types.include?(type)
+      Bhf.configuration.image_types.include?(type)
     end
 
     def bhf_main_logo(area)

data/app/views/bhf/form/column/_rich_text.html.haml

@@ -0,0 +1,2 @@
+= node f, field do
+  = f.rich_text_area field.name, class: 'default_input'

data/app/views/layouts/bhf/application.haml

@@ -10,6 +10,7 @@
       = stylesheet_link_tag css
     - Bhf.configuration.js.each do |js|
       = javascript_include_tag js
+
   %body
 
     = render partial: 'bhf/helper/flash', locals: {flash: flash}

data/bhf.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: bhf 1.0.0.beta7 ruby lib
+# stub: bhf 1.0.0.beta8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf".freeze
-  s.version = "1.0.0.beta7"
+  s.version = "1.0.0.beta8"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Anton Pawlik".freeze]
-  s.date = "2018-08-09"
+  s.date = "2019-12-27"
   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
   s.email = "anton.pawlik@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js",
     "app/assets/javascripts/bhf/mootools-more-1.5.0.js",
     "app/assets/javascripts/bhf/mootools_ujs.js",
+    "app/assets/javascripts/bhf/trix.js",
     "app/assets/stylesheets/bhf/MooEditable.scss",
     "app/assets/stylesheets/bhf/application.sass",
     "app/assets/stylesheets/bhf/functions.sass",
@@ -82,7 +83,6 @@ Gem::Specification.new do |s|
     "app/views/bhf/form/belongs_to/_select.html.haml",
     "app/views/bhf/form/belongs_to/_static.html.haml",
     "app/views/bhf/form/column/_activestorage_attachment.html.haml",
-    "app/views/bhf/form/column/_activestorage_attachments.html.haml",
     "app/views/bhf/form/column/_array.html.haml",
     "app/views/bhf/form/column/_boolean.html.haml",
     "app/views/bhf/form/column/_date.html.haml",
@@ -93,8 +93,8 @@ Gem::Specification.new do |s|
     "app/views/bhf/form/column/_markdown.html.haml",
     "app/views/bhf/form/column/_multiple_fields.html.haml",
     "app/views/bhf/form/column/_number.html.haml",
-    "app/views/bhf/form/column/_paperclip.html.haml",
     "app/views/bhf/form/column/_password.html.haml",
+    "app/views/bhf/form/column/_rich_text.html.haml",
     "app/views/bhf/form/column/_static.html.haml",
     "app/views/bhf/form/column/_string.html.haml",
     "app/views/bhf/form/column/_text.html.haml",
@@ -129,7 +129,6 @@ Gem::Specification.new do |s|
     "app/views/bhf/table/column/_hash.html.haml",
     "app/views/bhf/table/column/_image.html.haml",
     "app/views/bhf/table/column/_number.html.haml",
-    "app/views/bhf/table/column/_paperclip.html.haml",
     "app/views/bhf/table/column/_primary_key.html.haml",
     "app/views/bhf/table/column/_string.html.haml",
     "app/views/bhf/table/column/_text.html.haml",
@@ -173,29 +172,29 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://antpaw.github.io/bhf".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.0.6".freeze
   s.summary = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>.freeze, [">= 4.2"])
+      s.add_runtime_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
+      s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 6"])
       s.add_runtime_dependency(%q<turbolinks>.freeze, [">= 2"])
       s.add_runtime_dependency(%q<kaminari>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<haml-rails>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 5"])
       s.add_development_dependency(%q<shoulda>.freeze, [">= 3"])
       s.add_development_dependency(%q<rdoc>.freeze, [">= 3"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 1"])
       s.add_development_dependency(%q<jeweler>.freeze, [">= 2"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rails>.freeze, [">= 4.2"])
+      s.add_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
+      s.add_dependency(%q<sass-rails>.freeze, [">= 6"])
       s.add_dependency(%q<turbolinks>.freeze, [">= 2"])
       s.add_dependency(%q<kaminari>.freeze, [">= 0"])
       s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
-      s.add_dependency(%q<sass-rails>.freeze, [">= 5"])
       s.add_dependency(%q<shoulda>.freeze, [">= 3"])
       s.add_dependency(%q<rdoc>.freeze, [">= 3"])
       s.add_dependency(%q<bundler>.freeze, [">= 1"])
@@ -203,11 +202,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>.freeze, [">= 4.2"])
+    s.add_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
+    s.add_dependency(%q<sass-rails>.freeze, [">= 6"])
     s.add_dependency(%q<turbolinks>.freeze, [">= 2"])
     s.add_dependency(%q<kaminari>.freeze, [">= 0"])
     s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
-    s.add_dependency(%q<sass-rails>.freeze, [">= 5"])
     s.add_dependency(%q<shoulda>.freeze, [">= 3"])
     s.add_dependency(%q<rdoc>.freeze, [">= 3"])
     s.add_dependency(%q<bundler>.freeze, [">= 1"])

data/lib/bhf.rb

@@ -1,5 +1,4 @@
 require 'haml'
-require 'sass'
 require 'turbolinks'
 require 'kaminari'
 
@@ -24,8 +23,9 @@ module Bhf
     end
 
     initializer 'bhf.assets.precompile' do |app|
-      app.config.assets.precompile += %w( bhf/logo_bhf.svg )
+      app.config.assets.precompile += %w( bhf/application.css bhf/application.js bhf/logo_bhf.svg )
     end
+
   end
 
 
@@ -48,7 +48,7 @@ module Bhf
     config_accessor(:css)                       { ['bhf/application'] }
     config_accessor(:js)                        { ['bhf/application'] }
     config_accessor(:abstract_settings)         { []                  }
-    config_accessor(:paperclip_image_types)     {
+    config_accessor(:image_types)     {
       ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png',
        'image/tif', 'image/gif']
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta7
+  version: 1.0.0.beta8
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,44 +16,44 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.2.2.1
 - !ruby/object:Gem::Dependency
-  name: turbolinks
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,7 @@ files:
 - app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js
 - app/assets/javascripts/bhf/mootools-more-1.5.0.js
 - app/assets/javascripts/bhf/mootools_ujs.js
+- app/assets/javascripts/bhf/trix.js
 - app/assets/stylesheets/bhf/MooEditable.scss
 - app/assets/stylesheets/bhf/application.sass
 - app/assets/stylesheets/bhf/functions.sass
@@ -223,7 +224,6 @@ files:
 - app/views/bhf/form/belongs_to/_select.html.haml
 - app/views/bhf/form/belongs_to/_static.html.haml
 - app/views/bhf/form/column/_activestorage_attachment.html.haml
-- app/views/bhf/form/column/_activestorage_attachments.html.haml
 - app/views/bhf/form/column/_array.html.haml
 - app/views/bhf/form/column/_boolean.html.haml
 - app/views/bhf/form/column/_date.html.haml
@@ -234,8 +234,8 @@ files:
 - app/views/bhf/form/column/_markdown.html.haml
 - app/views/bhf/form/column/_multiple_fields.html.haml
 - app/views/bhf/form/column/_number.html.haml
-- app/views/bhf/form/column/_paperclip.html.haml
 - app/views/bhf/form/column/_password.html.haml
+- app/views/bhf/form/column/_rich_text.html.haml
 - app/views/bhf/form/column/_static.html.haml
 - app/views/bhf/form/column/_string.html.haml
 - app/views/bhf/form/column/_text.html.haml
@@ -270,7 +270,6 @@ files:
 - app/views/bhf/table/column/_hash.html.haml
 - app/views/bhf/table/column/_image.html.haml
 - app/views/bhf/table/column/_number.html.haml
-- app/views/bhf/table/column/_paperclip.html.haml
 - app/views/bhf/table/column/_primary_key.html.haml
 - app/views/bhf/table/column/_string.html.haml
 - app/views/bhf/table/column/_text.html.haml
@@ -330,8 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A simple to use Rails-Engine-Gem that offers an admin interface for trusted

data/app/views/bhf/form/column/_paperclip.html.haml

@@ -1,19 +0,0 @@
-- # no file upload on ajax submit :(
-- unless @quick_edit
-  = node f, field do
-    - file = f.object.send(field.name)
-    - if file.file?
-
-      - if type_is_image?(file.content_type)
-        = link_to image_tag(find_smallest_size_url_for_file(file), class: 'uploaded_image'), file.url
-      - else
-        = link_to file.original_filename, file.url, class: 'uploaded_file'
-
-      - if f.object.respond_to?(:"#{field.name}_destroy")
-        .file_delete
-          = f.check_box "#{field.name}_destroy"
-          = f.label "#{field.name}_destroy", t('bhf.helpers.file.delete')
-
-    %a.qe_button.ninja_file_field_holder.default_form_align{data: {empty_field_text: t('bhf.helpers.form.file_field.select')}}
-      %span.h_text= t('bhf.helpers.form.file_field.select')
-      = f.file_field field.name, class: 'ninja_file_field'

data/app/views/bhf/table/column/_paperclip.html.haml

@@ -1,6 +0,0 @@
-= content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
-  - file = column_value
-  - if type_is_image?(file.content_type)
-    = image_tag find_smallest_size_url_for_file(file), alt: column_value, class: 'preview_image'
-  - else
-    = file.original_filename