associates 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1de008a6d97d2dbf9f02295947c05d758d519191
-  data.tar.gz: 53485eb8cab825705f024869bd53c78417c441c4
+  metadata.gz: bfcebdf85b7fd77eaf150b1c7dcb688f89c1ade3
+  data.tar.gz: 76ee2577e6119a1d6c8dc02d775b5a1f0c31ec94
 SHA512:
-  metadata.gz: 0153eb8ef6935fc08ec4de4a53d126bf441d1500b1e32662d16203f806eb43cdf5f7a995d0763ef1fe09218fa9abeb1be9e23c1a0384217c02504f8b98749cd8
-  data.tar.gz: 2a37522a4e24f6ca6c3971d147c8d02c4d736e6e930e611e7b74f1c10163440c3b92eb08564dbf81098402f9a8b5eebbbfbb76adbd5d33397c2afcc01c7b726d
+  metadata.gz: a76d3020c9f42ffff29c6b3aa37fa15edb15f48bfa6eb7b67cffd0de32114b0775873629933b25b29217ac3d0a240a10699722a8aff2a6bc4b0d1ee4b01a3789
+  data.tar.gz: a37bdff086f8b109ee45287640e5a3e345079cb4aa34afeff1d999b45178446c8759416d9c7d011048f0b0db4d4dbdf9992baf735ee92e86f18694c488d8e321

data/lib/associates.rb

@@ -69,45 +69,67 @@ module Associates
     # @param options [Hash]
     # @return [Item]
     def build_associate(model, options = {})
-      model_name             = model.to_s.underscore
-      model_klass            = (options[:class_name] || model).to_s.classify.constantize
-      dependent_models_names = extract_attributes(options[:depends_on]) || []
-      dependent_models_names = dependent_models_names.map(&:to_s)
+      model_name                = model.to_s.underscore
+      model_klass               = (options[:class_name] || model).to_s.classify.constantize
+      dependent_associate_names = (extract_attributes(options[:depends_on]) || []).map(&:to_s)
+      attribute_names           = extract_attribute_names(model_klass, options)
 
-      if options[:only]
-        attribute_names = extract_attributes(options[:only])
-      else
-        excluded = BLACKLISTED_ATTRIBUTES.to_a
-
-        if options[:except]
-          excluded += extract_attributes(options[:except]).map(&:to_s)
-        end
+      ensure_name_uniqueness(associates.map(&:name), model_name)
+      ensure_attribute_uniqueness(associates.map(&:attribute_names), attribute_names) if options[:delegate]
+      ensure_dependent_names_existence(associates.map(&:name), dependent_associate_names)
 
-        attribute_names = model_klass.attribute_names.reject { |name| excluded.include?(name) }
-      end
+      Item.new(model_name, model_klass, attribute_names, dependent_associate_names, options)
+    end
 
-      # Ensure associate name don't clash with already declared ones
-      if associates.map(&:name).include?(model_name)
+    # Ensure associate name don't clash with already declared ones
+    #
+    # @param associates_names [Array]
+    # @param name [String]
+    def ensure_name_uniqueness(associates_names, name)
+      if associates_names.include?(name)
         raise NameError, "already defined associate name '#{model_name}' for #{name}(#{object_id})"
       end
+    end
 
-      # Ensure associate attribute names don't clash with already declared ones
-      if options[:delegate]
-        attribute_names.each do |attribute_name|
-          if associates.map(&:attribute_names).include?(attribute_name)
-            raise NameError, "already defined attribute name '#{attribute_name}' for #{name}(#{object_id})"
-          end
+    # Ensure associate attribute names don't clash with already declared ones
+    #
+    # @param associates_attribute_names [Array]
+    # @param attribute_names [Array]
+    def ensure_attribute_uniqueness(associates_attribute_names, attribute_names)
+      attribute_names.each do |attribute_name|
+        if associates_attribute_names.include?(attribute_name)
+          raise NameError, "already defined attribute name '#{attribute_name}' for #{name}(#{object_id})"
         end
       end
+    end
 
-      # Ensure associate dependent names exists
-      dependent_models_names.each do |dependent_name|
-        unless associates.map(&:name).include?(dependent_name)
+    # Ensure associate dependent names exists
+    #
+    # @param associates_names [Array]
+    # @param dependent_associate_names [Array]
+    def ensure_dependent_names_existence(associates_names, dependent_associate_names)
+      dependent_associate_names.each do |dependent_name|
+        unless associates_names.include?(dependent_name)
           raise NameError, "undefined associated model '#{dependent_name}' for #{name}(#{object_id})"
         end
       end
+    end
+
+    # @param model_klass [Class]
+    # @param options [Hash]
+    # @return [Array]
+    def extract_attribute_names(model_klass, options)
+      if options[:only]
+        extract_attributes(options[:only])
+      else
+        excluded = BLACKLISTED_ATTRIBUTES.to_a
+
+        if options[:except]
+          excluded += extract_attributes(options[:except]).map(&:to_s)
+        end
 
-      Item.new(model_name, model_klass, attribute_names, dependent_models_names, options)
+        model_klass.attribute_names.reject { |name| excluded.include?(name) }
+      end
     end
 
     # Define associated model attribute methods delegation

data/lib/associates/persistence.rb

@@ -27,6 +27,13 @@ module Associates
       end
     end
 
+    # @return [Boolean] Wether or not all models are persited
+    def persisted?
+      associates.all? do |associate|
+        send(associate.name).send(:persisted?)
+      end
+    end
+
     # @return [True, ActiveRecord::RecordInvalid]
     def save!
       save || raise(ActiveRecord::RecordInvalid)

data/lib/associates/version.rb

@@ -1,3 +1,3 @@
 module Associates
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: associates
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Philippe Dionne
@@ -30,7 +30,7 @@ cert_chain:
   DuNlzvjhWtPDwE5mYO5x5XquWQuENw78urt1aioNrIe0/15dHpDoIEDILa6zU46B
   XDtp1YxdeVGIBuNoP1vjDSvNKYj0pMjRAEPrqK39jKE=
   -----END CERTIFICATE-----
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord