dbview_cti 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.1 (23/10/2013)
+
+* Fixed handling of the remote part of associations (i.e. the belongs_to part when a cti-class has e.g. a has_many association)
+* Blocks passed to e.g. has_many are no longer ignored
+
 ## 0.1.0 (22/10/2013)
 
 * Added transparent support for associations

data/lib/db_view_cti/model/collection_delegator.rb

@@ -0,0 +1,38 @@
+require 'delegate'
+
+module DBViewCTI
+  module Model
+
+    class CollectionDelegator < SimpleDelegator
+      def initialize(object, target_class_name)
+        super(object)
+        @target_class_name = target_class_name
+      end
+      
+      def <<(object, *args, &block)
+        __getobj__.send('<<', object.convert_to(@target_class_name), *args, &block)
+      end
+
+      def []=(*args, &block)
+        object = args.last.convert_to(@target_class_name)
+        __getobj__.send('[]=', *(args[0..-2]), object, &block)
+      end
+
+      def delete(*args, &block)
+        objects = args.map do |obj|
+          obj.respond_to?(:convert_to) ? obj.convert_to(@target_class_name) : obj
+        end
+        __getobj__.send('delete', *objects, &block)
+      end
+
+      def destroy(*args, &block)
+        objects = args.map do |obj|
+          obj.respond_to?(:convert_to) ? obj.convert_to(@target_class_name) : obj
+        end
+        __getobj__.send('delete', *objects, &block)
+      end
+
+    end
+
+  end
+end

data/lib/db_view_cti/model/cti.rb

@@ -35,7 +35,7 @@ module DBViewCTI
         type_string = type_string.camelize if type.is_a?(Symbol)
         return self if type_string == self.class.name
         query = self.class.cti_inner_join_sql(id, type_string)
-        # query is nil when we try to cenvert to an descendant class (instead of an ascendant),
+        # query is nil when we try to cenvert to a descendant class (instead of an ascendant),
         # or when we try to convert to a class outside of the hierarchy
         if query.nil?
           specialized = specialize
@@ -117,7 +117,7 @@ module DBViewCTI
         # redefine association class methods (except for belongs_to)
         [:has_many, :has_and_belongs_to_many, :has_one].each do |name|
           self.class_eval <<-eos, __FILE__, __LINE__+1
-            def #{name}(*args)
+            def #{name}(*args, &block)
               cti_initialize_cti_associations
               @cti_associations[:#{name}] << args.first
               super
@@ -125,8 +125,8 @@ module DBViewCTI
           eos
         end
 
-        # redefine associations defined in ascendant classes so they keep working
         def cti_redefine_associations
+          # redefine associations defined in ascendant classes so they keep working
           @cti_ascendants.each do |ascendant|
             [:has_many, :has_and_belongs_to_many].each do |association_type|
               ascendant.constantize.cti_associations[association_type].each do |association|
@@ -158,8 +158,59 @@ module DBViewCTI
         
         def cti_redefine_single_association(name, class_name)
           self.class_eval <<-eos, __FILE__, __LINE__+1
-            def #{name}(*args)
-              self.convert_to('#{class_name}').send('#{name}', *args)
+            def #{name}(*args, &block)
+              self.convert_to('#{class_name}').send('#{name}', *args, &block)
+            end
+          eos
+        end
+        
+         # fix the 'remote' (i.e. belongs_to) part of any has_one of has_many association in this class
+        def cti_redefine_remote_associations
+          cti_initialize_cti_associations
+          # redefine remote belongs_to associations
+          [: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)
+                @cti_redefined_remote_associations[association_type] << association
+              end
+            end
+          end
+          # redefine remote has_many and has_and_belongs_to_many associations
+          [: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)
+                @cti_redefined_remote_associations[association_type] << association
+              end
+            end
+          end
+        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 )
+            end
+          eos
+        end
+
+        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)
+            end
+            def #{remote_association}(*args, &block)
+              collection = super
+              DBViewCTI::Model::CollectionDelegator.new(collection, '#{self.name}')
             end
           eos
         end
@@ -180,8 +231,10 @@ module DBViewCTI
         
         def cti_initialize_cti_associations
           @cti_associations ||= {}
+          @cti_redefined_remote_associations ||= {}
           [:has_many, :has_and_belongs_to_many, :has_one].each do |name|
             @cti_associations[name] ||= []
+            @cti_redefined_remote_associations[name] ||= []
           end
         end
         

data/lib/db_view_cti/model/extensions.rb

@@ -8,6 +8,7 @@ module DBViewCTI
         def cti_base_class
           self.class_eval { include(DBViewCTI::Model::CTI) }
           @cti_base_class = true
+          cti_redefine_remote_associations
         end
   
         def cti_derived_class
@@ -18,6 +19,10 @@ module DBViewCTI
           self.table_name = DBViewCTI::Names.view_name(self)
           self.superclass.cti_register_descendants(self.name)
           cti_redefine_associations
+          cti_redefine_remote_associations
+          # call redefine_remote_associations on superclass to deal with associations
+          # that were defined after the call to cti_derived_class or cti_base_class
+          self.superclass.cti_redefine_remote_associations
         end
   
       end

data/lib/db_view_cti/version.rb

@@ -1,3 +1,3 @@
 module DBViewCTI
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/dbview_cti.rb

@@ -28,6 +28,7 @@ module DBViewCTI
     extend ActiveSupport::Autoload
     autoload :CTI
     autoload :Extensions
+    autoload :CollectionDelegator
   end
 end
 

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

@@ -1,5 +1,5 @@
 class Launch < ActiveRecord::Base
   attr_accessible :spache_ship_id, :date unless Rails::VERSION::MAJOR > 3
 
-  belongs_to :launch
+  belongs_to :space_ship
 end

data/spec/models/space_shuttle_spec.rb

@@ -19,104 +19,155 @@ describe SpaceShuttle do
     shuttle.convert_to(:space_ship).reliability.should eq 100
   end
   
-  it "can use has_many associations defined in ascendant classes" do
-    # create dummy space ships to make sure the shuttle we'll cereate has a different database id than
-    # its associated spaceship
-    (1..2).map { SpaceShip.create }
-    shuttle = SpaceShuttle.create(:name => 'Discovery', :reliability => 100)
-    shuttle.id.should_not eq shuttle.convert_to(:space_ship).id
-    # test has_many functionality
-    launch1 = Launch.new(:date => Date.today)
-    launch2 = Launch.new(:date => Date.tomorrow)
-    launch3 = Launch.new(:date => Date.tomorrow)
-    expect {
-      shuttle.launches << launch1
-      shuttle.save!
-    }.to change(Launch, :count).by(1)
-    expect {
-      shuttle.launches = [ launch1, launch2 ]
-      shuttle.save!
-    }.to change(Launch, :count).by(1)
-    shuttle.launch_ids.sort.should eq [ launch1.id, launch2.id ]
-    launch3.save!
-    shuttle.launch_ids = [ launch1.id, launch3.id ]
-    shuttle.launch_ids.sort.should eq [ launch1.id, launch3.id ]
-  end
+  context 'associations' 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 }
+      @shuttle = SpaceShuttle.create(:name => 'Discovery', :reliability => 100)
+      @shuttle.id.should_not eq @shuttle.convert_to(:space_ship).id
+    end
+    
+    it "can use has_many associations defined in ascendant classes" do
+      launch1 = Launch.new(:date => Date.today)
+      launch2 = Launch.new(:date => Date.tomorrow)
+      launch3 = Launch.new(:date => Date.tomorrow)
+      expect {
+        @shuttle.launches << launch1
+        @shuttle.save!
+      }.to change(Launch, :count).by(1)
+      expect {
+        @shuttle.launches = [ launch1, launch2 ]
+        @shuttle.save!
+      }.to change(Launch, :count).by(1)
+      @shuttle.launch_ids.sort.should eq [ launch1.id, launch2.id ]
+      launch3.save!
+      @shuttle.launch_ids = [ launch1.id, launch3.id ]
+      @shuttle.launch_ids.sort.should eq [ launch1.id, launch3.id ]
+    end
   
-  it "can use has_many :through associations defined in ascendant classes" do
-    # create dummy space ships to make sure the shuttle we'll cereate has a different database id than
-    # its associated spaceship
-    (1..2).map { SpaceShip.create }
-    shuttle = SpaceShuttle.create(:name => 'Discovery', :reliability => 100)
-    shuttle.id.should_not eq shuttle.convert_to(:space_ship).id
-    # test has_many functionality
-    experiment1 = Experiment.new(:name => 'Zero-gravity')
-    experiment2 = Experiment.new(:name => 'Physics 101')
-    experiment3 = Experiment.new(:name => 'Cell growth')
-    expect {
-      shuttle.experiments << experiment1
-      shuttle.save!
-    }.to change(Experiment, :count).by(1)
-    expect {
-      shuttle.experiments = [ experiment1, experiment2 ]
-      shuttle.save!
-    }.to change(Experiment, :count).by(1)
-    shuttle.experiment_ids.sort.should eq [ experiment1.id, experiment2.id ]
-    experiment3.save!
-    shuttle.experiment_ids = [ experiment1.id, experiment3.id ]
-    shuttle.experiment_ids.sort.should eq [ experiment1.id, experiment3.id ]
-    Experiment.last.space_ships.first.specialize.id.should eq shuttle.id
-  end
+    it "supports assignment on the 'remote' side of a has_many association" do
+      launch = Launch.new(:date => Date.today)
+      expect {
+        launch.space_ship = @shuttle
+        launch.save!
+      }.to change(Launch, :count).by(1)
+      launch.destroy
+      launch = Launch.new(:date => Date.today)
+      expect {
+        launch.space_ship = @shuttle.convert_to(:vehicle)
+        launch.save!
+      }.to change(Launch, :count).by(1)
+    end
+    
+    it "can use has_many :through associations defined in ascendant classes" do
+      experiment1 = Experiment.new(:name => 'Zero-gravity')
+      experiment2 = Experiment.new(:name => 'Physics 101')
+      experiment3 = Experiment.new(:name => 'Cell growth')
+      expect {
+        @shuttle.experiments << experiment1
+        @shuttle.save!
+      }.to change(Experiment, :count).by(1)
+      expect {
+        @shuttle.experiments = [ experiment1, experiment2 ]
+        @shuttle.save!
+      }.to change(Experiment, :count).by(1)
+      @shuttle.experiment_ids.sort.should eq [ experiment1.id, experiment2.id ]
+      experiment3.save!
+      @shuttle.experiment_ids = [ experiment1.id, experiment3.id ]
+      @shuttle.experiment_ids.sort.should eq [ experiment1.id, experiment3.id ]
+      Experiment.last.space_ships.first.specialize.id.should eq @shuttle.id
+    end
   
-  it "can use has_one associations defined in ascendant classes" do
-    # create dummy space ships to make sure the shuttle we'll cereate has a different database id than
-    # its associated captain
-    (1..2).map { SpaceShip.create }
-    shuttle = SpaceShuttle.create(:name => 'Discovery', :reliability => 100)
-    shuttle.id.should_not eq shuttle.convert_to(:space_ship).id
-    # test has_one functionality
-    captain = Captain.new(:name => 'Armstrong')
-    expect {
-      shuttle.captain = captain
-      shuttle.save!
-    }.to change(Captain, :count).by(1)
-    shuttle.reload
-    shuttle.captain.id.should eq captain.id
-    shuttle.captain.destroy
-    expect {
-      shuttle.create_captain(:name => 'Glenn')
-    }.to change(Captain, :count).by(1)
-    shuttle.captain.space_ship_id.should eq shuttle.convert_to(:space_ship).id
-    expect {
-      cap = shuttle.build_captain(:name => 'Aldrinn')
-      cap.save!
-    }.to change(Captain, :count).by(1)
-    shuttle.captain.space_ship_id.should eq shuttle.convert_to(:space_ship).id
-  end
+    it "supports operations on the 'remote' side of a has_many :through association" do
+      experiment = Experiment.new(:name => 'Zero-gravity')
+      shuttle2 = SpaceShuttle.create(:name => 'Endeavour', :reliability => 100)
+      shuttle2.id.should_not eq shuttle2.convert_to(:space_ship).id
+      expect {
+        experiment.space_ships = [@shuttle, shuttle2]
+        experiment.save!
+      }.to change(ExperimentSpaceShipPerformance, :count).by(2)
+      ExperimentSpaceShipPerformance.all.map(&:destroy)
+      expect {
+        experiment.space_ships << @shuttle
+        experiment.save!
+      }.to change(ExperimentSpaceShipPerformance, :count).by(1)
+      expect {
+        experiment.space_ships.delete(@shuttle)
+      }.to change(ExperimentSpaceShipPerformance, :count).by(-1)
+    end
+    
+    it "can use has_one associations defined in ascendant classes" do
+      captain = Captain.new(:name => 'Armstrong')
+      expect {
+        @shuttle.captain = captain
+        @shuttle.save!
+      }.to change(Captain, :count).by(1)
+      @shuttle.reload
+      @shuttle.captain.id.should eq captain.id
+      @shuttle.captain.destroy
+      expect {
+        @shuttle.create_captain(:name => 'Glenn')
+      }.to change(Captain, :count).by(1)
+      @shuttle.captain.space_ship_id.should eq @shuttle.convert_to(:space_ship).id
+      expect {
+        cap = @shuttle.build_captain(:name => 'Aldrinn')
+        cap.save!
+      }.to change(Captain, :count).by(1)
+      @shuttle.captain.space_ship_id.should eq @shuttle.convert_to(:space_ship).id
+    end
   
-  it "can use has_and_belongs_to_many associations defined in ascendant classes" do
-    # create dummy space ships to make sure the shuttle we'll cereate has a different database id than
-    # its associated spaceship
-    (1..2).map { SpaceShip.create }
-    shuttle = SpaceShuttle.create(:name => 'Discovery', :reliability => 100)
-    shuttle.id.should_not eq shuttle.convert_to(:space_ship).id
-    # test has_and_belongs_to_many functionality
-    astronaut1 = Astronaut.new(:name => 'Armstrong')
-    astronaut2 = Astronaut.new(:name => 'Glenn')
-    astronaut3 = Astronaut.new(:name => 'Gagarin')
-    expect {
-      shuttle.astronauts << astronaut1
-      shuttle.save!
-    }.to change(Astronaut, :count).by(1)
-    shuttle.astronauts.first.name.should eq astronaut1.name
-    expect {
-      shuttle.astronauts = [ astronaut1, astronaut2 ]
-      shuttle.save!
-    }.to change(Astronaut, :count).by(1)
-    shuttle.astronaut_ids.sort.should eq [ astronaut1.id, astronaut2.id ]
-    astronaut3.save!
-    shuttle.astronaut_ids = [ astronaut1.id, astronaut3.id ]
-    shuttle.astronaut_ids.sort.should eq [ astronaut1.id, astronaut3.id ]
+    it "supports operations on the 'remote' side of a has_one association" do
+      captain = Captain.new(:name => 'Armstrong')
+      expect {
+        captain.space_ship = @shuttle
+        captain.save!
+      }.to change(Captain, :count).by(1)
+      captain.destroy
+      captain = Captain.new(:name => 'Armstrong')
+      expect {
+        captain.space_ship = @shuttle.convert_to(:vehicle)
+        captain.save!
+      }.to change(Captain, :count).by(1)
+    end
+    
+    it "can use has_and_belongs_to_many associations defined in ascendant classes" do
+      astronaut1 = Astronaut.new(:name => 'Armstrong')
+      astronaut2 = Astronaut.new(:name => 'Glenn')
+      astronaut3 = Astronaut.new(:name => 'Gagarin')
+      expect {
+        @shuttle.astronauts << astronaut1
+        @shuttle.save!
+      }.to change(Astronaut, :count).by(1)
+      @shuttle.astronauts.first.name.should eq astronaut1.name
+      expect {
+        @shuttle.astronauts = [ astronaut1, astronaut2 ]
+        @shuttle.save!
+      }.to change(Astronaut, :count).by(1)
+      @shuttle.astronaut_ids.sort.should eq [ astronaut1.id, astronaut2.id ]
+      astronaut3.save!
+      @shuttle.astronaut_ids = [ astronaut1.id, astronaut3.id ]
+      @shuttle.astronaut_ids.sort.should eq [ astronaut1.id, astronaut3.id ]
+    end
+
+    it "supports operations on the 'remote' side of a has_and_belongs_to_many association" do
+      astronaut = Astronaut.new(:name => 'Armstrong')
+      shuttle2 = SpaceShuttle.create(:name => 'Endeavour', :reliability => 100)
+      shuttle2.id.should_not eq shuttle2.convert_to(:space_ship).id
+      query = 'SELECT COUNT(*) FROM astronauts_space_ships'
+      ActiveRecord::Base.connection().execute(query)[0]['count'].to_i.should be_zero
+      astronaut.space_ships = [@shuttle, shuttle2]
+      astronaut.save!
+      ActiveRecord::Base.connection().execute(query)[0]['count'].to_i.should eq 2
+      astronaut.space_ships.delete(@shuttle, shuttle2)
+      ActiveRecord::Base.connection().execute(query)[0]['count'].to_i.should be_zero
+      astronaut.space_ships << @shuttle
+      astronaut.save!
+      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
+    end
+    
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbview_cti
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,6 +78,7 @@ files:
 - lib/db_view_cti/connection_adapters/schema_statements.rb
 - lib/db_view_cti/loader.rb
 - lib/db_view_cti/migration/command_recorder.rb
+- lib/db_view_cti/model/collection_delegator.rb
 - lib/db_view_cti/model/cti.rb
 - lib/db_view_cti/model/extensions.rb
 - lib/db_view_cti/names.rb
@@ -210,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2732780512702174148
+      hash: 3228810689469855643
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2732780512702174148
+      hash: 3228810689469855643
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25