rhino_project_core 0.25.0.beta.16 → 0.30.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '089e1dbd80df2979c8b07724ff6fdb32716d7d6be4f3eebedfb1e18c69952610'
-  data.tar.gz: 84bdac04576b5e2dc6cc2c198356526e17f6e4801af8abe31f9b31754699494b
+  metadata.gz: '09bab6f8b81658c76669317d949e44e1e0728d7be46cb80793fa2488ffcff097'
+  data.tar.gz: 571b132824ac728b7e8072095a106c9731350abe88ce69d74b46852fe3ada36f
 SHA512:
-  metadata.gz: 7270b4f2a2e105178ab7913d0e9501bbcea8a7867edfdd71ef42d7b9fcf706b3ce1a8faafd3b102a9a7fe294924c3ed7e488ac4f865dd825cfe3d46256540a64
-  data.tar.gz: 59ba86a48867cbd4b6c66769fd8971bb670b68a3bc608ac154cf1f9d51df88401a274bc7a2f16f26465d9fa3fa8e826728a21ca26621550355a965c9ac30ff85
+  metadata.gz: 134e615ee50fbfe6de3f37a04a633dc82b89cdcae1d7c2e881b2000f759bdabae4ff22d2e0912d9d642660ee4ff323238b2d134c4644552082dc2d05e252e896
+  data.tar.gz: 975781708959682419d2f40637cf1833dc316f05d353d12422de0074a1a541f63db49f06d7de18e084ecaaaad3460604df9ccaf929ba5ad1e6050b155e176e18

data/app/helpers/rhino/omniauth_helper.rb

@@ -5,10 +5,12 @@ module Rhino
     module_function
 
     def strategies_metadata
+      params = { resource_class: "User" }
+
       strategies.each_with_object([]) do |strategy, array|
         array << {
           name: strategy,
-          path: "#{::OmniAuth.config.path_prefix}/#{strategy}"
+          path: "#{::OmniAuth.config.path_prefix}/#{strategy}?#{params.to_param}"
         }
       end
     end
@@ -21,6 +23,8 @@ module Rhino
         match[1].downcase.to_sym
       end.uniq
 
+      strategies += [:developer] if Rails.env.development? && !Rake.try(:application)
+
       strategies
     end
 

data/app/overrides/devise_token_auth/confirmations_controller_override.rb

@@ -5,7 +5,7 @@ module DeviseTokenAuth::ConfirmationsController::Extensions
   def show
     super
   rescue StandardError
-    redirect_to ENV["RHINO_APP_URL"]
+    redirect_to ENV["FRONT_END_URL"]
   end
 end
 

data/app/overrides/devise_token_auth/passwords_controller_override.rb

@@ -4,6 +4,6 @@ class DeviseTokenAuth::PasswordsController
   # If there is an error preparing to edit the password, redirect to frontend
   # This would normally be an expired password token
   def render_edit_error
-    redirect_to "#{ENV['RHINO_APP_URL']}/auth/reset-password/expired"
+    redirect_to "#{ENV['FRONT_END_URL']}/auth/reset-password/expired"
   end
 end

data/lib/generators/rhino/dev/setup/setup_generator.rb

@@ -15,6 +15,8 @@ module Rhino
         class_option :db_port, type: :numeric, default: 5432, group: :database
         class_option :db_user, type: :string, group: :database
         class_option :db_password, type: :string, group: :database
+        class_option :redis_port, type: :numeric, default: 6379, group: :redis
+        class_option :redis_database, type: :numeric, default: 0, group: :redis
 
         attr_reader :server_port,
                     :db_name,
@@ -22,6 +24,9 @@ module Rhino
                     :db_port,
                     :db_user,
                     :db_password,
+                    :redis_host,
+                    :redis_port,
+                    :redis_database,
                     :dockerized
 
         source_root File.expand_path("templates", __dir__)
@@ -87,6 +92,18 @@ module Rhino
             options[:db_password] || ENV["DB_PASSWORD"] || ""
           end
 
+          def redis_host_default
+            options[:redis_host] || ENV["REDIS_HOST"] || "localhost"
+          end
+
+          def redis_port_default
+            options[:redis_port] || ENV["REDIS_PORT"]
+          end
+
+          def redis_database_default
+            options[:redis_database] || ENV["REDIS_DATABASE"]
+          end
+
           def dockerized_default
             options[:defaults] == "docker" ? "Y" : "N"
           end
@@ -97,6 +114,7 @@ module Rhino
             @server_port = ask_prompt("Port?", server_port_default)
 
             collect_database_info
+            collect_redis_info
           end
 
           def collect_docker_info
@@ -108,6 +126,9 @@ module Rhino
             @db_user = "postgres"
             @db_password = "password"
             @db_port = 5432
+            @redis_host = "redis"
+            @redis_port = 6379
+            @redis_database = 0
 
             puts <<~HERE
               The following docker configuration has been automatically set for you:
@@ -115,6 +136,9 @@ module Rhino
               Database port: #{db_port}
               Database user: #{db_user}
               Database password: #{db_password}
+              Redis host: #{redis_host}
+              Redis port: #{redis_port}
+              Redis database: #{redis_database}
             HERE
           end
 
@@ -128,6 +152,14 @@ module Rhino
             nil
           end
 
+          def collect_redis_info
+            @redis_host ||= ask_prompt("Redis host?", redis_host_default)
+            @redis_port ||= ask_prompt("Redis port?", redis_port_default)
+            @redis_database ||= ask_prompt("Redis database?", redis_database_default)
+
+            nil
+          end
+
           def project_file(file)
             File.join(project_dir, file)
           end

data/lib/generators/rhino/dev/setup/templates/env.tt

@@ -1,20 +1,22 @@
 PORT=<%= server_port %>
 
-RHINO_APP_URL=http://localhost:$PORT
+# Server
+ROOT_URL=http://localhost:$PORT
+FRONT_END_URL=http://localhost:$PORT
 
 DB_NAME=<%= db_name %>
 DB_HOST=<%= db_host %>
 DB_PORT=<%= db_port %>
 DB_USERNAME=<%= db_user %>
 DB_PASSWORD=<%= db_password %>
+REDIS_HOST=<%= redis_host %>
+REDIS_PORT=<%= redis_port %>
+REDIS_DATABASE=<%= redis_database %>
 
-# Production
-
-#RHINO_PUBLIC_ROLLBAR_ACCESS_TOKEN=
-
-#RHINO_PUBLIC_STRIPE_PUBLISHABLE_KEY=pk_...
-#RHINO_STRIPE_SECRET_KEY=sk_...
+# Client
+VITE_API_ROOT_PATH=$ROOT_URL
 
+# Production server:
 SENDGRID_API_KEY=<api-key>
 
 #AWS_ACCESS_KEY=
@@ -26,6 +28,13 @@ SENDGRID_API_KEY=<api-key>
 #AZURE_ACCOUNT_NAME="azure_acc_name"
 #AZURE_CONTAINER="container-test"
 
+#STRIPE_PUBLISHABLE_KEY=pk_...
+#STRIPE_SECRET_KEY=sk_...
+
 #AUTH_GOOGLE_OAUTH2_CLIENT_ID=
 #AUTH_GOOGLE_OAUTH2_SECRET_KEY=
 
+ROLLBAR_ACCESS_TOKEN=
+
+# Production client:
+VITE_ROLLBAR_ACCESS_TOKEN=

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

@@ -11,7 +11,6 @@ module Rhino
     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
-    class_option :skip_admin, type: :boolean, default: false, desc: "Skip generating ActiveAdmin resources", group: :admin
 
     # Parent source paths
     def source_paths
@@ -53,10 +52,6 @@ module Rhino
       end
     end
 
-    def active_admin_resource
-      generate "rhino:admin", class_name unless options[:skip_admin]
-    end
-
     protected
       def check_ownership
         raise Thor::Error, "Exactly one owner must be defined on a reference or globally" unless base_owner? ^ global_owner? ^ reference_owner?

data/lib/generators/rhino/module/templates/test/dummy/config/initializers/devise_token_auth.rb

@@ -66,6 +66,6 @@ DeviseTokenAuth.setup do |config|
   # send email, set it to true. (This is a setting for compatibility)
   # config.send_confirmation_email = true
 
-  config.default_confirm_success_url = "#{ENV['RHINO_APP_URL']}/auth/signin"
-  config.default_password_reset_url = "#{ENV['RHINO_APP_URL']}/auth/reset-password"
+  config.default_confirm_success_url = "#{ENV['FRONT_END_URL']}/auth/signin"
+  config.default_password_reset_url = "#{ENV['FRONT_END_URL']}/auth/reset-password"
 end

data/lib/rhino/resource/active_storage_extension.rb

@@ -11,8 +11,6 @@ module Rhino
       included do
         attribute :url
         attribute :url_attachment
-        attribute :previews, :json, default: {}
-        attribute :representations, :json, default: {}
         attribute :variants, :json, default: {}
 
         rhino_policy :active_storage_attachment
@@ -25,35 +23,20 @@ module Rhino
           url(attachment, disposition: :attachment)
         end
 
-        def representations
-          return unless representable?
+        def variants
+          # Not everything may be processed into a variant based on mime type
+          return unless variable?
 
           record.attachment_reflections[self.name]&.named_variants&.keys&.index_with do |v|
-            representation = representation(v)
+            variant = variant(v)
 
             {
-               url: url(representation),
-               url_attachment: url_attachment(representation)
+               url: url(variant),
+               url_attachment: url_attachment(variant)
             }
           end
         end
 
-        # FIXME: Cache for performance
-        def previews
-          # Not everything may be processed into a preview based on mime type
-          return unless previewable?
-
-          representations
-        end
-
-        # FIXME: Cache for performance
-        def variants
-          # Not everything may be processed into a variant based on mime type
-          return unless variable?
-
-          representations
-        end
-
         def display_name
           filename.to_s
         end
@@ -61,7 +44,7 @@ module Rhino
 
       class_methods do
         def readable_properties
-          super + [ "previews", "representations", "variants", "signed_id"]
+          super + [ "variants", "signed_id"]
         end
       end
 

data/lib/rhino/sieve/order.rb

@@ -13,7 +13,7 @@ module Rhino
         @param = params[:order]
 
         # Always append id to the end of the order clause to ensure a stable sort for pagination
-        result = apply_order.order(scope.primary_key.to_sym)
+        result = apply_order.order(scope.primary_key)
         @app.resolve(result, params)
       end
 

data/lib/rhino/version.rb

@@ -8,9 +8,9 @@ module Rhino
 
   module VERSION
     MAJOR = 0
-    MINOR = 25
+    MINOR = 30
     TINY  = 0
-    PRE   = "beta.16"
+    PRE   = "alpha.1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.25.0.beta.16
+  version: 0.30.0.alpha.1
 platform: ruby
 authors:
 - JP Rosevear
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-03-29 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -15,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 7.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 7.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
@@ -49,14 +50,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: analytics-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -91,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.15.0
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -133,14 +134,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -387,7 +388,6 @@ files:
 - app/controllers/rhino/crud_controller.rb
 - app/controllers/rhino/simple_controller.rb
 - app/controllers/rhino/simple_stream_controller.rb
-- app/helpers/rhino/env_helper.rb
 - app/helpers/rhino/omniauth_helper.rb
 - app/helpers/rhino/policy_helper.rb
 - app/helpers/rhino/segment_helper.rb
@@ -395,7 +395,6 @@ files:
 - app/models/rhino/current.rb
 - app/models/rhino/user.rb
 - app/overrides/active_record/nested_error_override.rb
-- app/overrides/activeadmin/resource_dsl_override.rb
 - app/overrides/activestorage/direct_uploads_controller_override.rb
 - app/overrides/activestorage/redirect_controller_override.rb
 - app/overrides/activestorage/redirect_representation_controller_override.rb
@@ -427,8 +426,6 @@ files:
 - lib/commands/rhino/module/new_command.rb
 - lib/commands/rhino/module/rails_command.rb
 - lib/commands/rhino/module/test_command.rb
-- lib/generators/rhino/admin/admin_generator.rb
-- lib/generators/rhino/admin/templates/resource.rb.tt
 - lib/generators/rhino/dev/setup/setup_generator.rb
 - lib/generators/rhino/dev/setup/templates/env.tt
 - lib/generators/rhino/dev/setup/templates/prepare-commit-msg
@@ -511,6 +508,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -525,7 +523,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.22
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []

data/app/helpers/rhino/env_helper.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Rhino
-  module EnvHelper
-    module_function
-
-    def rhino_env_tag
-      # Filter environment variables to get only those starting with "RHINO_PUBLIC"
-      rhino_public_env = ENV.select { |key, _| key.start_with?("RHINO_PUBLIC") }
-
-      # Create a JavaScript object with the environment variables
-      js_env = rhino_public_env.transform_keys { |key| key.sub("RHINO_PUBLIC_", "") }
-
-      # Create a JavaScript snippet that initializes window.rhino.env
-      js_code = <<~JS
-        (function() {
-          window.rhino = window.rhino || {};
-          window.rhino.env = window.rhino.env || {};
-          var env = #{js_env.to_json};
-          for (var key in env) {
-            if (Object.prototype.hasOwnProperty.call(env, key)) {
-              window.rhino.env[key] = env[key];
-            }
-          }
-        })();
-      JS
-
-      # Return as a script tag
-      javascript_tag(js_code)
-    end
-  end
-end

data/app/overrides/activeadmin/resource_dsl_override.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require "active_admin/resource_dsl"
-
-module ActiveAdmin
-  # This is the class where all the register blocks are evaluated.
-  class ResourceDSL
-    # Runs in the context of the ResourceDSL
-    def rhino_filters
-      klass = self.config.resource_class_name.constantize
-      klass.ransackable_filters.each do |attr|
-        filter attr.to_sym
-      end
-    end
-
-    # Runs in the context of the controller
-    def rhino_permit_params(permitted: [])
-      permit_params do
-        klass = self.active_admin_config.resource_class_name.constantize
-
-        permitted += klass.creatable_properties.map(&:to_sym) if params[:action] == "create"
-        permitted += klass.updatable_properties.map(&:to_sym) if params[:action] == "update"
-
-        # Allow owner and other references to be assigned or changed by admin
-        # All possible relations
-        references = klass.describe[:properties].select { |_p, d| d[:type] == :reference }.keys
-
-        # Restrict to the valid create/update properties
-        references.select! { |r| permitted.include?(r.to_sym) }
-        permitted += references.map { |r| klass.reflections[r].foreign_key }
-
-        permitted.uniq
-      end
-    end
-  end
-end

data/lib/generators/rhino/admin/admin_generator.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators"
-
-module Rhino
-  class AdminGenerator < Rails::Generators::NamedBase
-    source_root File.expand_path("templates", __dir__)
-
-    def admin
-      template "resource.rb", "app/admin/#{file_path.tr('/', '_').pluralize}.rb" unless options[:skip_admin]
-    end
-  end
-end

data/lib/generators/rhino/admin/templates/resource.rb.tt

@@ -1,4 +0,0 @@
-ActiveAdmin.register <%= class_name %> do
-  rhino_filters
-  rhino_permit_params
-end