Checked 2.0.2 → 3.0.0

data/lib/Checked/Demand/File_Paths.rb

@@ -1,57 +1,50 @@
 class Checked
-  class Demand
-    class File_Paths < Sinatra::Base
-      
-      INVALID_CHARS = %r!([^a-zA-Z0-9\.\_\-\/~,]+)!
-      include Checked::Arch
-      map '/file_path!'
-      
-      get
-      def check!
-        string! return!
-        
-        return! return!.strip
-        not_empty! return!
-        
-        validate_format!
-        expand_target if File.exists?(File.expand_path return!)
-        
-        return! 
-      end
-
-      get
-      def not_dir!
-        demand !File.directory?(return!), "...can't be an existing directory."
-      end
-
-      get
-      def not_file!
-        demand !File.file?(return!), "...can't be a file."
-      end
-
-      get
-      def dir!
-        demand File.directory?(return!), "...must be an existing directory." 
-      end
-
-      private 
-
-      def validate_format!
-        demand !( return![INVALID_CHARS] ), "...has invalid characters: #{$1.inspect}"
-      end
-      
-      def expand_target
-        return! File.expand_path(return!)
-      end
-
-      # 
-      # fs_path => File system object path
-      # 
-      def fs_path?
-        request.path[%r!(_|/)(dir|file|check)[^a-zA-Z]+\Z!]
-      end
-
-    end # === class File_Addresses
-  end # === class Demand
+  class File_Paths < Strings
+
+    INVALID_CHARS = %r!([^a-zA-Z0-9\.\_\-\/~,]+)!
+
+    def check!
+      super
+      string! return!
+
+      return! return!.strip
+      not_empty! return!
+
+      validate_format!
+      expand_target if File.exists?(File.expand_path return!)
+
+      return! 
+    end
+
+    def not_dir!
+      demand !File.directory?(return!), "...can't be an existing directory."
+    end
+
+    def not_file!
+      demand !File.file?(return!), "...can't be a file."
+    end
+
+    def dir!
+      demand File.directory?(return!), "...must be an existing directory." 
+    end
+
+    private 
+
+    def validate_format!
+      demand !( return![INVALID_CHARS] ), "...has invalid characters: #{$1.inspect}"
+    end
+
+    def expand_target
+      return! File.expand_path(return!)
+    end
+
+    # 
+    # fs_path => File system object path
+    # 
+    def fs_path?
+      request.path[%r!(_|/)(dir|file|check)[^a-zA-Z]+\Z!]
+    end
+
+  end # === class File_Addresses
 end # === class Checked
 

data/lib/Checked/Demand/Hashs.rb

@@ -1,24 +1,16 @@
 class Checked
-  class Demand
-    class Hashs < Sinatra::Base
-      
-      
-      include Checked::Arch
-      map '/hash!'
+  class Hashs
 
-      get
-      def check!
-        demand hash?(return!), "...is not a Hash."
-      end
+    def check!
+      demand hash?(return!), "...is not a Hash."
+    end
 
-      get
-      def symbol_keys!
-        all_syms = return!.keys.all? { |k| k.is_a?(Symbol) }
-        demand all_syms, '...must have all symbol keys.'
-      end
+    def symbol_keys!
+      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 # === class Hashs
 end # === class Checked
 
 

data/lib/Checked/Demand/Strings.rb

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

data/lib/Checked/Demand/Symbols.rb

@@ -1,22 +1,15 @@
 
 class Checked
-  class Demand
-    class Symbols < Sinatra::Base
+  class Symbols
 
-      include Checked::Arch
-      map '/symbol!'
-      
-      get
-      def check!
-        demand return!.is_a?(Symbol), '...must be a symbol.'
-      end
-      
-      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
+    def check!
+      demand return!.is_a?(Symbol), '...must be a symbol.'
+    end
+
+    def in! *raw_arrs
+      arrs = raw_arrs.flatten
+      demand arrs.flatten.include?(return!), "...must be in array: #{arrs}"
+    end # === def in!
+
+  end # === class Symbols
 end # === class Checked

data/lib/Checked/Demand/Vars.rb

@@ -1,105 +1,57 @@
 class Checked
-  class Demand
-    class Vars < Sinatra::Base
-      
-      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
-
-      get
-      def either! 
-        answer = args_hash['args'].flatten.detect { |m|
-          begin
-            return!.send m
-            true
-          rescue Failed
-            false
-          end
-        }
-        demand answer, "...is not any: #{args_hash['args'].inspect}"
-      end
-
-      get
-      def be!
-        rejected = args_hash['args'].flatten.select { |m|
-          !(return!.send m)
-        }
-        demand rejected.empty?, "...must be all of these: #{rejected.map(&:to_s).join(', ')}"
-      end
-      
-      get
-      def not_be!
-        rejected = args_hash['args'].flatten.select { |m|
-          !!(return!.send m)
-        }
-        demand rejected.empty?, "...must not be: #{rejected.map(&:to_s).join(', ')}"
-      end
-
-      get
-      def one_of! 
-        klasses = args_hash['args']
-        demand \
-          klasses.flatten.any? { |k| return!.is_a?(k) }, \
+  class Vars
+
+    def check!
+      return!
+    end
+
+    def either! *args
+      answer = args.flatten.detect { |m|
+        begin
+          return!.send m
+          true
+        rescue Failed
+          false
+        end
+      }
+      demand answer, "...is not any: #{args.inspect}"
+    end
+
+    def be! *args
+      rejected = args.flatten.select { |m|
+        !(return!.send m)
+      }
+      demand rejected.empty?, "...must be all of these: #{rejected.map(&:to_s).join(', ')}"
+    end
+
+    def not_be! *args
+      rejected = args.flatten.select { |m|
+        !!(return!.send m)
+      }
+      demand rejected.empty?, "...must not be: #{rejected.map(&:to_s).join(', ')}"
+    end
+
+    def one_of! *klasses
+      demand \
+        klasses.flatten.any? { |k| return!.is_a?(k) }, \
           "...can only be of class/module: #{klasses.map(&:to_s).join(', ')}"
-      end
+    end
 
-      get
-      def nil!
-        demand return!.nil?, "...must be nil."
-      end
+    def nil!
+      demand return!.nil?, "...must be nil."
+    end
 
-      get
-      def not_nil!
-        demand !return!.nil?, "...can't be nil." 
-      end
+    def not_nil!
+      demand !return!.nil?, "...can't be nil." 
+    end
 
-      get
-      def respond_to! 
-        rejected = args_hash['args'].reject { |m|
-          !return!.respond_to?(m)
-        }
-        demand rejected.empty?, "...must respond to #{rejected.inspect}"
-      end
+    def respond_to! *args
+      rejected = args.reject { |m|
+        !return!.respond_to?(m)
+      }
+      demand rejected.empty?, "...must respond to #{rejected.inspect}"
+    end
 
-    end # === class Vars
-  end # === class Demand
+  end # === class Vars
 end # === module Checked
 

data/lib/Checked/version.rb

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

data/lib/Checked.rb

@@ -5,56 +5,33 @@ require "Checked/Arch"
 
 class Checked
   
-  class Check_Args < Sinatra::Base
-    
-    include Checked::Arch
+  class App
     
-    before 
-    def set_target
-      keys! args_hash, 'name', 'value', 'args'
-      a = args_hash['args']
-      t = args_hash['value']
-
-      demand a, array?(a), ':args must be an array.' 
-      
-      request.env['original_target'] = t
-      
-      # === target_name
-      request.env['target_name'] ||= begin
-                                       if t.respond_to?(:english_name)
-                                         t.english_name 
-                                       elsif !args_hash['name'].to_s.strip.empty?
-                                         args_hash['name'].strip
-                                       else
-                                         t.class.name.gsub('_', ' ')
-                                       end
-                                     end
-      
-      return! t
+    def initialize
+      @target = nil
     end
-    
-  end # === class Check_Args < Sinatra::Base
-
-  use Check_Args
-
-  class App
-    include Sin_Arch::App
   end # === class App
   
 end # === class Checked
 
 
 
+require "Checked/All"
 %w{ Ask Clean Demand }.each { |klass|
   
   require "Checked/#{klass}/#{klass}"
+  included = []
   
   Dir.glob(File.join File.dirname(__FILE__), "Checked/#{klass}/*.rb").each { |path|
     next if path["/#{klass}/#{klass}.rb"]
     
     path =~ %r!lib/Checked/(.+)/(.+)\.rb!
     require( "Checked/#{$1}/#{$2}" ) 
-    Checked.use eval("Checked::#{klass}::#{$2}")
+    
+    unless included.include?($2)
+      Checked.const_get($2.to_sym).send :include, Checked::All
+      included << $2
+    end
   }
   
 }

data/spec/tests/Ask.rb

@@ -20,17 +20,17 @@ describe "array! :include?" do
   
 end # === describe Ask :includes
 
-describe "array! :exclude?" do
+describe "array! :exclude_all?" do
   
   behaves_like :racked_dsl
 
   it "returns true if array excludes element." do
-    Array!([:a]).exclude?(:b)
+    Array!([:a]).exclude_all?(:b)
     .should.be == true
   end
   
   it "returns false if array does contains element" do
-    Array!([:a]).exclude?(:a)
+    Array!([:a]).exclude_all?(:a)
     .should.be == false
   end
   

data/spec/tests/Clean.rb

@@ -53,7 +53,7 @@ describe "Clean :chop_slash_r" do
       Hi\r\n
       Ok\r\n
     @
-    String!(string).chop_slash_r.should.be == string.gsub("\r", '')
+    String!(string).chop_slash_r.should.be == string.strip.gsub("\r", '')
   end
   
   
@@ -69,7 +69,7 @@ describe "Clean :os_stardard" do
       Hi\r\n
       Ok\r\n
     @
-    String!(string).os_stardard.should.be == string.strip.gsub("\r", '')
+    String!(string).os_stardard.should.be == string.gsub("\r", '').strip
   end
   
 end # === describe

data/spec/tests/DSL.rb

@@ -102,7 +102,7 @@ describe "Stripped!" do
   end
   
   it 'returns string with original name' do
-    Stripped!("Test String", 'test').Checked.name.should == 'Test String'
+    Stripped!("Test String", 'test').Checked.target_name.should == 'Test String'
   end
   
 end # === describe Stripped!
@@ -111,9 +111,9 @@ describe "String!" do
   
   behaves_like :racked_dsl
   
-  it 'returns the string' do
+  it 'returns the string with same name' do
     s = 'str'
-    String!( s ).object_id.should.be == s.object_id
+    String!( 'Tester', s ).Checked.target_name.should.be == 'Tester'
   end
   
   it 'raises Demand::Failed if not a string' do

data/spec/tests/Demand.rb

@@ -156,7 +156,7 @@ describe "Demand string! :file_read!" do
   behaves_like :racked_dsl
   
   it 'returns a string with right carriage returns erased.' do
-    String!("test\r\ntest\r\n").file_content!.should == "test\ntest\n"
+    String!("test\r\ntest\r\n").file_content!.should == "test\ntest"
   end
   
 end # === describe Demand string! :file_read!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Checked
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-15 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: Sin_Arch
-  requirement: &7738600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *7738600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7738060 !ruby/object:Gem::Requirement
+  requirement: &23425480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7738060
+  version_requirements: *23425480
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &7737440 !ruby/object:Gem::Requirement
+  requirement: &23425020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7737440
+  version_requirements: *23425020
 - !ruby/object:Gem::Dependency
   name: Bacon_Colored
-  requirement: &7736560 !ruby/object:Gem::Requirement
+  requirement: &23424540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7736560
+  version_requirements: *23424540
 description: ! "\n    Various DSLs to clean, question (Ask), and validate (Demand)
   your objects,\n  their classes (data types), and their properties.\n  "
 email:
@@ -71,6 +60,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/Checked.rb
+- lib/Checked/All.rb
 - lib/Checked/Arch.rb
 - lib/Checked/Ask/Arrays.rb
 - lib/Checked/Ask/Ask.rb