ohm-contrib 0.0.23 → 0.0.24

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.23'
+    VERSION = '0.0.24'
   end
 
   autoload :Boundaries,        "ohm/contrib/boundaries"
@@ -8,6 +8,7 @@ module Ohm
   autoload :ToHash,            "ohm/contrib/to_hash"
   autoload :WebValidations,    "ohm/contrib/web_validations"
   autoload :NumberValidations, "ohm/contrib/number_validations"
+  autoload :DateValidations,   "ohm/contrib/date_validations"
   autoload :ExtraValidations,  "ohm/contrib/extra_validations"
   autoload :Typecast,          "ohm/contrib/typecast"
   autoload :Locking,           "ohm/contrib/locking"

data/lib/ohm/contrib/date_validations.rb

@@ -0,0 +1,23 @@
+require 'date'
+
+module Ohm
+  module DateValidations
+    DATE = /\A([0-9]{4})-([01]?[0-9])-([0123]?[0-9])\z/
+    
+    def assert_date(att, error = [att, :not_date])
+      if assert_format att, DATE, error
+        m = send(att).to_s.match(DATE)
+        assert is_date_parseable?(m[1], m[2], m[3]), error
+      end
+    end
+
+  private
+    def is_date_parseable?(year, month, day)
+      Date.new(Integer(year), Integer(month), Integer(day))
+    rescue ArgumentError
+      return false
+    else
+      return true
+    end
+  end
+end

data/lib/ohm/contrib/extra_validations.rb

@@ -12,6 +12,7 @@ module Ohm
   #     attribute :author_email
   #     attribute :url
   #     attribute :ipaddr
+  #     attribute :birthday
   #
   #     def validate
   #       super
@@ -21,6 +22,7 @@ module Ohm
   #       assert_ipaddr  :ipaddr
   #       assert_url     :url
   #       assert_email   :author_email
+  #       assert_date    :birthday
   #     end
   #   end
   #
@@ -32,10 +34,11 @@ module Ohm
   module ExtraValidations
     include NumberValidations
     include WebValidations
+    include DateValidations
 
   protected
     def assert_member(att, set, error = [att, :not_member])
       assert set.include?(send(att)), error
     end
   end
-end
+end

data/lib/ohm/contrib/typecast.rb

@@ -15,6 +15,7 @@ module Ohm
   # * Time
   # * Hash
   # * Array
+  # * Boolean
   module Types
     def self.defined?(type)
       @constants ||= constants.map(&:to_s)
@@ -35,11 +36,15 @@ module Ohm
       ]
 
       def self.[](value)
-        return (self::EMPTY.nil? ? nil : self::EMPTY.dup) if value.to_s.empty?
+        return empty  if value.to_s.empty?
 
         new(value)
       end
 
+      def self.empty
+        defined?(self::RAW) ? self::RAW.new : nil
+      end
+
       def self.delegate_to(klass, except = @@delegation_blacklist)
         methods = klass.public_instance_methods.map(&:to_sym) - except
         def_delegators :object, *methods
@@ -51,8 +56,6 @@ module Ohm
     end
 
     class Primitive < Base
-      EMPTY = nil
-
       def initialize(value)
         @raw = value
       end
@@ -120,6 +123,15 @@ module Ohm
       end
     end
 
+    class Boolean
+      def self.[](value)
+        case value
+        when 'false', false, '0', 0 then false
+        when 'true',  true,  '1', 1  then true
+        end
+      end
+    end
+
     class Serialized < Base
       attr :object
 
@@ -152,7 +164,6 @@ module Ohm
     end
 
     class Hash < Serialized
-      EMPTY = {}
       RAW   = ::Hash
 
       delegate_to ::Hash
@@ -165,7 +176,6 @@ module Ohm
     end
 
     class Array < Serialized
-      EMPTY = []
       RAW   = ::Array
 
       delegate_to ::Array

data/ohm-contrib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-06-01}
+  s.date = %q{2010-06-11}
   s.description = %q{Highly decoupled drop-in functionality for Ohm models}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "lib/ohm/contrib.rb",
      "lib/ohm/contrib/boundaries.rb",
      "lib/ohm/contrib/callbacks.rb",
+     "lib/ohm/contrib/date_validations.rb",
      "lib/ohm/contrib/extra_validations.rb",
      "lib/ohm/contrib/locking.rb",
      "lib/ohm/contrib/number_validations.rb",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
      "test/test_ohm_boundaries.rb",
      "test/test_ohm_contrib.rb",
      "test/test_ohm_contrib_callbacks.rb",
+     "test/test_ohm_date_validations.rb",
      "test/test_ohm_extra_validations.rb",
      "test/test_ohm_number_validations.rb",
      "test/test_ohm_timestamping.rb",
@@ -55,6 +57,7 @@ Gem::Specification.new do |s|
      "test/test_ohm_boundaries.rb",
      "test/test_ohm_contrib.rb",
      "test/test_ohm_contrib_callbacks.rb",
+     "test/test_ohm_date_validations.rb",
      "test/test_ohm_extra_validations.rb",
      "test/test_ohm_number_validations.rb",
      "test/test_ohm_timestamping.rb",

data/test/test_ohm_contrib.rb

@@ -48,4 +48,10 @@ class TestOhmContrib < Test::Unit::TestCase
       Ohm::ExtraValidations
     end
   end
-end
+
+  test "autoloading of DateValidations" do
+    assert_nothing_raised NameError, LoadError do
+      Ohm::DateValidations
+    end
+  end
+end

data/test/test_ohm_date_validations.rb

@@ -0,0 +1,30 @@
+require "helper"
+
+class DateValidationsTest < Test::Unit::TestCase
+  describe "date validation with a normal string column" do
+    class Person < Ohm::Model
+      include Ohm::DateValidations
+
+      attribute :birthday
+      
+      def validate
+        assert_date :birthday
+      end
+    end
+
+    test "accepts all canonical dates" do
+      assert Person.new(:birthday => "2010-05-05").valid?
+      assert Person.new(:birthday => "2010-5-5").valid?
+      assert Person.new(:birthday => "2010-05-5").valid?
+      assert Person.new(:birthday => "2010-5-05").valid?
+    end
+
+    test "also catches invalid dates" do
+      assert ! Person.new(:birthday => "2010-02-29").valid?
+    end
+
+    test "invalid when empty" do
+      assert ! Person.new(:birthday => "").valid?
+    end
+  end
+end

data/test/test_ohm_extra_validations.rb

@@ -29,4 +29,4 @@ class OhmExtraValidationsTest < Test::Unit::TestCase
       assert_equal [[:state, :not_member]], order.errors
     end
   end
-end
+end

data/test/test_ohm_typecast.rb

@@ -614,4 +614,45 @@ class TestOhmTypecast < Test::Unit::TestCase
       assert_equal %{"\\\"FooBar\\\""}, post.addresses.inspect
     end
   end
-end
+
+  context "when using Boolean" do
+    class User < Ohm::Model
+      include Ohm::Typecast
+      
+      attribute :is_admin, Boolean
+    end
+
+    test "empty is nil" do
+      assert_equal nil, User.new.is_admin
+
+      u = User.create
+      u = User[u.id]
+
+      assert_equal nil, User.new.is_admin
+    end
+
+    test "false, 0, '0' is false" do
+      [false, 0, '0'].each do |val|
+        assert_equal false, User.new(:is_admin => val).is_admin
+      end
+
+      [false, 0, '0'].each do |val|
+        u = User.create(:is_admin => val)
+        u = User[u.id]
+        assert_equal false, u.is_admin
+      end
+    end
+
+    test "true, 1, '1' is true" do
+      [true, 1, '1'].each do |val|
+        assert_equal true, User.new(:is_admin => val).is_admin
+      end
+
+      [true, 1, '1'].each do |val|
+        u = User.create(:is_admin => val)
+        u = User[u.id]
+        assert_equal true, u.is_admin
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 23
-  version: 0.0.23
+  - 24
+  version: 0.0.24
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +08:00
+date: 2010-06-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ files:
 - lib/ohm/contrib.rb
 - lib/ohm/contrib/boundaries.rb
 - lib/ohm/contrib/callbacks.rb
+- lib/ohm/contrib/date_validations.rb
 - lib/ohm/contrib/extra_validations.rb
 - lib/ohm/contrib/locking.rb
 - lib/ohm/contrib/number_validations.rb
@@ -108,6 +109,7 @@ files:
 - test/test_ohm_boundaries.rb
 - test/test_ohm_contrib.rb
 - test/test_ohm_contrib_callbacks.rb
+- test/test_ohm_date_validations.rb
 - test/test_ohm_extra_validations.rb
 - test/test_ohm_number_validations.rb
 - test/test_ohm_timestamping.rb
@@ -149,6 +151,7 @@ test_files:
 - test/test_ohm_boundaries.rb
 - test/test_ohm_contrib.rb
 - test/test_ohm_contrib_callbacks.rb
+- test/test_ohm_date_validations.rb
 - test/test_ohm_extra_validations.rb
 - test/test_ohm_number_validations.rb
 - test/test_ohm_timestamping.rb