gbdev-acts_as_callback_logger 0.1.3 → 0.2.0

data/LICENSE

@@ -2,4 +2,6 @@ Licensing terms follow:
  
 This software is placed under the Creative Commons Attribution-Share ALike 3.0 Unported License
  
-http://creativecommons.org/licenses/by-sa/3.0/
+http://creativecommons.org/licenses/by-sa/3.0/
+
+MIT

data/Rakefile

@@ -1,17 +1,24 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'spec/rake/spectask'
 
-desc 'Default: run unit tests.'
-task :default => :test
 
 desc 'Test the acts_as_callback_logger plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+task :default => :spec
+
+desc 'Test the acts_as_callback_logger plugin.'
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+  # t.fail_on_error = false
 end
 
+# Rake::TestTask.new(:test) do |t|
+#   t.libs << 'lib'
+#   t.pattern = 'test/**/*_test.rb'
+#   t.verbose = true
+# end
+
 desc 'Generate documentation for the acts_as_callback_logger plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -20,3 +27,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+

data/lib/acts_as_callback_logger.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'ruby-debug'
 
 module GBDev #:nodoc:
   module Acts #:nodoc:
@@ -87,7 +88,7 @@ module GBDev #:nodoc:
           # 2 is the substring need for the model.
           mod = self.msg.downcase.match(/^(deleted|updated)(.*)[(].*$/)[2] 
           mod = mod.titleize.gsub(' ','')
-          Inflector.camelize(mod).constantize
+          ActiveSupport::Inflector.camelize(mod).constantize
         end
                          
       end # InstanceMethods

data/lib/callback_logger.rb

@@ -11,14 +11,14 @@ module GBDev #:nodoc:
       attr_accessor :callback_logger_text_attr, :aacl_model
       
       def log_callbacks(new_options = {}) 
-        options = {:text => 'name', :aacl_model => 'AppLog'}
+        options = {:aacl_model => 'AppLog'}
         options.merge!(new_options)
         
-        self.callback_logger_text_attr = options[:text]
-        
         mod = options[:aacl_model].titleize.gsub(' ','')
-        mod = Inflector.camelize(mod).constantize
+        mod = ActiveSupport::Inflector.camelize(mod).constantize
         self.aacl_model = mod
+        
+        self.callback_logger_text_attr = options[:text].to_sym if options.has_key?(:text)
                                             
         extend GBDev::CallbackLogger::SingletonMethods
         include GBDev::CallbackLogger::InstanceMethods
@@ -39,12 +39,10 @@ module GBDev #:nodoc:
         
     module InstanceMethods
 
-      def log_create
-        self.class.callback_logger_text_attr = self.class.callback_logger_text_attr.to_sym
+      def log_create      
         class_name = self.class.to_s.titleize.downcase
-        descr_text = self.send(self.class.callback_logger_text_attr)
-        msg = "Created #{class_name} (#{descr_text})"
-        self.class.aacl_model.create({:msg => msg})
+        msg = "Created #{class_name} (#{text_to_display})"
+        self.class.aacl_model.create({:msg => msg, :model => self.class.to_s})
       rescue Exception => msg
         # Just fail quietly
       end
@@ -53,11 +51,9 @@ module GBDev #:nodoc:
         data = self.changes.keys.collect{ |key| "#{key}||#{self.changes[key][0]}||#{self.changes[key][1]}" }.join('|::|')
         data = "id||#{self.id}||#{self.id}|::|#{data}" unless data.empty?
         
-        self.class.callback_logger_text_attr = self.class.callback_logger_text_attr.to_sym
         class_name = self.class.to_s.titleize.downcase
-        descr_text = self.send(self.class.callback_logger_text_attr)
-        msg = "Updated #{class_name} (#{descr_text})"
-        self.class.aacl_model.create({:msg => msg, :data => data}) unless data.empty?
+        msg = "Updated #{class_name} (#{text_to_display})"
+        self.class.aacl_model.create({:msg => msg, :data => data, :model => self.class.to_s}) unless data.empty?
       rescue Exception => msg
         # Just fail quietly          
       end
@@ -65,15 +61,19 @@ module GBDev #:nodoc:
       def log_destroy
         data = self.attributes.keys.collect{ |key| "#{key}||#{self.attributes[key]}" }.join('|::|')
         
-        self.class.callback_logger_text_attr = self.class.callback_logger_text_attr.to_sym
         class_name = self.class.to_s.titleize.downcase
-        descr_text = self.send(self.class.callback_logger_text_attr)
-        msg = "Deleted #{class_name} (#{descr_text})"
-        self.class.aacl_model.create({:msg => msg, :data => data})          
+        msg = "Deleted #{class_name} (#{text_to_display})"
+        self.class.aacl_model.create({:msg => msg, :data => data, :model => self.class.to_s})          
       rescue Exception => msg
         # Just fail quietly          
       end
       
+      
+      private 
+      
+      def text_to_display
+        self.class.callback_logger_text_attr.nil? ? self.id : self.send(self.class.callback_logger_text_attr)
+      end
     end # InstanceMethods
      
   end # CallbackLogger

data/spec/acts_as_callback_logger_spec.rb

@@ -8,7 +8,7 @@ if Object.const_defined?(:ActiveRecord) and Object.const_defined?(:Mocha) and Ob
   end
    
   class Program < ActiveRecord::Base
-    log_callbacks
+    log_callbacks({:text => 'name'})
   end
   
   class GroupType < ActiveRecord::Base
@@ -33,20 +33,19 @@ if Object.const_defined?(:ActiveRecord) and Object.const_defined?(:Mocha) and Ob
       
       it 'should undo the program name change' do        
         @program.save.should be_true
-        
         program_id = @program.id
         
         AppLog.count.should == 1
-        msg = 'Created program (Some Program)'
+        msg = "Created program (Some Program)"
         AppLog.count(:conditions => ["msg = ?", msg]).should == 1      
         
         @program.name = 'Dog Man'
         @program.save.should be_true
         AppLog.count.should == 2
-        msg = 'Updated program (Dog Man)'
+        msg = "Updated program (Dog Man)"
         AppLog.count(:conditions => ["msg = ?", msg]).should == 1
         
-        app_log = AppLog.find_by_msg('Updated program (Dog Man)')
+        app_log = AppLog.find_by_msg(msg)
         app_log.undo.should be_true
         app_log.restored_at.should_not be_nil
         
@@ -57,16 +56,18 @@ if Object.const_defined?(:ActiveRecord) and Object.const_defined?(:Mocha) and Ob
       it 'should undo the group type deletion' do        
         @group_type.save.should be_true
         
+        group_type_id = @group_type.id
+        
         AppLog.count.should == 1
-        msg = 'Created group type (Some Group Type)'
+        msg = "Created group type (#{group_type_id})"
         AppLog.count(:conditions => ["msg = ?", msg]).should == 1      
         
         @group_type.destroy
         GroupType.count.should == 0
-        msg = 'Deleted group type (Some Group Type)'
+        msg = "Deleted group type (#{group_type_id})"
         AppLog.count(:conditions => ["msg = ?", msg]).should == 1
         
-        app_log = AppLog.find_by_msg('Deleted group type (Some Group Type)')
+        app_log = AppLog.find_by_msg("Deleted group type (#{group_type_id})")
         app_log.undo.should be_true
         app_log.restored_at.should_not be_nil        
       end      
@@ -74,26 +75,28 @@ if Object.const_defined?(:ActiveRecord) and Object.const_defined?(:Mocha) and Ob
     
     describe 'Models watched' do
       it 'should add a created, updated and deleted entries to the app_logs table' do
-        @program.save.should be_true
+        @program.save.should be_true 
+        program_id = @program.id                
         AppLog.count.should == 1
-        msg = 'Created program (Some Program)'
+        msg = "Created program (Some Program)"
         AppLog.count(:conditions => ["msg = ?", msg]).should == 1
         
         @group_type.save.should be_true
+        group_type_id = @group_type.id        
         AppLog.count.should == 2
-        msg = 'Created group type (Some Group Type)'
+        msg = "Created group type (#{group_type_id})"
         AppLog.count(:conditions => ["msg = ?", msg]).should == 1        
         
         @program.name = 'Dog Man'
         @program.save.should be_true
         AppLog.count.should == 3
-        msg = 'Updated program (Dog Man)'
+        msg = "Updated program (Dog Man)"
         AppLog.count(:conditions => ["msg = ?", msg]).should == 1        
         
         @group_type.destroy
         AppLog.count.should == 4
-        msg = 'Deleted group type (Some Group Type)'
-        AppLog.count(:conditions => ["msg = ?", msg]).should == 1        
+        msg = "Deleted group type (#{group_type_id})"
+        AppLog.count(:conditions => ["msg = ?", msg]).should == 1      
       end
     end  
   

data/spec/schema.rb

@@ -12,6 +12,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :app_logs do |t|
     t.column :msg, :string, :null => false
     t.column :data, :text
+    t.column :model, :text
     t.column :restored_at, :datetime
     t.column :created_at, :datetime
   end

data/spec/spec_helper.rb

@@ -4,8 +4,8 @@ require 'active_record'
 require 'spec'
 require 'mocha'
 
-require '../lib/acts_as_callback_logger'
-require '../lib/callback_logger'
+require File.dirname(__FILE__) + '/../lib/acts_as_callback_logger'
+require File.dirname(__FILE__) + '/../lib/callback_logger'
 
 include GBDev::Acts::CallbackLogger
 include GBDev::CallbackLogger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gbdev-acts_as_callback_logger
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Wes Hays