Checked 2.0.1 → 2.0.2

data/lib/Checked/Arch.rb

@@ -1,7 +1,7 @@
 class Checked
 
   module Arch
-    include DSL::Ruby
+    include DSL::Racked
 
     def self.included klass
       klass.send :include, Sin_Arch::Arch

data/lib/Checked/Clean/Strings.rb

@@ -4,6 +4,13 @@ class Checked
     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!'
 
@@ -11,10 +18,6 @@ class Checked
       def strip_val 
         return!( return!.strip ) if strippable_route?
       end
-      
-      def strippable_route?
-        params['name'][%r![^\?\!]\Z!] && !%w{chop_slash_r}.include?(params['name'])
-      end
 
       get
       def untar

data/lib/Checked/DSL.rb

@@ -90,24 +90,11 @@ class Checked
   
     module Ruby
 
-      def demand *args
-        case args.size
-        when 2
-          bool, raw_msg = args
-          msg = raw_msg.sub(%r!\A\.\.\.!, "#{target_name || return!.class}, #{return!.inspect}, ")
-          fail!(msg) unless bool
-          return!
-        when 3
-          val, bool, raw_msg = args
-          if respond_to?(:return!) && return! == val
-            return demand( bool, raw_msg )
-          end
-          msg = raw_msg.sub(%r!\A\.\.\.!, "#{val.class}, #{val.inspect}, ")
-          fail!(msg) unless bool
-          val
-        else
-          raise ArgumentError, "Too many arguments: #{args.inspect}"
-        end
+      def demand val, bool, raw_msg
+        return val if bool
+
+        fail! raw_msg.sub(%r!\A\.\.\.!, "#{val.class}, #{val.inspect}, ")
+        val
       end
 
       def fail! msg
@@ -197,10 +184,27 @@ class Checked
           end
         ~
       }
+      
+      def demand *pars
+        if pars.size == 2
+          val = return!
+          bool, raw_msg = pars
+        elsif respond_to?(:return!) && return! == pars[0] 
+          val, bool, raw_msg = pars
+        else
+          return super
+        end
+        
+        msg = raw_msg.sub(%r!\A\.\.\.!, "#{target_name || return!.class}, #{return!.inspect}, ")
+        
+        super( return!, bool, msg )
+      end
 
       def Stripped! *args
         v = String!(*args)
-        String!(v.strip)
+        n = v.strip
+        n.Checked<< v.Checked
+        n
       end
 
       def Check! ns, *name_and_or_val

data/lib/Checked/version.rb

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

data/spec/tests/DSL.rb

@@ -101,6 +101,9 @@ describe "Stripped!" do
     Stripped!(" n ").empty?.should.be === false
   end
   
+  it 'returns string with original name' do
+    Stripped!("Test String", 'test').Checked.name.should == 'Test String'
+  end
   
 end # === describe Stripped!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Checked
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: Sin_Arch
-  requirement: &20263140 !ruby/object:Gem::Requirement
+  requirement: &7738600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20263140
+  version_requirements: *7738600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20261900 !ruby/object:Gem::Requirement
+  requirement: &7738060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20261900
+  version_requirements: *7738060
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &20260680 !ruby/object:Gem::Requirement
+  requirement: &7737440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20260680
+  version_requirements: *7737440
 - !ruby/object:Gem::Dependency
   name: Bacon_Colored
-  requirement: &20258300 !ruby/object:Gem::Requirement
+  requirement: &7736560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20258300
+  version_requirements: *7736560
 description: ! "\n    Various DSLs to clean, question (Ask), and validate (Demand)
   your objects,\n  their classes (data types), and their properties.\n  "
 email: