datoki 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397ce11ce7b856de259198ac22633a0624fa971e
-  data.tar.gz: bb53e10c2760b096e7a56fee2a89fc93cbac2b22
+  metadata.gz: f8ba5eae546ee0b466bbb634b3b05203ad3cfef1
+  data.tar.gz: c5fca1d1cc64342d30538e9850b16c2995d55dd2
 SHA512:
-  metadata.gz: 48265561168ce8dd52640b1dfd5b2a709cc6201e052922b3a664377590b4ca6b1b8665f704b44a1c00811d030823cef13302bc698998e106ac6889f62decea2d
-  data.tar.gz: 7a0ab44c107a3abea4d8173fed8e54a590e7ba9453aca9c27959b7547c2919141c53da09fdea10bfcde9e0c6a69f126a8159e04fcf2e7d8b570b202e69d53fa3
+  metadata.gz: f356726aa8abe2b29ec6bfd0ff86594d81621e8bdbde5276d60aec70dc85aab1288c13893a6505f053f14d1c8d57f049707c39fdb93ce1db1fbfc51c33f90d7c
+  data.tar.gz: 49c0f8bbbd20b2785c2be44bea06f650e76cc01a8b30783c524fc2ab278ff3a4ae94010a74bf3b467ee1d3aeab341647a958aaedd9573565ea3c653d4a2d09a2

data/README.md

@@ -20,7 +20,7 @@ A Ruby gem for managing validation and records using PostgreSQL.
     on :create_or_update? do
 
       on :create? do
-        clean :name!, :desc
+        clean :name, :desc
       end
 
       on :update? do

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/datoki.rb

@@ -468,7 +468,6 @@ module Datoki
         @data.default_proc = Key_Not_Found
       else
         @raw = unknown
-        @raw.default_proc = Key_Not_Found
       end
     end
 
@@ -498,11 +497,17 @@ module Datoki
         }
       end
 
+      schema = self.class.schema
       if create?
+        # === Did the programmer forget to set the value?:
         self.class.fields.each { |k, meta|
-          if !clean.has_key?(k) && !meta[:allow][:null] && !meta[:primary_key]
+          has_default = schema[k] && schema[k][:default]
+          if clean[k].nil? && !meta[:allow][:null] && !meta[:primary_key] && !has_default
             fail ArgumentError, "#{k.inspect} is not set."
           end
+
+          # === Should we let the DB set the value?
+          @clean.delete(k) if @clean[k].nil? && has_default
         }
       end
 
@@ -528,48 +533,32 @@ module Datoki
   end
 
   def clean *args
-    if args.empty?
-      @clean ||= begin
-                   h = {}
-                   h.default_proc = Key_Not_Found
-                   h
-                 end
-      return @clean
-    end
+    @clean ||= {}
+
+    return @clean if args.empty?
 
+    # === Handle required fields:
+    # Example:
+    #   :name!, :age!
     if args.size > 1
       return args.each { |f| clean f }
     end
 
-    name     = args.first
-    required = false
+    name = args.first
 
-    if self.class.fields_as_required[name]
-      name = self.class.fields_as_required[name]
-      required = true
-    end
-
-    field_name(name)
-    f_meta   = self.class.fields[name]
-    required = true if (!field[:allow][:null] && (!@raw.has_key?(name) || @raw[name] == nil))
-
-    # === Did the programmer forget to set the value?:
-    if required && (!@raw.has_key?(name) || @raw[name].nil?)
-      fail ArgumentError, "#{name.inspect} is not set."
+    if (real_name = self.class.fields_as_required[name]) && @raw[real_name].nil? && @clean[real_name].nil?
+      fail ArgumentError, "#{real_name.inspect} is not set."
+    else
+      name = real_name || name
     end
 
-    # === Skip this if nothing is set and is null-able:
-    if !required && field[:allow][:null] && !@raw.has_key?(name) && !clean.has_key?(name)
-      return nil
-    end
+    @clean[name] = @raw[name] if !clean.has_key?(name) && @raw.has_key?(name)
 
-    clean[name] = @raw[name] unless clean.has_key?(name)
+    # === Skip cleaning if key is not set:
+    return nil unless @clean.has_key?(name)
 
-    # === Should we let the DB set the value?
-    if self.class.schema[name] && self.class.schema[name][:default] && (!clean.has_key?(name) || !clean[name])
-      clean.delete name
-      return self.class.schema[name][:default]
-    end
+    field_name(name)
+    f_meta = self.class.fields[name]
 
     # === Strip the value:
     if clean[name].is_a?(String) && field[:allow][:strip]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datoki
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - da99