yiffspace 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cbda883d136414b49a7ffe70ab70113d0423ca94ae9e35a7dc7d8cb4a6f816c
-  data.tar.gz: d1d0ad88b39084283699c695830e6f7125725b7045257672778274a7775fbc4a
+  metadata.gz: 6df835265036ddab2c96c9eee4f74e2d486ff5edcf6e08ea4ee245fd4d4860c4
+  data.tar.gz: 3f830fa81d6c083aff4f8b16d8f53a05d60ec2bee6cc7da16d97a5f9fb24a177
 SHA512:
-  metadata.gz: 7d9c72aaaa819e075b3cb8614daabf1c3ae954518a94a59f1004cdb2e2b1216c5af92bba85f1ab5ed564c927184b419e09303f4f1ddab5453ec1559e07ace884
-  data.tar.gz: 90cee9392c9ffb65f924a32e5bc8ef04bc7b6d5bc358961a47a88355f5b2601e43aacd3334abcdf8f0ca722f138a124e31b757a58b0fc8b0f15c68db5010dbf4
+  metadata.gz: a341d471f5e1aeb0d0226b7cd237927aa209f974d1b8a8c76642e7635629187714515e6051f8db78964c08dcffb90f6b52b913ae7f17e1baf4f52926e48361fc
+  data.tar.gz: d6d84c18eb1b40da513fe8dd8fb79c1e2719d9ffa23e17a3132cedd03e336a5cfc08429d3a3ecab8606baf963aaa1d0bdb33d3207617ac6e4a59c389582c412c

data/lib/yiffspace/concerns/user_resolvable_methods.rb

@@ -4,7 +4,8 @@ module YiffSpace
   module Concerns
     module UserResolvableMethods
       def resolvable(ip_addr = nil)
-        UserResolvable.new(self, ip_addr || send(YiffSpace.config.last_ip_addr_attribute) || YiffSpace.config.default_ip_address)
+        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

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,21 +42,16 @@ module YiffSpace
     # Default: -> { (user_class || ::User).system }
     attr_writer(:system_user_getter)
 
-    # The anonymous user's name, can be a proc
-    attr_reader(:anonymous_user_name)
-
-    # The `last_ip_addr` attribute of the User model, used by the UserResolvableMethods concern
-    attr_accessor(:last_ip_addr_attribute)
-
     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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yiffspace
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Donovan_DMC