fix bug for is_required

ikeqiao
1 parent e8562e57
Showing 2 changed files with 24 additions and 11 deletions Show diff stats
lib/has_magic_fields/extend.rb
spec/has_magic_fields/magic_fileds_spec.rb
 module HasMagicFields
   module Extend extend ActiveSupport::Concern
+    include ActiveModel::Validations
     module ClassMethods
       def has_magic_fields(options = {})
         # Associations
@@ -33,10 +34,8 @@ module HasMagicFields
       def method_missing(method_id, *args)
         super(method_id, *args)
       rescue NoMethodError
-        
         method_name = method_id.to_s
-        attr_names = magic_fields.map(&:name)
-        super(method_id, *args) unless attr_names.include?(method_name) or (md = /[\?|\=]/.match(method_name) and attr_names.include?(md.pre_match))
+        super(method_id, *args) unless magic_field_names.include?(method_name) or (md = /[\?|\=]/.match(method_name) and magic_field_names.include?(md.pre_match))
         if method_name =~ /=$/
           var_name = method_name.gsub('=', '')
@@ -47,6 +46,20 @@ module HasMagicFields
         end
       end
+      def magic_field_names
+        magic_fields.map(&:name)
+      end
+
+      def valid?(context = nil)
+        output = super(context)
+        magic_fields.each do |field| 
+          if field.is_required?
+            validates_presence_of(field.name) 
+          end
+        end
+        errors.empty? && output
+      end
+
       # Load the MagicAttribute(s) associated with attr_name and cast them to proper type.
       def read_magic_attribute(field_name)
         field = find_magic_field_by_name(field_name)
@@ -57,8 +70,8 @@ module HasMagicFields
       def write_magic_attribute(field_name, value)
         field = find_magic_field_by_name(field_name)
-        existing = find_magic_attribute_by_field(field) 
-        (attr = existing.first) ? update_magic_attribute(attr, value) : create_magic_attribute(field, value)
+        attribute = find_magic_attribute_by_field(field) 
+        (attr = attribute.first) ? update_magic_attribute(attr, value) : create_magic_attribute(field, value)
       end
       def find_magic_attribute_by_field(field)
@@ -21,18 +21,18 @@ describe HasMagicFields do
     it "allows setting and saving of magic attributes" do
       @charlie.magic_fields.create(:name => 'salary')
-      @charlie.name = "zhouzongsi"
       @charlie.salary = 50000
       @charlie.save
       @charlie = Person.find(@charlie.id)
       expect(@charlie.salary).not_to be(nil)
     end
-    # it "forces required if is_required is true" do
-    #  # TODO figure out why this fails
-    #  @charlie.magic_fields.create(:name => "last_name", :is_required => true)
-    #  expect(@charlie.save).to be(false)
-    # end
+    it "forces required if is_required is true" do
+     @charlie.magic_fields.create(:name => "last_name", :is_required => true)
+     expect(@charlie.save).to be(false)
+     @charlie.last_name = "zongsi"
+     expect(@charlie.save).to be(true)
+    end
     it "allows datatype to be :date" do
       @charlie.magic_fields.create(:name => "birthday", :datatype => :date)