eagerbeaver 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c558246984c62a7470ea996b956053150d58ec50
-  data.tar.gz: 5d8a81bb64fed4f171dc327604b9c06253bd5323
+  metadata.gz: e1cae32a36d43b90bcf7fd44a1761c735124877d
+  data.tar.gz: 7d1af0d4a273f42c87b751d02442bcf48e412265
 SHA512:
-  metadata.gz: 646386f43d5f2c9510121878dd95fc7c5b94221ee3337a0ef168d93d5e9e9150eae592bf01d61737a716da45adb622b4905ff4b20ff756bb9668b5ad78fcc4d6
-  data.tar.gz: ad9f291388b5b039c0f25d94993e2f178b87a537cbbfea74e5633efdfc851bfb830b2d4abd5673217e65d84cd138cd9550cc5f8c9e09d0e7fadf6d4a174235bb
+  metadata.gz: 30314ca7cd502769c85e9faa79912c2c691393e201aaf9a51ad4d4c80699f288594b28d1b49fabec34d42408c6337cec2096567d7c4e380858a37b23c9e6f391
+  data.tar.gz: 6928cff69c9e2aa8f0d4cf6c8a7ff47e958e731c50d94aab56e2134a77e261a5a98db584e3f97f45e0e43d4ddbaf14c504fd11c698b37d827550ffe7469faefa

data/.gitignore

@@ -10,3 +10,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+tags
+*.gem

data/lib/eagerbeaver.rb

@@ -3,7 +3,7 @@ require "eagerbeaver/version"
 class EagerBeaver
   def initialize(model, preloads)
     @model = model
-    @preloads = Array(preloads)
+    @preloads = preloads
   end
 
   def errors
@@ -26,10 +26,31 @@ class EagerBeaver
   end
 
   def association_name(model_string, association_name_or_alias)
-    association = model_string.constantize.reflect_on_all_associations.find { |a| a.name == association_name_or_alias }
-    association.try(:source_reflection_name) ||
-      association.try(:options).try(:[], :class_name) ||
-      association_name_or_alias
+    association = match_association(model_string.to_s, association_name_or_alias)
+    return association_name_or_alias unless association
+
+    options = association.options
+
+    if options[:through] && options[:source]
+      source = options[:source_type] || options[:source]
+      through = association_name(model_string, options[:through]) ||
+        association_name(options[:through], source)
+      association_name(through, source)
+    else
+      options[:class_name] || association_name_or_alias
+    end
+  end
+
+  def match_association(model_string, association)
+    constantize(model_string).reflect_on_all_associations.find { |a| a.name == association }
+  end
+
+  def constantize(model_string)
+    if model_string.first == model_string.first.upcase
+      model_string.singularize.constantize
+    else
+      model_string.split('_').map(&:capitalize).join.singularize.constantize
+    end
   end
 
   attr_reader :model, :preloads

data/lib/eagerbeaver/version.rb

@@ -1,3 +1,3 @@
 module Eagerbeaver
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eagerbeaver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Danny Park
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler