Checked 2.0.2 → 3.0.0

data/Checked.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "Sin_Arch"
-  
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bacon'
   s.add_development_dependency 'Bacon_Colored'

data/lib/Checked/All.rb

@@ -0,0 +1,34 @@
+
+class Checked
+  module All
+
+    include Checked::Arch
+
+    def be! *args
+      meth, vals = args
+      answer = return!.send meth, *vals
+      bool! answer
+      demand answer, "...failed #{meth} with #{vals.inspect}"
+    end
+
+    def not_be! *args
+      meth, vals = args
+      answer = return!.send(meth, *vals)
+      bool! answer
+      demand !answer, "...#{meth} should not be true with #{vals.inspect}"
+    end
+
+    def empty!
+      demand return!.empty?, "...must be empty."
+    end
+
+    def not_empty! *args
+      if args.empty?
+        demand !return!.empty?, "...can't be empty."
+      else
+        super
+      end
+    end
+
+  end # === class All
+end # === module Checked

data/lib/Checked/Arch.rb

@@ -1,12 +1,41 @@
 class Checked
 
   module Arch
+    
+    module Class_Methods
+      def map name
+        @map = name
+      end
+    end # === module Class_Methods
+    
+    def self.included klass
+      klass.extend Class_Methods
+    end
+    
     include DSL::Racked
+    
+    def initialize *args
+      @target = nil
+      super
+    end
+    
+    def request
+      self
+    end
 
-    def self.included klass
-      klass.send :include, Sin_Arch::Arch
+    def env
+      @env ||= {}
+    end
+
+    def return! val = :return_it
+      return @target if val === :return_it
+      @target = val
     end
     
+    def target_name= val
+      request.env['target_name'] = val
+    end
+
     def target_name
       request.env['target_name']
     end
@@ -14,16 +43,6 @@ class Checked
     def original_target
       request.env['original_target']
     end
-
-    def matcher
-      @matcher ||= begin
-                    m = args_hash['args'].first
-                    if !m
-                      raise Sin_Arch::Missing_Argument, "Missing argument for matcher."
-                    end
-                    m
-                   end
-    end
     
     #
     # ::Checked::Demand::Arrays => demand
@@ -43,8 +62,8 @@ class Checked
       return! return!.strip
     end
 
-    def not_empty_args!
-      not_empty! args_hash['args']
+    def not_empty_args! *args
+      not_empty! args
     end
       
     def fail! raw_msg

data/lib/Checked/Ask/Arrays.rb

@@ -1,31 +1,22 @@
 
 
 class Checked
-  class Ask
-    class Arrays < Sinatra::Base
+  
+  class Arrays
 
-      include Checked::Arch
+    def symbols?
+      return false if return!.empty?
+      return!.all? { |val| val.is_a? Symbol }
+    end 
 
-      map '/array!'
+    def include_all? *args
+      return!.include_all?(*args)
+    end
 
-      get
-      def symbols?
-        return false if return!.empty?
-        return!.all? { |val| val.is_a? Symbol }
-      end 
-      
-      get
-      def include? 
-        return!.include?(*args_hash['args'])
-      end
+    def exclude_all? *args
+      !return!.detect { |v| args.include?(v) }
+    end
 
-      get
-      def exclude? 
-        !return!.include?(*args_hash['args'])
-      end
-      
-    end # === class Arrays
+  end # === class Arrays
 
-
-  end # === class Ask
 end # === class Checked

data/lib/Checked/Ask/Strings.rb

@@ -1,12 +1,6 @@
 
 class Checked
-  class Ask
-    class Strings < Sinatra::Base
+  class Strings
 
-      include Checked::Arch
-
-      map '/string!'
-
-    end # === class Strings
-  end # === class Ask
+  end # === class Strings
 end # === class Checked

data/lib/Checked/Ask/Vars.rb

@@ -1,30 +1,22 @@
 
 class Checked
-  class Ask
-    class Vars < Sinatra::Base
-      
-      include Checked::Arch
+  class Vars
 
-      map '/var!'
+    def respond_to_all? *args
+      arr = not_empty!( args.flatten )
+      
+      arr.all? { |a|
+        return!.respond_to? a
+      }
+    end
 
-      get
-      def respond_to_all?
-        a = not_empty_args!
+    def respond_to_any? *args
+      arr = not_empty!(args)
 
-        a.all? { |a|
-          return!.respond_to? a
-        }
-      end
+      arr.any? { |a|
+        return!.respond_to? a
+      }
+    end
 
-      get
-      def respond_to_any?
-        a = not_empty_args!
-        
-        a.any? { |a|
-          return!.respond_to? a
-        }
-      end
-      
-    end # === class Vars
-  end # === class Ask
+  end # === class Vars
 end # === class Checked

data/lib/Checked/Clean/Strings.rb

@@ -1,100 +1,69 @@
 
 class Checked
-  class Clean
-    class Strings < Sinatra::Base
-
-      include Checked::Arch
-      
-      private
-      def strippable_route?
-        params['name'][%r![^\?\!]\Z!] && !%w{chop_slash_r}.include?(params['name'])
-      end
-
-      public
-
-      map '/string!'
-
-      before '/:name' 
-      def strip_val 
-        return!( return!.strip ) if strippable_route?
-      end
-
-      get
-      def untar
-        return!
-        .sub(/\.tar\.gz$/, '')
-        .sub(/\.tar/, '')
-      end
-
-      get
-      def file_names 
-        ( return!.split.select { |word| word[matcher] } )
-      end 
-
-      get
-      def file_names_by_ext  
-        names = file_names
-        bases = file_names.map { |s|
-          s.sub(%r!#{matcher}$!, '')
-        }
-
-        names.zip bases
-      end
-
-      get
-      def shell 
-         return!
-        .split("\n")
-        .map(&:strip)
-        .reject { |line| line.empty? }
-        .join(' && ')
-      end
-
-      get
-      def chop_ext
-         return!.sub /\.[^\.]+$/, ''
-      end
-
-      get
-      def ruby_name
-        File.basename chop_rb
-      end
-
-      get
-      def chop_rb
-         return!.sub %r!\.rb$!, '' 
-      end
-
-      get
-      def chop_slash_r
-        return!.gsub "\r", ''
-      end
-
-      get
-      def os_stardard
-        chop_slash_r
-      end
-
-      get
-      def to_single
-        return!.gsub( /s\Z/, '' )
-      end
-
-      get
-      def to_plural
-        return!.to_single + 's'
-      end
-
-      get
-      def to_class_name
-        return!.split('_').map(&:capitalize).join('_')
-      end
-
-      get
-      def to_camel_case
-        return!.split('_').map(&:capitalize).join
-      end
-
-    end # === class Strings
-  end # === class Clean
+  class Strings
+
+    def untar
+      return!
+      .sub(/\.tar\.gz$/, '')
+      .sub(/\.tar/, '')
+    end
+
+    def file_names matcher
+      ( return!.split.select { |word| word[matcher] } )
+    end 
+
+    def file_names_by_ext matcher 
+      names = file_names(matcher)
+      bases = names.map { |s|
+        s.sub(%r!#{matcher}$!, '')
+      }
+
+      names.zip bases
+    end
+
+    def shell 
+      return!
+      .split("\n")
+      .map(&:strip)
+      .reject { |line| line.empty? }
+      .join(' && ')
+    end
+
+    def chop_ext
+      return!.sub /\.[^\.]+$/, ''
+    end
+
+    def ruby_name
+      File.basename chop_rb
+    end
+
+    def chop_rb
+      return!.sub %r!\.rb$!, '' 
+    end
+
+    def chop_slash_r
+      return!.gsub "\r", ''
+    end
+
+    def os_stardard
+      chop_slash_r
+    end
+
+    def to_single
+      return!.gsub( /s\Z/, '' )
+    end
+
+    def to_plural
+      return!.to_single + 's'
+    end
+
+    def to_class_name
+      return!.split('_').map(&:capitalize).join('_')
+    end
+
+    def to_camel_case
+      return!.split('_').map(&:capitalize).join
+    end
+
+  end # === class Strings
 end # === class Checked

data/lib/Checked/DSL.rb

@@ -1,15 +1,18 @@
 class Object
+
+  def Checked= val
+    @sin_arch = val
+    val.return! self
+    val
+  end
   
   def Checked
-    @sin_arch ||= begin
-                    o = ::Checked::Obj.new
-                    o.value = self
-                    o
-                  end
+    raise "Not defined yet." unless Checked_applys?
+    @sin_arch
   end
 
   def Checked_applys?
-    (instance_variable_defined?(:@sin_arch) && Checked().on?)
+    instance_variable_defined?(:@sin_arch)
   end
 
   def method_missing meth_name, *args
@@ -22,69 +25,16 @@ class Object
     return(super) if @count > 6 
     
     raise "Unknown block." if block_given?
-    begin
-      result = Checked().get!(meth_name, *args)
-    rescue Sin_Arch::Not_Found
-      return super
-    end
+    return super unless Checked().respond_to?(meth_name)
+    result = Checked().send meth_name, *args
     @count = 1
     
-    result.Checked.<< Checked()
+    result.Checked= Checked() if meth_name.to_s['!'] && self.class == result.class
     result
   end
 
 end # === class Object
 
-class Checked
-
-  class Obj
-
-    module Base
-      
-      attr_accessor :map, :name, :value, :app
-      
-      def initialize
-        off!
-        self.map  = nil
-        self.name = nil
-      end
-      
-      def << checked
-        on! checked.map
-        self.name = checked.name
-      end
-
-      def on?
-        @on
-      end
-      
-      def on! new_map
-        raise ArgumentError, "Map value unacceptable: #{new_map.inspect}" unless new_map
-        self.map = new_map
-        @on = true
-      end
-      
-      def off?
-        !@on
-      end
-
-      def off!
-        @on = false
-      end
-      
-      def get! meth_name, *args
-        self.app = Checked::App.new
-        app.get!("/#{map}/#{meth_name}", 'name'=>name, 'value'=>value, 'args'=>args)
-      end
-      
-    end # === module Base
-    
-    include Base
-    
-  end # === class Obj
-  
-end # === class Checked
-
 class Checked
   module DSL
   
@@ -180,11 +130,11 @@ class Checked
       %w{ Array Bool File_Path Hash String Symbol Var }.each { |name|
         eval! %~
           def #{name}!( *args )
-            Check!( '#{name.downcase}!', *args ).check!
+            Check!( '#{name}s', *args ).check!
           end
         ~
       }
-      
+
       def demand *pars
         if pars.size == 2
           val = return!
@@ -203,7 +153,7 @@ class Checked
       def Stripped! *args
         v = String!(*args)
         n = v.strip
-        n.Checked<< v.Checked
+        n.Checked= v.Checked
         n
       end
 
@@ -217,9 +167,10 @@ class Checked
                       raise ArgumentError, "Unknown values for name/value: #{name_and_or_val.inspect}"
                     end
 
-        val.Checked.on! ns
-        val.Checked.name = name
-        val.Checked.get! 'check!'
+        val.Checked=Checked.const_get(ns.to_sym).new
+        val.Checked.target_name = name
+        val.Checked.return! val
+        val.Checked.check!
         val
       end
 

data/lib/Checked/Demand/Arrays.rb

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

data/lib/Checked/Demand/Bools.rb

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

data/lib/Checked/Demand/Demand.rb

@@ -2,7 +2,7 @@
 class Checked
   class Demand
     Failed = Class.new(RuntimeError)
-        
+
     def initialize *args
       raise "Demand not allowed to be used."
     end