prim 0.0.5 → 0.0.6

data/lib/prim.rb

@@ -26,6 +26,8 @@ module Prim
       # Store this configuration for global access.
       Prim.configured_primaries << self.prim_relationships[ singular_name ]
 
+      # Create dynamic methods for getting and setting the
+      # primary Collection member.
       define_method "primary_#{ singular_name }" do
         prim_collection_for(singular_name).primary
       end
@@ -33,6 +35,14 @@ module Prim
       define_method "primary_#{ singular_name }=" do |instance|
         prim_collection_for(singular_name).primary = instance
       end
+
+      # We alias the association's method chain so the original can be accessed.
+      # IS THIS IMPORTANT?!
+      define_method "#{ association_name }_with_primaries" do
+        prim_collection_for(singular_name).all
+      end
+
+      alias_method_chain association_name, :primaries
     end
   end
 

data/lib/prim/collection.rb

@@ -15,9 +15,6 @@ module Prim
     def initialize relationship, instance
       @instance     = instance
       @relationship = relationship
-
-      # Attach the relationship to the mapping class.
-      relationship.reflected_class.prim_relationship = relationship
     end
 
     # Loads the primary member of this collection.
@@ -48,6 +45,20 @@ module Prim
       true
     end
 
+    def all options = {}
+      options[:with_primaries] ||= true
+
+      if options[:with_primaries]
+        primary_member = primary
+        sources.tap do |records|
+          records.find { |r| r == primary_member }.try(:primary=, true)
+          records
+        end
+      else
+        sources
+      end
+    end
+
     private
 
     # Creates a new source record and a mapping between it and the owner instance.
@@ -63,12 +74,12 @@ module Prim
       mappings.create( relationship.foreign_key => source_record.id, primary: true )
     end
 
-    def mappings force_reload = false
-      instance.send( relationship.collection_label, force_reload )
+    def mappings
+      instance.association( relationship.collection_label ).proxy
     end
 
-    def sources force_reload = false
-      instance.send( relationship.association_name, force_reload )
+    def sources
+      instance.association( relationship.association_name ).proxy
     end
 
     # Returns the mapping for a given source record. If this Relationship doesn't

data/lib/prim/instance_methods.rb

@@ -5,10 +5,16 @@ module Prim
   module InstanceMethods
 
     module Owner
+      extend ActiveSupport::Concern
+
       def prim_collection_for singular_name
         @_prim_collections ||= {}
         @_prim_collections[ singular_name ] ||= Prim::Collection.new(self.class.prim_relationships[ singular_name ], self)
       end
+
+      included do
+        alias_method :assign_prim_collection_for, :prim_collection_for
+      end
     end
 
     module Reflected
@@ -25,6 +31,8 @@ module Prim
       def only_one_primary
         if self[:primary]
           siblings.update_all('"primary" = false')
+        elsif siblings.where( primary: true ).first.nil?
+          self[:primary] = true
         end
       end
 

data/lib/prim/relationship.rb

@@ -35,6 +35,7 @@ module Prim
 
       reflected_class.send :include, InstanceMethods::Reflected
       reflected_class.class_attribute :prim_relationship
+      reflected_class.prim_relationship = self
 
       source_class.send :include, InstanceMethods::Source if mapping_table?
     end

data/prim.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "prim"
-  s.version     = "0.0.5"
+  s.version     = "0.0.6"
   s.date        = "2013-01-02"
   s.summary     = "Easily manage Rails associations that need a primary member."
   s.description = "With Prim it's easy to add a primary member to any one-to-many or many-to-many association. " +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prim
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: