audits 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd77ffe6dabb842251a2ca814290071d1d81bc1
-  data.tar.gz: 1ef8e6018ad750aeb1f81f7b838d6f6fe10f3bc5
+  metadata.gz: 15cb05f37e893fde0dd55cdeaa0987e6100f309a
+  data.tar.gz: 1fdcd26f4d2ea7d925d0a2bdf148af201b3b69b3
 SHA512:
-  metadata.gz: 4b48ee5027a327a1fac51a19345fedef17b1474010cada6ff6cb20de565868596c24be143542e1c42779b0634b19a279032992eb88c5b6f6a60fa419372f3aa4
-  data.tar.gz: cf2fab06225aa0192459d64189045e843a8d6cc3251f8fef34de858fc0a9744f7e4a7d1f461b42b7fe1db6f52a6b67eb8349ba0cca74bc9fcafc630b4eaf5e7d
+  metadata.gz: 88d15d58b1c3888e7611149e4c4500b21a2bad2fb72cada6287bee81efe7e55253f2f03490ed9e5c011383a4b0f2a3e3e827f1d94a438e39eb039ecf9f5868d6
+  data.tar.gz: 818bdbd1a8af826243b8929174ce34b1069c3e5a887fc5002328a97093acdb3bc624c8a423ec998eafa514a9aa2e70c73d42672831aca708a67675e8ddab0680

data/lib/audits.rb

@@ -1,77 +1,2 @@
-require 'change.rb'
-
-class ActiveRecord::Base
-
-	before_save :before_save
-
-	@@auditable_properties = {}
-	@@parent_models = {}
-	@@current_user_id = nil
-
-	def self.auditable_properties
-		return @@auditable_properties[self.to_s] if !@@auditable_properties.blank?
-		return nil
-	end
-
-	def self.parent_model
-		return @@parent_models[self.to_s] if !@@parent_models.blank?
-		return nil
-	end
-
-	def self.audits(*properties)
-		@@auditable_properties[self.to_s] = properties
-		# puts "Calling audits from class #{self.to_s}"
-	end
-
-	def self.audit_parent(parent_model)
-		@@parent_models[self.to_s] = parent_model
-	end
-
-	def log_changes(parent_model_class_name = nil, parent_model_id = nil)
-		auditable_properties_list = self.class.auditable_properties
-		return if self.id.blank? or auditable_properties_list.blank?
-		auditable_properties_list.each do |property|
-			# Create Change object
-			original_value = self.send "#{property.to_s}_was"
-			new_value = self.send property.to_s
-			next if original_value.eql? new_value
-		
-			c = Change.new
-			c.model_class_name = self.class.name.demodulize
-			c.model_id = self.id
-			c.property_name = property.to_s
-			c.parent_model_class_name = parent_model_class_name
-			c.parent_model_id = parent_model_id
-			c.original_value = original_value.to_s if !original_value.blank?
-			c.new_value = new_value.to_s if !new_value.blank?
-			c.created_at = DateTime.now
-			c.created_by_id = Thread.current[:user].id if !Thread.current[:user].blank?
-			c.save!
-
-		end
-	end
-
-	def before_save
-		return if self.class.auditable_properties.blank?
-
-		parent = self.class.parent_model.blank? ? nil : self.send(self.class.parent_model.to_s)
-		parent_model_id = parent.blank? ? nil : parent.id
-		parent_model_class_name = parent.blank? ? nil : parent.class.name.demodulize
-
-		self.log_changes(parent_model_class_name, parent_model_id)
-	end
-
-	def get_changes
-		return nil if self.class.auditable_properties.blank? or self.id.blank?
-
-		return Change.get_model_changes(self.class.name.demodulize, self.id)
-	end
-end
-
-class ActionController::Base
-	before_filter :set_audit_user
-	
-	def set_audit_user
-		Thread.current[:user] = current_admin if defined? current_admin and !current_admin.blank?
-	end
+module Audits
 end

data/lib/audits/version.rb

@@ -1,3 +1,3 @@
 module Audits
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/generators/audits_install/audits_install_generator.rb

@@ -4,15 +4,21 @@ require 'rails/generators/active_record'
 class AuditsInstallGenerator < Rails::Generators::Base
 	include ::Rails::Generators::Migration
   source_root File.expand_path('../templates', __FILE__)
+  argument :user_class_name, :type => :string, :default => "user"
 
   def create_migration_file
   	migration_template 'create_changes.rb', 'db/migrate/create_changes.rb'
   end
 
-  # def copy_mailer_templates
-  # 	copy_file 'monitored_process_mailer.rb', 'app/mailers/monitored_process_mailer.rb'
-  # 	copy_file 'process_execution_result_email.html.erb', 'app/views/monitored_process_mailer/process_execution_result_email.html.erb'
-  # end
+  def copy_change_class
+    @user_class = user_class_name.downcase
+  	template 'change.txt', 'app/models/change.rb'
+  end
+
+  def copy_audits_code
+    @user_class = user_class_name.downcase
+    template 'audits.txt', 'config/initializers/audits.rb'
+  end
 
   def self.next_migration_number(dirname)
   	::ActiveRecord::Generators::Base.next_migration_number(dirname)

data/lib/generators/audits_install/templates/audits.txt

@@ -0,0 +1,75 @@
+class ActiveRecord::Base
+
+	before_save :before_save
+
+	@@auditable_properties = {}
+	@@parent_models = {}
+	@@current_user_id = nil
+
+	def self.auditable_properties
+		return @@auditable_properties[self.to_s] if !@@auditable_properties.blank?
+		return nil
+	end
+
+	def self.parent_model
+		return @@parent_models[self.to_s] if !@@parent_models.blank?
+		return nil
+	end
+
+	def self.audits(*properties)
+		@@auditable_properties[self.to_s] = properties
+		# puts "Calling audits from class #{self.to_s}"
+	end
+
+	def self.audit_parent(parent_model)
+		@@parent_models[self.to_s] = parent_model
+	end
+
+	def log_changes(parent_model_class_name = nil, parent_model_id = nil)
+		auditable_properties_list = self.class.auditable_properties
+		return if self.id.blank? or auditable_properties_list.blank?
+		auditable_properties_list.each do |property|
+			# Create Change object
+			original_value = self.send "#{property.to_s}_was"
+			new_value = self.send property.to_s
+			next if original_value.eql? new_value
+		
+			c = Change.new
+			c.model_class_name = self.class.name.demodulize
+			c.model_id = self.id
+			c.property_name = property.to_s
+			c.parent_model_class_name = parent_model_class_name
+			c.parent_model_id = parent_model_id
+			c.original_value = original_value.to_s if !original_value.blank?
+			c.new_value = new_value.to_s if !new_value.blank?
+			c.created_at = DateTime.now
+			c.created_by_id = Thread.current[:user].id if !Thread.current[:user].blank?
+			c.save!
+
+		end
+	end
+
+	def before_save
+		return if self.class.auditable_properties.blank?
+
+		parent = self.class.parent_model.blank? ? nil : self.send(self.class.parent_model.to_s)
+		parent_model_id = parent.blank? ? nil : parent.id
+		parent_model_class_name = parent.blank? ? nil : parent.class.name.demodulize
+
+		self.log_changes(parent_model_class_name, parent_model_id)
+	end
+
+	def get_changes
+		return nil if self.class.auditable_properties.blank? or self.id.blank?
+
+		return Change.get_model_changes(self.class.name.demodulize, self.id)
+	end
+end
+
+class ActionController::Base
+	before_filter :set_audit_user
+	
+	def set_audit_user
+		Thread.current[:user] = current_<%= @user_class %> if defined? current_<%= @user_class %> and !current_<%= @user_class %>.blank?
+	end
+end

data/lib/{change.rb → generators/audits_install/templates/change.txt}

@@ -1,6 +1,6 @@
 class Change < ActiveRecord::Base
 	# Associations
-	belongs_to :user, :class_name => 'User', :foreign_key => 'created_by_id'
+	belongs_to :<%= @user_class %>, :class_name => '<%= @user_class.capitalize %>', :foreign_key => 'created_by_id'
 
 	# Validations
 	validates :model_class_name, :model_id, :property_name, :created_at, :presence => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audits
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Juan Manuel Vallejo
@@ -52,9 +52,10 @@ files:
 - Rakefile
 - lib/audits.rb
 - lib/audits/version.rb
-- lib/change.rb
 - lib/generators/audits_install/USAGE
 - lib/generators/audits_install/audits_install_generator.rb
+- lib/generators/audits_install/templates/audits.txt
+- lib/generators/audits_install/templates/change.txt
 - lib/generators/audits_install/templates/create_changes.rb
 - lib/tasks/audits_tasks.rake
 - test/audits_test.rb