Checked 1.2.3 → 2.0.0

data/lib/Checked/Demand/Arrays.rb

@@ -1,78 +1,73 @@
-module Checked
+class Checked
   class Demand
-    class Arrays
+    class Arrays < Sinatra::Base
 
-      include Uni_Arch::Base
-      include Demand::Base
-      namespace '/array!'
+      include Checked::Arch
+      map '/array!'
       
-      route
+      get
       def check!
-        fail! "...is not an Array." unless array?(target)
+        array! return!
       end
 
-      route
+      get
       def no_nils!
-        if target.include?(nil)
-          fail!("...can't contain nils.")
-        end
+        demand \
+          return!.include?(nil), \
+          "...can't contain nils."
       end
 
-      route
+      get
       def no_empty_strings!
-        target.each { |s| 
-
-          if s.respond_to?(:rewind) 
-            s.rewind
-          end
+        return!.each { |memo,s| 
 
           final = if s.respond_to?(:readlines)
+                    s.rewind
                     s.readlines
                   else
                     s
                   end
 
-          if !final.is_a?(::String)
-            fail!("Array contains unknown class: #{final.inspect}")
-          end
-          
-          if final.is_a?(String) && final.strip.empty?
-            fail!("...can't contain empty strings.")
-          end
+          demand \
+            final.is_a?(::String), \
+            "...can't contain unknown class: #{final.inspect}"
+            
+          demand \
+            final.is_a?(::String) && final.strip.empty?, \
+            "...can't contain empty strings."
+            
         }
+        return!
       end
 
-      route
+      get
       def symbols!
-        not_empty!
-        if !target.all? { |v| v.is_a?(Symbol) }
-          fail! "...contains a non-symbol."
-        end
+        Checked::App.new.get!("/array!/not_empty!", 'name'=>target_name, 'value'=>return!, 'args'=>[])
+        demand \
+          return!.all? { |v| v.is_a?(Symbol) }, \
+          "...contains a non-symbol."
       end
 
-      route
+      get
       def include! 
-        return true if target.include?(matcher)
-        fail!("...must contain: #{matcher.inspect}")
+        demand return!.include?(matcher), \
+          "...must contain: #{matcher.inspect}"
       end
 
-      route
+      get
       def exclude! 
-        raise_e = val.include?(matcher)
-        return true unless raise_e
-        fail!("...can't contain #{matcher.inspect}")
+        demand val.include?(matcher), "...can't contain #{matcher.inspect}"
       end
 
-      route
+      get
       def matches_only! 
-        arr = target.reject { |val| val == matcher }
-        fail!( "...invalid elements: #{arr.inspect}" ) if !arr.empty?
+        demand \
+          return!.reject { |val| val == matcher }.empty?, \
+          "...invalid elements: #{arr.inspect}"
       end
       
-      private
-
 
     end # === class Arrays
   end # === class Demand
-end # === module Checked
+end # === class Checked
 

data/lib/Checked/Demand/Bools.rb

@@ -1,28 +1,30 @@
-module Checked
+class Checked
   class Demand
-    class Bools
+    class Bools < Sinatra::Base
         
-      include Uni_Arch::Base
-      include Demand::Base
-      namespace '/bool!'
+      include Checked::Arch
+      map '/bool!'
 
-      route
+      get
       def check!
-        fail!("...must be either of TrueClass or FalseClass.") unless [TrueClass, FalseClass].include?(target.class)
+        is_bool = [TrueClass, FalseClass].include?(return!.class)
+        demand is_bool, "...must be either of TrueClass or FalseClass."
       end
       
-      route
+      get
       def true!
-        fail! "...must be true (TrueClass)." unless target.class == TrueClass
+        is_true = return!.class == TrueClass
+        demand is_true, "...must be true (TrueClass)." 
       end
       
-      route 
+      get 
       def false!
-        fail! "...must be false (FalseClass)." unless target.class == FalseClass
+        is_false = return!.class == FalseClass
+        demand is_false, "...must be false (FalseClass)." 
       end
 
     end # === class Bools
   end # === class Demand
-end # === module Checked
+end # === class Checked
         
 

data/lib/Checked/Demand/Demand.rb

@@ -1,47 +1,12 @@
 
-
-module Checked
+class Checked
   class Demand
-
     Failed = Class.new(RuntimeError)
-
-    module Base
-      
-      include Checked::Base
-      
-      def err_msg msg = "...is invalid."
-        message = if msg.strip[ %r!^\.\.\.! ]
-                    msg.sub('...', '').strip
-                  else
-                    msg
-                  end
-      
-        t = if original_target != target
-              "#{original_target.inspect} (#{target})"
-            else
-              original_target.inspect
-            end
-        @err_msg || "#{target_name}, #{t}, #{message}"
-      end
-
-      def err_msg= msg
-        demand! msg, :string!, :not_empty!
-        @err_msg = msg
-      end
-      
-      private # ==========================================
-
-      def fail! msg
-        raise Failed, err_msg(msg)
-      end
-
-    end # === module Base
-    
+        
     def initialize *args
       raise "Demand not allowed to be used."
     end
-    
-  end # === class Demand
-end # === module Checked
+  end # === class Demand  
+end # === class Checked
 
 

data/lib/Checked/Demand/File_Paths.rb

@@ -1,48 +1,47 @@
-module Checked
+class Checked
   class Demand
-    class File_Paths
+    class File_Paths < Sinatra::Base
       
-      include Uni_Arch::Base
-      include Demand::Base
-      namespace '/file_path!'
+      INVALID_CHARS = %r!([^a-zA-Z0-9\.\_\-\/~,]+)!
+      include Checked::Arch
+      map '/file_path!'
       
-      route
+      get
       def check!
-        fail!('...must be a String.') unless target.is_a?(String)
+        string! return!
+        
+        return! return!.strip
+        not_empty! return!
         
-        strip_target
-        not_empty!
         validate_format!
-        expand_target if fs_path?
+        expand_target if File.exists?(File.expand_path return!)
+        
+        return! 
       end
 
-      route
+      get
       def not_dir!
-        if File.directory?(target)
-          fail! "...can't be an existing directory."
-        end
+        demand !File.directory?(return!), "...can't be an existing directory."
       end
 
-      route
+      get
       def not_file!
-        fail! "...can't be a file." if File.file?(target)
+        demand !File.file?(return!), "...can't be a file."
       end
 
-      route
+      get
       def dir!
-        fail! "...must be an existing directory." unless File.directory?(target)
+        demand File.directory?(return!), "...must be an existing directory." 
       end
 
       private 
 
       def validate_format!
-        if target[%r!([^a-zA-Z0-9\.\_\-\/~,]+)!]
-          fail! "...has invalid characters: #{$1.inspect}"
-        end
+        demand !( return![INVALID_CHARS] ), "...has invalid characters: #{$1.inspect}"
       end
       
       def expand_target
-        request.response.body= File.expand_path(target)
+        return! File.expand_path(return!)
       end
 
       # 
@@ -54,5 +53,5 @@ module Checked
 
     end # === class File_Addresses
   end # === class Demand
-end # === module Checked
+end # === class Checked
 

data/lib/Checked/Demand/Hashs.rb

@@ -1,29 +1,24 @@
-module Checked
+class Checked
   class Demand
-    class Hashs
+    class Hashs < Sinatra::Base
       
-      include Uni_Arch::Base
-      include Demand::Base
-      namespace '/hash!'
+      
+      include Checked::Arch
+      map '/hash!'
 
-      route
+      get
       def check!
-        fail!("...must be a Hash") unless hash?(target)
+        demand hash?(return!), "...is not a Hash."
       end
 
-      route
+      get
       def symbol_keys!
-        keys = target.keys
-
-        if keys.all? { |k| k.is_a?(Symbol) }
-          # do nothing
-        else
-          fail! '...must have all symbol keys.'
-        end
+        all_syms = return!.keys.all? { |k| k.is_a?(Symbol) }
+        demand all_syms, '...must have all symbol keys.'
       end
 
     end # === class Hashs
   end # === class Demand
-end # === module Checked
+end # === class Checked
 
 

data/lib/Checked/Demand/Strings.rb

@@ -1,77 +1,72 @@
 
-module Checked
+class Checked
   class Demand
-    class Strings
+    class Strings < Sinatra::Base
 
-      include Uni_Arch::Base
-      include Demand::Base
-      namespace '/string!'
+      include Checked::Arch
+      map '/string!'
       
-      route
+      get
       def check!
-        case target
+        case return!
         when String
+          
+          return!
         when StringIO
           target.rewind
-          request.response.body= target.readlines
+          return! target.readlines
           target.rewind
+          
+          return!
         else
-          fail! "...must be a String or StringIO"
+          demand false, "...must be a String or StringIO."
         end
       end
 
-      route
+      get
       def include!
-        included = target[matcher]
-        return true if included
-        fail!("...must contain: #{matcher.inspect}")
+        demand return![matcher], "...must contain: #{matcher.inspect}"
       end
 
-      route
+      get
       def exclude! matcher
-        raise_e = val[matcher]
-        return true unless raise_e
-        fail!("...can't contain #{matcher.inspect}")
+        demand !(return![matcher]), "...can't contain #{matcher.inspect}"
       end
 
-      route
+      get
       def matches_only!
-        str = target.gsub(matcher, '')
-        if !str.empty?
-          fail!( "...has invalid characters: #{str.inspect}" ) 
-        end
+        invalid = return!.gsub(matcher, '')
+        demand invalid.empty?, "...has invalid characters: #{str.inspect}" 
       end
 
-      route
+      get
       def not_empty!
-        if target.strip.empty? 
-          fail!("...can't be empty.") 
-        end
+        demand !(return!.strip.empty?), "...can't be empty."
       end
 
-      route
+      get
       def file_read!
-        request.response.body= target.gsub("\r\n", "\n")
+        return!.gsub("\r\n", "\n")
       end
       
-      route
+      get
       def new_content!
         not_empty!   
         file_read!
       end
 
-      route
+      get
       def file_content! 
         new_content!
       end
 
-      route
+      get
       def hostname!
-        puts target
-        fail!("...has invalid characters: #{$1.inspect}") if target[ %r!([^\dA-Za-z_-]+)! ]
+        invalid = return![ %r!([^\dA-Za-z_-]+)! ]
+        demand !invalid, "...has invalid characters: #{$1.inspect}"
       end
 
     end # === class String
   end # === class Demand
-end # === module Checked
+end # === class Checked
 

data/lib/Checked/Demand/Symbols.rb

@@ -1,28 +1,22 @@
 
-module Checked
+class Checked
   class Demand
-    class Symbols
+    class Symbols < Sinatra::Base
 
-      include Uni_Arch::Base
-      include Demand::Base
-      namespace '/symbol!'
+      include Checked::Arch
+      map '/symbol!'
       
-      route
+      get
       def check!
-        case target
-        when Symbol
-        else
-          fail! '...must be a Symbol.'
-        end
+        demand return!.is_a?(Symbol), '...must be a symbol.'
       end
       
-      route 
-      def in! arr
-        fail! "...must be in array: #{arr}" unless arr.include?(target)
+      get 
+      def in! 
+        arr = args_hash['args'].first
+        demand arr.include?(return!), "...must be in array: #{arr}"
       end # === def in!
       
-      
-
     end # === class Symbols
   end # === class Demand
-end # === module Checked
+end # === class Checked

data/lib/Checked/Demand/Vars.rb

@@ -1,62 +1,102 @@
-module Checked
+class Checked
   class Demand
-    class Vars
+    class Vars < Sinatra::Base
       
-      include Uni_Arch::Base
-      include Demand::Base
-      namespace '/var!'
+      include Checked::Arch
+      
+      map '/:type!'
+
+      get 
+      def not_empty!
+        demand !return!.empty?, "...can't be empty."
+      end
+
+      get 
+      def be! 
+        meth, vals = args_hash['args']
+        answer = return!.send meth, *vals
+        bool! answer
+        demand answer, "...failed #{meth} with #{vals.inspect}"
+      end
+
+      get
+      def not_be! 
+        meth, vals = args_hash['args']
+        answer = return!.send(meth, *vals)
+        bool! answer
+        demand !answer, "...#{meth} should not be true with #{vals.inspect}"
+      end
+
+      get
+      def empty!
+        demand return!.empty?, "...must be empty."
+      end
+
+      get
+      def not_empty!
+        demand !return!.empty?, "...can't be empty."
+      end
+
+      map '/var!' # ===============================
+      
+      get
+      def check!
+        return!
+      end
 
-      route
+      get
       def either! 
-        request.headers.args.flatten.detect { |m|
+        answer = args_hash['args'].flatten.detect { |m|
           begin
-            target.send m
+            return!.send m
             true
           rescue Failed
             false
           end
         }
+        demand answer, "...is not any: #{args_hash['args'].inspect}"
       end
 
-      route
+      get
       def be!
-        rejected = request.headers.args.flatten.select { |m|
-          !(target.send m)
+        rejected = args_hash['args'].flatten.select { |m|
+          !(return!.send m)
         }
-        fail!("...must be: #{rejected.map(&:to_s).join(', ')}") unless rejected.empty?
+        demand rejected.empty?, "...must be all of these: #{rejected.map(&:to_s).join(', ')}"
       end
       
-      route
+      get
       def not_be!
-        rejected = request.headers.args.flatten.select { |m|
-          !!(target.send m)
+        rejected = args_hash['args'].flatten.select { |m|
+          !!(return!.send m)
         }
-        fail!("...must not be: #{rejected.map(&:to_s).join(', ')}") unless rejected.empty?
+        demand rejected.empty?, "...must not be: #{rejected.map(&:to_s).join(', ')}"
       end
 
-      route
+      get
       def one_of! 
-        klasses = request.headers.args
-        return true if klasses.flatten.any? { |k| target.is_a?(k) }  
-        fail! "...can only be of class/module: #{klasses.map(&:to_s).join(', ')}"
+        klasses = args_hash['args']
+        demand \
+          klasses.flatten.any? { |k| return!.is_a?(k) }, \
+          "...can only be of class/module: #{klasses.map(&:to_s).join(', ')}"
       end
 
-      route
+      get
       def nil!
-        fail!("...must be nil.") unless target.nil?
+        demand return!.nil?, "...must be nil."
       end
 
-      route
+      get
       def not_nil!
-        fail!("...can't be nil.") if target.nil?
+        demand !return!.nil?, "...can't be nil." 
       end
 
-      route
+      get
       def respond_to! 
-        rejected = request.headers.args.reject { |m|
-          !target.respond_to?(m)
+        rejected = args_hash['args'].reject { |m|
+          !return!.respond_to?(m)
         }
-        fail!("...must respond to #{rejected.inspect}") unless rejected.empty?
+        demand rejected.empty?, "...must respond to #{rejected.inspect}"
       end
 
     end # === class Vars

data/lib/Checked/version.rb

@@ -1,3 +1,5 @@
-module Checked
-  VERSION = "1.2.3"
+require 'Sin_Arch'
+
+class Checked < Sinatra::Base
+  VERSION = "2.0.0"
 end