rhino_project_core 0.20.0.beta.82 → 0.20.0.beta.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f6123816342296824d915b225178c13a79bd0871a121557ccaf339305365a3
-  data.tar.gz: 56f08bd75c8aea4b341e865834ccd6502ca6f05bb49c957fcc20474aeffda8d6
+  metadata.gz: d3c51efa857ca590575cf699ed0f796ae7911e7a3a0d8d5eb060b2714d834322
+  data.tar.gz: 0b3ef1439527c46a6ecb57ed9e5aaff88e58050d96ae2cad54efe47507dac80c
 SHA512:
-  metadata.gz: 15782f70f64a12b73b61c5352212e120f0b3ddb6b4b0823842fa747229a6f8afe0eb67b2ab5f1bc0051c6292782cb568d9f110ff293b88822a3898a750c6f4eb
-  data.tar.gz: a1967b590b68299ec87bb95567552e8835ed56f64db246e2cafd65dc04af70cbf2c11cd33c7213f256ff5b984cb61b3c9c5ec397d1fb777f1d04e75f6eb895de
+  metadata.gz: c203b19dfec0e8ae34005ca2fdf05a1f7d0dba71c1cedd50a6da40fc664859e243ab34c8234bbc7a24567d33a66d59ea817532454c7e11c9b91d98af5c13611f
+  data.tar.gz: 2b84c93bf3562e9987fc5b5bdd90d6ecc882f3bd3f21d0f6acd03b1e772a75b9fa1ae6c639359483b2c2ae6f9fce5fa06b1706086b704cc6471109d1a685a457

data/app/overrides/devise_token_auth/omniauth_callbacks_controller_override.rb

@@ -30,7 +30,7 @@ module DeviseTokenAuth::OmniauthCallbacksController::Extensions
 
     # set a server cookie if configured
     if DeviseTokenAuth.cookie_enabled
-      auth_header = @resource.build_auth_header(@token.token, @token.client)
+      auth_header = @resource.build_auth_headers(@token.token, @token.client)
       cookies[DeviseTokenAuth.cookie_name] = DeviseTokenAuth.cookie_attributes.merge(value: auth_header.to_json)
     end
   rescue ActiveRecord::RecordInvalid

data/lib/generators/rhino/model/model_generator.rb

@@ -5,15 +5,20 @@ require "rails/generators/active_record/model/model_generator"
 
 module Rhino
   class ModelGenerator < ::ActiveRecord::Generators::ModelGenerator
-    # This is the path to the templates used by the original model generator
-    # I think this can be removed in Rails 7.1 https://github.com/rails/rails/pull/47181
-    source_root File.join(File.dirname(::ActiveRecord::Generators::ModelGenerator.instance_method(:create_migration_file).source_location.first),
-                          "templates")
+    source_root File.expand_path("templates", __dir__)
 
     class_option :owner, type: :string, desc: "The model is owned by the reference attribute", group: :owner
     class_option :base_owner, type: :boolean, default: false, desc: "The model is owned by the base owner", group: :owner
     class_option :global_owner, type: :boolean, default: false, desc: "The model is globally owned", group: :owner
 
+    # Parent source paths
+    def source_paths
+      [
+        File.expand_path("templates", __dir__),
+        ::ActiveRecord::Generators::ModelGenerator.source_root
+      ]
+    end
+
     def create_migration_file
       # We check the ownership of the reference attributes before creating the migration
       check_ownership

data/lib/generators/rhino/module/module_generator.rb

@@ -32,7 +32,8 @@ module Rhino
     class ModuleGenerator < ::Rails::Generators::PluginGenerator
       source_root File.expand_path("templates", __dir__)
 
-      class_option :database, type: :string, aliases: "-d", default: "postgresql"
+      class_option :database, type: :string, aliases: "-d", default: "postgresql", hide: true
+      class_option :full, type: :boolean, default: true, hide: true
       remove_class_option :template
 
       def self.banner
@@ -52,6 +53,17 @@ module Rhino
         ModuleBuilder
       end
 
+      def engine_config
+        content = []
+
+        content << "isolate_namespace #{camelized_modules}\n" if mountable?
+        content << "config.generators.api_only = true" if api?
+
+        return optimize_indentation(content.join("\n"), 4) if content.any?
+
+        nil
+      end
+
       def rhino_version
         ::Rhino::VERSION::STRING
       end

data/lib/generators/rhino/module/templates/lib/%namespaced_name%/engine.rb.tt

@@ -4,6 +4,7 @@ require "rhino/engine"
 
 module <%= camelized_modules %>
   class Engine < ::Rails::Engine
+<%= engine_config -%>
     config.autoload_paths << File.expand_path("../../lib", __dir__)
 
     initializer "<%= namespaced_name %>.register_module" do

data/lib/rhino/engine.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "rhino/version"
+
+require "devise_token_auth"
 module Rhino
   class Engine < ::Rails::Engine
     config.before_configuration do
@@ -12,19 +14,19 @@ module Rhino
       end
     end
 
-    initializer 'rhino.active_record_extension' do
+    initializer "rhino.active_record_extension" do
       ActiveSupport.on_load(:active_record) do
-        require_relative 'resource/active_record_extension'
-        require_relative 'resource/active_record_tree'
-        require_relative 'resource/active_model_extension'
+        require_relative "resource/active_record_extension"
+        require_relative "resource/active_record_tree"
+        require_relative "resource/active_model_extension"
 
         include Rhino::Resource::ActiveRecordExtension if Rhino.auto_include_active_record
       end
     end
 
-    initializer 'rhino.active_storage_extension' do
+    initializer "rhino.active_storage_extension" do
       ActiveSupport.on_load(:active_storage_attachment) do
-        require_relative 'resource/active_storage_extension'
+        require_relative "resource/active_storage_extension"
 
         include Rhino::Resource::ActiveStorageExtension
       end
@@ -32,7 +34,7 @@ module Rhino
 
     # https://guides.rubyonrails.org/engines.html#overriding-models-and-controllers
     # Use root instead of Rails.root to scope for this engine
-    initializer 'rhino.overrides' do
+    initializer "rhino.overrides" do
       overrides = "#{root}/app/overrides"
       Rails.autoloaders.main.ignore(overrides)
 
@@ -43,13 +45,13 @@ module Rhino
       end
     end
 
-    initializer 'rhino.check_resources' do
+    initializer "rhino.check_resources" do
       config.after_initialize do
         check_resources
       end
     end
 
-    initializer 'rhino.resource_reloader' do
+    initializer "rhino.resource_reloader" do
       config.after_initialize do
         Rails.application.reloader.to_prepare do
           Rhino.resource_classes = nil
@@ -57,8 +59,8 @@ module Rhino
       end
     end
 
-    initializer 'rhino.register_module' do
-      require 'rhino/omniauth/strategies/azure_o_auth2'
+    initializer "rhino.register_module" do
+      require "rhino/omniauth/strategies/azure_o_auth2"
 
       config.after_initialize do
         Rhino.registered_modules[:rhino] = {

data/lib/rhino/version.rb

@@ -10,7 +10,7 @@ module Rhino
     MAJOR = 0
     MINOR = 20
     TINY  = 0
-    PRE   = "beta.82"
+    PRE   = "beta.84"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.20.0.beta.82
+  version: 0.20.0.beta.84
 platform: ruby
 authors:
 - JP Rosevear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,16 +54,16 @@ dependencies:
   name: devise_token_auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: js_regex
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.1'
+- !ruby/object:Gem::Dependency
+  name: rgl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.6
 description: ''
 email:
 - jprosevear@nubinary.com