property_sets 3.9.0 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da83a6695b48bf923b2971cc108ad9ab636c9b6f66e50d631f1973601d454bf5
-  data.tar.gz: c4415b9eecc381a94af2bfbcfbe3a9837e4576526648b91a05fb05bc51241207
+  metadata.gz: 2384aedb2c9f673a4895f5a6e1948ae4ea88c335b2c79985a0c35609ebbce42e
+  data.tar.gz: dedff61be818879d70d720f3d7bfc545e0b73abeecaf57f678be2dc10a64d5e9
 SHA512:
-  metadata.gz: 89ebdbcb3d8123601c60d4aacee7c4f33b10da3eaafc9406d53457aa941742bcf5348516a9105bf3716196b00e42c9917fa3f2beb4ef5cc88cf4f1aeec58909c
-  data.tar.gz: 5a0c62442a970bb6eb5e43a94b701671306febe920b513bdefcd98c8213884ae29f3a02af9fcaffe5c71fb20517d5bb65a7ae17119929bce9668203c34ace4f9
+  metadata.gz: 9487f344c48e602edd77c4c36f9e5a4932db43cdc543efc68450d56a1fa433bcade00f1f88ac98ff452e4919865295fdbb9cb4e204ff7edd243ef16a46a28e13
+  data.tar.gz: a0223c6d67884a49a5165f5db027e02077d83bf094e563595f8e83d3c95c055312d46ec4b036da08c60c55e3e7f90a22b3265a940ff47f2aee4e650e9cb811a3

data/lib/property_sets/action_view_extension.rb

@@ -1,4 +1,4 @@
-require 'action_view'
+require "action_view"
 
 module ActionView
   module Helpers
@@ -8,9 +8,9 @@ module ActionView
 
         def initialize(property_set, template, object_name, object)
           @property_set = property_set
-          @template     = template
-          @object_name  = object_name
-          @object       = object
+          @template = template
+          @object_name = object_name
+          @object = object
         end
 
         def check_box(property, options = {}, checked_value = "1", unchecked_value = "0")
@@ -23,7 +23,7 @@ module ActionView
         def radio_button(property, checked_value = "1", options = {})
           options[:id] ||= "#{object_name}_#{property_set}_#{property}_#{checked_value}"
           options = prepare_options(property, options) do |properties|
-            properties.send("#{property}") == checked_value
+            properties.send(property.to_s) == checked_value
           end
           template.radio_button(object_name, property, checked_value, options)
         end
@@ -34,7 +34,7 @@ module ActionView
 
         def hidden_field(property, options = {})
           options = prepare_id_name(property, options)
-          unless options.keys.include?(:value)
+          unless options.key?(:value)
             options[:value] = cast_boolean(options[:object].send(property_set).send(property))
           end
           template.hidden_field(object_name, property, options)
@@ -43,7 +43,7 @@ module ActionView
         def select(property, choices, options = {}, html_options = {})
           options = prepare_id_name(property, options)
           current_value = options[:object].send(property_set).send(property)
-          template.select("#{object_name}[#{property_set}]", property, choices, { :selected => current_value }, html_options )
+          template.select("#{object_name}[#{property_set}]", property, choices, {selected: current_value}, html_options)
         end
 
         private
@@ -52,9 +52,9 @@ module ActionView
           throw "Invalid options type #{options.inspect}" unless options.is_a?(Hash)
 
           options.clone.tap do |prepared_options|
-            prepared_options[:object]   = object || fetch_target_object
-            prepared_options[:id]     ||= "#{object_name}_#{property_set}_#{property}"
-            prepared_options[:name]     = "#{object_name}[#{property_set}][#{property}]"
+            prepared_options[:object] = object || fetch_target_object
+            prepared_options[:id] ||= "#{object_name}_#{property_set}_#{property}"
+            prepared_options[:name] = "#{object_name}[#{property_set}][#{property}]"
           end
         end
 
@@ -75,18 +75,16 @@ module ActionView
 
         def cast_boolean(value)
           case value
-          when TrueClass  then '1'
-          when FalseClass then '0'
+          when TrueClass then "1"
+          when FalseClass then "0"
           else value
           end
         end
-
       end
 
       def property_set(identifier)
         PropertySetFormBuilderProxy.new(identifier, @template, object_name, object)
       end
-
     end
   end
 end

data/lib/property_sets/active_record_extension.rb

@@ -1,29 +1,27 @@
-require 'active_record'
-require 'property_sets/casting'
-require 'set'
+require "active_record"
+require "property_sets/casting"
 
 module PropertySets
   module ActiveRecordExtension
     module ClassMethods
-
-      RAILS6 = ActiveRecord::VERSION::MAJOR >= 6
+      attr_accessor :property_sets_connection_class
 
       def property_set(association, options = {}, &block)
         unless include?(PropertySets::ActiveRecordExtension::InstanceMethods)
-          self.send(:prepend, PropertySets::ActiveRecordExtension::InstanceMethods)
+          send(:prepend, PropertySets::ActiveRecordExtension::InstanceMethods)
           cattr_accessor :property_set_index
           self.property_set_index = Set.new
         end
 
-        raise "Invalid association name, letters only" unless association.to_s =~ /[a-z]+/
+        raise "Invalid association name, letters only" unless /[a-z]+/.match?(association.to_s)
         exists = property_set_index.include?(association)
 
-        self.property_set_index << association
+        property_set_index << association
 
         # eg AccountSetting - this IS idempotent
         property_class = PropertySets.ensure_property_set_class(
           association,
-          options.delete(:owner_class_name) || self.name
+          options.delete(:owner_class_name) || name
         )
 
         # eg property :is_awesome
@@ -33,48 +31,42 @@ module PropertySets
         property_class.table_name = tb_name if tb_name
 
         hash_opts = {
-          :class_name => property_class.name,
-          :autosave => true,
-          :dependent => :destroy,
-          :inverse_of => self.name.demodulize.underscore.to_sym,
+          class_name: property_class.name,
+          autosave: true,
+          dependent: :destroy,
+          inverse_of: name.demodulize.underscore.to_sym
         }.merge(options)
 
         # TODO: should check options are compatible? warn? raise?
-        reflection = self.reflections[association.to_s] # => ActiveRecord::Reflection::HasManyReflection
+        reflection = reflections[association.to_s] # => ActiveRecord::Reflection::HasManyReflection
         reflection.options.merge! options if reflection && !options.empty?
 
-        unless exists then # makes has_many idempotent...
+        unless exists # makes has_many idempotent...
           has_many association, **hash_opts do
             # keep this damn block! -- creates association_module below
           end
         end
 
-        # eg 5: AccountSettingsAssociationExtension
-        # eg 6: Account::SettingsAssociationExtension
-
         # stolen/adapted from AR's collection_association.rb #define_extensions
 
         module_name = "#{association.to_s.camelize}AssociationExtension"
-        module_name = name.demodulize + module_name unless RAILS6
-
-        target = RAILS6 ? self : self.parent
-        association_module = target.const_get module_name
+        association_module = const_get module_name
 
         association_module.module_eval do
           include PropertySets::ActiveRecordExtension::AssociationExtensions
 
           property_class.keys.each do |key|
-            raise "Invalid property key #{key}" if self.respond_to?(key)
+            raise "Invalid property key #{key}" if respond_to?(key)
 
             # Reports the coerced truth value of the property
             define_method "#{key}?" do
-              type  = property_class.type(key)
+              type = property_class.type(key)
               value = lookup_value(type, key)
-              ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
+              !["false", "0", "", "off", "n"].member?(value.to_s.downcase)
             end
 
             # Returns the value of the property
-            define_method "#{key}" do
+            define_method key.to_s do
               type = property_class.type(key)
               lookup_value(type, key)
             end
@@ -107,10 +99,10 @@ module PropertySets
           association_class.keys & keys.map(&:to_s)
         end
 
-        property_pairs = property_keys.map do |name|
+        property_pairs = property_keys.flat_map do |name|
           value = lookup_value(association_class.type(name), name)
           [name, value]
-        end.flatten(1)
+        end
         HashWithIndifferentAccess[*property_pairs]
       end
 
@@ -147,7 +139,7 @@ module PropertySets
       end
 
       def build_default(arg)
-        build(:name => arg.to_s, :value => association_class.raw_default(arg))
+        build(name: arg.to_s, value: association_class.raw_default(arg))
       end
 
       def lookup_without_default(arg)
@@ -157,7 +149,7 @@ module PropertySets
       def lookup_value(type, key)
         serialized = property_serialized?(key)
 
-        if instance = lookup_without_default(key)
+        if (instance = lookup_without_default(key))
           instance.value_serialized = serialized
           PropertySets::Casting.read(type, instance.value)
         else
@@ -172,7 +164,7 @@ module PropertySets
 
       # The finder method which returns the property if present, otherwise a new instance with defaults
       def lookup(arg)
-        instance   = lookup_without_default(arg)
+        instance = lookup_without_default(arg)
         instance ||= build_default(arg)
         instance.value_serialized = property_serialized?(arg)
 
@@ -186,7 +178,7 @@ module PropertySets
       # It does not have the side effect of adding a new setting object.
       def lookup_or_default(arg)
         instance = lookup_without_default(arg)
-        instance ||= association_class.new(:value => association_class.raw_default(arg))
+        instance ||= association_class.new(value: association_class.raw_default(arg))
         instance.value_serialized = property_serialized?(arg)
         instance
       end
@@ -201,18 +193,18 @@ module PropertySets
         update_property_set_attributes(attributes)
         super
       end
-      alias update_attributes update
+      alias_method :update_attributes, :update
 
       def update!(attributes)
         update_property_set_attributes(attributes)
         super
       end
-      alias update_attributes! update!
+      alias_method :update_attributes!, :update!
 
       def update_property_set_attributes(attributes)
         if attributes && self.class.property_set_index.any?
           self.class.property_set_index.each do |property_set|
-            if property_set_hash = attributes.delete(property_set)
+            if (property_set_hash = attributes.delete(property_set))
               send(property_set).set(property_set_hash, true)
             end
           end
@@ -221,7 +213,7 @@ module PropertySets
 
       def update_columns(attributes)
         if delegated_property_sets?
-          attributes = attributes.reject{|k,_| self.class.delegated_property_set_attributes.include?(k.to_s) }
+          attributes = attributes.reject { |k, _| self.class.delegated_property_set_attributes.include?(k.to_s) }
         end
 
         super attributes
@@ -248,7 +240,6 @@ module PropertySets
         attribute_names
       end
     end
-
   end
 end
 

data/lib/property_sets/casting.rb

@@ -1,8 +1,8 @@
-require 'json'
+require "json"
 
 module PropertySets
   module Casting
-    FALSE = [ "false", "0", "", "off", "n" ]
+    FALSE_VALUES = ["false", "0", "", "off", "n"]
 
     class << self
       def read(type, value)
@@ -53,7 +53,7 @@ module PropertySets
       private
 
       def false?(value)
-        FALSE.include?(value.to_s.downcase)
+        FALSE_VALUES.include?(value.to_s.downcase)
       end
     end
   end

data/lib/property_sets/delegator.rb

@@ -27,11 +27,7 @@ module PropertySets
 
         mappings.each do |old_attr, new_attr|
           self.delegated_property_set_attributes << old_attr.to_s
-          if ActiveRecord.version < Gem::Version.new("5.0")
-            attribute old_attr, ActiveRecord::Type::Value.new
-          else
-            attribute old_attr, ActiveModel::Type::Value.new
-          end
+          attribute old_attr, ActiveModel::Type::Value.new
           define_method(old_attr) {
             association = send(setname)
             type = association.association_class.type(new_attr)
@@ -44,7 +40,7 @@ module PropertySets
               send("#{old_attr}_will_change!")
             end
             send(setname).send("#{new_attr}=", value)
-            super(value) if defined?(super) # Rails 4 does not define this
+            super(value)
           end
 
           define_method("#{old_attr}_will_change!") do
@@ -69,7 +65,7 @@ module PropertySets
         # These are not database columns and should not be included in queries but
         # using the attributes API is the only way to track changes in the main model
         if respond_to?(:user_provided_columns)
-          self.user_provided_columns.reject!{|k,_| delegated_property_set_attributes.include?(k.to_s) }
+          user_provided_columns.reject! { |k, _| delegated_property_set_attributes.include?(k.to_s) }
         end
       end
     end

data/lib/property_sets/property_set_model.rb

@@ -1,22 +1,22 @@
-require 'active_support'
+require "active_support"
 
 module PropertySets
   module PropertySetModel
     # https://dev.mysql.com/doc/refman/5.6/en/storage-requirements.html
     COLUMN_TYPE_LIMITS = {
-      'tinyblob'   => 255,        # 2^8 - 1
-      'tinytext'   => 255,
-      'blob'       => 65535,      # 2^16 - 1
-      'text'       => 65535,
-      'mediumblob' => 16777215,   # 2^24 - 1
-      'mediumtext' => 16777215,
-      'longblob'   => 4294967295, # 2^32 - 1
-      'longtext'   => 4294967295,
+      "tinyblob" => 255,        # 2^8 - 1
+      "tinytext" => 255,
+      "blob" => 65535,      # 2^16 - 1
+      "text" => 65535,
+      "mediumblob" => 16777215,   # 2^24 - 1
+      "mediumtext" => 16777215,
+      "longblob" => 4294967295, # 2^32 - 1
+      "longtext" => 4294967295
     }.freeze
 
     module InstanceMethods
       def false?
-        [ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
+        ["false", "0", "", "off", "n"].member?(value.to_s.downcase)
       end
 
       def true?
@@ -93,7 +93,7 @@ module PropertySets
       end
 
       def value_column_limit
-        column = self.class.columns_hash.fetch('value')
+        column = self.class.columns_hash.fetch("value")
 
         # use sql_type because type returns :text for all text types regardless of length
         column.limit || COLUMN_TYPE_LIMITS.fetch(column.sql_type)
@@ -102,9 +102,9 @@ module PropertySets
 
     module ClassMethods
       def self.extended(base)
-        base.validate        :validate_format_of_name
-        base.validate        :validate_length_of_serialized_data
-        base.before_create   :coerce_value
+        base.validate :validate_format_of_name
+        base.validate :validate_length_of_serialized_data
+        base.before_create :coerce_value
         base.attr_accessible :name, :value if defined?(ProtectedAttributes)
       end
 
@@ -139,10 +139,10 @@ module PropertySets
       def owner_class=(owner_class_name)
         @owner_class_sym = owner_class_name.to_s.demodulize.underscore.to_sym
 
-        belongs_to              owner_class_sym, class_name: owner_class_name
-        validates_presence_of   owner_class_sym, class_name: owner_class_name
-        validates_uniqueness_of :name, :scope => owner_class_key_sym, :case_sensitive => false
-        attr_accessible         owner_class_key_sym, owner_class_sym if defined?(ProtectedAttributes)
+        belongs_to owner_class_sym, class_name: owner_class_name
+        validates_presence_of owner_class_sym, class_name: owner_class_name
+        validates_uniqueness_of :name, scope: owner_class_key_sym, case_sensitive: false
+        attr_accessible owner_class_key_sym, owner_class_sym if defined?(ProtectedAttributes)
       end
 
       def owner_assoc=(association)
@@ -161,6 +161,5 @@ module PropertySets
         "#{owner_class_sym}_id".to_sym
       end
     end
-
   end
 end

data/lib/property_sets/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "3.9.0"
+  VERSION = "3.11.0"
 end

data/lib/property_sets.rb

@@ -1,21 +1,25 @@
-require 'property_sets/property_set_model'
-require 'property_sets/active_record_extension'
-require 'property_sets/version'
+require "property_sets/property_set_model"
+require "property_sets/active_record_extension"
+require "property_sets/version"
 
 begin
-  require 'property_sets/action_view_extension'
+  require "property_sets/action_view_extension"
 rescue LoadError
 end
 
+if "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}" == "6.1"
+  ActiveRecord::Base.singleton_class.alias_method :connection_class_for_self, :connection_classes
+end
+
 module PropertySets
   def self.ensure_property_set_class(association, owner_class_name)
     const_name = "#{owner_class_name.demodulize}#{association.to_s.singularize.camelcase}"
     namespace = owner_class_name.deconstantize.safe_constantize || Object
 
     unless namespace.const_defined?(const_name, false)
-      property_class = Class.new(ActiveRecord::Base) do
+      property_class = Class.new(parent_for_property_class(namespace, owner_class_name)) do
         include PropertySets::PropertySetModel::InstanceMethods
-        extend  PropertySets::PropertySetModel::ClassMethods
+        extend PropertySets::PropertySetModel::ClassMethods
       end
 
       namespace.const_set(const_name, property_class)
@@ -26,4 +30,12 @@ module PropertySets
 
     namespace.const_get(const_name.to_s)
   end
+
+  def self.parent_for_property_class(namespace, owner_class_name)
+    owner_class = namespace.const_get(owner_class_name)
+
+    owner_class.property_sets_connection_class || owner_class.connection_class_for_self
+  rescue NameError
+    ::ActiveRecord::Base
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.11.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement