change_log 1.0.5 → 2.0.0

data/Gemfile

@@ -1,7 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 # Specify your gem's dependencies in change_log.gemspec
 gemspec
-
+gem 'activerecord-import', '~> 0.3.1'
 group :test do
   gem 'rake'
 end

data/Gemfile.lock

@@ -4,13 +4,32 @@ PATH
     change_log (1.0.5)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activerecord-import (0.3.1)
+      activerecord (~> 3.0)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    i18n (0.6.1)
+    multi_json (1.7.7)
     rake (10.0.3)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-import (~> 0.3.1)
   change_log!
   rake

data/README.textile

@@ -6,17 +6,12 @@ You can choose to skip the column which you do not want to keep change logs.
 For example: 'updated_at', 'created_at' and 'password' etc.
 
 * Note: 
-        Change Log version 1.0.5 is temporarily locked down to Rails 2.3.x and mysql database only.
-        Another version with fully support to Rails 3.x and multiple databases 
-        will be available soon in another branch on github.
-
+        Use Change Log version 1.0.5 if your application is using Rails 2.x.
 
 h2. Install Change Log Gem
 
 1. by command:
 <pre><code># gem install change_log</code></pre>
-   Then in your environment.rb:
-<pre><code>config.gem 'change_log'</code></pre>
 
 
 2. or by bundler:
@@ -27,12 +22,6 @@ gem 'change_log'
 Then:
 <pre><code>bundle install</code></pre>
 
-* Note: 
-        If you use bundler with Rails 2.3.x, you may get "enable_change_log" method missing error. 
-        This is because Rails 2.3.x comes with its own gem handling. 
-        You need to override that and replace it with support for Bundler. 
-        Visit "Bundler Website":http://gembundler.com/rails23.html to find out how.
-
 3. Create a table to keep all changes
 
     Generate a migration file similar to this:
@@ -152,7 +141,7 @@ Just remember in your environment.rb file, you need to tell change_log gem
 what is your table name:
 
 <pre><code># config/environment.rb
-ChangeLogs.set_table_name('hr_maintenances')
+ChangeLogs.table_name :hr_maintenances
 </code></pre>
 
 
@@ -163,7 +152,7 @@ h2. Wish List
 h3. Author
 ----
 
-Peter Zhang at NCS New Zealand.
+Peter Zhang at NCS Software Ltd New Zealand.
 Email: peterz@ncs.co.nz
 
-Copyright (c) 2011 Peter Zhang and NCS LTD, released under the MIT license
+Copyright (c) 2013 Peter Zhang and NCS Software LTD, released under the MIT license

data/lib/change_log/change_logs.rb

@@ -1,17 +1,20 @@
 class ChangeLogs < ActiveRecord::Base
   # Set table name to "change_logs" 
-  def table_name
-    :change_logs
-  end
+  self.table_name = :change_logs
 
   private
 
-  # Save Change Log details when options
-  def self.update_change_log_record_with(option={})
-    record = ChangeLogs.new(option)
-    record.field_type = get_field_type(option[:table_name],option[:attribute_name]) unless option[:action].eql?('DELETE')
-    record.created_at = Time.now
-    record.save
+  # Save Change Log details with changes 
+  def self.update_change_log_record_with(changes=[])
+    records = []
+    changes.each do |option|
+      record = ChangeLogs.new(option)
+      record.field_type = get_field_type(option[:table_name],option[:attribute_name]) unless option[:action].eql?('DELETE')
+      record.user = option[:user].id unless option[:user].is_a?(String)
+      record.created_at = Time.now
+      records << record
+    end
+    ChangeLogs.import records
   end
 
   # return the latest version number for this change

data/lib/change_log/has_change_log.rb

@@ -42,76 +42,44 @@ module ChangeLog
     # ActiveRecord models that declare `enable_change_log`.
     module InstanceMethods
 
-      # NOTE::This version's change_log is temporarily locked down to Rails 2.3.x
-      # and mysql database. Another version with fully support to Rails 3.x and multiple databases 
-      # will be available soon in another branch on github.
       def record_create
         # do nothing if the change log is not turned on
         return '' unless switched_on?
-
-        # generate the single sql insert statement
-        column_values = []
+        changes = []
         # saving changes to change log
         self.attributes.map do |key,value|
           unless self.ignore.include?(key.to_sym)
-            field_type = ChangeLogs.get_field_type(self.class.table_name,key)
-            value = value.gsub("'", %q(\\\')) unless value.blank? || !value.is_a?(String)
-            user = ChangeLog.whodidit
-            if user.blank?
-              user = 'Unkown'
-            else
-              user = ChangeLog.whodidit.is_a?(String) ? ChangeLog.whodidit : ChangeLog.whodidit.id
-            end
-            time = Time.now.strftime("%Y-%m-%d %T")
-            column_values << '(' + ["'INSERT'", self.id, "'#{self.class.table_name}'", "'#{user}'", "'#{field_type}'", "'#{key}'", "'#{value}'",1, "'#{time}'" ].join(',') + ')'
+            changes << {:action=>'INSERT', :record_id=>self.id,:table_name=>self.class.table_name, :user=>ChangeLog.whodidit,:attribute_name=>key,:new_value=>value,:version=>1}
           end
         end  
-        column_names = ['action','record_id','table_name','user','field_type','attribute_name','new_value','version','created_at']
-        insert_statement = "INSERT INTO `#{ChangeLogs.table_name}` (`#{column_names.join('`, `')}`) VALUES " + column_values.join( ',' ) + ";"
-        ChangeLogs.connection.execute( insert_statement )
+        ChangeLogs.update_change_log_record_with(changes)
   	  end
 
-      # NOTE::This version's change_log is temporarily locked down to Rails 2.3.x
-      # and mysql database. Another version with fully support to Rails 3.x and multiple databases 
-      # will be available soon in another branch on github.
       def record_update
         # do nothing if the change log is not turned on and no changes has been made
         return '' unless switched_on? && self.valid? && self.changed?
-
-        # generate the single sql insert statement
-        column_values = []
+        changes = []
         # saving changes to change log
         self.changes.each do |attribute_name,value|
           # do not record changes between nil <=> ''
           # and ignore the changes for ignored columns
           unless value[1].eql?(value[0]) || (value[1].blank?&&value[0].blank?) || self.ignore.include?(attribute_name.to_s)
-            field_type = ChangeLogs.get_field_type(self.class.table_name,attribute_name)
-            value[0] = value[0].gsub("'", %q(\\\')) unless value[0].blank? || !value[0].is_a?(String)
-            value[1] = value[1].gsub("'", %q(\\\')) unless value[1].blank? || !value[1].is_a?(String)
-            user = ChangeLog.whodidit
-            if user.blank?
-              user = 'Unkown'
-            else
-              user = ChangeLog.whodidit.is_a?(String) ? ChangeLog.whodidit : ChangeLog.whodidit.id
-            end
-            time = Time.now.strftime("%Y-%m-%d %T")
-            column_values << '(' + ["'UPDATE'", self.id, "'#{self.class.table_name}'", "'#{user}'","'#{field_type}'", "'#{attribute_name}'", "'#{value[0]}'","'#{value[1]}'",ChangeLogs.get_version_number(self.id,self.class.table_name),"'#{time}'"].join(',') + ')'
+            changes << {:action=>'UPDATE',:record_id=>self.id,:table_name=>self.class.table_name,:user=>ChangeLog.whodidit,:attribute_name=>attribute_name,:old_value=>value[0],:new_value=>value[1],:version => ChangeLogs.get_version_number(self.id,self.class.table_name)}
           end
         end  
-        column_names = ['action','record_id','table_name','user','field_type','attribute_name','old_value','new_value','version','created_at']
-        insert_statement = "INSERT INTO `#{ChangeLogs.table_name}` (`#{column_names.join('`, `')}`) VALUES " + column_values.join( ',' ) + ";"
-        ChangeLogs.connection.execute( insert_statement )
+        ChangeLogs.update_change_log_record_with(changes)
       end
 
       def record_destroy
         return '' unless switched_on?
-        ChangeLogs.update_change_log_record_with({:action=>'DELETE',:table_name=>self.class.table_name,:record_id=>self.id,:user=>ChangeLog.whodidit,:version => ChangeLogs.get_version_number(self.id,self.class.table_name)})
+        changes = [{:action=>'DELETE',:table_name=>self.class.table_name,:record_id=>self.id,:user=>ChangeLog.whodidit,:version => ChangeLogs.get_version_number(self.id,self.class.table_name)}]
+        ChangeLogs.update_change_log_record_with(changes)
       end
 
       # Return a list of change_log records
       # Return empty array if not record found
       def change_logs
-        return ChangeLogs.find(:all,:conditions=>['table_name= ? and record_id = ?',self.class.table_name,self.id],:order=>"created_at DESC")
+        return ChangeLogs.where(['table_name= ? and record_id = ?',self.class.table_name,self.id]).order("created_at DESC")
       end
 
       # Return `true` if current record has a list of change_log records

data/lib/change_log/version.rb

@@ -1,3 +1,3 @@
 module ChangeLog
-  VERSION = "1.0.5"
+  VERSION = "2.0.0"
 end

data/test/boot.rb

@@ -15,7 +15,7 @@ else
   if version
     gem 'rails', version
   else
-    gem 'actionpack', '< 3.0.0.a'
-    gem 'activerecord', '< 3.0.0.a'
+    gem 'actionpack', '> 3.0.0'
+    gem 'activerecord', '> 3.0.0'
   end
 end

data/test/change_log_test.rb

@@ -10,7 +10,7 @@ class ChangeLogTest < ActiveRecordTestCase
   # insert an new record
   # then check the total number
   def test_update_change_log_record_with
-    option = {:action=>'INSERT', :record_id=>3,:table_name=>'test', :user=>'test',:attribute_name=>'test',:new_value=>'50',:version=>1}
+    option = [{:action=>'INSERT', :record_id=>3,:table_name=>'test', :user=>'test',:attribute_name=>'test',:new_value=>'50',:version=>1}]
     assert_equal true, ChangeLogs.update_change_log_record_with(option) 
     assert_equal 3, ChangeLogs.count()
   end
@@ -29,7 +29,7 @@ class ChangeLogTest < ActiveRecordTestCase
   def test_change_log_logic
       # find a test, update the total
       version_number = ChangeLogs.get_version_number(1,'test')
-      option = {:action=>'UPDATE', :record_id=>1,:table_name=>'test', :user=>'peterz',:attribute_name=>'test',:new_value=>'999',:old_value=>'100',:version=>version_number}
+      option = [{:action=>'UPDATE', :record_id=>1,:table_name=>'test', :user=>'peterz',:attribute_name=>'test',:new_value=>'999',:old_value=>'100',:version=>version_number}]
       assert_equal true, ChangeLogs.update_change_log_record_with(option)
       change_log = ChangeLogs.find(version_number)
       assert_equal 'peterz',change_log.user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: change_log
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies: []
 description: A gem for tracking who did what and when it happened -- keeps all the
   changes done by user into a maintenance log