otoroshi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2993a278f341533c1590cd6bdea9291033167104f94018808577f67cbcd2f0ae
-  data.tar.gz: 725a187567625f428485a80edd5025b0ae7e3a859bebd4d73ea14557353a89ad
+  metadata.gz: 125c31a56b83045874e5c91780c2541b93c73a567914917c2b8d54c38650c32d
+  data.tar.gz: 45869708d77341f0a45cf3fed38f7719cdd50dac6e13cb7dc528fe36ac2b3f10
 SHA512:
-  metadata.gz: c14d31b349b599ff5ef0db40dbaed8723b47bd53de648589ace6ac8ccfeba85b926d263070fe7d13a0746168399508127cd4e3a33df032ff8cfef5d5a9d5380c
-  data.tar.gz: 19311d09a63ee50e89bd3b3c7dead8faeaba0bd1a4803dfba363c422b0c13704fbeb3bb60799cfac9d681736e209d1587b44be76840bc5736aff4822c6cf9c24
+  metadata.gz: 435e9e8988c073ac9c3d8a661c0bdc0030e17118ffb39ca15674b86f6a2ccf9a20d0308a4a126a9c74b0b54aaaee27110e9d6a66d86b99b3f6727f3068484563
+  data.tar.gz: d32b924aa3c1446481a2ada3390783881ef1b66a52db41f4e4beb7e72a596e5a854606276443e6f59bad5527fd69c9c3759cb94a84e2d88e1eee9ab1bb6910ac

data/lib/otoroshi/sanctuary.rb

@@ -5,11 +5,11 @@ module Otoroshi
   class Sanctuary
     class << self
       # Add a new property to the class (called by inherited class)
-      # Example: property name, type: String, validate: ->(v) { v.length > 3 }, optional: true
-      def property(name, type = Object, validate: ->(_) { true }, optional: false, default: nil)
+      # Example: property name, type: String, validate: ->(v) { v.length > 3 }, allow_nil: true
+      def property(name, type = Object, validate: ->(_) { true }, allow_nil: false, default: nil)
         define_default(name, default)
-        define_validate_type!(name, type, optional)
-        define_validate!(name, validate, optional)
+        define_validate_type!(name, type, allow_nil)
+        define_validate!(name, validate, allow_nil)
         define_getter(name)
         define_setter(name)
         add_to_properties(name)
@@ -49,19 +49,19 @@ module Otoroshi
       # ::define_validate_type!("score", Integer, false)
       # ----------------------------------------------
       # def validate_score_type!(value)
-      #   return if optional && value.nil?
+      #   return if allow_nil && value.nil?
       #   return if value.is_a?(Integer)
       #
-      #   raise ArgumentError, ":score does not match type validation"
+      #   raise ArgumentError, ":score does not match required type"
       # end
       #
-      def define_validate_type!(name, type, optional)
+      def define_validate_type!(name, type, allow_nil)
         lambda = type_validation(type)
         define_method :"validate_#{name}_type!" do |value|
-          return if type.nil? || optional && value.nil?
+          return if type.nil? || allow_nil && value.nil?
           return if lambda.call(value)
 
-          raise ArgumentError, ":#{name} does not match type validation"
+          raise ArgumentError, ":#{name} does not match required type"
         end
         private :"validate_#{name}_type!"
       end
@@ -91,9 +91,9 @@ module Otoroshi
       #   raise ArgumentError, ":score does not match validation"
       # end
       #
-      def define_validate!(name, validate, optional)
+      def define_validate!(name, validate, allow_nil)
         define_method :"validate_#{name}!" do |value|
-          return if optional && value.nil?
+          return if allow_nil && value.nil?
           return if instance_exec(value, &validate)
 
           raise ArgumentError, ":#{name} does not match validation"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otoroshi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Edouard Piron