validatable_associations 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/init.rb

@@ -1 +1,7 @@
+require "validatable_associations/has_one"
+
+require "validatable_associations/mass_assignment"
+require "validatable_associations/association"
+require "validatable_associations/confirmation"
+
 require "validatable_associations"

data/lib/validatable_associations.rb

@@ -4,114 +4,46 @@
 # library. This add-on lets you specify associations to other validatable Classes
 # and allows you to set up a decent validatable structure.
 module ValidatableAssociations
+  include MassAssignment
+  include Association
+  include Confirmation
 
   # ValidatableAssociations::ClassMethods
   #
-  # Includes Class methods for setting up the associations.
+  # Includes Class methods from associations.
   module ClassMethods
-
-    # Reader/writer method for has_one associations. Sets 1-n +associations+
-    # or defaults to return all previously specified associations if no
-    # parameters were given.
-    def has_one(*associations)
-      @has_one = [] unless @has_one
-      return @has_one if associations.empty?
-      @has_one += associations.map { |association| association.to_s }
-    end
-
+    include ValidatableAssociations::HasOne::ClassMethods
   end
 
   def self.included(base) #:nodoc:
     base.extend(ClassMethods)
   end
 
-  # The initialize method handles mass-assignment of a given Hash of
-  # +attributes+ to their instance variables.
-  def initialize(attributes = {})
-    return if !attributes || attributes.empty?
-    attributes.each { |ivar, value| assign_to(ivar, value) }
-  end
-
   # Catches calls to undefined methods. Checks if the +method+ called matches
   # a reader/writer method of an association and handles the read/write process.
   # Delegates to super otherwise.
   def method_missing(method, *args)
-    association_name = association_name_from(method)
-    super unless self.class.has_one.include? association_name
+    method = clean_method_name(method)
 
-    association_to_set = find_or_create_association(association_name, args[0])
-    self.instance_variable_set("@#{association_name}", association_to_set)
-    association_to_set
+    if association? method
+      handle_association(method, args[0])
+    elsif confirmation? method
+      handle_confirmation(method, args[0])
+    else
+      super
+    end
   rescue NameError
     super
   end
 
-  # Returns whether the validations of this model and all associated models
-  # passed successfully.
-  def valid?
-    validate_associations
-    super && associations_valid?
-  end
-
 private
 
-  # Assigns a given +value+ to a given +ivar+. Tries to use the writer method
-  # for the given instance variable and defaults to setting it directly in case
-  # no writer method was found.
-  def assign_to(ivar, value)
-    if assign_via_writer? ivar
-      self.send("#{ivar}=", value)
-    else
-      self.instance_variable_set("@#{ivar}", value)
-    end
-  end
-
-  # Checks whether a given +ivar+ should be assigned via an existing writer
-  # method or directly.
-  def assign_via_writer?(ivar)
-    self.methods.include?("#{ivar}=") || self.class.has_one.include?(ivar)
-  end
-
-  # Takes an +association_name+ and returns an existing association matching
-  # the given name. Instantiates a new association in case it hasn't been
-  # initialized already or in case of given +arguments+.
-  def find_or_create_association(association_name, arguments = nil)
-    if arguments
-      constant_from(association_name).new arguments
-    else
-      association = self.instance_variable_get("@#{association_name}")
-      association = constant_from(association_name).new unless association
-      association
-    end
-  end
-
-  # Validates all models associated with this model and stores the results.
-  def validate_associations
-    @association_validity = self.class.has_one.map do |association|
-      self.send(association).valid?
-    end
-  end
-
-  # Returns whether the validations of all models associated with this model
-  # passed successfully.
-  def associations_valid?
-    !@association_validity.include?(false)
-  end
-
   # Expects the name of a reader/writer +method+ and turns it into a valid
   # name for an association.
-  def association_name_from(method)
-    association_name = method.to_s
-    association_name.slice!(-1) if association_name[-1, 1] == "="
-    association_name
-  end
-
-  # Converts a given +symbol+ from snake_case into an existing Constant.
-  # Note that the constanize method might raise a NameError in case the given
-  # symbol could not be mapped to a Constant.
-  def constant_from(symbol)
-    symbol.to_s.camelize.constantize
+  def clean_method_name(method)
+    name = method.to_s
+    name.slice! -1 if name[-1, 1] == "="
+    name
   end
 
 end
-

data/lib/validatable_associations/association.rb

@@ -0,0 +1,58 @@
+module ValidatableAssociations
+  module Association
+
+      # Returns whether the validations of this model and all associated models
+      # passed successfully.
+      def valid?
+        validate_associations
+        super && associations_valid?
+      end
+
+    private
+
+      # Validates all models associated with this model and stores the results.
+      def validate_associations
+        @association_validity = self.class.has_one.map do |association|
+          self.send(association).valid?
+        end
+      end
+
+      # Returns whether the validations of all models associated with this model
+      # passed successfully.
+      def associations_valid?
+        !@association_validity.include? false
+      end
+
+      # Returns whether a given +method_name+ matches an association.
+      def association?(method_name)
+        self.class.has_one.include? method_name
+      end
+
+      def handle_association(association_name, argument)
+        association_to_set = find_or_create_association(association_name, argument)
+        self.instance_variable_set("@#{association_name}", association_to_set)
+        association_to_set
+      end
+
+      # Takes an +association_name+ and returns an existing association matching
+      # the given name. Instantiates a new association in case it hasn't been
+      # initialized already or in case of given +arguments+.
+      def find_or_create_association(association_name, arguments = nil)
+        if arguments
+          constant_from(association_name).new arguments
+        else
+          association = self.instance_variable_get("@#{association_name}")
+          association = constant_from(association_name).new unless association
+          association
+        end
+      end
+
+      # Converts a given +symbol+ from snake_case into an existing Constant.
+      # Note that the constanize method might raise a NameError in case the given
+      # symbol could not be mapped to a Constant.
+      def constant_from(symbol)
+        symbol.to_s.camelize.constantize
+      end
+
+  end
+end

data/lib/validatable_associations/confirmation.rb

@@ -0,0 +1,29 @@
+module ValidatableAssociations
+  module Confirmation
+
+    private
+
+      def confirmation?(method_name)
+        if method_name[-13, 13] == "_confirmation"
+          method = method_name.dup
+          method.slice!(-13, 13)
+        else
+          method = method_name
+        end
+
+      	self.public_methods.include? method
+      end
+
+      def handle_confirmation(confirmation, argument)
+        return self.instance_variable_get("@#{confirmation}") unless argument
+        
+        if self.public_methods.include? "#{confirmation}="
+          self.send("#{confirmation}=", argument)
+        else
+          self.instance_variable_set("@#{confirmation}", argument)
+        end
+        argument
+      end
+
+  end
+end

data/lib/validatable_associations/has_one.rb

@@ -0,0 +1,18 @@
+module ValidatableAssociations
+  module HasOne
+
+	  module ClassMethods
+
+		  # Reader/writer method for has_one associations. Sets 1-n +associations+
+		  # or defaults to return all previously specified associations if no
+		  # parameters were given.
+		  def has_one(*associations)
+		    @has_one = [] unless @has_one
+		    return @has_one if associations.empty?
+		    @has_one += associations.map { |association| association.to_s }
+		  end
+
+		end
+
+  end
+end

data/lib/validatable_associations/mass_assignment.rb

@@ -0,0 +1,31 @@
+module ValidatableAssociations
+  module MassAssignment
+
+    # The initialize method handles mass-assignment of a given Hash of
+    # +attributes+ to their instance variables.
+    def initialize(attributes = {})
+      return if !attributes || attributes.empty?
+      attributes.each { |ivar, value| assign_to(ivar, value) }
+    end
+
+  private
+
+    # Assigns a given +value+ to a given +ivar+. Tries to use the writer method
+    # for the given instance variable and defaults to setting it directly in case
+    # no writer method was found.
+    def assign_to(ivar, value)
+      if assign_via_writer? ivar
+        self.send("#{ivar}=", value)
+      else
+        self.instance_variable_set("@#{ivar}", value)
+      end
+    end
+
+    # Checks whether a given +ivar+ should be assigned via an existing writer
+    # method or directly.
+    def assign_via_writer?(ivar)
+      self.methods.include?("#{ivar}=") || association?(ivar)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatable_associations
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 +02:00
+date: 2009-10-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,10 @@ files:
 - VERSION
 - init.rb
 - lib/validatable_associations.rb
+- lib/validatable_associations/association.rb
+- lib/validatable_associations/confirmation.rb
+- lib/validatable_associations/has_one.rb
+- lib/validatable_associations/mass_assignment.rb
 - spec/lib/validatable_associations_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true