active_cached_resource 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32ab653731518678eebe3383d4c0848301c09a0e0f3844cc66c9e1657794fb9
-  data.tar.gz: c185462d895d9bc6721bbc186bed4db7bd251c77922a580cc39cc7051b5508e7
+  metadata.gz: ff5568ae59b708a8797b4a76940222c5b6e6203ae6914fcefcccae0b6fd4702e
+  data.tar.gz: 810e8446382d26728299806a427f865de4fbda34de6704ceb3a231163b471c0a
 SHA512:
-  metadata.gz: 946a1421c6fa752430a073981b6e44753cefb32676d1c7cf34e939d056f6ec2aadd13a050b7a5390b392132394250262ed24daec6ba0fe2e59d7d455f90201b2
-  data.tar.gz: fe1872444d09cad3405917a65b90a4317a9b6a02504cd83896f183aa28d8002a505d67b6903d39facfbdeb0f1e2334a6d50c80be85edb4debf7cf1534fa4871e
+  metadata.gz: 9c4e5b58ec0e1e9151c51e62e6760dd408098b68a01c634ca0ef62e2f999a6bb5c2d2a4961db0563a3d3a3490f9dcd6934c76a12e940233fd212a78fa6d34df4
+  data.tar.gz: b5d37c1863e51ef8aec7db5afebabe35a25d0aae60453a48ba61212f9348aea1dda4a1c43f0c00a5d80008d30170988bbf826eecc4e7fc74b7a5d978b63be67f

data/lib/active_cached_resource/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveCachedResource
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/activeresource/lib/active_resource/associations/builder/association.rb

@@ -4,7 +4,7 @@ module ActiveResource::Associations::Builder
   class Association # :nodoc:
     # providing a Class-Variable, which will have a different store of subclasses
     class_attribute :valid_options
-    self.valid_options = [:class_name]
+    self.valid_options = [:class_name, :foreign_key]
 
     # would identify subclasses of association
     class_attribute :macro

data/lib/activeresource/lib/active_resource/associations.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require "pry-byebug" # IGNORE: This line is for debugging purposes and should be removed in production code.
 module ActiveResource::Associations
   module Builder
-    autoload :Association, "active_resource/associations/builder/association"
-    autoload :HasMany,     "active_resource/associations/builder/has_many"
-    autoload :HasOne,      "active_resource/associations/builder/has_one"
-    autoload :BelongsTo,   "active_resource/associations/builder/belongs_to"
+    autoload :Association, "activeresource/lib/active_resource/associations/builder/association"
+    autoload :HasMany,     "activeresource/lib/active_resource/associations/builder/has_many"
+    autoload :HasOne,      "activeresource/lib/active_resource/associations/builder/has_one"
+    autoload :BelongsTo,   "activeresource/lib/active_resource/associations/builder/belongs_to"
   end
 
 
@@ -148,9 +149,11 @@ module ActiveResource::Associations
       elsif attributes.include?(method_name)
         attributes[method_name]
       elsif !new_record?
-        instance_variable_set(ivar_name, reflection.klass.find(:all, params: { "#{self.class.element_name}_id": self.id }))
+        # Association would be set on custom primary key if explicitly defined, otherwise use convention _id
+        assoc_key = self.class.custom_primary_key || "#{self.class.element_name}_id"
+        instance_variable_set(ivar_name, reflection.klass.find(:all, params: { assoc_key => self.id }))
       else
-        instance_variable_set(ivar_name, reflection.klass.find(:all))
+        instance_variable_set(ivar_name, reflection.klass.none)
       end
     end
   end

data/lib/activeresource/lib/active_resource/base.rb

@@ -672,6 +672,10 @@ module ActiveResource
         end
       end
 
+      def none
+        collection_parser.none
+      end
+
       # An instance of ActiveResource::Connection that is the base \connection to the remote service.
       # The +refresh+ parameter toggles whether or not the \connection is refreshed at every request
       # or not (defaults to <tt>false</tt>).
@@ -717,6 +721,10 @@ module ActiveResource
 
       attr_writer :primary_key
 
+      def custom_primary_key
+        @primary_key
+      end
+
       def primary_key
         if defined?(@primary_key)
           @primary_key
@@ -1226,6 +1234,10 @@ module ActiveResource
       load(attributes, false, persisted)
     end
 
+    def [](key)
+      public_send(key)
+    end
+
     # Returns a \clone of the resource that hasn't been assigned an +id+ yet and
     # is treated as a \new resource.
     #

data/lib/activeresource/lib/active_resource/collection.rb

@@ -6,12 +6,12 @@ require "active_support/inflector"
 module ActiveResource # :nodoc:
   class Collection # :nodoc:
     include Enumerable
-    delegate :==, :[], :&, :*, :+, :-, :<=>, :all?, :any?, :as_json, :at, :assoc, :blank?, :bsearch, :bsearch_index,
-         :collect, :combination, :compact, :count, :cycle, :deconstruct, :deep_dup, :dig, :difference, :drop,
+    delegate :==, :[], :&, :*, :+, :-, :<=>, :<<, :all?, :any?, :as_json, :at, :assoc, :blank?, :bsearch, :bsearch_index,
+         :collect, :combination, :compact, :concat, :count, :cycle, :deconstruct, :deep_dup, :dig, :difference, :drop,
          :drop_while, :each, :each_index, :empty?, :eql?, :excluding, :filter, :fifth, :find_index, :first,
          :flatten, :fourth, :hash, :include?, :including, :index, :inspect, :intersect?,
          :intersection, :join, :last, :length, :map, :max, :min, :minmax, :none?, :one?, :pack, :permutation,
-         :pretty_print_cycle, :present?, :product, :reject, :repeated_combination, :repeated_permutation,
+         :pretty_print_cycle, :present?, :product, :push, :reject, :repeated_combination, :repeated_permutation,
          :rassoc, :reverse, :reverse_each, :rindex, :rotate, :sample, :second, :second_to_last, :select,
          :shelljoin, :shuffle, :size, :slice, :sort, :sum, :take, :take_while, :third, :third_to_last, :to,
          :to_a, :to_ary, :to_fs, :to_formatted_s, :to_h, :to_param, :to_query, :to_s, :to_sentence, :to_xml,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_cached_resource
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jean Luis Urena
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.7.0
 specification_version: 4
 summary: ActiveResource, but with a caching layer.
 test_files: []