mysqlaudit 0.0.2 → 0.0.3

data/README.md

@@ -137,7 +137,6 @@ $ mysqlaudit uninstall --host 127.0.0.1 \
 Drop testing table and database:
 
 ```SQL
-DROP TABLE audit;
 DROP DATABASE foo;
 ```
 

data/bin/mysqlaudit

@@ -24,7 +24,11 @@ command :install do |c|
   c.option '--schema STRING', String, 'Schema name'
   c.option '--table STRING', String, 'Table name'
   c.action do |args, options|
-    Mysqlaudit::Actions.new(options.host, options.user, options.pass, options.schema, options.table).install
+    Mysqlaudit::Actions.new({host: options.host,
+                             user: options.user,
+                             password: options.pass,
+                             schema: options.schema,
+                             table: options.table}).install
   end
 end
 
@@ -38,7 +42,12 @@ command :uninstall do |c|
   c.option '--table STRING', String, 'Table name'
   c.option '--[no-]drop-audit-table', 'Drop audit table'
   c.action do |args, options|
-    Mysqlaudit::Actions.new(options.host, options.user, options.pass, options.schema, options.table, options.drop_audit_table).uninstall
+    Mysqlaudit::Actions.new({host: options.host,
+                             user: options.user,
+                             password: options.pass,
+                             schema: options.schema,
+                             table: options.table,
+                             drop: options.drop_audit_table}).uninstall
   end
 end
 
@@ -52,10 +61,17 @@ command :rollback do |c|
   c.option '--table STRING', String, 'Table name'
   c.option '--statement STRING', String, 'Statement operation: insert, update, delete'
   c.action do |args, options|
-    if [:insert, :update, :delete].include? options.statement.to_sym
-      Mysqlaudit::Actions.new(options.host, options.user, options.pass, options.schema, options.table, nil, options.statement).rollback
-    else
-      puts "Invalid values on argument: --statement."
+    if !options.statement.nil?
+      if [:insert, :update, :delete].include? options.statement.to_sym
+        Mysqlaudit::Actions.new({host: options.host,
+                                 user: options.user,
+                                 password: options.pass,
+                                 schema: options.schema,
+                                 table: options.table,
+                                 statement: options.statement.to_sym}).rollback
+      else
+        puts "Invalid values on argument: --statement."
+      end
     end
   end
 end

data/lib/mysqlaudit/actions.rb

@@ -4,25 +4,20 @@ module Mysqlaudit
   class Actions
     @audit = nil
 
-    def initialize(host, user, password, schema, table, drop = nil, statement = nil)
-    # def initialize(schema, table, options = {})
-    #   options = {host: 'localhost', user: 'root', password: ''}.merge(options)
-
-      $host      = host
-      $user      = user
-      $password  = password
-      $schema    = schema
-      $table     = table
-      $drop      = drop
-      $statement = statement
-
-      @audit = Mysqlaudit::Audit.new($host, $user, $password, $schema)
+    def initialize(options = {})
+      options.delete_if { |k, v| v.nil? }
+      $options = {host: 'localhost', user: 'root', password: ''}.merge(options)
+
+      @audit = Mysqlaudit::Audit.new($options[:host],
+                                     $options[:user],
+                                     $options[:password],
+                                     $options[:schema])
     end
 
     def install()
       @audit.create_table()
 
-      if !$table
+      if !$options[:table]
         tables = @audit.get_tables()
         tables.each do | table |
           @audit.create_trigger(table, :insert)
@@ -30,14 +25,14 @@ module Mysqlaudit
           @audit.create_trigger(table, :delete)
         end
       else
-        @audit.create_trigger($table, :insert)
-        @audit.create_trigger($table, :update)
-        @audit.create_trigger($table, :delete)
+        @audit.create_trigger($options[:table], :insert)
+        @audit.create_trigger($options[:table], :update)
+        @audit.create_trigger($options[:table], :delete)
       end
     end
 
     def uninstall()
-      if !$table
+      if !$options[:table]
         tables = @audit.get_tables()
         tables.each do | table |
           @audit.drop_trigger(table, :insert)
@@ -45,18 +40,18 @@ module Mysqlaudit
           @audit.drop_trigger(table, :delete)
         end
       else
-          @audit.drop_trigger($table, :insert)
-          @audit.drop_trigger($table, :update)
-          @audit.drop_trigger($table, :delete)
+          @audit.drop_trigger($options[:table], :insert)
+          @audit.drop_trigger($options[:table], :update)
+          @audit.drop_trigger($options[:table], :delete)
       end
 
-      if $drop
+      if $options[:drop]
         @audit.drop_table()
       end
     end
 
     def rollback()
-      @audit.rollback($table, $statement.to_sym)
+      @audit.rollback($options[:table], $options[:statement])
     end
   end
 end

data/lib/mysqlaudit/audit.rb

@@ -128,41 +128,36 @@ SQL
       @mysql.query(sql).count == 1
     end
 
-    def build_pivot_query(table, statement)
-      columns = get_columns($table)
-      key     = get_primary_key($table)
+    def rollback(table, statement)
+      columns = get_columns(table)
+      key     = get_primary_key(table)
 
       case statement
         when :insert
           sql = <<SQL
-SELECT CONCAT('/* ', trigger_at, ' */ DELETE FROM #{$table} WHERE id = ', MAX(primary_key),';') AS `row`
+SELECT CONCAT('/* ', trigger_at, ' */ DELETE FROM #{table} WHERE id = ', MAX(primary_key),';') AS `row`
 FROM audits
 WHERE `type`  = 'I'
-  AND `table` = '#{$table}'
+  AND `table` = '#{table}'
 GROUP BY primary_key
 ORDER BY trigger_at, primary_key, `column` ASC;
 SQL
         when :delete
-          sql = "SELECT CONCAT('/* ', trigger_at, ' */ INSERT INTO #{$table} (#{key}, #{columns.join(', ')}) VALUES (', primary_key, ', ', "
+          sql = "SELECT CONCAT('/* ', trigger_at, ' */ INSERT INTO #{table} (#{key}, #{columns.join(', ')}) VALUES (', primary_key, ', ', "
           columns.each do | column |
             sql << " QUOTE(MAX(IF(`column` = '#{column}', `old`, NULL))), ', ', "
           end
           sql  = sql.chomp(" ', ', ")
           sql << "');'"
-          sql << ") AS `row` FROM audits WHERE `type`  = 'D' AND `table` = '#{$table}' GROUP BY primary_key ORDER BY trigger_at, primary_key, `column` ASC;"
+          sql << ") AS `row` FROM audits WHERE `type`  = 'D' AND `table` = '#{table}' GROUP BY primary_key ORDER BY trigger_at, primary_key, `column` ASC;"
         when :update
           sql = "SELECT CONCAT('/* ', trigger_at, ' */ UPDATE users SET ',  `column`, ' = ', QUOTE(old), ' WHERE id = ', primary_key, ';') AS `row`"
-          sql << "FROM audits WHERE `type` = 'U' AND `table` = '#{$table}' ORDER BY trigger_at, primary_key, `column` ASC;"
+          sql << "FROM audits WHERE `type` = 'U' AND `table` = '#{table}' ORDER BY trigger_at, primary_key, `column` ASC;"
       end
 
       sql_result = @mysql.query(sql)
       sql_result.each(:as => :array) do |row|
         puts row
-      end
-    end
-
-    def rollback(table, statement)
-      build_pivot_query(table, statement)
-    end
+      end    end
   end
 end

data/lib/mysqlaudit/version.rb

@@ -1,3 +1,3 @@
 module Mysqlaudit
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysqlaudit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies: []
 description: MySQL tool for audit all tables with triggers.
 email: nicola51980@gmail.com