ohm 0.0.5 → 0.0.6

data/Rakefile

@@ -1,33 +1,9 @@
 require "rake/testtask"
-require 'rake/gempackagetask'
 
 task :default => :test
 
-gem_spec_file = 'ohm.gemspec'
-gem_spec = eval(File.read(gem_spec_file)) rescue nil
-
 desc 'Run all tests'
 Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
-
-Rake::GemPackageTask.new(gem_spec) do |pkg|
-  pkg.need_zip = false
-  pkg.need_tar = false
-  rm_f FileList['pkg/**/*.*']
-end if gem_spec
-
-desc "Generate the gemspec file."
-task :gemspec do
-  require 'erb'
-
-  File.open(gem_spec_file, 'w') do |f|
-    f.write ERB.new(File.read("#{gem_spec_file}.erb")).result(binding)
-  end
-end
-
-desc "Builds and installs the gem."
-task :install => :repackage do
-  `sudo gem install pkg/#{gem_spec.name}-#{gem_spec.version}.gem`
-end

data/lib/ohm/redis.rb

@@ -141,6 +141,7 @@ module Ohm
 
     def disconnect
       @sock.close
+      @sock = nil
     end
 
     def reconnect

data/lib/ohm/validations.rb

@@ -1,5 +1,62 @@
 module Ohm
   module Validations
+    class Presenter
+      class UnhandledErrors < StandardError
+        attr :errors
+
+        def initialize(errors)
+          @errors = errors
+        end
+
+        def message
+          "Unhandled errors: #{errors.inspect}"
+        end
+      end
+
+      def initialize(errors)
+        @errors = errors
+        @unhandled = errors.dup
+        @output = []
+      end
+
+      def on(error, message = (block_given? ? yield : raise(ArgumentError)))
+        handle(error) do
+          @output << message
+        end
+      end
+
+      def ignore(error)
+        handle(error)
+      end
+
+      def present
+        yield(self)
+        raise UnhandledErrors.new(@unhandled) unless @unhandled.empty?
+        @output
+      end
+
+    protected
+
+      def handle(error)
+        if (errors = @errors.select {|e| error === e }).any?
+          @unhandled -= errors
+          yield(errors) if block_given?
+        end
+      end
+    end
+
+    class Errors < Array
+      attr_accessor :model
+
+      def initialize(model)
+        @model = model
+      end
+
+      def present(presenter = Presenter, &block)
+        presenter.new(model.errors).present(&block)
+      end
+    end
+
     def valid?
       errors.clear
       validate
@@ -10,7 +67,7 @@ module Ohm
     end
 
     def errors
-      @errors ||= []
+      @errors ||= Errors.new(self)
     end
 
   protected

data/test/db/redis.pid

@@ -1 +1 @@
-6304
+36980

data/test/errors_test.rb

@@ -0,0 +1,120 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class ErrorsTest < Test::Unit::TestCase
+  class User < Ohm::Model
+    attribute :name
+    attribute :account
+
+    def validate
+      assert_present :name
+      assert_present :account
+      assert false, :terrible_error
+    end
+  end
+
+  setup do
+    @model = User.new(:account => "")
+    @model.valid?
+  end
+
+  context "errors handler" do
+    should "raise an error if the errors are not handled" do
+      assert_raise Ohm::Validations::Presenter::UnhandledErrors do
+        @model.errors.present do |e|
+          e.on :terrible_error do
+          end
+        end
+      end
+    end
+
+    should "evaluate blocks when errors match" do
+      values = []
+
+      @model.errors.present do |e|
+        e.on [:name, :nil] do
+          values << 1
+        end
+
+        e.on [:account, :empty] do
+          values << 2
+        end
+
+        e.on :terrible_error do
+          values << 3
+        end
+      end
+
+      assert_equal [1, 2, 3], values
+    end
+
+    should "accept case-like matches for an error" do
+      values = []
+
+      @model.errors.present do |e|
+        e.on Array do
+          values << 1
+        end
+
+        e.on :terrible_error do
+          values << 3
+        end
+      end
+
+      assert_equal [1, 3], values
+    end
+
+    should "accept multiple matches for an error" do
+      values = @model.errors.present do |e|
+        e.on [:name, :nil], "A"
+        e.on [:account, :empty] do
+          "B"
+        end
+        e.on :terrible_error, "C"
+      end
+
+      assert_equal %w{A B C}, values
+    end
+
+    class MyPresenter < Ohm::Validations::Presenter
+      def on(*args)
+        super(*args) do
+          yield.downcase
+        end
+      end
+    end
+
+    should "take a custom presenter" do
+      values = @model.errors.present(MyPresenter) do |e|
+        e.on([:name, :nil]) { "A" }
+        e.on([:account, :empty]) { "B" }
+        e.on(:terrible_error) { "C" }
+      end
+
+      assert_equal %w{a b c}, values
+    end
+
+    should "raise an error if neither a message nor a block are supplied" do
+      assert_raise ArgumentError do
+        Ohm::Validations::Presenter.new([:custom]).present do |e|
+          e.on(:custom)
+        end
+      end
+    end
+
+    should "not raise an error if the message passed is nil" do
+      values = Ohm::Validations::Presenter.new([:custom]).present do |e|
+        e.on(:custom, nil)
+      end
+
+      assert_equal [nil], values
+
+      assert_nothing_raised do
+        Ohm::Validations::Presenter.new([:custom]).present do |e|
+          e.on(:custom, nil) do
+            raise "Should not call block"
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -03:00
+date: 2009-06-22 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - test/benchmarks.rb
 - test/db/dump.rdb
 - test/db/redis.pid
+- test/errors_test.rb
 - test/indices_test.rb
 - test/model_test.rb
 - test/redis_test.rb