ohm-contrib 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/ohm/contrib/extra_validations.rb

@@ -0,0 +1,11 @@
+module Ohm
+  module ExtraValidations
+    include NumberValidations
+    include WebValidations
+
+  protected
+    def assert_member(att, set, error = [att, :not_member])
+      assert set.include?(send(att)), error
+    end    
+  end
+end

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.12'
+    VERSION = '0.0.13'
   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 :ExtraValidations,  "ohm/contrib/extra_validations"
   autoload :Typecast,          "ohm/contrib/typecast"
   autoload :Locking,           "ohm/contrib/locking"
 end

data/ohm-contrib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-21}
   s.description = %q{Highly decoupled drop-in functionality for Ohm models}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/ohm/contrib.rb",
      "lib/ohm/contrib/boundaries.rb",
+     "lib/ohm/contrib/extra_validations.rb",
      "lib/ohm/contrib/locking.rb",
      "lib/ohm/contrib/number_validations.rb",
      "lib/ohm/contrib/timestamping.rb",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
      "test/helper.rb",
      "test/test_ohm_boundaries.rb",
      "test/test_ohm_contrib.rb",
+     "test/test_ohm_extra_validations.rb",
      "test/test_ohm_number_validations.rb",
      "test/test_ohm_timestamping.rb",
      "test/test_ohm_to_hash.rb",
@@ -50,6 +52,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
      "test/test_ohm_boundaries.rb",
      "test/test_ohm_contrib.rb",
+     "test/test_ohm_extra_validations.rb",
      "test/test_ohm_number_validations.rb",
      "test/test_ohm_timestamping.rb",
      "test/test_ohm_to_hash.rb",

data/test/test_ohm_contrib.rb

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

data/test/test_ohm_extra_validations.rb

@@ -0,0 +1,32 @@
+require "helper"
+
+class OhmExtraValidationsTest < Test::Unit::TestCase
+  context "membership assertion" do
+    class Order < Ohm::Model
+      include Ohm::ExtraValidations
+
+      attribute :state
+
+      def validate
+        assert_member :state, %w(pending authorized declined)
+      end
+    end
+
+    should "be successful given all the members" do
+      order = Order.new(:state => 'pending')
+      assert order.valid?
+
+      order = Order.new(:state => 'authorized')
+      assert order.valid?
+
+      order = Order.new(:state => 'declined')
+      assert order.valid?
+    end
+
+    should "fail on a non-member" do
+      order = Order.new(:state => 'foobar')
+      assert ! order.valid?
+      assert_equal [[:state, :not_member]], order.errors
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +08:00
+date: 2010-05-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - VERSION
 - lib/ohm/contrib.rb
 - lib/ohm/contrib/boundaries.rb
+- lib/ohm/contrib/extra_validations.rb
 - lib/ohm/contrib/locking.rb
 - lib/ohm/contrib/number_validations.rb
 - lib/ohm/contrib/timestamping.rb
@@ -105,6 +106,7 @@ files:
 - test/helper.rb
 - test/test_ohm_boundaries.rb
 - test/test_ohm_contrib.rb
+- test/test_ohm_extra_validations.rb
 - test/test_ohm_number_validations.rb
 - test/test_ohm_timestamping.rb
 - test/test_ohm_to_hash.rb
@@ -144,6 +146,7 @@ test_files:
 - test/helper.rb
 - test/test_ohm_boundaries.rb
 - test/test_ohm_contrib.rb
+- test/test_ohm_extra_validations.rb
 - test/test_ohm_number_validations.rb
 - test/test_ohm_timestamping.rb
 - test/test_ohm_to_hash.rb