dbview_cti 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.3 (3/11/2013)
+
+* Fixed validation issue
+* Improved handling of associations in new (not yet persisted) objects
+
 ## 0.1.2 (27/10/2013)
 
 * Fundamental change to how associations are handled in order to solve problems with build

data/lib/db_view_cti/model/cti.rb

@@ -58,10 +58,12 @@ module DBViewCTI
 
         # for associations:
         alias_method_chain :association, :cti
-        validate :cti_validate_associations
-
         # save callbacks (necessary for saving associations)
         after_save :cti_save_associations
+
+        # validations
+        validate :cti_validate_associations
+        attr_accessor :cti_disable_validations
       end
       
       def destroy_with_cti

data/lib/db_view_cti/model/model_delegator.rb

@@ -2,7 +2,7 @@ require 'delegate'
 
 module DBViewCTI
   module Model
-
+    
     class ModelDelegator < SimpleDelegator
       
       attr_reader :cti_target_class
@@ -11,9 +11,10 @@ module DBViewCTI
         @cti_object = object
         @cti_converted_object = object.convert_to(target_class)
         if !@cti_converted_object
-          @cti_converted_object = object.becomes(target_class.constantize)
+          @cti_converted_object = target_class.constantize.new
           @cti_is_new = true
         end
+        disable_validations
         @cti_target_class = target_class
         super( @cti_converted_object )
       end
@@ -24,24 +25,60 @@ module DBViewCTI
       
       def save(*args, &block)
         return super unless cti_is_new?
-        # special case for new objects, we need som hackish id-juggling
-        old_id = @cti_object.id
+        # special case for new objects, we need to manually set the id and trick the object
+        # to think it was already persisted, so we get an update instead of an insert
         new_id = @cti_object.convert_to( @cti_target_class ).id
-        # since @cti_converted_object was created using 'becomes', @cti_object.id changes
-        # as well in the following statement. So we saved it in old_id and restore it after the
-        # call to save (i.e. super)
-        @cti_object.reload  # only needed in rails 4
         self.id = new_id
-        self.created_at = @cti_object.created_at  # only needed in rails 4
-        self.updated_at = @cti_object.updated_at  # only needed in rails 4
+        force_persisted_state
+        self.created_at = @cti_object.created_at
+        self.updated_at = @cti_object.updated_at
         retval = !!super
-        @cti_is_new = false
-        @cti_object.id = old_id
+        # throw away just saved object and convert from scratch
         @cti_converted_object = @cti_object.convert_to( @cti_target_class )
+        disable_validations
         __setobj__(@cti_converted_object)
-        retval
+        return retval
       end
       
+      private
+      
+        module DisableValidator
+          def validate_each(record, *args)
+            return if record.respond_to?(:cti_disable_validations) && record.cti_disable_validations
+            super
+          end
+          
+          if Rails::VERSION::MAJOR == 3
+            def validate(record, *args)
+              return if record.respond_to?(:cti_disable_validations) && record.cti_disable_validations
+              super
+            end
+          end
+        end
+        
+        def disable_validations(object = nil)
+          object ||= @cti_converted_object
+          object.cti_disable_validations = true
+          object._validators.values.flatten.each do |validator|
+            validator.extend( DisableValidator )
+          end
+        end
+        
+        module ForcePersistedState
+          def persisted?
+            true
+          end
+          
+          def new_record?
+            false
+          end
+        end
+      
+        def force_persisted_state(object = nil)
+          object ||= @cti_converted_object
+          object.extend( ForcePersistedState )
+        end
+
     end
     
   end

data/lib/db_view_cti/version.rb

@@ -1,3 +1,3 @@
 module DBViewCTI
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/dummy-rails-3/app/models/vehicle.rb

@@ -1,4 +1,6 @@
 class Vehicle < ActiveRecord::Base
   attr_accessible :name, :mass unless Rails::VERSION::MAJOR > 3
   cti_base_class
+  
+  validates :name, :presence => true  
 end

data/spec/models/space_shuttle_spec.rb

@@ -23,7 +23,7 @@ describe SpaceShuttle do
     before :each do
       # create dummy space ships to make sure the shuttle we'll create has a different database id than
       # its associated spaceship
-      (1..2).map { SpaceShip.create }
+      (1..2).map { SpaceShip.create(:name => 'test') }
       @shuttle = SpaceShuttle.create(:name => 'Discovery', :reliability => 100)
       @shuttle.id.should_not eq @shuttle.convert_to(:space_ship).id
     end
@@ -365,7 +365,7 @@ describe SpaceShuttle do
     end
         
     it "doesn't choke on belongs_to associations" do
-      @shuttle.category # should not rais exception
+      @shuttle.category # should not raise exception
     end    
     
     it "doesn't save in case of validation errors in associations defined in ascendant classes" do
@@ -381,6 +381,30 @@ describe SpaceShuttle do
       }.to raise_exception(ActiveRecord::RecordInvalid)
     end
 
+    it "doesn't choke on non-association related validations in association proxies" do
+      @shuttle.update_attribute(:name, nil)
+      expect {
+        @shuttle.save!
+      }.to raise_exception(ActiveRecord::RecordInvalid)
+      expect {
+        @shuttle.name = 'Name'
+        @shuttle.launches.build(:date => Date.today)
+        @shuttle.save!
+      }.to change(Launch, :count).by(1)
+      # similar for new object
+      shuttle = SpaceShuttle.new
+      expect {
+        shuttle.launches.build(:date => Date.today)
+        shuttle.save!
+      }.to raise_exception(ActiveRecord::RecordInvalid)
+      expect {
+        expect {
+          shuttle.name = 'Name'
+          shuttle.save!
+        }.to change(Launch, :count).by(1)
+      }.to change(SpaceShuttle, :count).by(1)
+    end
+    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbview_cti
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -748447197345162789
+      hash: -3935376093015518215
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -748447197345162789
+      hash: -3935376093015518215
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25