active_hash 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f2e4807b50cf0708d0a9ca9bea56e9a26bc9b7ca7eb2e81e0a93f88c333c7e
-  data.tar.gz: ba9dee0fea4fa0e02b8ebc2eae74839e72f1e2ea1fd262606561e42aac10ecf1
+  metadata.gz: f255dca493bb6e5cb46acba485f7df5af6ebfef6a708abf30757a3e39db1bb62
+  data.tar.gz: a5c7bcc8a8f85ab74395b7554c39cb33023a30dd592d68d9a9b5664d02d9e233
 SHA512:
-  metadata.gz: 1f7d4c59c9087aaddd26c05295507850f9720ba14b60cdfeb4c77bfbcefd43d982fb052212dc89e6fd5c0d753de047d512d1ce7d5ce3644dc9dd89efa166066d
-  data.tar.gz: ec31d53f5622c6b2a8958656b9ac035d00c2484b7d7ee8cd6b486ad6a9c1351ad1d55fbda487025b268ee708688ba832b0513189b91db773956eaea5ba2c2737
+  metadata.gz: bebafa5e913c561fbe97a1ba997df579072db9153be012773c2fcfdd33062cdd033b417b47ea5a6de5c234736b575b2c1d307185b2b7570c31ce825da107cd61
+  data.tar.gz: 439923f589dc14098c4b278ccee6ee0f66de3c17e67f5f41c8d0f2f6ccf706d93311582d3daadcb296c0de9afe97044b22f2f6136be1dd3bba6c93f03fdecd7a

data/CHANGELOG.md

@@ -1,6 +1,36 @@
 # active_hash Changelog
 
-## Version [3.2.0] - <sub><sup>2022-07-14</sup></sub>
+## Version [3.3.0] - <sub><sup>2024-04-30</sup></sub>
+
+### Added
+
+- Ruby 3.3 support [#298](https://github.com/active-hash/active_hash/pull/298) @m-nakamura145
+- Support `has_many :through` associations [#296](https://github.com/active-hash/active_hash/pull/296) @flavorjones
+- Rails 7.1 support [#291](https://github.com/active-hash/active_hash/pull/281) @y-yagi
+
+### Fixed
+
+- Rails 7.1: fix sqlite3 issue [#303](https://github.com/active-hash/active_hash/pull/303) @flavorjones
+- Rails 7.1.3: add missing `has_query_constraints?` [#300](https://github.com/active-hash/active_hash/pull/300) @flavorjones
+- `Array#pluck` supports methods [#299](https://github.com/active-hash/active_hash/pull/299) @iberianpig
+- Prefer `safe_constantize` over `constantize` [#297](https://github.com/active-hash/active_hash/pull/297) @flavorjones
+- Treat `nil` and `blank?` as different values [#295](https://github.com/active-hash/active_hash/pull/295) @kbrock
+- Fix `#where` for string keys [#292](https://github.com/active-hash/active_hash/pull/292) @usernam3
+
+## Version [3.2.1] - <sub><sup>2023-08-31</sup></sub>
+
+### Added
+
+- Improve `pp` output for `ActiveHash::Relation`. [#288](https://github.com/active-hash/active_hash/pull/288) @flavorjones
+
+### Fixed
+
+- Fix relation matching when attribute name collides with a method. [#281](https://github.com/active-hash/active_hash/pull/281) @flavorjones
+- Fix association reflection in applications that don't use ActiveHash::Associations. [#286](https://github.com/active-hash/active_hash/pull/286) @iberianpig
+- Fix `ActiveHash::Relation#method_missing` and `#respond_to_missing?` without scopes. [#278](https://github.com/active-hash/active_hash/pull/278) @julianrubisch
+
+
+## Version [3.2.0] - <sub><sup>2023-05-06</sup></sub>
 
 - Add Ruby 3.2 to the CI matrix [#275](https://github.com/active-hash/active_hash/pull/275) @petergoldstein
 - Handle default value of `false` [#274](https://github.com/active-hash/active_hash/pull/274) @ihollander
@@ -292,9 +322,10 @@
   - Setting data to nil correctly causes .all to return an empty array
   - Added reload(force) method, so that you can force a reload from files in ActiveFile, useful for tests
 
-[HEAD]: https://github.com/active-hash/active_hash/compare/v4.3.0...HEAD
-[4.3.0]: https://github.com/active-hash/active_hash/compare/v3.2.0...v4.3.0
-[4.2.0]: https://github.com/active-hash/active_hash/compare/v3.1.1...v4.2.0
+[HEAD]:  https://github.com/active-hash/active_hash/compare/v3.3.0...HEAD
+[3.3.0]: https://github.com/active-hash/active_hash/compare/v3.2.1...v3.3.0
+[3.2.1]: https://github.com/active-hash/active_hash/compare/v3.2.0...v3.2.1
+[3.2.0]: https://github.com/active-hash/active_hash/compare/v3.1.1...v3.2.0
 [3.1.1]: https://github.com/active-hash/active_hash/compare/v3.1.0...v3.1.1
 [3.1.0]: https://github.com/active-hash/active_hash/compare/v3.0.0...v3.1.0
 [3.0.0]: https://github.com/active-hash/active_hash/compare/v2.3.0...v3.0.0

data/lib/active_hash/base.rb

@@ -127,6 +127,10 @@ module ActiveHash
         @record_index ||= {}
       end
 
+      def has_query_constraints?
+        false
+      end
+
       private :record_index
 
       def reset_record_index
@@ -349,6 +353,11 @@ module ActiveHash
         base_class.name
       end
 
+      # Needed for ActiveRecord since rails/rails#47664
+      def composite_primary_key?
+        false
+      end
+
       def reload
         reset_record_index
         self.data = _data
@@ -406,7 +415,7 @@ module ActiveHash
     end
 
     def _read_attribute(key)
-      attributes[key]
+      attributes[key.to_sym]
     end
     alias_method :read_attribute, :_read_attribute
 

data/lib/active_hash/condition.rb

@@ -19,7 +19,7 @@ class ActiveHash::Relation::Condition
       expectation_method = inverted ? :any? : :all?
 
       constraints.send(expectation_method) do |attribute, expected|
-        value = record.public_send(attribute)
+        value = record.read_attribute(attribute)
 
         matches_value?(value, expected)
       end
@@ -39,6 +39,6 @@ class ActiveHash::Relation::Condition
   end
 
   def normalize(value)
-    value.respond_to?(:to_s) ? value.to_s : value
+    value.respond_to?(:to_s) ? value&.to_s : value
   end
-end
+end

data/lib/active_hash/relation.rb

@@ -22,6 +22,10 @@ module ActiveHash
       spawn.where!(conditions_hash)
     end
 
+    def pretty_print(pp)
+      pp.pp(entries.to_ary)
+    end
+
     class WhereChain
       attr_reader :relation
 
@@ -139,15 +143,11 @@ module ActiveHash
     end
 
     def pluck(*column_names)
-      symbolized_column_names = column_names.map(&:to_sym)
-
-      if symbolized_column_names.length == 1
-        column_name = symbolized_column_names.first
-        all.map { |record| record[column_name] }
+      if column_names.length == 1
+        column_name = column_names.first
+        all.map { |record| record.public_send(column_name) }
       else
-        all.map do |record|
-          symbolized_column_names.map { |column_name| record[column_name] }
-        end
+        all.map { |record| column_names.map { |column_name| record.public_send(column_name) } }
       end
     end
 
@@ -164,13 +164,13 @@ module ActiveHash
     end
 
     def method_missing(method_name, *args)
-      return super unless klass.scopes.key?(method_name)
+      return super unless klass.scopes&.key?(method_name)
 
       instance_exec(*args, &klass.scopes[method_name])
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      klass.scopes.key?(method_name) || super
+      klass.scopes&.key?(method_name) || super
     end
 
     private

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "3.2.0"
+    VERSION = "3.3.0"
   end
 end

data/lib/associations/associations.rb

@@ -2,12 +2,40 @@ module ActiveHash
   module Associations
 
     module ActiveRecordExtensions
+      def self.extended(base)
+        require_relative 'reflection_extensions'
+      end
+
+      def has_many(association_id, **options)
+        if options[:through]
+          klass_name = association_id.to_s.classify
+          klass =
+            begin
+              klass_name.safe_constantize
+            rescue StandardError, LoadError
+              nil
+            end
+
+          if klass && klass < ActiveHash::Base
+            define_method(association_id) do
+              join_models = send(options[:through])
+              join_models.flat_map do |join_model|
+                join_model.send(association_id.to_s.singularize)
+              end.uniq
+            end
+
+            return
+          end
+        end
+
+        super
+      end
 
       def belongs_to(name, scope = nil, **options)
         klass_name = options.key?(:class_name) ? options[:class_name] : name.to_s.camelize
         klass =
           begin
-            klass_name.constantize
+            klass_name.safe_constantize
           rescue StandardError, LoadError
             nil
           end
@@ -27,11 +55,11 @@ module ActiveHash
           :shortcuts => []
         }.merge(options)
         # Define default primary_key with provided class_name if any
-        options[:primary_key] ||= options[:class_name].constantize.primary_key
+        options[:primary_key] ||= options[:class_name].safe_constantize.primary_key
         options[:shortcuts] = [options[:shortcuts]] unless options[:shortcuts].kind_of?(Array)
 
         define_method(association_id) do
-          options[:class_name].constantize.send("find_by_#{options[:primary_key]}", send(options[:foreign_key]))
+          options[:class_name].safe_constantize.send("find_by_#{options[:primary_key]}", send(options[:foreign_key]))
         end
 
         define_method("#{association_id}=") do |new_value|
@@ -44,16 +72,13 @@ module ActiveHash
           end
 
           define_method("#{association_id}_#{shortcut}=") do |new_value|
-            send "#{association_id}=", new_value ? options[:class_name].constantize.send("find_by_#{shortcut}", new_value) : nil
+            send "#{association_id}=", new_value ? options[:class_name].safe_constantize.send("find_by_#{shortcut}", new_value) : nil
           end
         end
 
         if ActiveRecord::Reflection.respond_to?(:create)
           if defined?(ActiveHash::Reflection::BelongsToReflection)
             reflection = ActiveHash::Reflection::BelongsToReflection.new(association_id.to_sym, nil, options, self)
-            if options[:through]
-              reflection = ActiveRecord::ThroughReflection.new(reflection)
-            end
           else
             reflection = ActiveRecord::Reflection.create(
               :belongs_to,
@@ -84,7 +109,7 @@ module ActiveHash
               :belongs_to,
               association_id.to_sym,
               options,
-              options[:class_name].constantize
+              options[:class_name].safe_constantize
             )
           end
         end
@@ -92,7 +117,6 @@ module ActiveHash
     end
 
     def self.included(base)
-      require_relative "reflection_extensions"
       base.extend Methods
     end
 
@@ -105,7 +129,7 @@ module ActiveHash
             :primary_key => self.class.primary_key
           }.merge(options)
 
-          klass = options[:class_name].constantize
+          klass = options[:class_name].safe_constantize
           primary_key_value = send(options[:primary_key])
           foreign_key = options[:foreign_key].to_sym
 
@@ -117,6 +141,7 @@ module ActiveHash
             klass.where(foreign_key => primary_key_value)
           end
         end
+
         define_method("#{association_id.to_s.underscore.singularize}_ids") do
           public_send(association_id).map(&:id)
         end
@@ -130,7 +155,7 @@ module ActiveHash
             :primary_key => self.class.primary_key
           }.merge(options)
 
-          scope = options[:class_name].constantize
+          scope = options[:class_name].safe_constantize
 
           if scope.respond_to?(:scoped) && options[:conditions]
             scope = scope.scoped(:conditions => options[:conditions])
@@ -140,7 +165,6 @@ module ActiveHash
       end
 
       def belongs_to(association_id, options = {})
-
         options = {
           :class_name => association_id.to_s.classify,
           :foreign_key => association_id.to_s.foreign_key,
@@ -150,13 +174,12 @@ module ActiveHash
         field options[:foreign_key].to_sym
 
         define_method(association_id) do
-          options[:class_name].constantize.send("find_by_#{options[:primary_key]}", send(options[:foreign_key]))
+          options[:class_name].safe_constantize.send("find_by_#{options[:primary_key]}", send(options[:foreign_key]))
         end
 
         define_method("#{association_id}=") do |new_value|
           attributes[options[:foreign_key].to_sym] = new_value ? new_value.send(options[:primary_key]) : nil
         end
-
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -29,7 +29,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2024-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: An ActiveRecord-like model that uses a hash or file as a datasource