rhino_project_core 0.30.0.alpha.7 → 0.30.0.alpha.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00cd621849bf263dd9915b3abf6fd183a4a314710147b2650a51424ae6df4c82
-  data.tar.gz: b9837b83fd0cf963da31dc90f830b9a05fff1cf433f42692ff0fc8c83810e183
+  metadata.gz: 94494b306f6725a3889a08333c9b7d6bd6ae9c58e49d225234f359781130fc8c
+  data.tar.gz: 52c65110920f52ec46271dfc16ffeb738c80f344db9860f865dfcd09814d178b
 SHA512:
-  metadata.gz: 65c31457636e04b633912fb9eb1b164d042f7d55c8e65a4a1f2f48ea40900ab2e86dc110f2f4792928cefd424a0a7119334cc7c3589939f77b32cad7c203acf6
-  data.tar.gz: 120246ea15e61cdbd792d3817ee5b1c6feb225b3f7b4fe5222bdeae9d9d025eee006ee3dea80007f49859a3e3514cb4fef982eebec19b91a5de124cc260988f0
+  metadata.gz: 345595919d14b989b121a1d71b9a724efbb1046b1f3d964c98f65ebf6fc49d6e2215444dada9769dadcea40498ab1fdca6cf9d0d9b26ddca3b52a1e30428141e
+  data.tar.gz: 24e722ec2baf21dee4d34098d1c04282c17cfd26eba0c794d3ca242f28d2fb22502e521da6bd6870b9faeba6e3e296e5473eb53cdd0840a66b45f26083539409

data/app/overrides/activeadmin/resource_dsl_override.rb

@@ -0,0 +1,36 @@
+# 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

@@ -0,0 +1,13 @@
+# 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

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

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

@@ -15,8 +15,6 @@ 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,
@@ -24,9 +22,6 @@ module Rhino
                     :db_port,
                     :db_user,
                     :db_password,
-                    :redis_host,
-                    :redis_port,
-                    :redis_database,
                     :dockerized
 
         source_root File.expand_path("templates", __dir__)
@@ -92,18 +87,6 @@ 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
@@ -114,7 +97,6 @@ module Rhino
             @server_port = ask_prompt("Port?", server_port_default)
 
             collect_database_info
-            collect_redis_info
           end
 
           def collect_docker_info
@@ -126,9 +108,6 @@ 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:
@@ -136,9 +115,6 @@ 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
 
@@ -152,14 +128,6 @@ 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

@@ -9,9 +9,6 @@ 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 %>
 
 # Client
 VITE_API_ROOT_PATH=$ROOT_URL

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

@@ -11,6 +11,7 @@ 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
@@ -52,6 +53,10 @@ 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/rhino/resource/active_storage_extension.rb

@@ -11,6 +11,8 @@ 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
@@ -23,20 +25,35 @@ module Rhino
           url(attachment, disposition: :attachment)
         end
 
-        def variants
-          # Not everything may be processed into a variant based on mime type
-          return unless variable?
+        def representations
+          return unless representable?
 
           record.attachment_reflections[self.name]&.named_variants&.keys&.index_with do |v|
-            variant = variant(v)
+            representation = representation(v)
 
             {
-               url: url(variant),
-               url_attachment: url_attachment(variant)
+               url: url(representation),
+               url_attachment: url_attachment(representation)
             }
           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
@@ -44,7 +61,7 @@ module Rhino
 
       class_methods do
         def readable_properties
-          super + [ "variants", "signed_id"]
+          super + [ "previews", "representations", "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)
+        result = apply_order.order(scope.primary_key.to_sym)
         @app.resolve(result, params)
       end
 

data/lib/rhino/version.rb

@@ -10,7 +10,7 @@ module Rhino
     MAJOR = 0
     MINOR = 30
     TINY  = 0
-    PRE   = "alpha.7"
+    PRE   = "alpha.14"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.alpha.7
+  version: 0.30.0.alpha.14
 platform: ruby
 authors:
 - JP Rosevear
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-27 00:00:00.000000000 Z
+date: 2025-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +15,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +49,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: 12.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: analytics-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +91,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +133,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -395,6 +394,7 @@ 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
@@ -426,6 +426,8 @@ 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
@@ -508,7 +510,6 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -523,8 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: ''
 test_files: []