dbview_cti 0.1.3 → 0.1.4

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - rbx-19mode
+  - rbx
 env:
   - "RAILS_VERSION=3.2.0"
   - "RAILS_VERSION=4.0.0"

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4 (8/04/2014)
+
+* Fixed association issues
+
 ## 0.1.3 (3/11/2013)
 
 * Fixed validation issue

data/Gemfile

@@ -34,3 +34,10 @@ group :test, :development do
   gem "activerecord-postgresql-adapter", :platforms => [:ruby, :mswin, :mingw]
   gem "activerecord-jdbcpostgresql-adapter", :platforms => [:jruby]  
 end
+
+# for rubinius testing in Travis (cf. travis docs)
+platforms :rbx do
+  gem 'racc'
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+end

data/lib/db_view_cti/connection_adapters/schema_statements.rb

@@ -14,6 +14,11 @@ module DBViewCTI
         cti_execute_sql(generator.drop_view_sql)
       end
       
+      def cti_view_exists?(class_name)
+        generator = DBViewCTI::SQLGeneration::Migration::Factory.generator(class_name)
+        cti_execute_sql(generator.view_exists_sql)[0]['count'].to_i > 0
+      end
+
       # use with block in up/down methods
       def cti_recreate_views_after_change_to(class_name, options = {})
         klass = class_name.constantize

data/lib/db_view_cti/model/collection_delegator.rb

@@ -10,7 +10,7 @@ module DBViewCTI
       end
       
       def <<(object, *args, &block)
-        __getobj__.send('<<', object.convert_to(@target_class_name), *args, &block)
+        __getobj__.send('<<', object.try(:convert_to, @target_class_name), *args, &block)
       end
 
       def []=(*args, &block)

data/lib/db_view_cti/model/cti.rb

@@ -62,7 +62,7 @@ module DBViewCTI
         after_save :cti_save_associations
 
         # validations
-        validate :cti_validate_associations
+        validate :cti_validate_associations, :cti_no_disable => true
         attr_accessor :cti_disable_validations
       end
       
@@ -164,6 +164,31 @@ module DBViewCTI
           result
         end
         
+        # redefine validate to always add :unless proc so we can disable the validations for an object
+        # by setting the cti_disable_validations accessor to true
+        def validate(*args, &block)
+          # we specifically don't want to disable balidations belonging to associations. Based on the naming
+          # rails uses, we return immediately in such cases (there must be a cleaner way to do this...)
+          return super if args.first && args.first.to_s =~ /^validate_associated_records_for_/
+          # rest of implementation insipred by the validate implementation in rails
+          options = args.extract_options!.dup
+          return super if options[:cti_no_disable]
+          if options.key?(:unless)
+            options[:unless] = Array(options[:unless])
+            options[:unless].unshift( cti_validation_unless_proc )
+          else
+            options[:unless] = cti_validation_unless_proc
+          end
+          args << options
+          return super(*args, &block)
+        end
+        
+        def cti_validation_unless_proc
+          @cti_validation_unless_proc ||= Proc.new do |object| 
+            object.respond_to?(:cti_disable_validations) && object.cti_disable_validations
+          end
+        end
+        
         # redefine association class methods
         [:has_many, :has_and_belongs_to_many, :has_one].each do |name|
           self.class_eval <<-eos, __FILE__, __LINE__+1
@@ -196,11 +221,9 @@ module DBViewCTI
           [:has_many, :has_one].each do |association_type|
             @cti_associations[association_type].each do |association|
               next if @cti_redefined_remote_associations[association_type].include?( association )
-              remote_class = association.to_s.camelize.singularize.constantize
-              remote_associations = remote_class.reflect_on_all_associations(:belongs_to).map(&:name)
-              remote_association = self.name.underscore.to_sym
-              if remote_associations.include?( remote_association )
-                cti_redefine_remote_belongs_to_association(remote_class, remote_association)
+              if cti_reciprocal_association_present_for?( association, :belongs_to )
+                remote_class = cti_association_name_to_class_name( association ).constantize
+                cti_redefine_remote_belongs_to_association(remote_class, cti_class_name_to_association_name.to_sym)
                 @cti_redefined_remote_associations[association_type] << association
               end
             end
@@ -209,21 +232,44 @@ module DBViewCTI
           [:has_many, :has_and_belongs_to_many].each do |association_type|
             @cti_associations[association_type].each do |association|
               next if @cti_redefined_remote_associations[association_type].include?( association )
-              remote_class = association.to_s.camelize.singularize.constantize
-              remote_associations = remote_class.reflect_on_all_associations( association_type ).map(&:name)
-              remote_association = self.name.underscore.pluralize.to_sym
-              if remote_associations.include?( remote_association )
-                cti_redefine_remote_to_many_association(remote_class, remote_association)
+              if cti_reciprocal_association_present_for?( association, association_type, true )
+                remote_class = cti_association_name_to_class_name( association ).constantize
+                cti_redefine_remote_to_many_association(remote_class, cti_class_name_to_association_name( true ).to_sym)
                 @cti_redefined_remote_associations[association_type] << association
               end
             end
           end
         end
+        
+        # Check if a reciprocal association of type 'type' is present for the given association.
+        # (example: check if a has_many association has a corresponding belongs_to  in the remote class).
+        # Plural indicates wether the remote association we're looking for is plural (i.e. has_many :space_ships)
+        # or singular (i.e. belongs_to :space_ship).
+        # Normally, the method checks if the remote association refers to this class, but it is possible to
+        # pass in 'class_name' to check different classes
+        def cti_reciprocal_association_present_for?(association, type, plural = false, class_name = nil)
+          remote_class = cti_association_name_to_class_name( association ).constantize
+          remote_associations = remote_class.reflect_on_all_associations( type ).map(&:name)
+          remote_associations.include?( cti_class_name_to_association_name(plural, class_name).to_sym )
+        end
+        
+        # converts e.g. SpaceShip to :space_ship (for plural == false), or :space_ships (for plural true)
+        def cti_class_name_to_association_name(plural = false, class_name = nil)
+          class_name ||= self.name
+          association_name = class_name.underscore
+          association_name = association_name.pluralize if plural
+          association_name
+        end
+
+        # converts e.g. :space_ships to SpaceShip
+        def cti_association_name_to_class_name(association_name)
+          association_name.to_s.camelize.singularize
+        end
 
         def cti_redefine_remote_belongs_to_association(remote_class, remote_association)
           remote_class.class_eval <<-eos, __FILE__, __LINE__+1
             def #{remote_association}=(object, *args, &block)
-              super( object.convert_to('#{self.name}'), *args, &block )
+              super( object.try(:convert_to, '#{self.name}'), *args, &block )
             end
           eos
         end
@@ -231,7 +277,7 @@ module DBViewCTI
         def cti_redefine_remote_to_many_association(remote_class, remote_association)
           remote_class.class_eval <<-eos, __FILE__, __LINE__+1
             def #{remote_association}=(objects, *args, &block)
-              super( objects.map { |o| o.convert_to('#{self.name}') }, *args, &block)
+              super( objects.map { |o| o.try(:convert_to, '#{self.name}') }, *args, &block)
             end
             def #{remote_association}(*args, &block)
               collection = super

data/lib/db_view_cti/model/model_delegator.rb

@@ -42,26 +42,9 @@ module DBViewCTI
       
       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

data/lib/db_view_cti/sql_generation/migration/base.rb

@@ -57,6 +57,10 @@ module DBViewCTI
           "DROP VIEW #{@view_name};"
         end
         
+        def view_exists_sql
+          raise NotImplementedError, "DBViewCTI: view_exists_sql not implemented for this adapter."
+        end
+
         def create_trigger_sql
           # to be implemented by derived classes
           raise NotImplementedError, "DBViewCTI: create_trigger_sql not implemented for this adapter."

data/lib/db_view_cti/sql_generation/migration/postgresql.rb

@@ -87,6 +87,10 @@ module DBViewCTI
           insert_trigger_func + insert_trigger
         end
   
+        def view_exists_sql
+          "SELECT count(*) FROM pg_views where viewname='#{@view_name}';"
+        end
+
         def drop_trigger_sql
           query = <<-eos
             DROP TRIGGER IF EXISTS #{@trigger_name} ON #{@view_name};

data/lib/db_view_cti/version.rb

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

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

@@ -3,4 +3,7 @@ class Vehicle < ActiveRecord::Base
   cti_base_class
   
   validates :name, :presence => true  
-end
+  validate do |vehicle|
+    errors.add(:base, "Block validation failed: name can't be blank") if vehicle.name.blank?
+  end
+end

data/spec/dummy-rails-3/db/migrate/20140408013710_check_view_exists.rb

@@ -0,0 +1,8 @@
+class CheckViewExists < ActiveRecord::Migration
+  def up
+    raise 'View should exist!' if !cti_view_exists?('Car')
+  end
+  
+  def down
+  end
+end

data/spec/models/space_shuttle_spec.rb

@@ -91,6 +91,12 @@ describe SpaceShuttle do
         launch.space_ship = @shuttle.convert_to(:vehicle)
         launch.save!
       }.to change(Launch, :count).by(1)
+      launch = Launch.new(:date => Date.today)
+      # also test nil assignment
+      expect {
+        launch.space_ship = nil
+        launch.save!
+      }.to change(Launch, :count).by(1)
     end
 
     it "supports accepts_nested_attributes for has_many associations defined in ascendant classes" do
@@ -184,6 +190,18 @@ describe SpaceShuttle do
       expect {
         experiment.space_ships.delete(@shuttle)
       }.to change(ExperimentSpaceShipPerformance, :count).by(-1)
+      # make sure nil assignments raise activerecord exceptions and not exceptions in dbview_cti code
+      expect {
+        experiment.space_ships = [ nil ]
+        experiment.save!
+      }.to raise_error(ActiveRecord::AssociationTypeMismatch)
+      expect {
+        experiment.space_ships << nil
+        experiment.save!
+      }.to raise_error(ActiveRecord::AssociationTypeMismatch)
+      expect {
+        experiment.space_ships.delete(nil)
+      }.to raise_error(ActiveRecord::AssociationTypeMismatch)
     end
     
     it "supports accepts_nested_attributes for has_many :through associations defined in ascendant classes" do
@@ -252,6 +270,12 @@ describe SpaceShuttle do
         captain.space_ship = @shuttle.convert_to(:vehicle)
         captain.save!
       }.to change(Captain, :count).by(1)
+      # also test nil assignment
+      captain = Captain.new(:name => 'Armstrong')
+      expect {
+        captain.space_ship = nil
+        captain.save!
+      }.to change(Captain, :count).by(1)
     end
     
     it "supports accepts_nested_attributes for has_one associations defined in ascendant classes" do
@@ -341,6 +365,18 @@ describe SpaceShuttle do
       ActiveRecord::Base.connection().execute(query)[0]['count'].to_i.should eq 1
       astronaut.space_ships.destroy(@shuttle)
       ActiveRecord::Base.connection().execute(query)[0]['count'].to_i.should be_zero
+      # make sure nil assignments raise activerecord exceptions and not exceptions in dbview_cti code
+      expect {
+        astronaut.space_ships = [nil]
+        astronaut.save!
+      }.to raise_error(ActiveRecord::AssociationTypeMismatch)
+      expect {
+        astronaut.space_ships << nil
+        astronaut.save!
+      }.to raise_error(ActiveRecord::AssociationTypeMismatch)
+      expect {
+        astronaut.space_ships.destroy(nil)
+      }.to raise_error(ActiveRecord::AssociationTypeMismatch)
     end
 
     it "supports accepts_nested_attributes for has_and_belongs_to_many associations defined in ascendant classes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbview_cti
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,6 +148,7 @@ files:
 - spec/dummy-rails-3/db/migrate/20131022020655_create_habtm_join_table.rb
 - spec/dummy-rails-3/db/migrate/20131022030659_create_experiments.rb
 - spec/dummy-rails-3/db/migrate/20131022030720_create_experiment_space_ship_performances.rb
+- spec/dummy-rails-3/db/migrate/20140408013710_check_view_exists.rb
 - spec/dummy-rails-3/db/schema.rb
 - spec/dummy-rails-3/lib/assets/.gitkeep
 - spec/dummy-rails-3/log/.gitkeep
@@ -214,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3935376093015518215
+      hash: 1297181597632204944
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3935376093015518215
+      hash: 1297181597632204944
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25