sequel-audit_by_day 0.0.2 → 0.0.3

data/README.md

@@ -32,8 +32,8 @@ Given following models:
 # end
 #
 class User < Sequel::Model
-  def admin_in_audit?
-    admin
+  def audit_kind
+    admin ? "admin" : "user"
   end
 end
 #
@@ -65,8 +65,8 @@ end
 #       Time        :expired_at
 #       Date        :valid_from
 #       Date        :valid_to
-#       foreign_key :title_updated_by_id, :users, on_delete: :set_null
-#       foreign_key :admin_user_id, :users, on_delete: :set_null
+#       foreign_key :title_updated_by_user_id, :users, on_delete: :set_null
+#       foreign_key :title_updated_by_admin_id, :users, on_delete: :set_null
 #       index [:master_id, :created_at, :valid_from, :valid_to]
 #     end
 #   end

data/lib/sequel/plugins/audit_by_day.rb

@@ -6,44 +6,57 @@ module Sequel
       def self.configure(master, opts={})
         audit_foreign_key = opts[:foreign_key]
         default_valid_from = opts.fetch(:default_valid_from){ Time.utc(1000) }
+        updated_by_regexp = opts.fetch(:updated_by_regexp){ /(.+)_updated_by_(.+)_id/ }
         raise Error, ":foreign_key options is required for audit" unless audit_foreign_key
         raise Error, ":foreign_key column does not exists for audit" unless master.columns.include? audit_foreign_key
-        updated_by_suffix = "_updated_by_id"
-        version_columns = master.version_class.columns.collect do |column|
-          column_str = column.to_s
-          if column_str.end_with? updated_by_suffix
-            column_str = column_str.gsub(updated_by_suffix, "").to_sym
-          end
-        end.compact
+        version_columns = {}
+        master.version_class.columns.each do |column|
+          next unless column.to_s =~ updated_by_regexp
+          column_name, column_kind = $1, $2
+          version_columns[column_name] ||= {}
+          version_columns[column_name][column_kind] = column
+        end
         master.instance_eval do
           @audit_foreign_key = audit_foreign_key
-          @audit_checked_columns = Set.new version_columns
-          @default_valid_from = default_valid_from
+          @audit_checked_columns = Set.new version_columns.keys
+          @audit_version_columns = version_columns
+          @audit_default_valid_from = default_valid_from
         end
       end
 
       module ClassMethods
-        attr_reader :audit_foreign_key, :audit_checked_columns, :default_valid_from
+        attr_reader :audit_foreign_key, :audit_checked_columns,
+          :audit_version_columns, :audit_default_valid_from
 
         def find_for(audited_id, at)
           where(audit_foreign_key => audited_id, :for => at).with_current_version.first
         end
 
         def audit(master, previous_values, updated_values, update_time, updated_by)
-          changed_values = updated_values.select do |column, updated_value|
-            audit_checked_columns.include?(column) &&
-            previous_values[column]!=updated_value
+          changed_values = updated_values.select do |column_name, updated_value|
+            audit_checked_columns.include?(column_name.to_s) &&
+            previous_values[column_name]!=updated_value
           end
+
           audit_for_day = find_for master.id, update_time
           audit_for_day ||= new({audit_foreign_key => master.id, :for => update_time})
-          if updated_by.respond_to?(:admin_in_audit?) && updated_by.admin_in_audit?
-            attrs = {admin_user_id: updated_by.id}
-          else
-            attrs = Hash[changed_values.collect{|column, _| ["#{column}_updated_by_id", updated_by]}]
-            attrs[:admin_user_id] = nil
+
+          attrs = {}
+          updated_by_kind = updated_by.audit_kind.to_s
+          changed_values.each do |column_name, _|
+            unless audit_version_columns[column_name.to_s].has_key? updated_by_kind
+              raise AuditKindNotFound, "no audit column for column: #{column_name} and kind: #{updated_by_kind}"
+            end
+            audit_version_columns[column_name.to_s].each do |kind, column|
+              if kind==updated_by_kind
+                attrs[column] = updated_by.id
+              else
+                attrs[column] = nil
+              end
+            end
           end
           audit_for_day.update_attributes attrs.merge({
-            partial_update: true, valid_from: default_valid_from
+            partial_update: true, valid_from: audit_default_valid_from
           })
         end
       end

data/lib/sequel-audit_by_day/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module AuditByDay
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-audit_by_day
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3607155131098875955
+      hash: -471555587537663744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3607155131098875955
+      hash: -471555587537663744
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24