veneer 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

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

@@ -20,6 +20,10 @@ module ActiveRecord
           klass.find(:all,opts)
         end
 
+        def before_save(*methods)
+          klass.before_save *methods
+        end
+
         private
         def conditional_to_ar_opts(c)
           opts = {}

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

@@ -4,16 +4,20 @@ module ActiveRecord
       class InstanceWrapper < Veneer::Base::InstanceWrapper
         def update(attributes = {})
           instance.update_attributes(attributes)
+        rescue Veneer::Errors::BeforeSaveError => e
+          handle_before_save_error(e)
         end
 
         def save!
           instance.save!
-        rescue ActiveRecord::RecordInvalid => e
-          raise ::Veneer::Errors::NotSaved
+        rescue ActiveRecord::RecordInvalid, Veneer::Errors::BeforeSaveError=> e
+          raise ::Veneer::Errors::NotSaved, e.message
         end
 
         def save
           instance.save
+        rescue Veneer::Errors::BeforeSaveError => e
+          handle_before_save_error(e)
         end
       end # InstanceWrapper
     end # VeneerInterface

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

@@ -20,6 +20,14 @@ module DataMapper
           klass.all(opts)
         end
 
+        def before_save(*methods)
+          klass.class_eval do
+            methods.each do |meth|
+              before :save, meth
+            end
+          end
+        end
+
         private
         def opts_from_conditional_for_dm(c)
           opts = {}

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

@@ -1,23 +1,39 @@
-module DataMapper
-  module Resource
-    module VeneerInterface
-      class InstanceWrapper < ::Veneer::Base::InstanceWrapper
+  module DataMapper
+    module Resource
+      module VeneerInterface
+        class InstanceWrapper < ::Veneer::Base::InstanceWrapper
 
-        def save!
-          r = instance.save
-          raise ::Veneer::Errors::NotSaved unless r
-          r
-        end
+          def save
+            result = false
+            instance.class.transaction do
+              result = instance.save
+            end
+            result
+          rescue ::Veneer::Errors::BeforeSaveError => e
+            handle_before_save_error(e)
+          end
 
-        def new_record?
-          instance.respond_to?(:new?) ? instance.new? : instance.new_record?
-        end
+          def save!
+            result = false
+            instance.class.transaction do
+              result = instance.save
+              raise ::Veneer::Errors::NotSaved unless result
+              result
+            end
+            result
+          rescue ::Veneer::Errors::BeforeSaveError => e
+            raise ::Veneer::Errors::NotSaved, e.message
+          end
+
+          def new_record?
+            instance.respond_to?(:new?) ? instance.new? : instance.new_record?
+          end
 
-        def destroy
-          instance.destroy
-          self
+          def destroy
+            instance.destroy
+            self
+          end
         end
       end
     end
   end
-end

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

@@ -20,6 +20,10 @@ module MongoMapper
           klass.all(opts)
         end
 
+        def before_save(*methods)
+          klass.before_save *methods
+        end
+
         private
         def conditional_to_mongo_opts(c)
           opts = {}

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

@@ -4,8 +4,22 @@ module MongoMapper
       class InstanceWrapper < ::Veneer::Base::InstanceWrapper
         def save!
           instance.save!
-        rescue
-          raise ::Veneer::Errors::NotSaved
+        rescue ::Veneer::Errors::BeforeSaveError => e
+          raise ::Veneer::Errors::NotSaved, e.message
+        rescue => e
+          raise ::Veneer::Errors::NotSaved, e.message
+        end
+
+        def save
+          instance.save
+        rescue ::Veneer::Errors::BeforeSaveError => e
+          handle_before_save_error(e)
+        end
+
+        def update(*args)
+          instance.update(*args)
+        rescue ::Veneer::Errors::BeforeSaveError => e
+          handle_before_save_error(e)
         end
       end
     end

data/lib/veneer/base/instance_wrapper.rb

@@ -6,6 +6,20 @@ module Veneer
         @instance, @options = instance, opts
       end
 
+      def class
+        @instance.class
+      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)
+        end
+        false
+      end
+
       # Checks equality of the instances
       # @api public
       def ==(other)

data/lib/veneer/errors.rb

@@ -5,5 +5,6 @@ module Veneer
     class NotSaved                        < VeneerError;    end
     class ConditionalOperatorNotSupported < VeneerError;    end
     class NotImplemented                  < VeneerError;    end
+    class BeforeSaveError                 < VeneerError;    end
   end
 end

data/test/macros/class_wrapper/hooks.rb

@@ -0,0 +1,41 @@
+class Test::Unit::TestCase
+  def self.veneer_should_implement_before_save_hooks
+    context "impelements before_save" do
+      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
+      end
+
+      context "before_save" do
+        setup do
+          $captures = []
+          Veneer(@klass).before_save :check_before_save
+          @klass.class_eval do
+            include Veneer::Test::BeforeSaveSetup
+          end unless Veneer::Test::BeforeSaveSetup > @klass
+        end
+
+        teardown{ $captures = [] }
+
+        should "run the before save block" do
+          Veneer(@klass).new(@valid_attributes).save
+          assert_contains $captures, :check_before_save
+        end
+
+        should "allow me to raise inside the before save without propergating the issue further" do
+          assert_nothing_raised do
+            Veneer(@klass).new(@valid_attributes.merge(:name => "raise_on_before_save")).save
+          end
+        end
+
+        should "allow me to save! with an invalid before_save hook and do the right thing" do
+          assert_raise(::Veneer::Errors::NotSaved) do
+            Veneer(@klass).new(@valid_attributes.merge(:name => "raise_on_before_save")).save!
+          end
+        end
+      end
+    end
+  end
+end

data/test/support/before_save_mixin.rb

@@ -0,0 +1,14 @@
+module Veneer
+  module Test
+    module BeforeSaveSetup
+      def check_before_save
+        $captures << :check_before_save
+        if name == "raise_on_before_save"
+          raise Veneer::Errors::BeforeSaveError, [:name, "cannot be raise_on_before_save"]
+        else
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -15,7 +15,8 @@ module Veneer
         veneer_should_impelement_destroy_all
         veneer_should_implement_create_with_invalid_attributes
         veneer_should_implement_find
-      end
+        veneer_should_implement_before_save_hooks
+     end
     end
   end
 end

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

@@ -16,6 +16,7 @@ module Veneer
         veneer_should_impelement_destroy_all
         veneer_should_implement_create_with_invalid_attributes
         veneer_should_implement_find
+        veneer_should_implement_before_save_hooks
       end
     end
   end

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

@@ -16,6 +16,7 @@ module Veneer
         veneer_should_impelement_destroy_all
         veneer_should_implement_create_with_invalid_attributes
         veneer_should_implement_find
+        veneer_should_implement_before_save_hooks
       end
     end
   end

data/veneer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{veneer}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2009-12-05}
+  s.date = %q{2009-12-06}
   s.description = %q{Veneer provides basic querying, saving, deleteing and creating of data stores.}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
@@ -45,10 +45,12 @@ Gem::Specification.new do |s|
      "test/macros/class_wrapper/create_macro.rb",
      "test/macros/class_wrapper/delete_macro.rb",
      "test/macros/class_wrapper/find_macro.rb",
+     "test/macros/class_wrapper/hooks.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/test_helper.rb",
      "test/veneer/adapters/active_record/active_record_setup.rb",
@@ -74,10 +76,12 @@ Gem::Specification.new do |s|
     "test/macros/class_wrapper/create_macro.rb",
      "test/macros/class_wrapper/delete_macro.rb",
      "test/macros/class_wrapper/find_macro.rb",
+     "test/macros/class_wrapper/hooks.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/test_helper.rb",
      "test/veneer/adapters/active_record/active_record_setup.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: veneer
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-05 00:00:00 +11:00
+date: 2009-12-06 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -51,10 +51,12 @@ files:
 - test/macros/class_wrapper/create_macro.rb
 - test/macros/class_wrapper/delete_macro.rb
 - test/macros/class_wrapper/find_macro.rb
+- test/macros/class_wrapper/hooks.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/test_helper.rb
 - test/veneer/adapters/active_record/active_record_setup.rb
@@ -101,10 +103,12 @@ test_files:
 - test/macros/class_wrapper/create_macro.rb
 - test/macros/class_wrapper/delete_macro.rb
 - test/macros/class_wrapper/find_macro.rb
+- test/macros/class_wrapper/hooks.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/test_helper.rb
 - test/veneer/adapters/active_record/active_record_setup.rb