rabarber 5.2.0 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a773c884c0e207de25a518ff864d25ff13cd1a05c712c88efd17d264782d52
-  data.tar.gz: 901200cff398f2355a307aff03c9e63f1bcdbecf07369bf768fe7f12ebed9151
+  metadata.gz: 56f2e8d3ca8eef785029c9a7f42f20b847a15d1a2e057a40ba2bbc9476c16ddd
+  data.tar.gz: ea63f014aaae04bfaa2cfd25dc9c129a0071f5aadb74d5bdbca6d798b90d09c9
 SHA512:
-  metadata.gz: dd83d11d1c831f3ecb5ea36fb6d650113453f5e30b5cfdfb1affb58a515a5f77da33eb067a03abde379997f47c7e8c44d5abdf05c3a1b363d778215241406ad0
-  data.tar.gz: 130c1c65c3d5bc2e33b788e35f4a790586784ced24a20a110b106303729a2c5a798330e5e05abfe6ebf58902a63761af99909443a92b2dcec496f6d26136926e
+  metadata.gz: 44a7774698408e7e75ccac46732f86090cb16785197947da597ceeb9d50c0a8bf9d43999fb6bf0fa07d8ab44bce52c5183daa0fcd2fcd9e58dbae93a0bd4a174
+  data.tar.gz: 3b312953e3ec2ab760da6d5e3267c0fcf10697f3981f309772592143a3cc2f0b8bb6eb3c5bccdbdb2a9c3bfb66cdd92cdbb1dc297bcd6397b81d91cb8a5c86ee

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v5.2.2
+
+### Bugs:
+
+-  Fixed deprecation warnings showing when calling non-deprecated methods
+
+## v5.2.1
+
+### Bugs:
+
+- Fixed error raised on Rails console commands when the database was not yet set up
+
 ## v5.2.0
 
 ### Features:

data/lib/rabarber/models/concerns/roleable.rb

@@ -102,7 +102,7 @@ module Rabarber
     private
 
     def create_new_roles(role_names, context:)
-      new_roles = role_names - Rabarber::Role.names(context:)
+      new_roles = role_names - Rabarber.roles(context:)
       new_roles.each { |role_name| Rabarber::Role.create!(name: role_name, **context) }
     end
 

data/lib/rabarber/models/role.rb

@@ -100,7 +100,11 @@ module Rabarber
       private
 
       def deprecation_warning(method, alternative)
-        ActiveSupport::Deprecation.new("6.0.0", "rabarber").warn("`Rabarber::Role.#{method}` method is deprecated and will be removed in the next major version, use `#{alternative}` instead.") if caller_locations.map(&:label).exclude?(alternative)
+        callers = caller_locations.map(&:label)
+
+        return if callers.include?(alternative) || callers.include?("ActiveRecord::Relation#scoping")
+
+        ActiveSupport::Deprecation.new("6.0.0", "rabarber").warn("`Rabarber::Role.#{method}` method is deprecated and will be removed in the next major version, use `#{alternative}` instead.")
       end
 
       def delete_roleables_cache(role, context:)

data/lib/rabarber/railtie.rb

@@ -4,9 +4,15 @@ require "rails/railtie"
 
 module Rabarber
   class Railtie < Rails::Railtie
+    def self.table_exists?
+      ActiveRecord::Base.connection.data_source_exists?("rabarber_roles")
+    rescue ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished
+      false
+    end
+
     initializer "rabarber.to_prepare" do |app|
       app.config.to_prepare do
-        if ActiveRecord::Base.connection.data_source_exists?("rabarber_roles")
+        if Rabarber::Railtie.table_exists?
           Rabarber::Role.where.not(context_type: nil).distinct.pluck(:context_type).each do |context_class|
             context_class.constantize
           rescue NameError => e

data/lib/rabarber/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rabarber
-  VERSION = "5.2.0"
+  VERSION = "5.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabarber
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.2
 platform: ruby
 authors:
 - enjaku4
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Simple role-based authorization library for Ruby on Rails
 test_files: []