log_table 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb2249532417af1e619879bf7d6ac4ab809b87dd
-  data.tar.gz: bf7a4550319548d0c3b8a1c3498ce3d037664da1
+  metadata.gz: 7e5835027ab6c463244f53d0001322ef538659d7
+  data.tar.gz: 50319fa2fd5b590c3935311ba586b769ea277357
 SHA512:
-  metadata.gz: 777964c013f49520968acb5f31768098066adce71bbb5968c5059740bcb80a99f1345ea0576b5429f36b3ffd1c3c4729f073da1b2bcaac59c94362d97f04773a
-  data.tar.gz: c33ee25ed5bd35258dda6fd3ef4add858289785883a433312f56819920c499276665a440e9a018a7677882e9fdc5a92489ced04e6f5d4bdf80702f8a13b7784a
+  metadata.gz: 944e4552d8c9e9b51565af7b6113a8e11e7dd23e5997ebb2d6327c4df05cb7711c3f81c79d0ef95a8fcf06d56302fe2221618ce0125a0102259e006abb0a23af
+  data.tar.gz: 87df6659324c917584a54eeecc0f4cc7b7a8945598daed14dfc39f7b27563b7bbe0ccd23e1c3203de143d54c7df13c9923c39b6e135fa872bb66563b92cbab4c

data/lib/log_table/railtie.rb

@@ -14,7 +14,7 @@ module LogTable
     railtie_name :log_table
 
     rake_tasks do
-      load 'tasks/db/generate_log_table.rake'
+      load 'tasks/db/generate_log_table_migration.rake'
       load 'tasks/db/generate_log_trigger_migration.rake'
     end
   end

data/lib/log_table/version.rb

@@ -1,3 +1,3 @@
 module LogTable
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

data/lib/log_table.rb

@@ -10,36 +10,41 @@ require 'hairtrigger'
 require 'log_table/railtie' if defined?(Rails::Railtie)
 
 module LogTable
-  module LogStatus
-    STATUS_COLUMN_NAME = 'log_table_status'
+  STATUS_COLUMN_NAME = 'log_table_status'
+
+  def self.included(base)
+    base.send :extend, ClassMethods
+  end
+
+  module ClassMethods
     INSERTED = 'inserted'
     UPDATED = 'updated'
     DELETED = 'deleted'
 
-    def self.sql_func(status, model_name, column_names, table_name, options)
-      col_names = column_names
+    def sql_func(status, options)
+      col_names = column_names    # Avoid any unnecessary round trips to the database
 
       db_columns = [STATUS_COLUMN_NAME] + col_names.map { |col_name|
-          col_name == 'id' ? "#{model_name.underscore}_id" : "#{col_name}"
+          col_name == 'id' ? "#{model_name.to_s.underscore}_id" : "#{col_name}"
         }
 
       db_columns_str = db_columns.join(', ')
 
-      values = (["\"#{status}\""] + col_names.map { |col| "NEW.#{col}" }).join(', ')
+      values = ["\"#{status}\""]
+
+      col_prefix = status == DELETED ? 'OLD' : 'NEW'
+
+      values += col_names.map { |col| "#{col_prefix}.#{col}" }
+
+      values_str = values.join(', ')
 
       log_table_name = options[:table_name] || "#{table_name}_log"
 
-      sql = "INSERT INTO #{log_table_name}(#{db_columns_str}) VALUES (#{values})"
+      sql = "INSERT INTO #{log_table_name}(#{db_columns_str}) VALUES (#{values_str})"
 
       sql
     end
-  end
-
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
 
-  module ClassMethods
     ##
     # add_log_trigger will add hairtrigger triggers to the model.
     # It will generate triggers for :insert and :update.
@@ -49,20 +54,16 @@ module LogTable
     # - :table_name - Specify table name of the log table.
     #
     def add_log_trigger(options = {})
-
       trigger.after(:insert) do
-        LogStatus.sql_func(LogStatus::INSERTED, name, column_names, table_name,
-          options)
+        sql_func(INSERTED, options)
       end
 
       trigger.after(:update) do
-        LogStatus.sql_func(LogStatus::UPDATED, name, column_names, table_name,
-          options)
+        sql_func(UPDATED, options)
       end
 
       trigger.after(:delete) do
-        LogStatus.sql_func(LogStatus::DELETED, name, column_names, table_name,
-          options)
+        sql_func(DELETED, options)
       end
     end
   end

data/lib/tasks/db/generate_log_table_migration.rake

@@ -32,7 +32,7 @@ namespace :db do
       table = OpenStruct.new
       table.model_id_col_name = "#{clazz.name.underscore}_id"
 
-      cols = [OpenStruct.new(name: LogTable::LogStatus::STATUS_COLUMN_NAME,
+      cols = [OpenStruct.new(name: LogTable::STATUS_COLUMN_NAME,
         type: :string)]
 
       cols += clazz.columns.map do |col|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_table
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Daisuke Shimamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hairtrigger