citier 0.1.13 → 0.1.14

data/Manifest

@@ -7,4 +7,5 @@ lib/citier/core_ext.rb
 lib/citier/instance_methods.rb
 lib/citier/root_instance_methods.rb
 lib/citier/sql_adapters.rb
+lib/citier/relation_methods.rb
 Manifest

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('citier', '0.1.13') do |p|
+Echoe.new('citier', '0.1.14') do |p|
   p.description    = "CITIER (Class Inheritance & Table Inheritance Embeddings for Rails) is a solution for single and multiple class table inheritance.
     For full information: http://peterhamilton.github.com/citier/
     For the original version by ALTRABio see www.github.com/altrabio/"

data/citier.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{citier}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Hamilton, Originally from Laurent Buffat, Pierre-Emmanuel Jouve"]
@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
     "lib/citier/instance_methods.rb",
     "lib/citier/child_instance_methods.rb",
     "lib/citier/root_instance_methods.rb",
-    "lib/citier/sql_adapters.rb"]
+    "lib/citier/sql_adapters.rb",
+    "lib/citier/relation_methods.rb"]
   s.files = ["Rakefile",
     "lib/citier.rb",
     "lib/citier/acts_as_citier.rb",
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/citier/child_instance_methods.rb",
     "lib/citier/root_instance_methods.rb",
     "lib/citier/sql_adapters.rb",
+    "lib/citier/relation_methods.rb",
     "Manifest",
     "citier.gemspec"]
   s.homepage = %q{https://github.com/peterhamilton/citier/}

data/lib/citier/relation_methods.rb

@@ -0,0 +1,96 @@
+module ActiveRecord
+  class Relation
+    
+    alias_method :relation_delete_all, :delete_all
+    def delete_all(conditions = nil)
+      return relation_delete_all(conditions) if !@klass.acts_as_citier?
+      
+      return relation_delete_all(conditions) if conditions
+
+      deleted = true
+      ids = nil
+      c = @klass
+      
+      bind_values.each do |bind_value|
+        if bind_value[0].name == "id"
+          ids = bind_value[1]
+          break
+        end
+      end
+      ids ||= where_values_hash["id"] || where_values_hash[:id]
+      where_hash = ids ? { :id => ids } : nil
+      
+      deleted &= c.base_class.where(where_hash).relation_delete_all
+      while c.superclass != ActiveRecord::Base
+        if c.const_defined?(:Writable)
+          citier_debug("Deleting back up hierarchy #{c}")
+          deleted &= c::Writable.where(where_hash).delete_all
+        end
+        c = c.superclass
+      end
+      
+      deleted
+    end
+    
+    alias_method :relation_to_a, :to_a
+    def to_a
+      return relation_to_a if !@klass.acts_as_citier?
+      
+      records = relation_to_a
+      
+      c = @klass
+      
+      if records.all? { |record| record.class == c } 
+        return records 
+      end
+      
+      full_records = []
+      ids_wanted = {}
+      
+      # Map all the ids wanted per type
+      records.each do |record|
+        if record.class == c # We don't need to find the record again if this is already the correct one
+          full_records << record
+          next
+        end
+        
+        ids_wanted[record.class] ||= []
+        ids_wanted[record.class] << record.id
+      end
+      
+      # Find all wanted records
+      ids_wanted.each do |type_class, ids|
+        full_records.push(*type_class.find(ids))
+      end
+      
+      # Make a new array with the found records at the right places
+      records.each do |record|              
+        full_record = full_records.find { |full_record| full_record.id == record.id }
+        record.force_attributes(full_record.instance_variable_get(:@attributes), :merge => true, :clear_caches => false)
+      end
+      
+      return records
+    end
+    
+    alias_method :relation_apply_finder_options, :apply_finder_options
+    def apply_finder_options(options)
+      return relation_apply_finder_options(options) if !@klass.acts_as_citier?
+      
+      relation = self
+      
+      # With option :no_children set to true, only records of type self will be returned. 
+      # So Root.all(:no_children => true) won't return Child records.
+      no_children = options.delete(:no_children)
+      if no_children
+        relation = clone
+
+        c = @klass
+        
+        self_type = c.superclass == ActiveRecord::Base ? nil : c.name
+        relation = relation.where(:type => self_type)
+      end
+      
+      relation.relation_apply_finder_options(options)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Peter Hamilton, Originally from Laurent Buffat, Pierre-Emmanuel Jouve
@@ -47,6 +47,7 @@ extra_rdoc_files:
 - lib/citier/child_instance_methods.rb
 - lib/citier/root_instance_methods.rb
 - lib/citier/sql_adapters.rb
+- lib/citier/relation_methods.rb
 files: 
 - Rakefile
 - lib/citier.rb
@@ -57,6 +58,7 @@ files:
 - lib/citier/child_instance_methods.rb
 - lib/citier/root_instance_methods.rb
 - lib/citier/sql_adapters.rb
+- lib/citier/relation_methods.rb
 - Manifest
 - citier.gemspec
 has_rdoc: true