Checked 1.0.0 → 1.1.0

data/lib/Checked/Ask/Arrays.rb

@@ -4,6 +4,7 @@ module Checked
   class Ask
     class Arrays
 
+      include Uni_Arch::Base
       include Ask::Base
 
       namespace '/array!'

data/lib/Checked/Ask/Strings.rb

@@ -1,27 +1,28 @@
 
 module Checked
   class Ask
-      class Strings
+    class Strings
 
-        include Ask::Base
-        
-        namespace '/string!'
+      include Uni_Arch::Base
+      include Ask::Base
 
-        route
-        def empty?
-          target.strip.empty?
-        end
+      namespace '/string!'
 
-        route
-        def include? 
-          !!target[*args]
-        end
+      route
+      def empty?
+        target.strip.empty?
+      end
 
-        route
-        def exclude? 
-          !target[*args]
-        end
+      route
+      def include? 
+        !!target[*args]
+      end
 
-      end # === class Strings
+      route
+      def exclude? 
+        !target[*args]
+      end
+
+    end # === class Strings
   end # === class Ask
 end # === module Checked

data/lib/Checked/Ask/Vars.rb

@@ -3,6 +3,7 @@ module Checked
   class Ask
     class Vars
       
+      include Uni_Arch::Base
       include Ask::Base
 
       namespace '/var!'

data/lib/Checked/Base/Arch.rb

@@ -1,13 +1,26 @@
 
 module Checked 
   class Arch
-    include ::Checked::Base
+
+    include Uni_Arch::Base
 
     before
     def save_key
       request.response.body= request.headers.check_target
     end
     
+    before
+    def run_check
+      return if request.path['/var!/']
+      return if request.path['/check!/']
+      request.response.body= begin
+                               path = request.path.split('/')[0,2].join('/') + "/check!/"
+                               app  = Checked::Arch.new( path, :check_name => request.headers.check_name, :check_target => request.response.body )
+                               app.fulfill_request
+                               app.request.response.body
+                             end
+    end
+
     after_method
     def save_last_response
       unless request.path[%r@!/\Z@]

data/lib/Checked/Base/Base.rb

@@ -2,8 +2,6 @@ module Checked
 
   module Base
 
-    include Uni_Arch::Base
-
     CHECK = begin
               o = Object.new
               o.extend Checked::DSL

data/lib/Checked/Base/DSL.rb

@@ -4,7 +4,7 @@ module Checked
     
     # ============ Demand ==============
     
-    %w{ String Array Hash }.each { |name|
+    %w{ String Array File_Path Hash Bool }.each { |name|
       eval %~
         def #{name}!( *args )
           #{name.downcase}!(*args).check!
@@ -12,6 +12,14 @@ module Checked
       ~
     }
     
+    %w{ True False }.each { |bool|
+      eval %~
+        def #{bool}! *args
+          bool!(*args).#{bool.downcase}!
+        end
+      ~
+    }
+    
     %w{ var array bool file_path string symbol hash }.each { |klass|
       eval %~
         def #{klass}! *args

data/lib/Checked/Clean/Strings.rb

@@ -3,6 +3,7 @@ module Checked
   class Clean
     class Strings
 
+      include Uni_Arch::Base
       include Clean::Base
 
       namespace '/string!'

data/lib/Checked/Demand/Arrays.rb

@@ -2,12 +2,12 @@ module Checked
   class Demand
     class Arrays
 
+      include Uni_Arch::Base
       include Demand::Base
-
       namespace '/array!'
       
-      before
-      def validate_target_class
+      route
+      def check!
         fail! "...is not an Array." unless array?(target)
       end
 

data/lib/Checked/Demand/Bools.rb

@@ -2,12 +2,12 @@ module Checked
   class Demand
     class Bools
         
+      include Uni_Arch::Base
       include Demand::Base
-
       namespace '/bool!'
 
-      before
-      def validate
+      route
+      def check!
         fail!("...must be either of TrueClass or FalseClass.") unless [TrueClass, FalseClass].include?(target.class)
       end
       

data/lib/Checked/Demand/Demand.rb

@@ -4,16 +4,11 @@ module Checked
   class Demand
 
     Failed = Class.new(RuntimeError)
-    
+
     module Base
       
       include Checked::Base
-        
-      route "/!w!!/check!/"
-      def check!
-        # do nothing
-      end
-    
+      
       def err_msg msg = "...is invalid."
         message = if msg.strip[ %r!^\.\.\.! ]
                     msg.sub('...', '').strip

data/lib/Checked/Demand/File_Paths.rb

@@ -2,12 +2,12 @@ module Checked
   class Demand
     class File_Paths
       
+      include Uni_Arch::Base
       include Demand::Base
-
       namespace '/file_path!'
       
-      before
-      def validate
+      route
+      def check!
         fail!('...must be a String.') unless target.is_a?(String)
         
         strip_target
@@ -18,7 +18,7 @@ module Checked
 
       route
       def hostname!
-        matches_only! %r![\dA-Za-z_-]!
+        fail!("...has invalid characters: #{$1.inspect}") if target[ %r!([^\dA-Za-z_-]+)! ]
       end
 
       route
@@ -54,7 +54,7 @@ module Checked
       # fs_path => File system object path
       # 
       def fs_path?
-        request.path[%r!(_|/)(dir|file)[^a-zA-Z]+\Z!]
+        request.path[%r!(_|/)(dir|file|check)[^a-zA-Z]+\Z!]
       end
 
     end # === class File_Addresses

data/lib/Checked/Demand/Hashs.rb

@@ -2,12 +2,12 @@ module Checked
   class Demand
     class Hashs
       
+      include Uni_Arch::Base
       include Demand::Base
-
       namespace '/hash!'
 
-      before
-      def validate_target_class
+      route
+      def check!
         fail!("...must be a Hash") unless hash?(target)
       end
 

data/lib/Checked/Demand/Strings.rb

@@ -3,12 +3,12 @@ module Checked
   class Demand
     class Strings
 
+      include Uni_Arch::Base
       include Demand::Base
-
       namespace '/string!'
       
-      before
-      def validate
+      route
+      def check!
         case target
         when String
         when StringIO

data/lib/Checked/Demand/Symbols.rb

@@ -3,12 +3,12 @@ module Checked
   class Demand
     class Symbols
 
+      include Uni_Arch::Base
       include Demand::Base
-
       namespace '/symbol!'
       
-      before
-      def validate
+      route
+      def check!
         case target
         when Symbol
         else

data/lib/Checked/Demand/Vars.rb

@@ -2,8 +2,8 @@ module Checked
   class Demand
     class Vars
       
+      include Uni_Arch::Base
       include Demand::Base
-      
       namespace '/var!'
 
       route

data/lib/Checked/version.rb

@@ -1,3 +1,3 @@
 module Checked
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/tests/DSL.rb

@@ -5,7 +5,7 @@ describe "String!" do
     BOX.String!('str').should.be == 'str'
   end
   
-  it 'raise Demand::Failed if not a string' do
+  it 'raises Demand::Failed if not a string' do
     lambda {
       BOX.String!([])
     }.should.raise(Checked::Demand::Failed)
@@ -21,11 +21,73 @@ describe "Array!" do
     BOX.Array!([:arr]).should.be == [:arr]
   end
   
-  it 'raise Demand::Failed if not an Array' do
+  it 'raises Demand::Failed if not an Array' do
     lambda {
       BOX.Array!(:a)
     }.should.raise(Checked::Demand::Failed)
     .message.should.match %r!Symbol, :a, is not an Array.!
   end
   
+end # === describe Array!
+
+
+describe "File_Path!" do
+  
+  it 'returns a stripped string' do
+    BOX.File_Path!(" ~/ ").should.be == File.expand_path("~/")
+  end
+  
+  it 'raises Demand::Failed if not a string' do
+    lambda {
+      BOX.File_Path!(:something)
+    }.should.raise(Checked::Demand::Failed)
+    .message.should.match %r!Symbol, :something, must be a String!
+  end
+  
 end # === describe String!
+
+
+describe "Bool!" do
+  
+  it 'returns original value' do
+    BOX.Bool!(true).should.be === true
+    BOX.Bool!(false).should.be === false
+  end
+  
+  it 'raises Demand::Failed if not a boolean' do
+    lambda { BOX.Bool!(:true) }
+    .should.raise(Checked::Demand::Failed)
+    .message.should.match %r!Symbol, :true, must be either of TrueClass or FalseClass!
+  end
+  
+end # === describe Bool!
+
+
+describe "True!" do
+  
+  it 'returns original value' do
+    BOX.True!(true).should.be === true
+  end
+  
+  it 'raises Demand::Failed if not true' do
+    lambda { BOX.True!(false) }
+    .should.raise(Checked::Demand::Failed)
+    .message.should.match %r!FalseClass, false, must be true!
+  end
+  
+end # === describe True!
+
+
+describe "False!" do
+  
+  it 'returns original value' do
+    BOX.False!(false).should.be === false
+  end
+  
+  it 'raises Demand::Failed if not false' do
+    lambda { BOX.False!(true) }
+    .should.raise(Checked::Demand::Failed)
+    .message.should.match %r!TrueClass, true, must be false!
+  end
+  
+end # === describe False!

data/spec/tests/Demand.rb

@@ -107,7 +107,7 @@ describe "Demand file_path! not_file!" do
     .message.should.match %r!bashrc", can't be a file!
   end
 
-  it 'must return expand path' do
+  it 'must return expanded path' do
     path = "~/,RANDOM"
     target = File.expand_path(path)
     BOX.file_path!(path).not_file!.should.be == target

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Checked
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: Uni_Arch
-  requirement: &12169680 !ruby/object:Gem::Requirement
+  requirement: &19092720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12169680
+  version_requirements: *19092720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12168560 !ruby/object:Gem::Requirement
+  requirement: &19091320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12168560
+  version_requirements: *19091320
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &12167360 !ruby/object:Gem::Requirement
+  requirement: &19089240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12167360
+  version_requirements: *19089240
 - !ruby/object:Gem::Dependency
   name: Bacon_Colored
-  requirement: &12166240 !ruby/object:Gem::Requirement
+  requirement: &19088080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12166240
+  version_requirements: *19088080
 description: ! "\n    Various DSLs to clean, question (Ask), and validate (Demand)
   your objects,\n  their classes (data types), and their properties.\n  "
 email: