active_hash 3.3.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f03cf8270c4fd278e024200679342d2063170eb886caacc29eec8b1577ff5d3
-  data.tar.gz: d1b0cf6ed32af1f82471e22a593d5929be18f47c729e514376485a9a34a8a74d
+  metadata.gz: 87c94fe12c3633dc4d691ff9c67c818ec68495f89e5529130b2e4d49504cefd3
+  data.tar.gz: dab8cc2c530de82a9020a68d128ca1d6c815aa68ab977ea242a3f2d8470d8c22
 SHA512:
-  metadata.gz: 33f26034c33d2e1b5533007a10cd63672478e0c421c3e0e1819392bfae33c6815af58ec8605492790ec3bbbbdfe642839647b296902008c0c92f525bed311d06
-  data.tar.gz: fb495624034f265a1503f5f493fff74097653f3b00a703b1f9406d397a70eb744a6322e0758bfe9e4b6f7bd4a0ea86b2e5bcadb55adaf2fb1be87525330271dd
+  metadata.gz: 1cb506c09e918622c2581d2f7727076db0fbc43a4940cd90dad2ff96857b16d19b2b77bb1b808e7c160ab4109ad7b97369b167a7c057730cd9806e6fbef72988
+  data.tar.gz: 8588f0311f2b680147bec5606cfdbc5ec0b0a224672c28dbd33c67bd88d85351050baf726eaaaa8c908c4c5d5e3200314f4939a29368244da81b5c8bcf9e88db

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # active_hash Changelog
 
+## Version [4.1.0] - <sub><sup>2026-04-01</sup></sub>
+
+### Added
+
+- Add `Relation#or` support [#343](https://github.com/active-hash/active_hash/pull/343) @opsys-saito
+- Alias `Relation#find_each` and `Base#find_each` to `#each` [#333](https://github.com/active-hash/active_hash/pull/333) @DmitryBarskov
+
+### Fixed
+
+- Fix `exists?` to support ids which are strings [#339](https://github.com/active-hash/active_hash/pull/339) @mtmail
+- Fix `model_name` availability when using `ActiveModel::Serialization` [#335](https://github.com/active-hash/active_hash/pull/335) @moznion
+
+## Version [4.0.0] - <sub><sup>2025-07-30</sup></sub>
+
+### Added
+
+- Add i18n support [#230](https://github.com/active-hash/active_hash/pull/230) @ryu-sato @Yuki-Inoue
+- Add `column_names` method [#311](https://github.com/active-hash/active_hash/pull/311) @hatsu38
+- Add block support to `count` [#317](https://github.com/active-hash/active_hash/pull/317) @ashleyHutton
+- Support ruby 3.4 [#328](https://github.com/active-hash/active_hash/pull/328) @flavorjones
+- Add `:alias` to `has_many :through` [#329](https://github.com/active-hash/active_hash/pull/329) @alexgriff
+- Add Active Record 8.0 [#324](https://github.com/active-hash/active_hash/pull/324) @flavorjones
+
+### Fixed
+
+- Fix Do not suppress load errors[#309](https://github.com/active-hash/active_hash/pull/309) @andreynering
+- Ensure `field_names` are all strings [#312](https://github.com/active-hash/active_hash/pull/312) @flavorjones
+- Hide private `add_default_value` [#314](https://github.com/active-hash/active_hash/pull/314) @kbrock
+- Fix `exists?(nil)` [#320](https://github.com/active-hash/active_hash/pull/320) @y-yagi
+- Enance Enum support [#321](https://github.com/active-hash/active_hash/pull/321) @hatsu38
+- Updated docs [#326](https://github.com/active-hash/active_hash/pull/326) @y-yagi
+
+### Removed
+
+- Drop Active Record < 6.1. Ruby < 3.0 [#324](https://github.com/active-hash/active_hash/pull/324) @flavorjones
+
 ## Version [3.3.1] - <sub><sup>2024-05-03</sup></sub>
 
 ### Fixed
@@ -329,7 +365,9 @@
   - 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/v3.3.0...HEAD
+[HEAD]:  https://github.com/active-hash/active_hash/compare/v4.1.0...HEAD
+[4.1.0]: https://github.com/active-hash/active_hash/compare/v4.0.0...v4.1.0
+[3.3.1]: https://github.com/active-hash/active_hash/compare/v3.3.0...v3.3.1
 [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

data/README.md

@@ -34,7 +34,11 @@ Other:
 gem install active_hash
 ```
 
-**Currently version 2.x doesn't support Ruby < 2.4 and Rails < 5**. If you use these versions, please use 1.x.
+Requirements:
+
+- v1.x: Ruby >= 1.9.3, Rails >= 2.2.2
+- v2.x, v3.x: Ruby >= 2.4, Rails >= 5
+- upcoming: Ruby >= 3.0, Rails >= 6.1
 
 ```ruby
 gem 'active_hash', '~> 1.5.3'
@@ -558,7 +562,7 @@ Call `Model.reload(true)` to force reload the data from disk.
 In Rails, you can use this snippet. Please just note it resets the state every request, which may not always be desired.
 
 ```ruby
-before_filter do
+before_action do
   [Model1, Model2, Model3].each { |m| m.reload(true) }
 end
 ```
@@ -606,6 +610,20 @@ Constants are formed by first stripping all non-word characters and then upcasin
 
 The field specified as the _enum_accessor_ must contain unique data values.
 
+## I18n
+
+ActiveHash supports i18n as ActiveModel.
+Put following code in one of your locale file (e.g. `config/locales/LANGUAGE_CODE.yml`)
+
+```yaml
+# for example, inside config/locales/ja.yml
+ja:
+  activemodel:
+    models:
+      # `Country.model_name.human` will evaluates to "国"
+      country: "国"
+```
+
 ## Contributing
 
 If you'd like to become an ActiveHash contributor, the easiest way it to fork this repo, make your changes, run the specs and submit a pull request once they pass.
@@ -619,10 +637,10 @@ If your changes seem reasonable and the specs pass I'll give you commit rights t
 
 ## Releasing a new version
 
-To make users' lives easier, please maintain support for:
+To make users' lives easier, CI will exercise tests for:
 
-  * Ruby 2.4
-  * ActiveRecord/ActiveSupport from 5.0 through edge
+  * Ruby 3.0 through current
+  * ActiveRecord/ActiveSupport from 6.1 through edge
 
 Once appraisal passes in all supported rubies, follow these steps to release a new version of active_hash:
 

data/active_hash.gemspec

@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
     Dir.glob("lib/**/*")
   ].flatten
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
-  s.add_runtime_dependency('activesupport', '>= 5.0.0')
+  s.add_runtime_dependency('activesupport', '>= 6.1.0')
   s.add_development_dependency "pry"
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 3.0.0'
 end

data/lib/active_file/base.rb

@@ -49,7 +49,7 @@ module ActiveFile
       end
       protected :actual_root_path
 
-      [:find, :find_by_id, :all, :where, :method_missing].each do |method|
+      [:find, :find_by_id, :all, :where, :method_missing, :find_each].each do |method|
         define_method(method) do |*args, &block|
           reload unless data_loaded
           return super(*args, &block)

data/lib/active_hash/base.rb

@@ -25,6 +25,7 @@ module ActiveHash
 
     if Object.const_defined?(:ActiveModel)
       extend ActiveModel::Naming
+      extend ActiveModel::Translation
       include ActiveModel::Conversion
     else
       def to_param
@@ -50,6 +51,23 @@ module ActiveHash
         @field_names ||= []
       end
 
+      #
+      # Useful for CSV integration needing column names as strings.
+      #
+      # @return [Array<String>] An array of column names as strings.
+      #
+      # @example Usage
+      #  class Country < ActiveHash::Base
+      #    fields :name, :code
+      #  end
+      #
+      #  Country.column_names
+      #  # => ["id", "name", "code"]
+      #
+      def column_names
+        field_names.map(&:name)
+      end
+
       def the_meta_class
         class << self
           self
@@ -85,17 +103,17 @@ module ActiveHash
         end
       end
 
-      def exists?(args = nil)
+      def exists?(args = :none)
         if args.respond_to?(:id)
           record_index[args.id.to_s].present?
-        elsif args == false
+        elsif !args
           false
-        elsif args.nil?
+        elsif args == :none
           all.present?
         elsif args.is_a?(Hash)
           all.where(args).present?
         else
-          all.where(id: args.to_i).present?
+          all.where(id: args.to_s).present?
         end
       end
 
@@ -172,7 +190,7 @@ module ActiveHash
         relation
       end
 
-      delegate :where, :find, :find_by, :find_by!, :find_by_id, :count, :pluck, :ids, :pick, :first, :last, :order, to: :all
+      delegate :where, :find_each, :find, :find_by, :find_by!, :find_by_id, :count, :pluck, :ids, :pick, :first, :last, :order, to: :all
 
       def transaction
         yield
@@ -198,7 +216,9 @@ module ActiveHash
       end
 
       def field(field_name, options = {})
+        field_name = field_name.to_sym
         validate_field(field_name)
+
         field_names << field_name
 
         add_default_value(field_name, options[:default]) if options.key?(:default)
@@ -210,7 +230,8 @@ module ActiveHash
       end
 
       def validate_field(field_name)
-        if [:attributes].include?(field_name.to_sym)
+        field_name = field_name.to_sym
+        if [:attributes].include?(field_name)
           raise ReservedFieldError.new("#{field_name} is a reserved field in ActiveHash.  Please use another name.")
         end
       end
@@ -263,8 +284,10 @@ module ActiveHash
         self.default_attributes[field_name] = default_value
       end
 
+      private :add_default_value
+
       def define_getter_method(field, default_value)
-        unless instance_methods.include?(field.to_sym)
+        unless instance_methods.include?(field)
           define_method(field) do
             attributes[field].nil? ? default_value : attributes[field]
           end

data/lib/active_hash/relation.rb

@@ -7,6 +7,8 @@ module ActiveHash
     delegate :empty?, :length, :first, :second, :third, :last, to: :records
     delegate :sample, to: :records
 
+    alias find_each each
+
     attr_reader :conditions, :order_values, :klass, :all_records
 
     def initialize(klass, all_records, conditions = nil, order_values = nil)
@@ -22,6 +24,22 @@ module ActiveHash
       spawn.where!(conditions_hash)
     end
 
+    def or(other)
+      unless other.is_a?(self.class)
+        raise ArgumentError, "or() expects an ActiveHash::Relation"
+      end
+
+      unless other.klass == klass
+        raise ArgumentError, "or() expects relations for the same model"
+      end
+
+      merged = (records + other.records).uniq do |record|
+        record.respond_to?(:id) ? record.id : record.object_id
+      end
+
+      self.class.new(klass, merged, [], order_values)
+    end
+
     def pretty_print(pp)
       pp.pp(entries.to_ary)
     end
@@ -135,6 +153,7 @@ module ActiveHash
     end
 
     def count
+      return super if block_given?
       length
     end
 

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "3.3.1"
+    VERSION = "4.1.0"
   end
 end

data/lib/associations/associations.rb

@@ -8,19 +8,16 @@ module ActiveHash
 
       def has_many(association_id, scope = nil, **options, &extension)
         if options[:through]
-          klass_name = association_id.to_s.classify
-          klass =
-            begin
-              klass_name.safe_constantize
-            rescue StandardError, LoadError
-              nil
-            end
+          source_association_name = options[:source]&.to_s || association_id.to_s.singularize
+
+          through_klass = reflect_on_association(options[:through])&.klass
+          klass = through_klass&.reflect_on_association(source_association_name)&.klass
 
           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)
+                join_model.send(source_association_name)
               end.uniq
             end
 
@@ -33,12 +30,7 @@ module ActiveHash
 
       def belongs_to(name, scope = nil, **options)
         klass_name = options.key?(:class_name) ? options[:class_name] : name.to_s.camelize
-        klass =
-          begin
-            klass_name.safe_constantize
-          rescue StandardError, LoadError
-            nil
-          end
+        klass = klass_name.safe_constantize
 
         if klass && klass < ActiveHash::Base
           options = { class_name: klass_name }.merge(options)

data/lib/enum/enum.rb

@@ -14,6 +14,20 @@ module ActiveHash
         reload
       end
 
+      def enum(columns)
+        columns.each do |column, values|
+          values = values.zip(values.map(&:to_s)).to_h if values.is_a?(Array)
+          values.each do |method, value|
+            class_eval <<~METHOD, __FILE__, __LINE__ + 1
+              # frozen_string_literal: true
+              def #{method}?
+                #{column} == #{value.inspect}
+              end
+            METHOD
+          end
+        end
+      end
+
       def insert(record)
         super
         set_constant(record) if defined?(@enum_accessors)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -26,10 +26,9 @@ authors:
 - Brett Richardson
 - Rachel Heaton
 - Keisuke Izumiya
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -37,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +92,6 @@ metadata:
   changelog_uri: https://github.com/active-hash/active_hash/blob/master/CHANGELOG.md
   source_code_uri: http://github.com/active-hash/active_hash
   bug_tracker_uri: https://github.com/active-hash/active_hash/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,15 +99,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 4.0.9
 specification_version: 4
 summary: An ActiveRecord-like model that uses a hash or file as a datasource
 test_files: []