gbdev-acts_as_callback_logger 0.2.0 → 0.3.0

data/init.rb

@@ -1,8 +1,16 @@
 require 'active_record'
-require 'acts_as_callback_logger'
-require 'callback_logger'
+require File.dirname(__FILE__) + "/lib/acts_as_callback_logger.rb"
+require File.dirname(__FILE__) + "/lib/callback_logger.rb"
+require File.dirname(__FILE__) + "/lib/logger_link_to.rb"
 
-ActiveRecord::Base.class_eval do
-  include GBDev::Acts::CallbackLogger
-  include GBDev::CallbackLogger
-end
+# ActiveRecord::Base.class_eval do
+#   include GBDev::Acts::CallbackLogger
+#   include GBDev::CallbackLogger
+# end
+
+#ActionView::Helpers::AssetTagHelper.class_eval do
+# ActionView::Helpers::TagHelper.class_eval do
+#   include GBDev::CallbackLogger::HelperMethods
+# end
+
+#ActionView::Helpers::FormHelper.send(:include, GBDev::CallbackLogger::HelperMethods)

data/lib/acts_as_callback_logger.rb

@@ -10,10 +10,13 @@ module GBDev #:nodoc:
       end
 
       module ClassMethods
+        # attr_accessor :callback_text_attr
         
-        def acts_as_callback_logger(new_options = {}) 
-          options = {:text => 'name'}
-          options.merge!(new_options)
+        def acts_as_callback_logger(*args) 
+          # options = {:text => 'name', :object_url => {}}
+          # options.merge!(args.pop) unless args.empty?        
+          #                                     
+          # self.callback_text_attr = options.delete(:text)
                                               
           extend GBDev::Acts::CallbackLogger::SingletonMethods
           include GBDev::Acts::CallbackLogger::InstanceMethods
@@ -97,4 +100,4 @@ module GBDev #:nodoc:
   end # Acts
 end # GBDev
 
-ActiveRecord::Base.send :include, GBDev::Acts::CallbackLogger
+ActiveRecord::Base.send(:include, GBDev::Acts::CallbackLogger)

data/lib/callback_logger.rb

@@ -8,18 +8,19 @@ module GBDev #:nodoc:
     end
 
     module ClassMethods
-      attr_accessor :callback_logger_text_attr, :aacl_model
+      attr_accessor :callback_logger_text_attr, :callback_logger_model, :callback_logger_object_url
       
-      def log_callbacks(new_options = {}) 
-        options = {:aacl_model => 'AppLog'}
-        options.merge!(new_options)
+      def log_callbacks(*args) 
+        options = {:text => '', :object_url => {}, :aacl_model => 'AppLog'}
+        options.merge!(args.pop) unless args.empty?    
         
-        mod = options[:aacl_model].titleize.gsub(' ','')
+        self.callback_logger_text_attr = options.delete(:text).to_sym unless options[:text].blank?        
+        self.callback_logger_object_url = options.delete(:object_url)  
+
+        mod = options.delete(:aacl_model).titleize.gsub(' ','')
         mod = ActiveSupport::Inflector.camelize(mod).constantize
-        self.aacl_model = mod
-        
-        self.callback_logger_text_attr = options[:text].to_sym if options.has_key?(:text)
-                                            
+        self.callback_logger_model = mod
+                     
         extend GBDev::CallbackLogger::SingletonMethods
         include GBDev::CallbackLogger::InstanceMethods
         
@@ -39,10 +40,11 @@ module GBDev #:nodoc:
         
     module InstanceMethods
 
-      def log_create      
+      def log_create  
+        data = "id||#{self.id}||#{self.id}|"    
         class_name = self.class.to_s.titleize.downcase
         msg = "Created #{class_name} (#{text_to_display})"
-        self.class.aacl_model.create({:msg => msg, :model => self.class.to_s})
+        self.class.callback_logger_model.create({:msg => msg, :data => data, :model => self.class.to_s})
       rescue Exception => msg
         # Just fail quietly
       end
@@ -53,7 +55,7 @@ module GBDev #:nodoc:
         
         class_name = self.class.to_s.titleize.downcase
         msg = "Updated #{class_name} (#{text_to_display})"
-        self.class.aacl_model.create({:msg => msg, :data => data, :model => self.class.to_s}) unless data.empty?
+        self.class.callback_logger_model.create({:msg => msg, :data => data, :model => self.class.to_s}) unless data.empty?
       rescue Exception => msg
         # Just fail quietly          
       end
@@ -63,7 +65,7 @@ module GBDev #:nodoc:
         
         class_name = self.class.to_s.titleize.downcase
         msg = "Deleted #{class_name} (#{text_to_display})"
-        self.class.aacl_model.create({:msg => msg, :data => data, :model => self.class.to_s})          
+        self.class.callback_logger_model.create({:msg => msg, :data => data, :model => self.class.to_s})          
       rescue Exception => msg
         # Just fail quietly          
       end
@@ -72,11 +74,11 @@ module GBDev #:nodoc:
       private 
       
       def text_to_display
-        self.class.callback_logger_text_attr.nil? ? self.id : self.send(self.class.callback_logger_text_attr)
+        self.class.callback_logger_text_attr.blank? ? self.id : self.send(self.class.callback_logger_text_attr)
       end
     end # InstanceMethods
      
   end # CallbackLogger
 end # GBDev
 
-ActiveRecord::Base.send :include, GBDev::CallbackLogger
+ActiveRecord::Base.send(:include, GBDev::CallbackLogger)

data/lib/logger_link_to.rb

@@ -0,0 +1,50 @@
+require 'rubygems' 
+require 'active_support'
+#require 'action_view'
+
+module ActionView::Helpers::AssetTagHelper
+# module GBDev #:nodoc:
+#   module CallbackLogger #:nodoc:
+#     module HelperMethods #:nodoc:
+      
+      def callback_logger_link_to(app_log_object)
+        # TODO: add object checker stuff here....
+        
+        # Get model updated in the transaction
+        model = ActiveSupport::Inflector.singularize(app_log_object.model)
+        model = ActiveSupport::Inflector.camelize(model).constantize    
+        # obj = model.find(obj_id)   
+        return app_log_object.msg if model.callback_logger_object_url.blank?
+        
+        # Get stuff within parentheses.  It will be the second match.
+        regex = Regexp.new('\((.+)\)$') 
+        matches = regex.match(app_log_object.msg)    
+        return app_log_object.msg if matches.nil?
+        
+        # matches[1] contains the content within the parentheses.
+        content = matches[1] 
+        
+        # Get the id for this entry
+        regex = Regexp.new('^id\|\|(\d+)\|\|') # String:  id||176028860||176028860|::|updated_at||....
+        matches = regex.match(app_log_object.data)      
+        return app_log_object.msg if matches.nil?
+        
+        # matches[1] contains the content within the parentheses.
+        obj_id = matches[1]
+        
+        # Add the id to the url. There should probably be a 
+        # check whether or not to include it.
+        # TODO: ....
+        model.callback_logger_object_url.merge!({:id => obj_id})
+        
+        app_log_object.msg.gsub(content, link_to(content, model.callback_logger_object_url))    
+      end
+      
+#     end
+#   end
+# end
+end
+
+# module ActionView::Helpers::AssetTagHelper 
+#   include GBDev::CallbackLogger::HelperMethods
+# end

data/spec/acts_as_callback_logger_spec.rb

@@ -1,107 +1,115 @@
-#!/usr/bin/env ruby -w
-require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper') 
- 
-if Object.const_defined?(:ActiveRecord) and Object.const_defined?(:Mocha) and Object.const_defined?(:Spec)
-   
-  class AppLog < ActiveRecord::Base
-    acts_as_callback_logger
-  end
-   
-  class Program < ActiveRecord::Base
-    log_callbacks({:text => 'name'})
-  end
-  
-  class GroupType < ActiveRecord::Base
-    log_callbacks
-  end  
-  
-  
-  describe 'CallbackLogger' do
-    
-    before(:each) do
-      AppLog.delete_all
-      Program.delete_all
-      GroupType.delete_all      
-      @program = Program.new({:name => 'Some Program'})
-      @group_type = GroupType.new({:name => 'Some Group Type'})
-    end 
-    
-    describe 'AppLog' do
-      it 'should not have any logs in it to start' do
-        AppLog.count.should be_zero
-      end  
-      
-      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)"
-        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)"
-        AppLog.count(:conditions => ["msg = ?", msg]).should == 1
-        
-        app_log = AppLog.find_by_msg(msg)
-        app_log.undo.should be_true
-        app_log.restored_at.should_not be_nil
-        
-        program = Program.find(program_id)
-        program.name.should == 'Some Program'
-      end
-      
-      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 (#{group_type_id})"
-        AppLog.count(:conditions => ["msg = ?", msg]).should == 1      
-        
-        @group_type.destroy
-        GroupType.count.should == 0
-        msg = "Deleted group type (#{group_type_id})"
-        AppLog.count(:conditions => ["msg = ?", msg]).should == 1
-        
-        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      
-    end    
-    
-    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_id = @program.id                
-        AppLog.count.should == 1
-        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 (#{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)"
-        AppLog.count(:conditions => ["msg = ?", msg]).should == 1        
-        
-        @group_type.destroy
-        AppLog.count.should == 4
-        msg = "Deleted group type (#{group_type_id})"
-        AppLog.count(:conditions => ["msg = ?", msg]).should == 1      
-      end
-    end  
-  
-  end  
-  
-else
-  $stderr.puts "Warning: ActiveRecord, Spec or Mocha not found -- skipping AAR tests"
-end
+# #!/usr/bin/env ruby -w
+# require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper') 
+#  
+# if Object.const_defined?(:ActiveRecord) and Object.const_defined?(:Mocha) and Object.const_defined?(:Spec)
+#    
+#   class AppLog < ActiveRecord::Base
+#     acts_as_callback_logger
+#   end
+#    
+#   class Program < ActiveRecord::Base
+#     log_callbacks :text => 'name'
+#   end
+#   
+#   class GroupType < ActiveRecord::Base
+#     log_callbacks :text => 'name'#, :object_url => {:controller => 'clients/charges', :action => 'edit'}
+#   end
+#    
+#    
+#   describe 'CallbackLogger' do
+#   
+#     before(:each) do
+#       build_database_connection
+#       InitialSchema.up
+#       
+#       AppLog.delete_all
+#       Program.delete_all
+#       GroupType.delete_all      
+#       @program = Program.new({:name => 'Some Program'})
+#       @group_type = GroupType.new({:name => 'Some Group Type'})      
+#     end 
+# 
+#     after(:each) do
+#       InitialSchema.down
+#     end  
+#             
+#     describe 'AppLog' do
+#       
+#       it 'should not have any logs in it to start' do
+#         AppLog.count.should be_zero
+#       end  
+#       
+#       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)"
+#         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)"
+#         AppLog.count(:conditions => ["msg = ?", msg]).should == 1
+#         
+#         app_log = AppLog.find_by_msg(msg)
+#         app_log.undo.should be_true
+#         app_log.restored_at.should_not be_nil
+#         
+#         program = Program.find(program_id)
+#         program.name.should == 'Some Program'
+#       end
+#       
+#       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 (#{@group_type.name})"
+#         AppLog.count(:conditions => ["msg = ?", msg]).should == 1      
+#         
+#         @group_type.destroy
+#         GroupType.count.should == 0
+#         msg = "Deleted group type (#{@group_type.name})"
+#         AppLog.count(:conditions => ["msg = ?", msg]).should == 1
+#         
+#         app_log = AppLog.find_by_msg("Deleted group type (#{@group_type.name})")
+#         app_log.undo.should be_true
+#         app_log.restored_at.should_not be_nil        
+#       end      
+#     end    
+#     
+#     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_id = @program.id                
+#         AppLog.count.should == 1
+#         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 (#{@group_type.name})"
+#         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)"
+#         AppLog.count(:conditions => ["msg = ?", msg]).should == 1        
+#         
+#         @group_type.destroy
+#         AppLog.count.should == 4
+#         msg = "Deleted group type (#{@group_type.name})"
+#         AppLog.count(:conditions => ["msg = ?", msg]).should == 1      
+#       end
+#     end  
+#   
+#   end  
+#   
+# else
+#   $stderr.puts "Warning: ActiveRecord, Spec or Mocha not found -- skipping AAR tests"
+# end

data/spec/logger_link_to_spec.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby -w
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper') 
+ 
+if Object.const_defined?(:ActiveRecord) and Object.const_defined?(:Mocha) and Object.const_defined?(:Spec)
+
+  class AppLog < ActiveRecord::Base
+    acts_as_callback_logger
+  end
+   
+  class Event < ActiveRecord::Base
+    log_callbacks :text => 'name'
+  end
+  
+  class Charge < ActiveRecord::Base
+    log_callbacks :text => 'name'#, :object_url => {:controller => 'clients/charges', :action => 'edit'}
+  end
+
+
+  describe 'GBDev::CallbackLogger::HelperMethods' do 
+    
+    before(:each) do
+      build_database_connection
+      InitialSchema.up
+    end 
+    
+    after(:each) do
+      build_database_connection
+      InitialSchema.down
+    end
+
+    describe 'logger_link_to' do
+      it "should not be a link since :object_url is not set" do
+        AppLog.delete_all
+        Event.delete_all     
+        event = Event.new({:name => 'Some Event'})
+        event.save.should be_true
+        log = AppLog.find(:first)                
+        logger_link_to(log).should == "Created event (Some Event)"
+      end         
+    end  
+    
+    # describe 'logger_link_to' do
+    #   it "should build a link in the message between the parentheses" do
+    #     AppLog.delete_all
+    #     Charge.delete_all     
+    #     charge = Charge.new({:name => 'Some Charge'})
+    #     charge.save.should be_true
+    #     log = AppLog.find(:first)                
+    #     logger_link_to(log).should match(/Created charge \(<a href.*\/clients\/charges\/edit.*>Some Charge<\/a>\)/)
+    #   end         
+    # end    
+  end  
+  
+else
+  $stderr.puts "Warning: ActiveRecord, Spec or Mocha not found -- skipping AAR tests"
+end

data/spec/spec_helper.rb

@@ -1,19 +1,123 @@
+ENV["RAILS_ENV"] = "test"
+PLUGIN_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+ 
 require 'rubygems'
 require 'ruby-debug'
 require 'active_record'
-require 'spec'
+require 'active_support'
+require 'action_controller'
+require 'action_view'
+require 'rexml/document'
+require 'html/document'
 require 'mocha'
+require 'spec'
+
+require File.join(PLUGIN_ROOT, 'lib/acts_as_callback_logger')
+require File.join(PLUGIN_ROOT, 'lib/callback_logger')
+require File.join(PLUGIN_ROOT, 'lib/logger_link_to')
+
+include ActionView::Helpers::UrlHelper  
+include ActionController::UrlWriter
+include ActionView::Helpers::AssetTagHelper
 
-require File.dirname(__FILE__) + '/../lib/acts_as_callback_logger'
-require File.dirname(__FILE__) + '/../lib/callback_logger'
+#include GBDev::Acts::CallbackLogger
+#include GBDev::CallbackLogger
+#include GBDev::CallbackLogger::HelperMethods
 
-include GBDev::Acts::CallbackLogger
-include GBDev::CallbackLogger
+# config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+# ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/debug.log')
+# ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'postgresql'])
 
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/debug.log')
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'postgresql'])
+ActionController::UrlWriter.default_url_options = {:host => 'localhost'}
+ActionController::Routing::Routes.draw do |map|
+  map.connect ':controller/:action/:id'
+  map.connect ':controller/:action/:id.:format'
+end
 
 load(File.dirname(__FILE__) + '/schema.rb') if File.exist?(File.dirname(__FILE__) + '/schema.rb')
+ 
+#ActionView::Helpers::AssetTagHelper.send :include, GBDev::CallbackLogger::HelperMethods
+ 
+ 
+ 
+ 
+
+class InitialSchema < ActiveRecord::Migration
+
+ def self.up
+   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
+
+   create_table :events do |t|
+     t.column :name, :string, :limit => 255
+   end
+
+   create_table :charges do |t|
+     t.column :name, :string, :limit => 255
+   end  
+
+   create_table :programs do |t|
+     t.column :name, :string, :limit => 255
+   end
+
+   create_table :group_types do |t|
+     t.column :name, :string, :limit => 255
+   end 
+ end
+
+ def self.down
+   drop_table :app_logs
+   drop_table :events
+   drop_table :charges
+   drop_table :programs
+   drop_table :group_types
+ end
+
+end
+
+
+def create_sqlite3_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3", 
+    :dbfile => ":memory:"
+  )
+end
+
+def create_postgresql_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter  => "postgresql",
+    :host     => "localhost",
+    :username => "aacl",
+    :password => "aacl",
+    :database => "acts_as_callback_logger"
+  )    
+end
 
+def create_mysql_connection
+  # '/tmp/mysql.sock' is the default location and file rails looks for.
+  mysql_socket = ENV['MYSQLSOCKET'].nil? ? '/tmp/mysql.sock' : ENV['MYSQLSOCKET']
+  ActiveRecord::Base.establish_connection(
+    :adapter  => "mysql",
+    :host     => "localhost",
+    :username => "aacl",
+    :password => "aacl",
+    :database => "acts_as_callback_logger",
+    :socket   => mysql_socket
+  )    
+end 
 
+def build_database_connection
+  case ENV['DATABASE']
+    when 'mysql'
+       create_mysql_connection
+    when 'postgresql' 
+       create_postgresql_connection
+    else 'sqlite3'     
+      create_sqlite3_connection
+  end
+end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gbdev-acts_as_callback_logger
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Wes Hays
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-23 00:00:00 -07:00
+date: 2008-12-05 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -32,9 +32,9 @@ files:
 - uninstall.rb
 - lib/acts_as_callback_logger.rb
 - lib/callback_logger.rb
+- lib/logger_link_to.rb
 - spec/acts_as_callback_logger_spec.rb
-- spec/database.yml
-- spec/schema.rb
+- spec/logger_link_to_spec.rb
 - spec/spec_helper.rb
 - tasks/acts_as_callback_logger_tasks.rake
 has_rdoc: false
@@ -65,6 +65,4 @@ specification_version: 2
 summary: Rails gem/plugin to log callback events (after_create, after_update,  after_destroy) for certain models tracking various things that users  did within the application.
 test_files: 
 - spec/acts_as_callback_logger_spec.rb
-- spec/database.yml
-- spec/schema.rb
 - spec/spec_helper.rb

data/spec/database.yml

@@ -1,7 +0,0 @@
-postgresql:
-  adapter: postgresql
-  database: acts_as_callback_logger
-  username: aacl
-  password: aacl
-  host: localhost
-

data/spec/schema.rb

@@ -1,28 +0,0 @@
-ActiveRecord::Schema.define(:version => 1) do
-  
-  begin
-    execute 'DROP TABLE app_logs' 
-    execute 'DROP TABLE programs' 
-    execute 'DROP TABLE group_types'
-  rescue
-    # Do nothing because this is the first time this script has ran so
-    # the tables did not exist yet.  Thus is why the error was thrown.
-  end
-
-  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
-  
-  create_table :programs do |t|
-    t.column :name, :string, :limit => 255
-  end
-  
-  create_table :group_types do |t|
-    t.column :name, :string, :limit => 255
-  end  
-  
-end