riot-datamapper 0.0.4 → 0.1.0

data/README.md

@@ -39,11 +39,16 @@ class User
 
   property :foo,    String
   property :bar,    Serial
+  property :buzz,   Integer
   property :monkey, Boolean, :default => false
   property :name,   String,  :default => 'monkey', :required => true
 
   has n, :comments, :through => :posts
   has 1, :address
+
+  validates_presence_of  :foo
+  validates_uniquness_of :bar
+  validates_length_of    :buzz, :maximum => 20
 end
 
 class Address
@@ -87,6 +92,10 @@ context "User Model" do
 
   asserts_topic.has_association :has_n, :comments, :through => :posts
   asserts_topic.has_association :has 1, :address
+
+  asserts_topic.has_validation :validates_presence_of,  :foo
+  asserts_topic.has_validation :validates_uniquness_of, :bar
+  asserts_topic.has_validation :validates_length_of,    :buzz, :maximum => 20
 end
 
 context "Address Model" do
@@ -119,11 +128,6 @@ context "Post Model" do
 end
 ```
 
-## TODO ##
-
-* Add more macros
-* Add validation macros so you can do something like #has_validation :validates_presence_of
-
 ## Copyright
 
 Copyright © 2011 Arthur Chiu. See [MIT-LICENSE](https://github.com/achiu/riot-datamapper/blob/master/MIT-LICENSE) for details.

data/lib/riot-datamapper/has_validation.rb

@@ -0,0 +1,31 @@
+module Riot
+  module DataMapper
+    class HasValidation < Riot::AssertionMacro
+      register :has_validation
+
+      def evaluate(model, validation, field, options={})
+
+        validator = model.validators.context(:default).detect do |v|
+          keyword = validation.to_s.match(/validates_(\w+)_of/)[1]
+          v.class.inspect.downcase =~ /#{keyword}/ && v.field_name.to_sym == field.to_sym
+        end
+
+        fail_msg    = "expected #{model} to have validation :#{validation} on :#{field}"
+        pass_msg    = "#{model} has validation :#{validation} on :#{field}"
+        options_msg = " with options #{options.inspect}"
+
+        return fail(fail_msg) if validator.nil?
+
+        unless options.empty?
+          if options.all? { |key, value| validator.options[key] == value }
+            pass_msg << options_msg
+          else
+            return fail(fail_msg + options_msg)
+          end
+        end
+
+        pass(pass_msg)
+      end
+    end
+  end
+end

data/lib/riot-datamapper/version.rb

@@ -1,5 +1,5 @@
 module Riot
   module Datamapper
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/test/has_validation_test.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../teststrap', __FILE__)
+
+context "has_validation macro" do
+  setup do
+    Object.send(:remove_const, :FooBar) if Object.const_defined?(:FooBar)
+
+    class FooBar
+      include DataMapper::Resource
+
+      property :id,  Serial
+      property :foo, String
+      property :bar, Integer
+      property :buzz, Integer
+
+      validates_presence_of     :foo
+      validates_numericality_of :bar
+      validates_length_of       :buzz, :maximum => 20
+    end
+    DataMapper.finalize ; FooBar
+  end
+
+  asserts "that it passes when the model has the validation" do
+    Riot::DataMapper::HasValidation.new.evaluate(topic, :validates_presence_of, :foo).first
+  end.equals :pass
+
+  asserts "that it fails when the model does not have the validation" do
+    Riot::DataMapper::HasValidation.new.evaluate(topic, :validates_presence_of, :bar).first
+  end.equals :fail
+
+  asserts "that it passes when the model has the validation and options" do
+    Riot::DataMapper::HasValidation.new.evaluate(topic, :validates_length_of, :buzz, :maximum => 20).first
+  end.equals :pass
+
+  asserts "that it fails when the model does not have the validation and options" do
+    Riot::DataMapper::HasValidation.new.evaluate(topic, :validates_length_of, :buzz, :maximum => 30).first
+  end.equals :fail
+
+  asserts "that it has message when the model has the validation and options" do
+    Riot::DataMapper::HasValidation.new.evaluate(topic, :validates_length_of, :buzz, :maximum => 20).last
+  end.equals "FooBar has validation :validates_length_of on :buzz with options {:maximum=>20}"
+
+end

metadata

@@ -1,60 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: riot-datamapper
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Arthur Chiu
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: riot
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2172728880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dm-core
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2172728880
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: &2172728460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2172728460
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  requirement: &2172759240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2172759240
 description: Riot Assertion Macros for DataMapper
-email: 
+email:
 - mr.arthur.chiu@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -68,35 +64,34 @@ files:
 - riot-datamapper.gemspec
 - test/has_association_test.rb
 - test/has_property_test.rb
+- test/has_validation_test.rb
 - test/teststrap.rb
 homepage: https://www.github.com/achiu/riot-datamapper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: riot-datamapper
-rubygems_version: 1.8.4
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Riot Assertion Macros for DataMapper
-test_files: 
+test_files:
 - test/has_association_test.rb
 - test/has_property_test.rb
+- test/has_validation_test.rb
 - test/teststrap.rb