yiffspace 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 898fcc0c57ef87f3ec8b152dff077bdf42b25152cbbae517a82fc7ad61a45885
-  data.tar.gz: 78d22498abcbde0062218aa341a4ca7e86587d0692d4fbc7161824d83483a3fe
+  metadata.gz: 6df835265036ddab2c96c9eee4f74e2d486ff5edcf6e08ea4ee245fd4d4860c4
+  data.tar.gz: 3f830fa81d6c083aff4f8b16d8f53a05d60ec2bee6cc7da16d97a5f9fb24a177
 SHA512:
-  metadata.gz: 7784ddb66524eee1542651e0f70f3ae64a7e6cf297083307f2a4b21d493a2baad3982a4af406c7336932a30de42019647810fcbcac17c037649d0d2fd66be72f
-  data.tar.gz: 0b5c0786bb0fb67a416400a42c22fa89488449343b0362a2c1f848b20766baf9481bcf3cc106b613786e00f7f6f8566168408efcbb507a783dae3ff6898ea8e5
+  metadata.gz: a341d471f5e1aeb0d0226b7cd237927aa209f974d1b8a8c76642e7635629187714515e6051f8db78964c08dcffb90f6b52b913ae7f17e1baf4f52926e48361fc
+  data.tar.gz: d6d84c18eb1b40da513fe8dd8fb79c1e2719d9ffa23e17a3132cedd03e336a5cfc08429d3a3ecab8606baf963aaa1d0bdb33d3207617ac6e4a59c389582c412c

data/lib/yiffspace/auth/discord_info.rb

@@ -36,7 +36,7 @@ module YiffSpace
         Images::Banner.get_for(id, :discord).update(banner)
       end
 
-      def serializable_hash
+      def serializable_hash(*)
         ATTRIBUTES.to_h { |key| [key.to_s, instance_variable_get("@#{key}")] }
       end
 

data/lib/yiffspace/concerns/user_resolvable_methods.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module YiffSpace
+  module Concerns
+    module UserResolvableMethods
+      def resolvable(ip_addr = nil)
+        attr = YiffSpace.config.last_ip_addr_attribute
+        UserResolvable.new(self, ip_addr || (attr && respond_to?(attr) ? send(attr) : nil) || YiffSpace.config.default_ip_address)
+      end
+
+      def resolve
+        self
+      end
+
+      def is?(user_or_id)
+        id == u2id(user_or_id)
+      end
+
+      def ==(other)
+        return super if other.is_a?(YiffSpace.config.user_class)
+
+        other.is_a?(YiffSpace.config.user_resolvable_class) && super(other.user)
+      end
+
+      def ===(other)
+        other == YiffSpace.config.user_like_class || super
+      end
+
+      def is_a?(other)
+        other == YiffSpace.config.user_like_class || super
+      end
+
+      include(YiffSpace::Utils::UserToId)
+
+      private(:u2id)
+    end
+  end
+end

data/lib/yiffspace/configuration.rb

@@ -28,6 +28,12 @@ module YiffSpace
     # The default IP address assigned to Utils::Current when none is present.
     attr_accessor(:default_ip_address)
 
+    # The `last_ip_addr` attribute of the User model, used by the UserResolvableMethods concern
+    attr_accessor(:last_ip_addr_attribute)
+
+    # The anonymous user's name, can be a proc
+    attr_reader(:anonymous_user_name)
+
     # Override the proc used to fetch the anonymous user. Must respond to #call.
     # Default: -> { (user_class || ::User).anonymous }
     attr_writer(:anonymous_user_getter)
@@ -36,18 +42,16 @@ module YiffSpace
     # Default: -> { (user_class || ::User).system }
     attr_writer(:system_user_getter)
 
-    # The anonymous user name
-    attr_reader(:anonymous_user_name)
-
     def initialize
-      @max_multi_count       = -> { 100 }
-      @redis_url             = -> {}
-      @user_class            = nil
-      @user_like_class       = nil
-      @user_resolvable_class = nil
-      @current_class         = nil
-      @default_ip_address    = "127.0.0.1"
-      @anonymous_user_name   = -> { "Anonymous" }
+      @max_multi_count        = -> { 100 }
+      @redis_url              = -> {}
+      @user_class             = nil
+      @user_like_class        = nil
+      @user_resolvable_class  = nil
+      @current_class          = nil
+      @default_ip_address     = "127.0.0.1"
+      @last_ip_addr_attribute = :last_ip_addr
+      @anonymous_user_name    = -> { "Anonymous" }
     end
 
     def user_class

data/lib/yiffspace/images/avatar/base.rb

@@ -20,6 +20,21 @@ module YiffSpace
         def update(*)
           raise(NotImplementedError)
         end
+
+        def serializable_hash(*)
+          { "id" => @id, "type" => @type }
+        end
+
+        def self.from_json(data)
+          raise(ArgumentError, "invalid data") if data.blank?
+
+          data = JSON.parse(data) if data.is_a?(String)
+          data = ::YiffSpace::Utils::OpenHash.from(data)
+
+          return Avatar.find_type(data.type).from_json(data) if self == Base
+
+          new(data.id)
+        end
       end
     end
   end

data/lib/yiffspace/images/avatar.rb

@@ -24,6 +24,10 @@ module YiffSpace
           value.try(:type)&.to_sym == type.to_sym
         end&.second
       end
+
+      def find_type!(type)
+        find_type(type) || raise(StandardError, "No avatar class for type: #{type}")
+      end
     end
   end
 end

data/lib/yiffspace/images/banner/base.rb

@@ -20,6 +20,21 @@ module YiffSpace
         def update(*)
           raise(NotImplementedError)
         end
+
+        def serializable_hash(*)
+          { "id" => @id, "type" => @type }
+        end
+
+        def self.from_json(data)
+          raise(ArgumentError, "invalid data") if data.blank?
+
+          data = JSON.parse(data) if data.is_a?(String)
+          data = ::YiffSpace::Utils::OpenHash.from(data)
+
+          return Banner.find_type(data.type).from_json(data) if self == Base
+
+          new(data.id)
+        end
       end
     end
   end

data/lib/yiffspace/images/banner.rb

@@ -24,6 +24,10 @@ module YiffSpace
           value.try(:type)&.to_sym == type.to_sym
         end&.second
       end
+
+      def find_type!(type)
+        find_type(type) || raise(StandardError, "No banner class for type: #{type}")
+      end
     end
   end
 end

data/lib/yiffspace/include/all.rb

@@ -13,6 +13,7 @@ require_relative("query_helper")
 require_relative("routes")
 require_relative("table_builder")
 require_relative("trace_logger")
+require_relative("u2id")
 require_relative("user_attribute")
 require_relative("user_like")
 require_relative("user_resolvable")

data/lib/yiffspace/include/u2id.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative("../utils/user_to_id")
+
+include(YiffSpace::Utils::UserToId) # rubocop:disable Style/MixinUsage

data/lib/yiffspace/railtie.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module YiffSpace
+  class Railtie < Rails::Railtie
+    initializer("yiffspace.serializers") do
+      ActiveSupport.on_load(:active_job) do
+        ActiveJob::Serializers.add_serializers(
+          Serializers::AnonymousAuthInfoSerializer,
+          Serializers::AnonymousUserInfoSerializer,
+          Serializers::AuthInfoSerializer,
+          Serializers::AvatarSerializer,
+          Serializers::BannerSerializer,
+          Serializers::DiscordInfoSerializer,
+          Serializers::PermissionsSerializer,
+          Serializers::UserInfoSerializer,
+          Serializers::UserResolvableSerializer,
+        )
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/anonymous_auth_info_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class AnonymousAuthInfoSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(_)
+        super({})
+      end
+
+      def deserialize(_)
+        Auth::AuthInfo::Anonymous.instance
+      end
+
+      private
+
+      def klass
+        Auth::AuthInfo::Anonymous
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/anonymous_user_info_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class AnonymousUserInfoSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(_)
+        super({})
+      end
+
+      def deserialize(_)
+        Auth::UserInfo::Anonymous.instance
+      end
+
+      private
+
+      def klass
+        Auth::UserInfo::Anonymous
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/auth_info_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class AuthInfoSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(arg)
+        super(**arg.serializable_hash)
+      end
+
+      def deserialize(arg)
+        Auth::AuthInfo.from_json(arg)
+      end
+
+      private
+
+      def klass
+        Auth::AuthInfo
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/avatar_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class AvatarSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(arg)
+        super(**arg.serializable_hash)
+      end
+
+      def deserialize(arg)
+        Images::Avatar::Base.from_json(arg)
+      end
+
+      private
+
+      def klass
+        Images::Avatar::Base
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/banner_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class BannerSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(arg)
+        super(**arg.serializable_hash)
+      end
+
+      def deserialize(arg)
+        Images::Banner::Base.from_json(arg)
+      end
+
+      private
+
+      def klass
+        Images::Banner::Base
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/discord_info_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class DiscordInfoSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(arg)
+        super(**arg.serializable_hash)
+      end
+
+      def deserialize(arg)
+        Auth::DiscordInfo.from_json(arg)
+      end
+
+      private
+
+      def klass
+        Auth::DiscordInfo
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/permissions_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class PermissionsSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(arg)
+        super("value" => arg.value)
+      end
+
+      def deserialize(arg)
+        Auth::Permissions.new(arg["value"])
+      end
+
+      private
+
+      def klass
+        Auth::Permissions
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/user_info_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class UserInfoSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(arg)
+        super(**arg.serializable_hash)
+      end
+
+      def deserialize(arg)
+        Auth::UserInfo.from_json(arg)
+      end
+
+      private
+
+      def klass
+        Auth::UserInfo
+      end
+    end
+  end
+end

data/lib/yiffspace/serializers/user_resolvable_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require("active_job")
+
+module YiffSpace
+  module Serializers
+    class UserResolvableSerializer < ActiveJob::Serializers::ObjectSerializer
+      def serialize(arg)
+        super("user" => arg.user&.id, "ip_addr" => arg.ip_addr)
+      end
+
+      def deserialize(arg)
+        YiffSpace.config.user_resolvable_class.new(arg["user"].blank? ? nil : YiffSpace.config.user_class.find(arg["user"]), arg["ip_addr"])
+      end
+
+      private
+
+      def klass
+        YiffSpace.config.user_resolvable_class
+      end
+    end
+  end
+end

data/lib/yiffspace/utils/user_attribute.rb

@@ -10,7 +10,8 @@ module YiffSpace
       class CloneError < StandardError; end
       attr_reader(:klass, :attribute, :db, :ip, :optional, :clones, :overwrite, :aliases, :ignore_nil, :ar_options)
 
-      def initialize(klass, attribute, db:, ip: !db, optional: !db, clones: [], overwrite: false, aliases: [], ignore_nil: false, **ar_options)
+      # noinspection RubyUnusedLocalVariable
+      def initialize(klass, attribute, db:, ip: !db, optional: !db, clones: [], clone: [], overwrite: false, aliases: [], alias: [], ignore_nil: false, **ar_options)
         UserAttribute.class_setup(klass)
         @klass = klass
         @attribute = attribute.to_sym
@@ -18,9 +19,9 @@ module YiffSpace
         # noinspection RubySimplifyBooleanInspection
         @ip = ip == true ? :"#{attribute}_ip_addr" : ip
         @optional = optional
-        @clones = Array(clones).map(&:to_sym)
+        @clones = Array(clones.presence || clone).map(&:to_sym)
         @overwrite = overwrite
-        @aliases = Array(aliases).map(&:to_sym)
+        @aliases = Array(aliases.presence || binding.local_variable_get(:alias)).map(&:to_sym)
         @ignore_nil = ignore_nil
         @ar_options = ar_options
         if ar_options.any? && !db # rubocop:disable Style/IfUnlessModifier
@@ -191,7 +192,7 @@ module YiffSpace
         klass.instance_exec do
           scope("for_#{ua.attribute}", ->(value) { where(ua.db && ua.ar_options.key?(:foreign_key) ? ua.ar_options[:foreign_key] : "#{ua.attribute}_id" => u2id(value)) }) unless respond_to?("for_#{ua.attribute}")
           scope("for_#{ua.attribute}_id", ->(value) { where(ua.db && ua.ar_options.key?(:foreign_key) ? ua.ar_options[:foreign_key] : "#{ua.attribute}_id" => value) }) unless respond_to?("for_#{ua.attribute}_id")
-          scope("for_#{ua.attribute}_name", ->(value) { where(ua.db && ua.ar_options.key?(:foreign_key) ? ua.ar_options[:foreign_key] : "#{ua.attribute}_id" => ::User.name_to_id(value)) }) unless respond_to?("for_#{ua.attribute}_name")
+          scope("for_#{ua.attribute}_name", ->(value) { where(ua.db && ua.ar_options.key?(:foreign_key) ? ua.ar_options[:foreign_key] : "#{ua.attribute}_id" => YiffSpace.config.user_class.name_to_id(value)) }) unless respond_to?("for_#{ua.attribute}_name")
         end
 
         aliases.each do |alias_attr|

data/lib/yiffspace/utils/user_resolvable.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
+require("active_support/core_ext/module/delegation")
+require("active_support/core_ext/string/inflections")
+
 module YiffSpace
   module Utils
     class UserResolvable
       attr_reader(:user, :ip_addr)
 
       def initialize(user, ip_addr, validate: true)
-        if user.is_a?(UserResolvable)
-          TraceLogger.warn("UserResolvable", "Unexpectedly received UserResolvable for user argument")
+        if user.is_a?(YiffSpace.config.user_resolvable_class)
+          TraceLogger.warn(self.class.name.demodulize, "Unexpectedly received #{user.class.name} for user argument")
           user = recursive_resolve(user)
         end
         @user = user
@@ -36,14 +39,14 @@ module YiffSpace
 
       def self.recursive_resolve(resolvable)
         result = resolvable
-        result = result.resolve while result.is_a?(UserResolvable)
+        result = result.resolve while result.is_a?(YiffSpace.config.user_resolvable_class)
         result
       end
 
       def ==(other)
         return other == user if other.is_a?(YiffSpace.config.user_class)
 
-        other.is_a?(UserResolvable) && user == other.user
+        other.is_a?(YiffSpace.config.user_resolvable_class) && user == other.user
       end
 
       def ===(other)

data/lib/yiffspace/utils/user_to_id.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module YiffSpace
+  module Utils
+    module UserToId
+      def u2id(value, klass = YiffSpace.config.user_class)
+        value.is_a?(klass) || (klass == YiffSpace.config.user_class && value.is_a?(YiffSpace.config.user_resolvable_class)) ? value.id : value
+      end
+    end
+  end
+end

data/lib/yiffspace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YiffSpace
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/yiffspace.rb

@@ -13,9 +13,12 @@ module YiffSpace
 end
 
 require("zeitwerk")
+require("active_support/all")
+require("active_support/core_ext/object/blank")
 
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect({ "postgresql" => "PostgreSQL", "yiffspace" => "YiffSpace", "query_dsl" => "QueryDSL" })
 loader.ignore("#{__dir__}/yiffspace/core_ext")
 loader.ignore("#{__dir__}/yiffspace/include")
+loader.ignore("#{__dir__}/yiffspace/railtie.rb")
 loader.setup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: yiffspace
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Donovan_DMC
 bindir: bin
 cert_chain: []
-date: 2026-06-01 00:00:00.000000000 Z
+date: 2026-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abbrev
@@ -139,6 +139,7 @@ files:
 - lib/yiffspace/concerns/has_bit_flags.rb
 - lib/yiffspace/concerns/user_methods.rb
 - lib/yiffspace/concerns/user_name_methods.rb
+- lib/yiffspace/concerns/user_resolvable_methods.rb
 - lib/yiffspace/config_builder.rb
 - lib/yiffspace/configuration.rb
 - lib/yiffspace/configuration/images.rb
@@ -194,12 +195,23 @@ files:
 - lib/yiffspace/include/routes.rb
 - lib/yiffspace/include/table_builder.rb
 - lib/yiffspace/include/trace_logger.rb
+- lib/yiffspace/include/u2id.rb
 - lib/yiffspace/include/user_attribute.rb
 - lib/yiffspace/include/user_like.rb
 - lib/yiffspace/include/user_resolvable.rb
+- lib/yiffspace/railtie.rb
 - lib/yiffspace/search/query_builder.rb
 - lib/yiffspace/search/query_dsl.rb
 - lib/yiffspace/search/query_helper.rb
+- lib/yiffspace/serializers/anonymous_auth_info_serializer.rb
+- lib/yiffspace/serializers/anonymous_user_info_serializer.rb
+- lib/yiffspace/serializers/auth_info_serializer.rb
+- lib/yiffspace/serializers/avatar_serializer.rb
+- lib/yiffspace/serializers/banner_serializer.rb
+- lib/yiffspace/serializers/discord_info_serializer.rb
+- lib/yiffspace/serializers/permissions_serializer.rb
+- lib/yiffspace/serializers/user_info_serializer.rb
+- lib/yiffspace/serializers/user_resolvable_serializer.rb
 - lib/yiffspace/utils.rb
 - lib/yiffspace/utils/cache.rb
 - lib/yiffspace/utils/current.rb
@@ -215,6 +227,7 @@ files:
 - lib/yiffspace/utils/user_attribute.rb
 - lib/yiffspace/utils/user_like.rb
 - lib/yiffspace/utils/user_resolvable.rb
+- lib/yiffspace/utils/user_to_id.rb
 - lib/yiffspace/version.rb
 homepage: https://yiff.space
 licenses: