bhf 1.0.0.beta13 → 1.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0299a01e605ea27b2d8d18c66f4a3777b3c3c49d00fe25d9b144d6b12939085e'
-  data.tar.gz: 4c73e93c7866ed81e04372459bb155b1c1a15a6e392b0462d0acc3c02491d68e
+  metadata.gz: 7de2d8de2daf035ca6792f1a8f0ee79d115c147ec524d05cfb399062ea613a51
+  data.tar.gz: 2da1451f1ac4a51ac6ef2bb64049cf77f276731d2fb9f0ad361e0889a013640e
 SHA512:
-  metadata.gz: c958e66dde651b74f2d2b7cb6c4b8aad2934e49c551442645be298fadcbd75d79794303a225179b03ac6641041932374805e40a8b04e486f9f35487e5c82bef4
-  data.tar.gz: 0dc40e56b3f326275afd315d92ce3df1fb7f898396f4a45a6716771dfe3017877b9cda5aaa8a9e3906a7f575d73f90ce65e72924e52d431c0d0f5837f702d7d7
+  metadata.gz: 9dabe94a653a2ecb3d374b1a32278fbb5132c6eabbf6abafb34381562c97bb0f91d72011c192c230b221b366c413a7d21e090ea75d7021edd0b81b3afdd786aa
+  data.tar.gz: c771edcf4fcbea5674fce3f56cfd5e8da1edf47b3c45838a7687983e8a5d51dfadda4912a2addbbba90ad016b3ccd717e066534e5ae1f8516abd0aea04a00440

data/Gemfile.lock

@@ -58,8 +58,8 @@ GEM
       zeitwerk (~> 2.2)
     addressable (2.4.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.2)
@@ -94,7 +94,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (1.7.0)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jeweler (2.3.9)
       builder
@@ -109,19 +109,19 @@ GEM
       semver2
     json (2.3.0)
     jwt (2.2.1)
-    kaminari (1.1.1)
+    kaminari (1.2.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
-    loofah (2.4.0)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -130,16 +130,19 @@ GEM
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
     mime-types (2.99.3)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    mini_portile2 (2.8.0)
+    minitest (5.14.1)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     oauth2 (1.4.2)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
@@ -147,7 +150,8 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     psych (3.1.0)
-    rack (2.0.8)
+    racc (1.6.0)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (6.0.2.1)
@@ -177,7 +181,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rake (13.0.1)
-    rdoc (6.2.1)
+    rdoc (6.3.1)
     ruby_parser (3.14.1)
       sexp_processor (~> 4.9)
     sass-rails (6.0.0)
@@ -217,12 +221,12 @@ GEM
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    zeitwerk (2.2.2)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-1.0.0.beta13
+1.0.0.beta15

data/app/controllers/bhf/embed_entries_controller.rb

@@ -37,7 +37,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
 
   def update
     before_save
-    if @object.update_attributes(@permited_params)
+    if @object.update(@permited_params)
       manage_many_to_many
       after_save
 

data/app/controllers/bhf/entries_controller.rb

@@ -53,7 +53,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
     render file: 'public/404.html', layout: false and return unless @object
 
     before_save
-    if @object.update_attributes(@permited_params)
+    if @object.update(@permited_params)
       manage_relations
       after_save
 

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.beta13 ruby lib
+# stub: bhf 1.0.0.beta15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf".freeze
-  s.version = "1.0.0.beta13"
+  s.version = "1.0.0.beta15"
 
   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 = "2020-07-16"
+  s.date = "2023-03-21"
   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 = [
@@ -174,7 +174,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://antpaw.github.io/bhf".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.8".freeze
+  s.rubygems_version = "3.0.9".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

data/config/locales/de.yml

@@ -64,8 +64,8 @@ de:
       entries: Einträge
       info:
         default: "Es werden <strong>%{offset_start} - %{offset_end}</strong> von <strong>%{count}</strong> %{name} angezeigt"
-        other: "Es werden <strong>alle %{count}</strong> %{name_plural} angezeigt"
-        one: "Es wird <strong>1</strong> %{name_singular} angezeigt"
+        other: "Es werden <strong>alle %{count}</strong> %{name} angezeigt"
+        one: "Es wird <strong>1</strong> %{name} angezeigt"
         zero: "Es wurde nichts gefunden"
 
     footer:

data/config/locales/en.yml

@@ -69,9 +69,9 @@ en:
       entries: entries
       info:
         default: "Displaying <strong>%{offset_start} - %{offset_end}</strong> of <strong>%{count}</strong> %{name} in total"
-        other: "Displaying <strong>all %{count}</strong> %{name_plural}"
-        one: "Displaying <strong>1</strong> %{name_singular}"
-        zero: "No %{name_zero} found"
+        other: "Displaying <strong>all %{count}</strong> %{name}"
+        one: "Displaying <strong>1</strong> %{name}"
+        zero: "No %{name} found"
 
     footer:
       state: 'Page rendered in ~%{time} seconds'

data/config/locales/pt.yml

@@ -68,9 +68,9 @@ pt:
       entries: registros
       info:
         default: "Exibindo <strong>%{offset_start} - %{offset_end}</strong> de <strong>%{count}</strong> %{name} no total"
-        other: "Exibindo <strong>todos %{count}</strong> %{name_plural}"
-        one: "Exibindo <strong>1</strong> %{name_singular}"
-        zero: "Nenhum(a) %{name_zero} encontrado"
+        other: "Exibindo <strong>todos %{count}</strong> %{name}"
+        one: "Exibindo <strong>1</strong> %{name}"
+        zero: "Nenhum(a) %{name} encontrado"
 
     footer:
       state: 'Página renderizada em ~%{time} segundos'

data/lib/bhf/mongoid/document.rb

@@ -20,18 +20,19 @@ module Bhf::Mongoid
         @name = mongoid_field.name
         @klass = mongoid_field.class_name.constantize
         @foreign_key = mongoid_field.key
-        @macro = case mongoid_field.macro
-          when :references_and_referenced_in_many
-            :has_and_belongs_to_many
-          when :references_many
-            :has_many
-          when :references_one
-            :has_one
-          when :referenced_in
-            :belongs_to
-          else
-            mongoid_field.macro
-        end
+        @macro = mongoid_field.class.name.demodulize.underscore.to_sym
+        # @macro = case mongoid_field.macro
+        #   when :references_and_referenced_in_many
+        #     :has_and_belongs_to_many
+        #   when :references_many
+        #     :has_many
+        #   when :references_one
+        #     :has_one
+        #   when :referenced_in
+        #     :belongs_to
+        #   else
+        #     mongoid_field.macro
+        # end
       end
     end
 
@@ -67,7 +68,7 @@ module Bhf::Mongoid
       def reflections
         c = {}
         relations.each do |key, meta|
-          next if meta.macro == :embedded_in
+          next if meta.is_a?(Mongoid::Association::Embedded::EmbeddedIn)
           c[key] = Reflection.new(meta)
         end
         c
@@ -112,7 +113,7 @@ module Bhf::Mongoid
 
       def get_embedded_parent(parent_id, &block)
         relations.each do |key, meta|
-          next unless meta.macro == :embedded_in
+          next unless meta.is_a?(Mongoid::Association::Embedded::EmbeddedIn)
           parent = meta.class_name.constantize
           parent = parent.find(parent_id) rescue nil
 
@@ -130,7 +131,7 @@ module Bhf::Mongoid
           else
             meta.inverse_foreign_key.pluralize
           end.to_s
-          if parent.relations[key_name] and parent.relations[key_name].macro == :embeds_one
+          if parent.relations[key_name] and parent.relations[key_name].is_a?(Mongoid::Association::Embedded::EmbedsOne)
             parent.send("build_#{key_name}", params)
           else
             parent.send(key_name).build(params)
@@ -146,7 +147,7 @@ module Bhf::Mongoid
             meta.inverse_foreign_key.pluralize
           end.to_s
           relation = parent.send(key_name)
-          if parent.relations[key_name].macro == :embeds_one
+          if parent.relations[key_name].is_a?(Mongoid::Association::Embedded::EmbedsOne)
             relation
           else
             relation.find(ref_id)

data/lib/bhf/platform/pagination.rb

@@ -25,11 +25,11 @@ module Bhf::Platform
     def create(platform)
       platform_params = template.params[platform.name] || {}
 
-      links = if !(page_links = template.paginate(platform.objects, {
+      links = if !(page_links = template.paginate(platform.objects,
         theme: 'bhf',
         param_name: [platform.name, :page],
         params: template.params.permit!
-      })).blank?
+      )).blank?
         "#{load_more(platform)} #{page_links}"
       elsif platform.objects.total_pages == 1 && platform.objects.size > @offset_to_add
         load_less(platform)
@@ -51,12 +51,20 @@ module Bhf::Platform
           offset_end: collection.offset_value + collection.limit_value
         })
       else
-        I18n.t('bhf.pagination.info', {
-          name_zero: platform.title,
-          name_singular: platform.title_singular,
-          name_plural: platform.title,
-          count: collection.size
-        })
+        count = collection.size
+        platform_title = case count
+        when 0
+          platform.title
+        when 1
+          platform.title_singular
+        else
+          platform.title
+        end
+
+        I18n.t('bhf.pagination.info',
+          count: count,
+          name: platform_title
+        )
       end.html_safe
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta13
+  version: 1.0.0.beta15
 platform: ruby
 authors:
 - Anton Pawlik
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -316,7 +316,7 @@ homepage: http://antpaw.github.io/bhf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -331,8 +331,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: A simple to use Rails-Engine-Gem that offers an admin interface for trusted
   user.