citier4 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 892d3a85b0eb6ea9e0f275b9576ae24ccaa024b9
-  data.tar.gz: 90666da3b034811754b6bafd8bf2c96edc9d326d
+  metadata.gz: 487b7108d47f5766250f0f68a7d133828d4bb5bd
+  data.tar.gz: 138a93acf1ca20151b5d45038c14340a2236e798
 SHA512:
-  metadata.gz: 44846e1920f902554b06112d055736b61fb1edb0b2e62ef7478e01b3fe92b55aa0cc6f83fb21abfcbf937209dedf609f31cbafe7f3f5d6631fc96cb1d3fb2af6
-  data.tar.gz: bab8d6a4b5fd655febe857b7efa592964e30f790a5a735c23254894f830f2cb883f9dad3e9e520dfdc7b22358d6e06378503a6f21fbf17b110ec158921a18336
+  metadata.gz: 37b8851436ce2b16be48b0615c8bd2d143c0a99373b095d5b0b4a61f108fbf1b484b0dea168a28465572c957c70f5691e7abf9cefddacd051e3790582cd87927
+  data.tar.gz: e326fcbfb3a9a5300a133b5fb250ad81b3ad2b0fa29ac3dbc7b6865c15a8c7d994870ca4fcb549aa9838dc5f912f0b904774558afe492be400749acad66f252d

data/lib/citier4.rb

@@ -1,4 +1,4 @@
-CITIER_DEBUGGING = (::Rails.env == 'development')
+CITIER_DEBUGGING = (::Rails.env == 'development' || ::Rails.env == 'test')
 
 # debugger
 

data/lib/citier4/acts_as_citier4.rb

@@ -17,7 +17,6 @@ module Citier4
     end
     
     module ClassMethods
-      @@first_call=true
       
       def acts_as_citier4(options = {})
         # your code will go here
@@ -34,9 +33,7 @@ module Citier4
          
         table_name = (options[:table_name] || self.name.tableize.gsub(/\//,'_')).to_s
         
-        # if @@first_call 
-        # Unfortunatly, first_call is not a good solution when we are in developpement : acts_as_citier4 could be reload for the root class ...
-        if ! superclass.acts_as_citier?
+       if ! superclass.acts_as_citier?
             # Root class
             # Option for setting the inheritance columns, default value = 'type'
             # authorized only in root
@@ -51,6 +48,8 @@ module Citier4
             citier_debug("Root Class, in home directory")
             self.table_name = "#{table_name}"
             citier_debug("table_name -> #{self.table_name}")
+            
+            self.const_set("Writeable", create_class_root_writable(self))
 
             # Add the functions required for root classes only
             # include is for adding methods to an instance of a class
@@ -85,7 +84,19 @@ module Citier4
           # Add the functions required for children only
           send :include, Citier4::ChildInstanceMethods
         end
-        @@first_call = false
+        
+        def changes_applied
+           super
+         end
+
+         def clear_attribute_changes(att)
+           super
+         end
+
+         def clear_changes_information
+           super
+         end
+         
       end
 
     end

data/lib/citier4/child_instance_methods.rb

@@ -13,16 +13,14 @@ module Citier4
       # Run save and create/update callbacks, just like ActiveRecord does
       self.run_callbacks(:save) do
         self.run_callbacks(self.new_record? ? :create : :update) do
-          # debugger
-          #ici
-          #get the attributes of the class which are inherited from it's parent.
-          attributes_for_parent = self.attributes.reject { |key,value| !self.class.superclass.column_names.include?(key) }
-          changed_attributes_for_parent = self.changed_attributes.reject { |key,value| !self.class.superclass.column_names.include?(key) }
+          
+          # changed_attributes_for_parent = self.changed_attributes.reject { |key,value| !self.class.superclass.column_names.include?(key) }
 
           # Get the attributes of the class which are unique to this class and not inherited.
-          attributes_for_current = self.attributes.reject { |key,value| self.class.superclass.column_names.include?(key) }
-          changed_attributes_for_current = self.changed_attributes.reject { |key,value| self.class.superclass.column_names.include?(key) }
+          #attributes_for_current = self.attributes.reject { |key,value| self.class.superclass.column_names.include?(key) }
+          #changed_attributes_for_current = self.changed_attributes.reject { |key,value| self.class.superclass.column_names.include?(key) }
 
+          # debugger
           citier_debug("Attributes for #{self.class.superclass.to_s}: #{attributes_for_parent.inspect}")
           citier_debug("Changed attributes for #{self.class.superclass.to_s}: #{changed_attributes_for_parent.keys.inspect}")
           citier_debug("Attributes for #{self.class.to_s}: #{attributes_for_current.inspect}")
@@ -34,23 +32,31 @@ module Citier4
     
           #create a new instance of the superclass, passing the inherited attributes.
           
-          # 
           parent = self.class.superclass.new
-          parent.force_attributes(attributes_for_parent, :merge => true)
-          # Ceci ne marche pas : parent = self.class.superclass.new attributes_for_parent
+          parent.id = self.id # nul if create, a real id otherwise
+          parent.clear_changes_information 
+          # Natural Rail STI process, in new, change the "type" colomn from nil to "class.superclass.name"
+          # so we have a flaged change for this "type" colomun.
+          # And we have to clear these change
+          # Clear all changes is more simple and probably more efficient that a specific clear on the STI "type" column
+          # like the line bellow
+          # parent.clear_attribute_change(parent.class.inheritance_column)
+          parent.force_attributes(changed_attributes_for_parent)
+          # parent.force_attributes(attributes_for_parent, :merge => true)
+          # parent = self.class.superclass.new self.changed_attributes_for_parent
+          # these doen't work, because parent.class IS NOT self.superclass, but self.class
+          # sinon, TODO, pourquoi descendre en superclass. Il faut sauter et aller a la prochaine superclass dure ...
+          parent.is_new_record(self.new_record?)
           
-          changed_attributes_for_parent["id"] = 0 # We need to change at least something to force a timestamps update.
-          parent.force_changed_attributes(changed_attributes_for_parent)
+          # parent.force_changed_attributes(changed_attributes_for_parent)
+          # parent.type = self.type
+          # parent.is_new_record(new_record?)
       
-          parent.id = self.id if id
-          parent.type = self.type
-    
-          parent.is_new_record(new_record?)
-      
-          # If we're root (AR subclass) this will just be saved as normal through AR. If we're a child it will call this method again. 
+          # If we're root this will just be saved as normal through AR. If we're a child it will call this method again. 
           # It will try and save it's parent and then save itself through the Writeable constant.
+          # For a new record, we will have an id, only when the root is saved.
           parent_saved = parent.save
-          self.id = parent.id
+         #  self.id = parent.id
 
           if !parent_saved
             # Couldn't save parent class
@@ -58,25 +64,24 @@ module Citier4
             citier_debug("Errors = #{parent.errors.to_s}")
             return false # Return false and exit run_callbacks :save and :create/:update, so the after_ callback won't run.
           end
-    
-          #End of parent saving
-    
-          ######
-          ##
-          ## Self Saving
-          ##
-
+          ###### End of parent saving #####
+          ###### Self Saving
           # If there are attributes for the current class (unique & not inherited), save current model
+          # attention, si aucun attribut pour le parent, mais que on est en new_record
+          # il faut quand meme sauver le current. DOTO Faire un test.
           if !attributes_for_current.empty?
-          
+           # ici, parrent est sauvé, et on a un ID
             current = self.class::Writeable.new
-            current.force_attributes(attributes_for_current, :merge => true)
+            # current.force_attributes(attributes_for_current, :merge => true)
+            current.force_attributes(attributes_for_current)
             # marche pas non plus current = self.class::Writeable.new attributes_for_current
             
             current.force_changed_attributes(changed_attributes_for_current)
         
-            current.id = self.id
+            # current.id = self.id  # NON
+            current.id = parent.id
             current.is_new_record(new_record?)
+            clear_attribute_changes(:id) if !current.new_record?
       
             current_saved = current.save
             
@@ -89,12 +94,14 @@ module Citier4
             end
           end  
 
-          # at this point, parent_saved && current_saved
-          
-          is_new_record(false) # This is no longer a new record
-
-          self.force_changed_attributes({}) # Reset changed_attributes so future changes will be tracked correctly
-          
+          # at this point, parent_saved && current_saved 
+        
+          # if self.class.name == self.attributes[self.class.inheritance_column]  
+              is_new_record(false) # This is no longer a new record
+              #self.force_changed_attributes({}) # Reset changed_attributes so future changes will be tracked correctly
+              self.id = parent.id
+              self.clear_changes_information
+          # end
           # No return, because we want the after callback to run.
         end
       end

data/lib/citier4/core_ext.rb

@@ -18,6 +18,34 @@ class ActiveRecord::Base
     @new_record = state
   end
   
+  
+  #create the writeable class which inherits from ActiveRecord::Base
+  # for the root class (TODO merge the code with the cild)
+  def self.create_class_root_writable(class_reference) 
+    Class.new(ActiveRecord::Base) do
+      # include Citier4::InstanceMethods::ForcedWriters
+
+      # set the name of the table associated to this class
+      # this class will be associated to the writable table of the class_reference class
+      # self.table_name = view_name[5..view_name.length]
+      self.table_name = class_reference.table_name
+      # remove the STI mecanizm
+      self.inheritance_column = :_type_disabled
+      
+      def changes_applied
+         super
+       end
+
+       def clear_attribute_changes(att)
+         super
+       end
+
+       def clear_changes_information
+         super
+       end
+    end
+  end
+  
   #create the writeable class which inherits from ActiveRecord::Base
   def self.create_class_writable(class_reference) 
     Class.new(ActiveRecord::Base) do
@@ -27,6 +55,18 @@ class ActiveRecord::Base
       # set the name of the table associated to this class
       # this class will be associated to the writable table of the class_reference class
       self.table_name = view_name[5..view_name.length]
+      
+      def changes_applied
+         super
+       end
+
+       def clear_attribute_changes(att)
+         super
+       end
+
+       def clear_changes_information
+         super
+       end
     end
   end
 end
@@ -110,7 +150,7 @@ module ActiveRecord
   def load
     puts "in load de citier4"
    exec_queries unless loaded?
-
+   # debugger
    self
   end
  end

data/lib/citier4/instance_methods.rb

@@ -1,5 +1,27 @@
 module Citier4
-  module InstanceMethods    
+  module InstanceMethods 
+    
+
+     #get the attributes of the class which are inherited from it's parent.
+     def  attributes_for_parent
+       attributes.select { |key,value| self.class.superclass.column_names.include?(key) }
+     end
+     
+    #get the changes attributes of the class which are inherited from it's parent.
+     def  changed_attributes_for_parent
+        key_changed = changed.select{ |key| self.class.superclass.column_names.include?(key) }
+        attributes.select { |key,vlaue| key_changed.include?(key) }     
+      end
+             
+      def attributes_for_current
+         attributes.select { |key,value| self.class::Writeable.column_names.include?(key) }
+      end
+      
+      def changed_attributes_for_current
+        key_changed = changed.select{ |key| self.class::Writeable.column_names.include?(key) }
+        attributes.select { |key,vlaue| key_changed.include?(key) } 
+      end     
+           
     def self.included(base)
       base.send :include, ForcedWriters
     end
@@ -20,6 +42,8 @@ module Citier4
         end
       end
     
+      # TODO : Is is still usefull ? Can we remove by using ActiveRecord::Dirty ?
+      # see http://api.rubyonrails.org/classes/ActiveModel/Dirty.html
       def force_changed_attributes(new_changed_attributes, options = {})
         new_changed_attributes = @attributes.merge(new_changed_attributes) if options[:merge]
         @changed_attributes = new_changed_attributes

data/lib/citier4/root_instance_methods.rb

@@ -39,7 +39,8 @@ module Citier4
     end
   
     def is_root?
-      self.class.superclass==ActiveRecord::Base # eoz
+      ! self.class.superclass.acts_as_citier?
+      # self.class.superclass==ActiveRecord::Base # eoz
       # self.class.superclass==Refinery::Core::BaseModel
     end
 

data/lib/citier4/version.rb

@@ -1,3 +1,3 @@
 module Citier4
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/callback_test.rb

@@ -0,0 +1,26 @@
+class Record
+  include ActiveSupport::Callbacks
+  define_callbacks :save
+
+  def save
+    puts "start save"
+    run_callbacks :save do
+      puts "- save"
+    end
+    puts "end save"
+  end
+end
+
+class PersonRecord < Record
+  set_callback :save, :before, :saving_message
+  def saving_message
+    puts "saving..."
+  end
+
+  set_callback :save, :after do |object|
+    puts "saved"
+  end
+end
+
+person = PersonRecord.new
+person.save

data/test/changed_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class Changed < ActiveSupport::TestCase
+
+def setup
+   Book.create name: "book1", author: "auteur1"
+   Product.create name: "product1"
+   Book.create name: "book2", author: "auteur2"
+end
+  
+  
+
+ test "changed in find in root or child" do 
+     book = Book.first
+     book_changed = book.changed
+     
+     product = Product.first
+     product_changed = product.changed
+     
+     assert_not book.changed?
+     assert_not product.changed?
+     assert_equal book_changed, product_changed
+  end   
+
+end

data/test/child_instance_methods_test.rb

@@ -25,10 +25,12 @@ class ChildInstanceMethods < ActiveSupport::TestCase
      # in rails 4.2 lire au niveau de Product ne permet pas de récuperer les champs Book ..
      Product.delete_all
      assert_equal Book.count, 0  
-     Book.create( name: "UnLivre", author: "Inconnu")
-     product = Product.find_by( name: "UnLivre")
+     book=Book.create( name: "UnLivreAvecUnNomSuperCompliqué", author: "Inconnu")
+     product = Product.find_by( name: "UnLivreAvecUnNomSuperCompliqué")
+     assert_equal book.id, product.id
      assert_equal product.class.name, "Book"
-     assert_equal product.author,"Inconnu"
+     assert_equal book.class.name, "Book"
+     assert_equal product.author, book.author
      product.delete
      assert_equal Book.count, 0
     end

data/test/deleting_methods_test.rb

@@ -49,9 +49,9 @@ class DeletingMethods < ActiveSupport::TestCase
   ### DESTROY
   
   test "destroy by id, in root, the first in root" do
+    # debugger
     puts "TODO Destroy work in rails 4.1, but not any more in 4.2"
     # return true
-    debugger
      id = Product.first.id # first could be a child or a root ...
      Product.destroy(id)
      assert data_base_is_clean?(id), "data base is not clean after delete first in root"
@@ -59,7 +59,7 @@ class DeletingMethods < ActiveSupport::TestCase
 
    test "destroy by id, in root, the first in child" do
      puts "TODO Destroy work in rails 4.1, but not any more in 4.2"
-     return true
+     #return true
       id = Book.first.id
       Product.destroy(id)
       assert data_base_is_clean?(id), "data base is not clean after delete first in root"
@@ -69,7 +69,7 @@ class DeletingMethods < ActiveSupport::TestCase
 
     test "destroy by id, in child, the first in child" do
       puts "TODO Destroy work in rails 4.1, but not any more in 4.2"
-      return true
+      #return true
         id = Book.first.id
         Book.destroy(id)
         assert data_base_is_clean?(id), "data base is not clean after delete first in root"
@@ -80,7 +80,7 @@ class DeletingMethods < ActiveSupport::TestCase
 
     test "destroy by instance the first in root" do
       puts "TODO Destroy work in rails 4.1, but not any more in 4.2"
-      return true
+      #return true
        product = Product.first
        id = product.id
        product.delete
@@ -88,7 +88,7 @@ class DeletingMethods < ActiveSupport::TestCase
      end
 
      test "destroy by instance the first in book" do
-       puts "TODO Destroy work in rails 4.1, but not any more in 4.2"
+       #puts "TODO Destroy work in rails 4.1, but not any more in 4.2"
        return true
         book = Book.first
         id = book.id

data/test/dummy/app/models/book.rb

@@ -2,6 +2,6 @@ class Book < Product
   
     acts_as_citier4
     
-    validates :author, presence: true
+    # validates :author, presence: true
     
 end

data/test/dummy/app/models/product.rb

@@ -2,6 +2,6 @@ class Product < ActiveRecord::Base
 
    acts_as_citier4
   
-   validates :name, presence: true
+   # validates :name, presence: true
    
 end

data/test/dummy/config/database.yml

@@ -10,15 +10,23 @@ default: &default
   timeout: 5000
 
 development:
-  <<: *default
-  database: db/development.sqlite3
+    adapter: postgresql
+    encoding: unicode
+    database: citier4_development
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
+
+#test:
+#  <<: *default
+#  database: db/test.sqlite3
+
 test:
-  <<: *default
-  database: db/test.sqlite3
+    adapter: postgresql
+    encoding: unicode
+    database: citier4_test
+
 
 production:
   <<: *default