glue 0.20.0 → 0.21.0

data/test/glue/tc_property_type_checking.rb

@@ -10,26 +10,26 @@ Glue::Property.type_checking = true
 module Test # :nodoc: all
 
 class Person 
-	prop_accessor :age, Fixnum
-	
-	def initialize(age = nil)
-		@age = age
-	end
+  prop_accessor :age, Fixnum
+  
+  def initialize(age = nil)
+    @age = age
+  end
 
 end
 
 class TC_PropertiesTypeChecking < Test::Unit::TestCase
 
-	def test_all
-		per = Person.new
+  def test_all
+    per = Person.new
 =begin
-		FIXME: does not work when run in the full test suite.
-		assert_raises(RuntimeError) {
-			per.age = 'Hello'
-		}
+    FIXME: does not work when run in the full test suite.
+    assert_raises(RuntimeError) {
+      per.age = 'Hello'
+    }
 =end
-	end
-	
+  end
+  
 end
 
 end

data/test/glue/tc_strings.rb

@@ -3,100 +3,100 @@ require 'test/unit'
 require 'glue/string'
 
 class TCStringUtilsUtils < Test::Unit::TestCase # :nodoc: all
-	include Glue
-
-	def setup
-		@s = "this is any cool test"
-	end
-
-	def test_valid?
-		assert_equal(true, StringUtils.valid?("test"))
-		assert_equal(false, StringUtils.valid?(""))
-		assert_equal(false, StringUtils.valid?(nil))
-	end
-
-	def test_head
-		assert_equal(nil, StringUtils.head(nil))
-		assert_equal("this...", StringUtils.head(@s, 3))
-		assert_equal("this+++", StringUtils.head(@s, 3, false, "+++"))
-		assert_equal("thi...", StringUtils.head(@s, 3, true))
-		assert_equal("this is...", StringUtils.head(@s, 8))
-		assert_equal(nil, StringUtils.head(@s, 0))
-		assert_equal(nil, StringUtils.head(@s, 0, true))
-		assert_equal("this is...", StringUtils.head(@s, 8, true))
-	end
-
-	def test_rewrite
-		rules = [
-			[/\/\$/, "../n1"],
-			[/\$/, "../n1"],
-			[/^games/, "../../games"],
-			[/^tmp/, "/n/theseas/var/tmp"],
-		]
-		string = StringUtils.rewrite("games/arkanoid.html", rules)
-		assert_equal("../../games/arkanoid.html", string)
-		string = StringUtils.rewrite("tmp/garbage.html", rules)
-		assert_equal("/n/theseas/var/tmp/garbage.html", string)
-		string = StringUtils.rewrite("root/index.html", rules)
-		assert_equal("root/index.html", string)
-		assert_equal(nil, StringUtils.rewrite(nil, rules))
-		assert_equal("", StringUtils.rewrite("", rules))
-
-		assert_raises(ArgumentError) {
-			assert_equal("koko", StringUtils.rewrite("koko", nil))
-		}
-
-		# bug: should keep order
-		s = StringUtils.rewrite("/$/koko.html", rules)
-		assert_equal("../n1/koko.html", s)
-	end
-
-	def test_wrap
-		s = "1234567890abcdefghijklmnopqrstu"
-		r = "1234 5678 90ab cdef ghij klmn opqr stu"
-		assert_equal(r, StringUtils::wrap(s, 4, " "))
-
-		s = "111111111111111111111111111111111111111111111111"
-		r = "1111111111 1111111111 1111111111 1111111111 11111111"
-		assert_equal(r, StringUtils::wrap(s, 10, " "))
-
-		s = "jackdaws love my big sphinx of quartz"
-		r = "jackdaws love my big sphinx of quartz"
-		assert_equal(r, StringUtils::wrap(s, 10, " "))
-
-		s = "jackdaws love my big sphinx of quartz"
-		r = "jack daws love my big sphi nx of quar tz"
-		assert_equal(r, StringUtils::wrap(s, 4, " "))
-
-		s = "jack.daws love my big sphinx of quartz"
-		r = "jack .daw s love my big sphi nx of quar tz"
-		assert_equal(r, StringUtils::wrap(s, 4, " "))
-
-		assert_equal("", StringUtils::wrap("", 4, " "))
-		assert_equal(nil, StringUtils::wrap(nil, 4, " "))
-	end
+  include Glue
+
+  def setup
+    @s = "this is any cool test"
+  end
+
+  def test_valid?
+    assert_equal(true, StringUtils.valid?("test"))
+    assert_equal(false, StringUtils.valid?(""))
+    assert_equal(false, StringUtils.valid?(nil))
+  end
+
+  def test_head
+    assert_equal(nil, StringUtils.head(nil))
+    assert_equal("this...", StringUtils.head(@s, 3))
+    assert_equal("this+++", StringUtils.head(@s, 3, false, "+++"))
+    assert_equal("thi...", StringUtils.head(@s, 3, true))
+    assert_equal("this is...", StringUtils.head(@s, 8))
+    assert_equal(nil, StringUtils.head(@s, 0))
+    assert_equal(nil, StringUtils.head(@s, 0, true))
+    assert_equal("this is...", StringUtils.head(@s, 8, true))
+  end
+
+  def test_rewrite
+    rules = [
+      [/\/\$/, "../n1"],
+      [/\$/, "../n1"],
+      [/^games/, "../../games"],
+      [/^tmp/, "/n/theseas/var/tmp"],
+    ]
+    string = StringUtils.rewrite("games/arkanoid.html", rules)
+    assert_equal("../../games/arkanoid.html", string)
+    string = StringUtils.rewrite("tmp/garbage.html", rules)
+    assert_equal("/n/theseas/var/tmp/garbage.html", string)
+    string = StringUtils.rewrite("root/index.html", rules)
+    assert_equal("root/index.html", string)
+    assert_equal(nil, StringUtils.rewrite(nil, rules))
+    assert_equal("", StringUtils.rewrite("", rules))
+
+    assert_raises(ArgumentError) {
+      assert_equal("koko", StringUtils.rewrite("koko", nil))
+    }
+
+    # bug: should keep order
+    s = StringUtils.rewrite("/$/koko.html", rules)
+    assert_equal("../n1/koko.html", s)
+  end
+
+  def test_wrap
+    s = "1234567890abcdefghijklmnopqrstu"
+    r = "1234 5678 90ab cdef ghij klmn opqr stu"
+    assert_equal(r, StringUtils::wrap(s, 4, " "))
+
+    s = "111111111111111111111111111111111111111111111111"
+    r = "1111111111 1111111111 1111111111 1111111111 11111111"
+    assert_equal(r, StringUtils::wrap(s, 10, " "))
+
+    s = "jackdaws love my big sphinx of quartz"
+    r = "jackdaws love my big sphinx of quartz"
+    assert_equal(r, StringUtils::wrap(s, 10, " "))
+
+    s = "jackdaws love my big sphinx of quartz"
+    r = "jack daws love my big sphi nx of quar tz"
+    assert_equal(r, StringUtils::wrap(s, 4, " "))
+
+    s = "jack.daws love my big sphinx of quartz"
+    r = "jack .daw s love my big sphi nx of quar tz"
+    assert_equal(r, StringUtils::wrap(s, 4, " "))
+
+    assert_equal("", StringUtils::wrap("", 4, " "))
+    assert_equal(nil, StringUtils::wrap(nil, 4, " "))
+  end
 =begin
-	def test_rationalize_filename
-		filename = StringUtils.rationalize_filename("hello my friend!.gif")
-		assert_equal("hello-my-friend.gif", filename)
-		filename = StringUtils.rationalize_filename("���� ����.gif")
-		assert_equal("pame-pali.gif", filename)
-		filename = StringUtils.rationalize_filename("�� ���.gif")
-		assert_equal("ti-les.gif", filename)
-
-		# bug:
-		filename = StringUtils.rationalize_filename("image-(10).gif")
-		assert_equal("image-10.gif", filename)
-	end
+  def test_rationalize_filename
+    filename = StringUtils.rationalize_filename("hello my friend!.gif")
+    assert_equal("hello-my-friend.gif", filename)
+    filename = StringUtils.rationalize_filename("���� ����.gif")
+    assert_equal("pame-pali.gif", filename)
+    filename = StringUtils.rationalize_filename("�� ���.gif")
+    assert_equal("ti-les.gif", filename)
+
+    # bug:
+    filename = StringUtils.rationalize_filename("image-(10).gif")
+    assert_equal("image-10.gif", filename)
+  end
 =end
-	def test_random_string
-		s1 = StringUtils.random()
-		s2 = StringUtils.random()
-		assert_not_equal(s1, s2)
-		assert(s1.size == s2.size)
-	end
-
-	def teardown
-		@s = nil
-	end
+  def test_random_string
+    s1 = StringUtils.random()
+    s2 = StringUtils.random()
+    assert_not_equal(s1, s2)
+    assert(s1.size == s2.size)
+  end
+
+  def teardown
+    @s = nil
+  end
 end

data/test/glue/tc_uri.rb

@@ -2,96 +2,96 @@ require 'test/unit'
 require 'glue/uri'
 
 class Dummy # :nodoc: all
-	attr_accessor :test1, :test2
+  attr_accessor :test1, :test2
 end
 
 class TC_Uri < Test::Unit::TestCase # :nodoc: all
-	include Glue
+  include Glue
 
-	def test_query_string_to_hash
-		# bad query string
+  def test_query_string_to_hash
+    # bad query string
 
-		assert_equal(0, UriUtils.query_string_to_hash("").length)
-		assert_equal(0, UriUtils.query_string_to_hash(nil).length)
+    assert_equal(0, UriUtils.query_string_to_hash("").length)
+    assert_equal(0, UriUtils.query_string_to_hash(nil).length)
 
-		# single valued
+    # single valued
 
-		parameters = UriUtils.query_string_to_hash("koko=2&lala=3")
-		assert_equal("2", parameters["koko"])
-		assert_equal("3", parameters["lala"])
+    parameters = UriUtils.query_string_to_hash("koko=2&lala=3")
+    assert_equal("2", parameters["koko"])
+    assert_equal("3", parameters["lala"])
 
-		parameters = UriUtils.query_string_to_hash("koko=2;lala=3")
-		assert_equal("2", parameters["koko"])
-		assert_equal("3", parameters["lala"])
+    parameters = UriUtils.query_string_to_hash("koko=2;lala=3")
+    assert_equal("2", parameters["koko"])
+    assert_equal("3", parameters["lala"])
 
-		# multivalued
+    # multivalued
 
-		parameters = UriUtils.query_string_to_hash("koko=2;lala=3&koko=5")
-		assert_equal(2, parameters["koko"].length)
-		assert_equal("2", parameters["koko"][0])
-		assert_equal("3", parameters["lala"])
-		assert_equal("5", parameters["koko"][1])
+    parameters = UriUtils.query_string_to_hash("koko=2;lala=3&koko=5")
+    assert_equal(2, parameters["koko"].length)
+    assert_equal("2", parameters["koko"][0])
+    assert_equal("3", parameters["lala"])
+    assert_equal("5", parameters["koko"][1])
 
-		# non existing value
-		assert_equal(nil, parameters["non-existing-value"])
-	end
+    # non existing value
+    assert_equal(nil, parameters["non-existing-value"])
+  end
 
-	def test_hash_to_query_string
-		hash = { "koko" => 1, "lala" => 2}
-		qs = "koko=1;lala=2"
-		assert_equal(qs, UriUtils.hash_to_query_string(hash))
+  def test_hash_to_query_string
+    hash = { "koko" => 1, "lala" => 2}
+    qs = "koko=1;lala=2"
+    assert_equal(qs, UriUtils.hash_to_query_string(hash))
 
-		assert_equal(nil, UriUtils.hash_to_query_string(nil))
+    assert_equal(nil, UriUtils.hash_to_query_string(nil))
 
-		# bug: dont encode complex objects
-		hash = { "a" => 2, "b" => 3, "c" => Dummy.new }
-		qs = "a=2;b=3"
-		assert_equal(qs, UriUtils.hash_to_query_string(hash))
-	end
+    # bug: dont encode complex objects
+    hash = { "a" => 2, "b" => 3, "c" => Dummy.new }
+    qs = "a=2;b=3"
+    assert_equal(qs, UriUtils.hash_to_query_string(hash))
+  end
 
-	def test_get_query_string
-		uri = "people/gmosx.sx?koko=1;lala=2"
-		assert_equal("koko=1;lala=2", UriUtils.get_query_string(uri))
+  def test_get_query_string
+    uri = "people/gmosx.sx?koko=1;lala=2"
+    assert_equal("koko=1;lala=2", UriUtils.get_query_string(uri))
 
-		uri = "http://www.navel.gr/people/gmosx.sx?koko=1&lala=2"
-		assert_equal("koko=1&lala=2", UriUtils.get_query_string(uri))
+    uri = "http://www.navel.gr/people/gmosx.sx?koko=1&lala=2"
+    assert_equal("koko=1&lala=2", UriUtils.get_query_string(uri))
 
-		uri = "http://www.navel.gr:8080/people/gmosx.sx?koko=1;lala=2"
-		assert_equal("koko=1;lala=2", UriUtils.get_query_string(uri))
-	end
+    uri = "http://www.navel.gr:8080/people/gmosx.sx?koko=1;lala=2"
+    assert_equal("koko=1;lala=2", UriUtils.get_query_string(uri))
+  end
 
-	def test_chomp_query_string
-		uri = "people/gmosx.sx"
-		assert_equal("people/gmosx.sx", UriUtils.chomp_query_string(uri))
+  def test_chomp_query_string
+    uri = "people/gmosx.sx"
+    assert_equal("people/gmosx.sx", UriUtils.chomp_query_string(uri))
 
-		uri = "people/gmosx.sx?koko=1;lala=2"
-		assert_equal("people/gmosx.sx", UriUtils.chomp_query_string(uri))
+    uri = "people/gmosx.sx?koko=1;lala=2"
+    assert_equal("people/gmosx.sx", UriUtils.chomp_query_string(uri))
 
-		uri = "http://www.navel.gr/people/gmosx.sx?koko=1&lala=2"
-		assert_equal("http://www.navel.gr/people/gmosx.sx", UriUtils.chomp_query_string(uri))
+    uri = "http://www.navel.gr/people/gmosx.sx?koko=1&lala=2"
+    assert_equal("http://www.navel.gr/people/gmosx.sx", UriUtils.chomp_query_string(uri))
 
-		uri = "http://www.navel.gr:8080/people/gmosx.sx?koko=1;lala=2"
-		assert_equal("http://www.navel.gr:8080/people/gmosx.sx", UriUtils.chomp_query_string(uri))
+    uri = "http://www.navel.gr:8080/people/gmosx.sx?koko=1;lala=2"
+    assert_equal("http://www.navel.gr:8080/people/gmosx.sx", UriUtils.chomp_query_string(uri))
 
-		assert_equal(nil, UriUtils.chomp_query_string(nil))
-	end
+    assert_equal(nil, UriUtils.chomp_query_string(nil))
+  end
 
-	def test_update_query_string
-		uri = "ko/index.sx?koko=1"
-		hash = {"lala" => 2, "kaka" => 3}
-		assert_equal("ko/index.sx?koko=1;lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
+  def test_update_query_string
+    uri = "ko/index.sx?koko=1"
+    hash = {"lala" => 2, "kaka" => 3}
+    assert_equal("ko/index.sx?koko=1;lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
 
-		uri = "http://www.navel.gr:8080/ko/index.sx?koko=1"
-		hash = {"lala" => 2, "kaka" => 3}
-		assert_equal("http://www.navel.gr:8080/ko/index.sx?koko=1;lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
+    uri = "http://www.navel.gr:8080/ko/index.sx?koko=1"
+    hash = {"lala" => 2, "kaka" => 3}
+    assert_equal("http://www.navel.gr:8080/ko/index.sx?koko=1;lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
 
-		uri = "http://www.navel.gr"
-		hash = {"lala" => 2, "kaka" => 3}
-		assert_equal("http://www.navel.gr?lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
+    uri = "http://www.navel.gr"
+    hash = {"lala" => 2, "kaka" => 3}
+    assert_equal("http://www.navel.gr?lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
 
-		# bug: no ? when passed an empty hash
-		uri = "http://www.navel.gr"
-		assert_equal("http://www.navel.gr", UriUtils.update_query_string(uri, {}))
-	end
+    # bug: no ? when passed an empty hash
+    uri = "http://www.navel.gr"
+    assert_equal("http://www.navel.gr", UriUtils.update_query_string(uri, {}))
+  end
 
 end

data/test/glue/tc_validation.rb

@@ -9,207 +9,207 @@ require 'glue/validation'
 Glue::Property.type_checking = false
 
 class TC_Validation < Test::Unit::TestCase # :nodoc: all
-	include Glue
-	
-	# Override the default error message
-	Validation::Errors.invalid_format = 'INVALID'
-
-	module Mixin
-		prop_accessor :value, String
-		validate_format :value, :format => /123/, :msg => 'mixin error'
-	end
-	
-	class User
-		include Mixin
-
-		prop_accessor :name, String
-		validate_format :name, :format => /L.o/, :msg => 'per class override'
-	end
-	
-	class Article
-		prop_accessor :name, String
-		validate_format :name, :format => /news/
-	end
-
-	class Dummy1
-		prop_accessor :test, Fixnum
-		prop_accessor :str, String
-		validate_value :test, :str
-	end
-
-	class Dummy2 
-		prop_accessor :password, String
-		validate_confirmation :password
-	end
-
-	class Dummy3 
-		prop_accessor :vmin, String
-		validate_length :vmin, :min => 2
-		
-		prop_accessor :vmax, String
-		validate_length :vmax, :max => 3, :msg => 'LOOONG'
-
-		prop_accessor :vran, String
-		validate_length :vran, :range => 2..4, :msg_long => 'argh'
-
-		prop_accessor :vlen, String
-		validate_length :vlen, :length => 3, :msg => 'argh'
-	end
-
-	class Dummy4
-		prop_accessor :sex, String
-		validate_inclusion :sex, :in => %w{ Male Female }, :msg => 'huh?'
-
-		prop_accessor :age, Fixnum
-		validate_inclusion :age, :in => 5..99
-	end
-
-	class Dummy5
-		property :age, Fixnum
-		validate_numeric :age, :integer => true
-
-		property :rate, Float
-		validate_numeric :rate
-	end
-
-	# bug
-
-	class NoProp
-		include Mixin
-		validate_length :value, :min => 3
-	end
-		
-	def test_validate_value
-		d = Dummy1.new
-		
-		assert !d.valid?
-		assert_equal 2, d.errors.count
-		d.test = 1
-		assert !d.valid?
-		assert_equal 1, d.errors.count
-		d.str = 'yeah'
-		assert d.valid?
-	end
-
-	def test_validate_confirmation
-		d = Dummy2.new
-
-		assert_respond_to d, :password_confirmation
-
-		d.password = 'hello'
-		assert !d.valid?
-		d.password_confirmation = 'hel'
-		assert !d.valid?
-		d.password_confirmation = 'hello'
-		assert d.valid?
-	end
-
-	def test_validate_format
-		u = User.new
-
-		u.value = '1234'
-
-		u.name = 'George'
-		assert !u.valid?
-
-		assert_equal 'per class override', u.errors[:name].first
-
-		u.name = 'Leonard'
-		assert u.valid?
-
-		a = Article.new
-
-		a.name = 'In the news'
-		assert a.valid?
-
-		a.name = 'Sports'
-		assert !a.valid?
-		
-		assert_equal 1, a.errors.count
-		assert_equal 1, a.errors.on(:name).size
-		assert_kind_of Array, a.errors[:name]
-		
-		assert_equal 'INVALID', a.errors[:name].first
-
-		# test mixin
-
-		u.value = '543'
-		assert !u.valid?
-	end
-
-	def test_validate_length
-		d = Dummy3.new
-
-		d.vmin = 'q'
-		d.vmax = '2'
-		d.vlen = '123'
-		d.vran = '123'
-
-		assert !d.valid?
-		assert_equal 'Too short, must be more than 2 characters long', d.errors.on(:vmin).first
-		d.vmin = 'longer'
-		assert d.valid?
-
-		d.vmax = 'loooooooooooong'
-		assert !d.valid?
-		assert_equal 'LOOONG', d.errors.on(:vmax).first
-
-		d.vmax = nil
-		assert !d.valid?
-		assert_equal 'No value provided', d.errors.on(:vmax).first
-
-		d.vlen = '12'
-		assert !d.valid?
-		assert_equal 'argh', d.errors.on(:vlen).first
-		
-		d.vlen = '1234565'
-		assert !d.valid?
-		
-		d.vran = '1'
-		assert !d.valid?
-		assert_equal 'Too short, must be more than 2 characters long', d.errors.on(:vran).first
-
-		d.vran = '11111111'
-		assert !d.valid?
-		assert_equal 'argh', d.errors.on(:vran).first
-	end
-
-	def test_validate_inclusion
-		d = Dummy4.new
-
-		d.sex = 'Alien'
-		d.age = 1
-
-		assert !d.valid?
-		assert_equal 2, d.errors.count
-
-		d.sex = 'Male'
-		assert !d.valid?
-		assert_equal 1, d.errors.count
+  include Glue
+  
+  # Override the default error message
+  Validation::Errors.invalid_format = 'INVALID'
+
+  module Mixin
+    prop_accessor :value, String
+    validate_format :value, :format => /123/, :msg => 'mixin error'
+  end
+  
+  class User
+    include Mixin
+
+    prop_accessor :name, String
+    validate_format :name, :format => /L.o/, :msg => 'per class override'
+  end
+  
+  class Article
+    prop_accessor :name, String
+    validate_format :name, :format => /news/
+  end
+
+  class Dummy1
+    prop_accessor :test, Fixnum
+    prop_accessor :str, String
+    validate_value :test, :str
+  end
+
+  class Dummy2 
+    prop_accessor :password, String
+    validate_confirmation :password
+  end
+
+  class Dummy3 
+    prop_accessor :vmin, String
+    validate_length :vmin, :min => 2
+    
+    prop_accessor :vmax, String
+    validate_length :vmax, :max => 3, :msg => 'LOOONG'
+
+    prop_accessor :vran, String
+    validate_length :vran, :range => 2..4, :msg_long => 'argh'
+
+    prop_accessor :vlen, String
+    validate_length :vlen, :length => 3, :msg => 'argh'
+  end
+
+  class Dummy4
+    prop_accessor :sex, String
+    validate_inclusion :sex, :in => %w{ Male Female }, :msg => 'huh?'
+
+    prop_accessor :age, Fixnum
+    validate_inclusion :age, :in => 5..99
+  end
+
+  class Dummy5
+    property :age, Fixnum
+    validate_numeric :age, :integer => true
+
+    property :rate, Float
+    validate_numeric :rate
+  end
+
+  # bug
+
+  class NoProp
+    include Mixin
+    validate_length :value, :min => 3
+  end
+    
+  def test_validate_value
+    d = Dummy1.new
+    
+    assert !d.valid?
+    assert_equal 2, d.errors.count
+    d.test = 1
+    assert !d.valid?
+    assert_equal 1, d.errors.count
+    d.str = 'yeah'
+    assert d.valid?
+  end
+
+  def test_validate_confirmation
+    d = Dummy2.new
+
+    assert_respond_to d, :password_confirmation
+
+    d.password = 'hello'
+    assert !d.valid?
+    d.password_confirmation = 'hel'
+    assert !d.valid?
+    d.password_confirmation = 'hello'
+    assert d.valid?
+  end
+
+  def test_validate_format
+    u = User.new
+
+    u.value = '1234'
+
+    u.name = 'George'
+    assert !u.valid?
+
+    assert_equal 'per class override', u.errors[:name].first
+
+    u.name = 'Leonard'
+    assert u.valid?
+
+    a = Article.new
+
+    a.name = 'In the news'
+    assert a.valid?
+
+    a.name = 'Sports'
+    assert !a.valid?
+    
+    assert_equal 1, a.errors.count
+    assert_equal 1, a.errors.on(:name).size
+    assert_kind_of Array, a.errors[:name]
+    
+    assert_equal 'INVALID', a.errors[:name].first
+
+    # test mixin
+
+    u.value = '543'
+    assert !u.valid?
+  end
+
+  def test_validate_length
+    d = Dummy3.new
+
+    d.vmin = 'q'
+    d.vmax = '2'
+    d.vlen = '123'
+    d.vran = '123'
+
+    assert !d.valid?
+    assert_equal 'Too short, must be more than 2 characters long', d.errors.on(:vmin).first
+    d.vmin = 'longer'
+    assert d.valid?
+
+    d.vmax = 'loooooooooooong'
+    assert !d.valid?
+    assert_equal 'LOOONG', d.errors.on(:vmax).first
+
+    d.vmax = nil
+    assert !d.valid?
+    assert_equal 'No value provided', d.errors.on(:vmax).first
+
+    d.vlen = '12'
+    assert !d.valid?
+    assert_equal 'argh', d.errors.on(:vlen).first
+    
+    d.vlen = '1234565'
+    assert !d.valid?
+    
+    d.vran = '1'
+    assert !d.valid?
+    assert_equal 'Too short, must be more than 2 characters long', d.errors.on(:vran).first
+
+    d.vran = '11111111'
+    assert !d.valid?
+    assert_equal 'argh', d.errors.on(:vran).first
+  end
+
+  def test_validate_inclusion
+    d = Dummy4.new
+
+    d.sex = 'Alien'
+    d.age = 1
+
+    assert !d.valid?
+    assert_equal 2, d.errors.count
+
+    d.sex = 'Male'
+    assert !d.valid?
+    assert_equal 1, d.errors.count
 
-		d.age = 110
-		assert !d.valid?
-		assert_equal 1, d.errors.count
+    d.age = 110
+    assert !d.valid?
+    assert_equal 1, d.errors.count
 
-		d.age = 90
-		assert d.valid?
-	end
+    d.age = 90
+    assert d.valid?
+  end
 
-	def test_validate_numeric
-		d = Dummy5.new
+  def test_validate_numeric
+    d = Dummy5.new
 
-		d.rate = 'Alien'
-		d.age = 'World' 
+    d.rate = 'Alien'
+    d.age = 'World' 
 
-		assert !d.valid?
-		assert_equal 2, d.errors.count
+    assert !d.valid?
+    assert_equal 2, d.errors.count
 
-		d.rate = 3
-		assert !d.valid?
-		assert_equal 1, d.errors.count
+    d.rate = 3
+    assert !d.valid?
+    assert_equal 1, d.errors.count
 
-		d.rate = 1.2
-		d.age = 123
-		assert d.valid?
-	end
+    d.rate = 1.2
+    d.age = 123
+    assert d.valid?
+  end
 end