type-enforcer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69b0b10137e641702abe4e4400e00be63e8b0e10
-  data.tar.gz: b0f90b58d9785ca514e704811f13bb89b46a2bf9
+  metadata.gz: a27db785362b083e806346c71fe4bda84d22d073
+  data.tar.gz: 6fc452f5a0e7d87dccb29f2f5e7ed2047028e894
 SHA512:
-  metadata.gz: 2bd4bcff6ecf474a14881c9c231430eb49c3089b1f12b1cd2586edf45c2340c7fe17bf4cc5e69d9132a7edbc4a1cde291f1818d9ee3d2c315b69be9583c4a1d4
-  data.tar.gz: d9d13c0c6b9154c84b2a4f755daa61f26877531db49cdbfc2575ca0bd6c7aa2937c6467a5e4ed60a9ca2861ebb11a97d5aae7e1a68f466885500b6daa8eb6e79
+  metadata.gz: bd204e0790cec27cb94be37028a1b3c05fe846602756207fa63d9a599ce835abf4bd90ae44f0eb6456abe561de165180d6389d5f0e2c4bd391408548186cdc06
+  data.tar.gz: 09857f101fc4ad5881975dcf82b98f80dfc0065e6fdb00c9e30bc9f5b0f788caf04c1c1b1e80dde01e1feb744ef906a888afd84b26aba3aae43ee4d247e8da93

data/lib/type-enforcer/base.rb

@@ -1,23 +1,39 @@
 module TypeEnforcer
   class Error < StandardError; end
-  class TypeError < StandardError; end
+  class NotFulfilledError < Error; end
+  class NotPresentError < Error; end
 
   refine Object do
-    def enforce(type)
-      case type
-      when Symbol
-        TypeEnforcer.try(type, self) || try(type) ? self : nil
+    def enforce(*args, &block)
+      options = TypeEnforcer.build_options(args, error: nil)
+
+      if block_given?
+        if try(*args, &block)
+          self
+        else
+          TypeEnforcer.raise_or_return(options[:error])
+        end
       else
-        self.acts_as?(type) ? self.try(:convert_to, type) || self : nil
+        case type = args.first
+        when Symbol
+          if TypeEnforcer.try(type, self, *args[1..-1]) || try(*args)
+            self
+          else
+            TypeEnforcer.raise_or_return(options[:error])
+          end
+        else
+          if self.acts_as?(type)
+            self.try(:convert_to, *args) || self
+          else
+            TypeEnforcer.raise_or_return(options[:error])
+          end
+        end
       end
     end
     alias_method :e, :enforce
 
-    def enforce!(type)
-      enforced = enforce(type)
-
-      raise TypeError if enforced.nil?
-      enforced
+    def enforce!(*args, &block)
+      enforce(*args, {error: NotFulfilledError}, &block)
     end
     alias_method :e!, :enforce!
 
@@ -29,18 +45,46 @@ module TypeEnforcer
       !nil?
     end
 
-    def present!
-      raise TypeError if nil?
-      self
+    def present!(error: NotPresentError)
+      unless present?
+        TypeEnforcer.raise_or_return(error)
+      else
+        self
+      end
     end
     alias_method :p!, :present!
 
-    def try(method, *args)
-      send(method, *args) if respond_to?(method)
+    def try(*args)
+      options = TypeEnforcer.build_options(args, rescues: StandardError)
+      begin
+        if block_given?
+          yield(self, *args)
+        else
+          send(*args)
+        end
+      rescue options[:rescues]
+        nil
+      end
     end
 
     def blank?
       nil? || try(:empty?)
     end
   end
+
+  def self.build_options(options, defaults)
+    if options.is_a?(Array)
+      options = options.last.is_a?(Hash) ? options.pop : {}
+    end
+
+    defaults.merge(options)
+  end
+
+  def self.raise_or_return(error)
+    if error.is_a?(Class) && error <= Exception
+      raise error
+    else
+      error
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: type-enforcer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kyle Lacy