active_hash 3.1.0 → 3.2.0

data/lib/associations/associations.rb

@@ -3,20 +3,17 @@ module ActiveHash
 
     module ActiveRecordExtensions
 
-      def belongs_to(*args)
-        our_args = args.dup
-        options = our_args.extract_options!
-        name = our_args.shift
-        options = {:class_name => name.to_s.camelize }.merge(options)
+      def belongs_to(name, scope = nil, **options)
+        klass_name = options.key?(:class_name) ? options[:class_name] : name.to_s.camelize
         klass =
           begin
-            options[:class_name].constantize
-          rescue
-            nil
-          rescue LoadError
+            klass_name.constantize
+          rescue StandardError, LoadError
             nil
           end
+
         if klass && klass < ActiveHash::Base
+          options = { class_name: klass_name }.merge(options)
           belongs_to_active_hash(name, options)
         else
           super
@@ -52,13 +49,20 @@ module ActiveHash
         end
 
         if ActiveRecord::Reflection.respond_to?(:create)
-          reflection = ActiveRecord::Reflection.create(
-            :belongs_to,
-            association_id.to_sym,
-            nil,
-            options,
-            self
-          )
+          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,
+              association_id.to_sym,
+              nil,
+              options,
+              self
+            )
+          end
 
           ActiveRecord::Reflection.add_reflection(
             self,
@@ -88,12 +92,12 @@ module ActiveHash
     end
 
     def self.included(base)
+      require_relative "reflection_extensions"
       base.extend Methods
     end
 
     module Methods
       def has_many(association_id, options = {})
-
         define_method(association_id) do
           options = {
             :class_name => association_id.to_s.classify,
@@ -113,13 +117,17 @@ 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
       end
 
       def has_one(association_id, options = {})
         define_method(association_id) do
           options = {
             :class_name => association_id.to_s.classify,
-            :foreign_key => self.class.to_s.foreign_key
+            :foreign_key => self.class.to_s.foreign_key,
+            :primary_key => self.class.primary_key
           }.merge(options)
 
           scope = options[:class_name].constantize
@@ -127,7 +135,7 @@ module ActiveHash
           if scope.respond_to?(:scoped) && options[:conditions]
             scope = scope.scoped(:conditions => options[:conditions])
           end
-          scope.send("find_by_#{options[:foreign_key]}", id)
+          scope.send("find_by_#{options[:foreign_key]}", send(options[:primary_key]))
         end
       end
 

data/lib/associations/reflection_extensions.rb

@@ -0,0 +1,25 @@
+module ActiveHash
+  module Reflection
+    class BelongsToReflection < ActiveRecord::Reflection::BelongsToReflection
+      def compute_class(name)
+        if polymorphic?
+          raise ArgumentError, "Polymorphic associations do not support computing the class."
+        end
+        
+        begin
+          klass = active_record.send(:compute_type, name)
+        rescue NameError => error
+          if error.name.match?(/(?:\A|::)#{name}\z/)
+            message = "Missing model class #{name} for the #{active_record}##{self.name} association."
+            message += " You can specify a different model class with the :class_name option." unless options[:class_name]
+            raise NameError.new(message, name)
+          else
+            raise
+          end
+        end
+
+        klass
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -26,10 +26,10 @@ authors:
 - Brett Richardson
 - Rachel Heaton
 - Keisuke Izumiya
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,7 +66,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG
+- CHANGELOG.md
 - LICENSE
 - README.md
 - active_hash.gemspec
@@ -75,18 +75,25 @@ files:
 - lib/active_file/multiple_files.rb
 - lib/active_hash.rb
 - lib/active_hash/base.rb
+- lib/active_hash/condition.rb
+- lib/active_hash/conditions.rb
 - lib/active_hash/relation.rb
 - lib/active_hash/version.rb
 - lib/active_json/base.rb
 - lib/active_yaml/aliases.rb
 - lib/active_yaml/base.rb
 - lib/associations/associations.rb
+- lib/associations/reflection_extensions.rb
 - lib/enum/enum.rb
-homepage: http://github.com/zilkey/active_hash
+homepage: http://github.com/active-hash/active_hash
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: http://github.com/active-hash/active_hash
+  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,9 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: An ActiveRecord-like model that uses a hash or file as a datasource
 test_files: []

data/CHANGELOG

@@ -1,225 +0,0 @@
-2020-01-15 (v3.1.0)
-  - Add ActiveHash::Base.order method inspired by ActiveRecord [#177](https://github.com/zilkey/active_hash/pull/177)
-  - Add #to_ary to ActiveHash::Relation [#182](https://github.com/zilkey/active_hash/pull/182)
-  - Allow #find to behave like Enumerable#find if id is nil and a block is given [#183](https://github.com/zilkey/active_hash/pull/183)
-  - Delegate :sample to `records` [#189](https://github.com/zilkey/active_hash/pull/189)
-
-2019-09-28 (v3.0.0)
-  - Make #where chainable [#178](https://github.com/zilkey/active_hash/pull/178)
-
-2019-09-28 (v2.3.0)
-  - Add ::scope method (inspired by ActiveRecord) [#173](https://github.com/zilkey/active_hash/pull/173)
-  - Let `.find(nil)` raise ActiveHash::RecordNotFound (inspired by ActiveRecord) [#174](https://github.com/zilkey/active_hash/pull/174)
-  - `where` clause now works with range argument [#175](https://github.com/zilkey/active_hash/pull/175)
-
-2019-03-06 (v2.2.1)
-  - Allow empty YAML [#171](https://github.com/zilkey/active_hash/pull/171) Thanks, @ppworks
-
-2018-11-22 (v2.2.0)
-  - Support pluck method [#164](https://github.com/zilkey/active_hash/pull/164) Thanks, @ihatov08
-  - Support where.not method [#167](https://github.com/zilkey/active_hash/pull/167) Thanks, @DialBird
-
-2018-04-05 (v2.1.0)
-  - Allow to use ERB (embedded ruby) in yml files [#160](https://github.com/zilkey/active_hash/pull/160) Thanks, @UgoMare
-  - Add `ActiveHash::Base.polymorphic_name` [#162](https://github.com/zilkey/active_hash/pull/162)
-  - Fix to be able to use enum accessor constant with same name as top-level constant[#161](https://github.com/zilkey/active_hash/pull/161) Thanks, @yujideveloper
-
-2018-02-27 (v2.0.0)
-  - Drop old Ruby and Rails support [#157](https://github.com/zilkey/active_hash/pull/157)
-  - Don't generate instance accessors for class attributes [#136](https://github.com/zilkey/active_hash/pull/136) Thanks, @rainhead
-
-2017-06-14 (v1.5.3)
-  - Support symbol values in where and find_by [#156](https://github.com/zilkey/active_hash/pull/156) Thanks, @south37
-
-2017-06-14 (v1.5.2)
-  - Fix find_by when passed an invalid id [#152](https://github.com/zilkey/active_hash/pull/152) Thanks, @davidstosik
-
-2017-04-20 (v1.5.1)
-  - Fix a bug on `.where` [#147](https://github.com/zilkey/active_hash/pull/147)
-
-2017-03-24 (v1.5.0)
-  - add support for `.find_by!`(@syguer)
-
-2015-09-13 (v1.4.1)
-  - fix bug where `#attributes` didn't contain default values #107
-  - add support for `.find_by` and `#_read_attribute`. Thanks, @andrewfader!
-
-2014-09-03 (v1.4.0)
-  - support Rails 4.2 (agraves, al2o3cr)
-
-2014-02-18 (v1.3.0)
-  - fix bug where including ActiveHash associations would make `belongs_to :imageable, polymorphic: true` blow up
-  - fixed several bugs that prevented active hash from being used without active record / active model
-  - add support for splitting up data sources into multiple files (rheaton)
-  - add support for storing data in json files (rheaton)
-
-2013-11-29 (v1.2.3)
-  - fix bug where active hash would call `.all` on models when setting has_many (grosser)
-
-2013-11-05 (v1.2.2)
-  - fix bug in gemspec that made it impossible to use w/ Rails 4
-
-2013-10-24 (v1.2.1)
-  - fixed nasty bug in belongs_to that would prevent users from passing procs (thanks for the issue freebird0221)
-  - fixed bug where passing in a separate class name to belongs_to_active_hash would raise an exception (mauriciopasquier)
-
-2013-10-01 (v1.2.0)
-  - belongs_to is back!
-  - added support for primary key options for belongs_to (tomtaylor)
-
-2013-09-09 (v1.0.2)
-  - `where(nil)` returns all results, like ActiveRecord (kugaevsky)
-
-2013-07-15 (v1.0.1)
-  - Travis CI for ActiveHash + Ruby 2, 1.8.7, Rubinius and JRuby support (mattheworiordan)
-  - no longer need to call .all before executing `find_by_*` or `where` methods (mattheworiordan)
-
-2013-06-24 (v1.0.0)
-  - save is a no-op on existing records, instead of raising an error (issue #63)
-
-2013-06-24 (v0.10.0)
-  - added ActiveYaml::Aliases module so you can DRY up your repetitive yaml (brett-richardson)
-
-2013-05-23 (v0.9.14)
-  - enum_accessor can now take multiple field names when generating the constant
-  - temporarily disabled rails edge specs since there's an appraisal issue with minitest
-
-2013-01-22
-  - Fix find_by_id and find method returning nil unless .all called in ActiveYaml (mattheworiordan)
-
-2012-07-25
-  - Make find_by_id lookups faster by indexing records by id (desmondmonster)
-
-2012-07-16
-  - Validate IDs are unique by caching them in a set (desmondmonster)
-
-2012-04-14
-  - Support for has_one associations (kbrock)
-
-2012-04-05
-  - Allow gems like simple_form to read metadata about belongs_to associations that point to active hash objects (kbrock)
-
-2012-01-19
-  - Move specs to appraisal (flavorjones)
-
-2012-01-18 (v0.9.8)
-  - Make ActiveHash.find with array raise an exception when record cannot be found (mocoso)
-
-2011-09-18 (v0.9.7)
-  - Fixing the setting of a belongs_to_active_hash association by association (not id).
-
-2011-08-31
-  - added a module which adds a .belongs_to_active_hash method to ActiveRecord, since it was broken for Rails 3.1 (thanks to felixclack for pointing this issue out)
-
-2011-06-07
-  - fixed bug where .find would not work if you defined your ids as strings
-
-2011-06-05
-  - fixed deprecation warnings for class_inheritable_accessor (thanks scudco!)
-  - added basic compatibility with the `where` method from Arel (thanks rgarver!)
-
-2011-04-19
-  - better dependency management and compatibility with ActiveSupport 2.x (thanks vandrijevik!)
-
-2011-01-22
-  - improved method_missing errors for dynamic finders
-  - prevent users from trying to overwrite :attributes (https://github.com/zilkey/active_hash/issues/#issue/33)
-
-2010-12-08
-  - ruby 1.9.2 compatibility
-
-2010-12-06
-  - added dependency on ActiveModel
-  - add persisted? method to ActiveHash::Base
-  - ActiveHash::Base#save takes *args to be compatible with ActiveModel
-  - ActiveHash::Base#to_param returns nil if the object hasn't been saved
-
-2010-11-09
-  - Use Ruby's definition of "word character" (numbers, underscores) when forming ActiveHash::Enum constants (tstuart)
-
-2010-11-07
-  - Get ActiveHash::Associations to return a scope for has_many active record relationships (mocoso)
-
-2010-10-20
-  - Allow find_by_* methods to accept an options hash, so rails associations don't blow up
-
-2010-10-07
-  - Add conditions to ActiveHash#all (Ryan Garver)
-  - Add #cache_key to ActiveHash::Base (Tom Stuart)
-  - Add banged dynamic finder support to ActiveHash::Base (Tom Stuart)
-
-2010-09-16
-  - Enum format now uses underscores instead of removing all characters
-  - Removed test dependency on acts_as_fu
-
-2010-05-26
-  - Silence metaclass deprecation warnings in active support 2.3.8
-
-2010-05-04
-  - When calling ActiveFile::Base.reload do not actually perform the reload if nothing has been modified unless you call reload(true) to force (Michael Schubert)
-
-2010-04-25
-  - When ActiveRecord model belongs_to an ActiveHash and the associated id is nil, returns nil instead of raising RecordNotFound (Jeremy Weiskotten)
-  - Merged Nakajima's "add" alias for "create" - gotta save those ASCII characters :)
-
-2010-03-01
-  - Removed "extend"-related deprecations - they didn't play well with rails class loading
-
-2010-01-18
-  - Added stub for #destroyed? method, since Rails associations now depend on it
-
-2009-12-19
-  - Added ActiveHash::Enum (John Pignata)
-  - Deprecated include ActiveHash::Associations in favor of extend ActiveHash::Associations
-  - Fixed bug where you can't set nil to an association
-  - Calling #belongs_to now creates the underlying field if it's not already there (belongs_to :city will create the :city_id field)
-
-2009-12-10
-  - Fixed a bug where belongs_to associations would raise an error instead of returning nil when the parent object didn't exist.
-  - Added #[] and #[]= accessors for more ActiveRecord-esque-ness. (Pat Nakajima & Dave Yeu)
-
-2009-12-01
-  - Add marked_for_destruction? to be compatible with nested attributes (Brandon Keene)
-  - Added second parameter to respond_to? and cleaned up specs (Brian Takita)
-  - Find with an id that does not exist now raises a RecordNotFound exception to mimic ActiveRecord (Pat Nakajima)
-
-2009-10-22
-  - added setters to ActiveHash::Base for all fields
-  - instantiating an ActiveHash object with a hash calls the setter methods on the object
-  - boolean default values now work
-
-2009-10-21
-  - Removed auto-reloading of files based on mtime - maybe it will come back later
-  - Made ActiveFile::Base.all a bit more sane
-
-2009-10-13
-  - added ActiveHash::Base.has_many, which works with ActiveRecord or ActiveHash classes (thanks to baldwindavid)
-  - added ActiveHash::Base.belongs_to, which works with ActiveRecord or ActiveHash classes (thanks to baldwindavid)
-  - added .delete_all method that clears the in-memory array
-  - added support for Hash-style yaml (think, Rails fixtures)
-  - added setter for parent object on belongs_to ( city = City.new; city.state = State.first; city.state_id == State.first.id )
-
-2009-10-12
-  - auto-assign fields after calling data= instead of after calling .all
-  - remove require 'rubygems', so folks with non-gem setups can still use AH
-  - added more specific activesupport dependency to ensure that metaclass is available
-  - AH no longer calls to_i on ids.  If you pass in a string as an id, you'll get a string back
-  - Fancy finders, such as find_all_by_id_and_name, will compare the to_s values of the fields, so you can pass in strings
-  - You can now use ActiveHash models as the parents of polymorphic belongs_to associations
-  - save, save!, create and create! now add items to the in-memory collection, and naively adds autoincrementing id
-  - new_record? returns false if the record is part of the collection
-  - ActiveHash now works with Fixjour!
-
-2009-08-19
-  - Added custom finders for multiple fields, such as .find_all_by_name_and_age
-
-2009-07-23
-  - Added support for auto-defining methods based on hash keys in ActiveHash::Base
-  - Changed the :field and :fields API so that they don't overwrite existing methods (useful when ActiveHash auto-defines methods)
-  - Fixed a bug where ActiveFile incorrectly set the root_path to be the path in the gem directory, not the current working directory
-
-2009-07-24
-  - ActiveFile no longer reloads files by default
-  - Added ActiveFile.reload_active_file= so you can cause ActiveFile to reload
-  - 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