validates_nested_uniqueness 0.9.0 → 0.9.1

data/lib/validates_nested_uniqueness.rb

@@ -7,22 +7,52 @@ module ActiveModel
 
       def initialize(options)
         super(options)
-        @klass = options[:class]
-        @association = options[:association]
+        @klass =        get_class_name(options[:scope])
+        @association =  options[:association]
+        @message =      options[:message]
       end
 
       def validate_each(record, attribute, value)
-        parent = nil
-        ObjectSpace.each_object(eval(@klass)) { |r| parent = r if r.try(@association).include?(record) }
-        if parent
-          count = parent.try(@association).to_a.count { |r| r[attribute] == record[attribute] }
-          if count > 1
-            record.errors.add(attribute, 'duplicate', :value => 'val')
+        
+        # working on trying to use conventions to determine association
+        # also, if has only one belongs_to, can use that as a default.
+        #puts record.class.name.underscore.to_sym
+        #puts(eval(@klass).reflect_on_association(record.class.name.underscore.to_sym))
+        
+        if parent = get_parent(record)
+          if get_child_count(parent, record, attribute) > 1
+            record.errors.add(attribute, 
+                              @message, 
+                              :value => record[attribute] )
           end
         end
       end
+      
+      # Gets a class name from a symbol.
+      def get_class_name(sym)
+        sym.to_s.split('_').collect(&:capitalize).join
+      end
+      
+      # Searches ObjectSpace for the parent object of record.
+      #
+      # It looks at all objects for the given class, then checks
+      def get_parent(record)
+        parent = nil
+        ObjectSpace.each_object(eval(@klass)) { |r| 
+          parent = r if r.try(@association).include?(record) 
+        }
+        parent
+      end
+      
+      # Searches the parent for duplicate children.
+      # A duplicate is defined as another child with an equivilant
+      # attribute.
+      def get_child_count(parent, record, attribute)
+        count = parent.try(@association).to_a.count { |r| 
+          r[attribute] == record[attribute] 
+        }
+      end
 
     end
-
   end
 end

data/lib/validates_nested_uniqueness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesNestedUniqueness
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_nested_uniqueness
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -50,8 +66,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/validates_nested_uniqueness/version.rb
 - lib/validates_nested_uniqueness.rb
+- lib/validates_nested_uniqueness/version.rb
 homepage: http://github.com/kstevens715/validates_nested_uniqueness
 licenses: []
 post_install_message: 
@@ -72,8 +88,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Validates uniqueness of has_many children
 test_files: []
+has_rdoc: