poly_belongs_to 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63f10835bb5c79fc10a255c58bca817c7f58caad
-  data.tar.gz: 20ac9975f50671b344766aa0c2c078df199cad1f
+  metadata.gz: d945fa7f779711426e5f3f4cf5cea436255a2403
+  data.tar.gz: 2bfbbeec531d122fa8520523b4b9fae25f4e52a3
 SHA512:
-  metadata.gz: 03f1ee0381c43c5f4712f11af56ccbf638ad34d79fa03a25e6a7d642c4e215f6fc6a8ca3028913c92d92c969936ad9016d636e3b12dd21dd3e2043a2f6f50636
-  data.tar.gz: 63422eb302602eb8630a4dac497694138a6e6a68cedbe231bb190938879557a9c058792a92574f80092729a1275fef928a2589baedf006c0a56250bd628d1928
+  metadata.gz: 49341ba09d46570a56bfce7368927931fe3ab5787a412c1983544f30bcec6b74061f1165f6e3d6641bf783077bd66685de7ef50f9d53e81fed464159bc12deae
+  data.tar.gz: 710b7e8a888401bdf849969e84e9d7570ae88183f716d0428c02ff9d3574a4b0b7b3a07d9e20122b3e60a89dd0da03e84d751e719b66dbd0eb005bf8daf236bf

data/lib/poly_belongs_to/core.rb

@@ -5,7 +5,7 @@ module PolyBelongsTo
     extend ActiveSupport::Concern
 
     included do
-      # @return [Symbol] first belongs_to relation
+      # @return [Symbol, nil] first belongs_to relation
       def self.pbt
         reflect_on_all_associations(:belongs_to).first.try(:name)
       end
@@ -84,7 +84,7 @@ module PolyBelongsTo
       
       private
       # Return Array of current Class polymorphic records that are orphaned from parents
-      # @return [Array<Object>, nil] ActiveRecord orphan objects
+      # @return [Array<Object>] ActiveRecord orphan objects
       def self._pbt_polymorphic_orphans
         accumalitive = nil
         pbt_valid_types.each do |type|
@@ -95,7 +95,7 @@ module PolyBelongsTo
       end
 
       # Return Array of current Class nonpolymorphic records that are orphaned from parents
-      # @return [Array<Object>, nil] ActiveRecord orphan objects
+      # @return [Array<Object>] ActiveRecord orphan objects
       def self._pbt_nonpolymorphic_orphans
         where(["#{pbt_id_sym} NOT IN (?)", pbt.to_s.capitalize.constantize.pluck(:id)])
       end
@@ -105,7 +105,7 @@ module PolyBelongsTo
       end
     end
     
-    # @return [Symbol] first belongs_to relation
+    # @return [Symbol, nil] first belongs_to relation
     def pbt
       self.class.pbt
     end
@@ -135,14 +135,14 @@ module PolyBelongsTo
     end
 
     # Get the parent relation.  Polymorphic relations are prioritized first.
-    # @return [Object] ActiveRecord object instasnce
+    # @return [Object, nil] ActiveRecord object instasnce
     def pbt_parent
       val = pbt
       if val && !pbt_id.nil?
         if poly?
-          "#{pbt_type}".constantize.find(pbt_id)
+          "#{pbt_type}".constantize.where(id: pbt_id).first
         else
-          "#{val.capitalize}".constantize.find(pbt_id)
+          "#{val.capitalize}".constantize.where(id: pbt_id).first
         end
       else
         nil
@@ -151,7 +151,7 @@ module PolyBelongsTo
 
     # Climb up each parent object in the hierarchy until the top is reached.
     #   This has a no-repeat safety built in.  Polymorphic parents have priority.
-    # @return [Object] top parent ActiveRecord object instace
+    # @return [Object, nil] top parent ActiveRecord object instace
     def pbt_top_parent
       record = self
       return nil unless record.pbt_parent
@@ -193,5 +193,11 @@ module PolyBelongsTo
     def pbt_params_name(allow_as_nested = true)
       self.class.pbt_params_name(allow_as_nested)
     end
+
+    # Return true or false on whether the record is orphaned
+    # @return [Boolean
+    def orphan?
+      pbts.present? && !pbt_parent.present?
+    end
   end
 end

data/lib/poly_belongs_to/version.rb

@@ -1,4 +1,4 @@
 module PolyBelongsTo
   # VERSION follows symantic versioning rules
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/core_test.rb

@@ -180,8 +180,13 @@ class CoreTest < ActiveSupport::TestCase
     end
 
     it "#pbt_parent returns nil if no ID is set for parent relationship" do
-      alpha = Alpha.new; alpha.save
+      alpha = Alpha.new;         alpha.save
+      beta  = alpha.betas.build; beta.save
       alpha.pbt_parent.must_be_nil
+      beta.pbt_parent.wont_be_nil
+      beta.pbt_parent.must_equal alpha
+      squishy = Squishy.create(Squishy.pbt_id_sym => 12345, Squishy.pbt_type_sym => "Address")
+      squishy.pbt_parent.must_be_nil
     end
 
     it "#pbt_top_parent climbs up belongs_to hierarchy to the top; polymorphic relationships first" do
@@ -287,5 +292,19 @@ class CoreTest < ActiveSupport::TestCase
       Squishy.singleton_class.method_defined?(:_pbt_nonpolymorphic_orphans).must_be_same_as false 
       Squishy.method_defined?(:_pbt_nonpolymorphic_orphans).must_be_same_as false 
     end
+
+    it "#orphan? gives boolean if record is orphaned" do
+      Squishy.create(Squishy.pbt_id_sym => 12345, Squishy.pbt_type_sym => "Phone").must_be :orphan?
+      Squishy.create(Squishy.pbt_id_sym => 12345, Squishy.pbt_type_sym => "Address").must_be :orphan?
+      User.create().wont_be :orphan?
+      user = users(:bob)
+      profile = user.profiles.build
+      phone = profile.phones.build
+      profile.save
+      profile.wont_be :orphan?
+      phone.wont_be :orphan?
+      user.wont_be :orphan?
+      Alpha.create.must_be :orphan?
+    end
  end
 end