veneer 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/veneer/adapters/activerecord/class_wrapper.rb

@@ -24,6 +24,24 @@ module ActiveRecord
           klass.before_save *methods
         end
 
+        %w(
+          validates_presence_of
+          validates_uniqueness_of
+          validates_confirmation_of
+        ).each do |meth|
+        class_eval <<-RUBY
+          def #{meth}(*args)
+            klass.#{meth}(*args)
+          end
+          RUBY
+        end
+
+        def validates_with_method(*methods)
+          methods.each do |meth|
+            @klass.validate meth
+          end
+        end
+
         private
         def conditional_to_ar_opts(c)
           opts = {}

data/lib/veneer/adapters/datamapper/class_wrapper.rb

@@ -28,7 +28,28 @@ module DataMapper
           end
         end
 
+        [
+          %w(validates_presence_of      validates_present),
+          %w(validates_uniqueness_of    validates_is_unique),
+          %w(validates_confirmation_of  validates_is_confirmed),
+          %w(validates_with_method      validates_with_method)
+        ].each do |(meth,natural)|
+          class_eval <<-RUBY
+            def #{meth}(*args)
+              ensure_validations_loaded!
+              klass.#{natural}(*args)
+            end
+          RUBY
+        end
+
         private
+        def ensure_validations_loaded!
+          unless defined?(::DataMapper::Validate)
+            ::Kernel.require 'dm-validations'
+            @klass.class_eval{include ::DataMapper::Validate}
+          end
+        end
+
         def opts_from_conditional_for_dm(c)
           opts = {}
 

data/lib/veneer/adapters/mongomapper/class_wrapper.rb

@@ -24,6 +24,24 @@ module MongoMapper
           klass.before_save *methods
         end
 
+        %w(
+          validates_presence_of
+          validates_uniqueness_of
+          validates_confirmation_of
+        ).each do |meth|
+          class_eval <<-RUBY
+            def #{meth}(*args)
+              klass.#{meth}(*args)
+            end
+          RUBY
+        end
+
+        def validates_with_method(*methods)
+          methods.each do |meth|
+            klass.validates_each(nil, :logic => ::Proc.new{ send(meth)})
+          end
+        end
+
         private
         def conditional_to_mongo_opts(c)
           opts = {}

data/lib/veneer/base/instance_wrapper.rb

@@ -11,11 +11,15 @@ module Veneer
       end
 
       def handle_before_save_error(e)
-        case e.message
-        when Array
-          instance.errors.add(e.message[0], e.message[1])
-        when String
-          instance.errors.add("", e.message)
+        if instance.respond_to?(:errors) && instance.errors.respond_to?(:add)
+          case e.message
+          when Array
+            instance.errors.add(e.message[0], e.message[1])
+          when String
+            instance.errors.add("", e.message)
+          end
+        else
+          ::STDOUT.puts e.message
         end
         false
       end

data/test/macros/class_wrapper/validations.rb

@@ -0,0 +1,91 @@
+class Test::Unit::TestCase
+  def self.veneer_should_implement_validations
+    context "implements validations" do
+      setup do
+        Veneer(@klass).destroy_all
+      end
+
+      should "setup the test correctly" do
+        assert_not_nil @klass
+        assert_kind_of Class, @klass
+        assert_not_nil @valid_attributes
+        assert_kind_of Hash, @valid_attributes
+        assert_not_nil @valid_attributes[:name]
+      end
+
+      context "validates_presence_of" do
+        setup do
+          key = [@klass, :validates_presence_of, :name]
+          unless $validations.include?(key)
+            Veneer(@klass).validates_presence_of(:name)
+            $validations << key
+          end
+        end
+
+        should "allow addition of a validation for presence_of" do
+          attr = @valid_attributes.dup
+          attr.delete(:name)
+          k = Veneer(@klass).new(attr)
+          assert_false k.valid?
+        end
+      end
+
+      context "validates_uniqueness_of" do
+        setup do
+          key = [@klass, :validates_uniqueness_of, :name]
+          unless $validations.include?(key)
+            Veneer(@klass).validates_uniqueness_of(:name)
+            $validations << key
+          end
+        end
+
+        should "not allow duplicate data" do
+          k = Veneer(@klass).new(@valid_attributes)
+          assert_true k.save
+          k2 = Veneer(@klass).new(@valid_attributes)
+          assert_false k2.valid?
+        end
+
+        # TODO: Get some introspection of validations happening
+        should "allow_non duplicate data" do
+          k = Veneer(@klass).new(@valid_attributes)
+          assert_true k.save
+          k2 = Veneer(@klass).new(@valid_attributes.merge(:name => "not a duplicate"))
+          assert_true k2.save
+        end
+      end
+
+      context "validates_confirmation_of" do
+        setup do
+          key = [@klass, :validates_confirmation_of, :password]
+          unless $validations.include?(key)
+            Veneer(@klass).validates_confirmation_of(:password)
+            $validations << key
+          end
+        end
+
+        should "be invalid without confirmation" do
+          k = Veneer(@klass).new(@valid_attributes)
+          k.password_confirmation = "Not Confirmed"
+          assert_false k.valid?
+        end
+      end
+
+      context "validates_with_method" do
+        setup do
+          key = [@klass, :validates_with_method, :v_with_m_test]
+          unless $validations.include?(key)
+            Veneer(@klass).validates_with_method(:v_with_m_test)
+            $validations << key
+          end
+        end
+
+        should "be invalid with an invalid through v_with_m_test" do
+          k = Veneer(@klass).new(@valid_attributes)
+          k.name = "v_with_m_test"
+          assert_false k.valid?
+        end
+      end
+    end
+  end
+end

data/test/macros/instance_wrapper/new_record_macro.rb

@@ -1,6 +1,10 @@
 class Test::Unit::TestCase
   def self.veneer_should_implement_new_record?
     context "on an instance" do
+      setup do
+        Veneer(@klass).destroy_all
+      end
+
       should "setup the test correctly" do
         assert_not_nil @klass
         assert_kind_of Class, @klass

data/test/test_helper.rb

@@ -9,6 +9,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'veneer'
 
+$validations = []
+
 class Test::Unit::TestCase
   include Veneer::Test::Helpers
 end

data/test/veneer/adapters/active_record/active_record_setup.rb

@@ -3,6 +3,7 @@ require 'veneer/adapters/activerecord'
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 class CreateActiveRecordFoo < ActiveRecord::Migration
+
   def self.up
     create_table :active_record_foos, :force => true do |t|
       t.string  :name
@@ -18,6 +19,7 @@ end
 CreateActiveRecordFoo.up
 
 class ActiveRecordFoo < ActiveRecord::Base
+  attr_accessor :password, :password_confirmation
   def self.veneer_spec_reset!
     delete_all
   end
@@ -25,4 +27,8 @@ class ActiveRecordFoo < ActiveRecord::Base
   def validate
     errors.add(:name, "Name cannot be 'invalid'") if name == "invalid"
   end
+
+  def v_with_m_test
+    errors.add(:name, "Name cannot be v_with_m_test") if name == "v_with_m_test"
+  end
 end

data/test/veneer/adapters/active_record/class_wrapper_test.rb

@@ -7,8 +7,8 @@ module Veneer
       context "Active Record Veneer Adapter" do
         setup do
           @klass              = ::ActiveRecordFoo
-          @valid_attributes   = {:name => "foo"}
-          @invalid_attributes = {:name => "invalid"}
+          @valid_attributes   = {:name => "foo", :password => "pass", :password_confirmation => "pass"}
+          @invalid_attributes = @valid_attributes.dup.merge(:name => "invalid")
         end
         veneer_should_have_the_required_veneer_constants
         veneer_should_implement_create_with_valid_attributes
@@ -16,7 +16,8 @@ module Veneer
         veneer_should_implement_create_with_invalid_attributes
         veneer_should_implement_find
         veneer_should_implement_before_save_hooks
-     end
+        veneer_should_implement_validations
+      end
     end
   end
 end

data/test/veneer/adapters/active_record/instance_wrapper_test.rb

@@ -7,8 +7,8 @@ module Veneer
       context "Active Record Veneer Adapter" do
         setup do
           @klass              = ::ActiveRecordFoo
-          @valid_attributes   = {:name => "foo"}
-          @invalid_attributes = {:name => "invalid"}
+          @valid_attributes   = {:name => "foo", :password => "pass", :password_confirmation => "pass"}
+          @invalid_attributes = @valid_attributes.dup.merge(:name => "invalid")
         end
 
         veneer_should_implement_new_record?

data/test/veneer/adapters/datamapper/class_wrapper_test.rb

@@ -7,8 +7,8 @@ module Veneer
       context "DataMapper Veneer Adapter" do
         setup do
           @klass = DMFoo
-          @valid_attributes   = {:name => "foo"}
-          @invalid_attributes = {:name => "invalid"}
+          @valid_attributes   = {:name => "foo", :password => "pass", :password_confirmation => "pass"}
+          @invalid_attributes = @valid_attributes.dup.merge(:name => "invalid")
         end
 
         veneer_should_have_the_required_veneer_constants
@@ -17,6 +17,7 @@ module Veneer
         veneer_should_implement_create_with_invalid_attributes
         veneer_should_implement_find
         veneer_should_implement_before_save_hooks
+        veneer_should_implement_validations
       end
     end
   end

data/test/veneer/adapters/datamapper/datamapper_setup.rb

@@ -6,6 +6,7 @@ DataMapper.setup(:default, 'sqlite3::memory:')
 
 class DMFoo
   include DataMapper::Resource
+  attr_accessor :password, :password_confirmation
 
   property :id,           Serial
   property :name,         String
@@ -20,6 +21,14 @@ class DMFoo
       true
     end
   end
+
+  def v_with_m_test
+    if name == "v_with_m_test"
+      [false, "name cannot be v_with_m_test"]
+    else
+      true
+    end
+  end
 end
 
 DataMapper.auto_migrate!

data/test/veneer/adapters/datamapper/instance_wrapper_test.rb

@@ -7,8 +7,8 @@ module Veneer
       context "DataMapper Veneer Adapter" do
         setup do
           @klass = DMFoo
-          @valid_attributes   = {:name => "foo"}
-          @invalid_attributes = {:name => "invalid"}
+          @valid_attributes   = {:name => "foo", :password => "pass", :password_confirmation => "pass"}
+          @invalid_attributes = @valid_attributes.dup.merge(:name => "invalid")
         end
 
         veneer_should_implement_new_record?

data/test/veneer/adapters/mongomapper/class_wrapper_test.rb

@@ -7,8 +7,8 @@ module Veneer
       context "MongoMapper Veneer Adapter" do
         setup do
           @klass =  MongoFoo
-          @valid_attributes     = {:name => "foo"}
-          @invalid_attributes   = {:name => "invalid"}
+          @valid_attributes   = {:name => "foo", :password => "pass", :password_confirmation => "pass"}
+          @invalid_attributes = @valid_attributes.dup.merge(:name => "invalid")
         end
 
         veneer_should_have_the_required_veneer_constants
@@ -17,6 +17,7 @@ module Veneer
         veneer_should_implement_create_with_invalid_attributes
         veneer_should_implement_find
         veneer_should_implement_before_save_hooks
+        veneer_should_implement_validations
       end
     end
   end

data/test/veneer/adapters/mongomapper/instance_wrapper_test.rb

@@ -7,8 +7,8 @@ module Veneer
       context "MongoMapper Veneer Adapter" do
         setup do
           @klass = MongoFoo
-          @valid_attributes   = {:name => "foo"}
-          @invalid_attributes = {:name => "invalid"}
+          @valid_attributes   = {:name => "foo", :password => "pass", :password_confirmation => "pass"}
+          @invalid_attributes = @valid_attributes.dup.merge(:name => "invalid")
         end
 
         veneer_should_implement_new_record?

data/test/veneer/adapters/mongomapper/mongomapper_setup.rb

@@ -7,6 +7,7 @@ MongoMapper.database = 'veneer_test'
 
 class MongoFoo
   include MongoMapper::Document
+  attr_accessor :password, :password_confirmation
 
   key :name,          String
   key :order_field1,  Integer
@@ -16,5 +17,9 @@ class MongoFoo
   def check_name
     errors.add(:name, "may not be invalid") if name == "invalid"
   end
+
+  def v_with_m_test
+    errors.add(:name, "may not be v_with_m_test") if name == "v_with_m_test"
+  end
 end
 

data/test/veneer/proxy_test.rb

@@ -134,16 +134,6 @@ class VeneerProxyTest < Test::Unit::TestCase
         @invalid_attributes = {:invalid => true}
         @instance           = ::Foo.new
       end
-
-      veneer_should_have_the_required_veneer_constants
-      veneer_should_implement_create_with_valid_attributes
-      veneer_should_implement_create_with_invalid_attributes
-      veneer_should_impelement_destroy_all
-      veneer_should_implement_find
-      veneer_should_implement_new_record?
-      veneer_should_implement_save
-      veneer_should_implement_save!
-      veneer_should_implement_destroy
     end
 
     context "all" do

data/veneer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{veneer}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
@@ -46,12 +46,14 @@ Gem::Specification.new do |s|
      "test/macros/class_wrapper/delete_macro.rb",
      "test/macros/class_wrapper/find_macro.rb",
      "test/macros/class_wrapper/hooks.rb",
+     "test/macros/class_wrapper/validations.rb",
      "test/macros/instance_wrapper/destroy_macro.rb",
      "test/macros/instance_wrapper/new_record_macro.rb",
      "test/macros/instance_wrapper/save_macro.rb",
      "test/macros/veneer_constants_interface.rb",
      "test/support/before_save_mixin.rb",
      "test/support/helpers.rb",
+     "test/support/valiations_method_method.rb",
      "test/test_helper.rb",
      "test/veneer/adapters/active_record/active_record_setup.rb",
      "test/veneer/adapters/active_record/class_wrapper_test.rb",
@@ -77,12 +79,14 @@ Gem::Specification.new do |s|
      "test/macros/class_wrapper/delete_macro.rb",
      "test/macros/class_wrapper/find_macro.rb",
      "test/macros/class_wrapper/hooks.rb",
+     "test/macros/class_wrapper/validations.rb",
      "test/macros/instance_wrapper/destroy_macro.rb",
      "test/macros/instance_wrapper/new_record_macro.rb",
      "test/macros/instance_wrapper/save_macro.rb",
      "test/macros/veneer_constants_interface.rb",
      "test/support/before_save_mixin.rb",
      "test/support/helpers.rb",
+     "test/support/valiations_method_method.rb",
      "test/test_helper.rb",
      "test/veneer/adapters/active_record/active_record_setup.rb",
      "test/veneer/adapters/active_record/class_wrapper_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: veneer
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -52,12 +52,14 @@ files:
 - test/macros/class_wrapper/delete_macro.rb
 - test/macros/class_wrapper/find_macro.rb
 - test/macros/class_wrapper/hooks.rb
+- test/macros/class_wrapper/validations.rb
 - test/macros/instance_wrapper/destroy_macro.rb
 - test/macros/instance_wrapper/new_record_macro.rb
 - test/macros/instance_wrapper/save_macro.rb
 - test/macros/veneer_constants_interface.rb
 - test/support/before_save_mixin.rb
 - test/support/helpers.rb
+- test/support/valiations_method_method.rb
 - test/test_helper.rb
 - test/veneer/adapters/active_record/active_record_setup.rb
 - test/veneer/adapters/active_record/class_wrapper_test.rb
@@ -104,12 +106,14 @@ test_files:
 - test/macros/class_wrapper/delete_macro.rb
 - test/macros/class_wrapper/find_macro.rb
 - test/macros/class_wrapper/hooks.rb
+- test/macros/class_wrapper/validations.rb
 - test/macros/instance_wrapper/destroy_macro.rb
 - test/macros/instance_wrapper/new_record_macro.rb
 - test/macros/instance_wrapper/save_macro.rb
 - test/macros/veneer_constants_interface.rb
 - test/support/before_save_mixin.rb
 - test/support/helpers.rb
+- test/support/valiations_method_method.rb
 - test/test_helper.rb
 - test/veneer/adapters/active_record/active_record_setup.rb
 - test/veneer/adapters/active_record/class_wrapper_test.rb