masking 1.0.0 → 1.1.0

data/lib/masking/cli.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'masking/config'
+require 'masking/version'
 require 'masking/errors'
 require 'masking/cli/error_message'
 require 'optparse'
@@ -14,8 +15,8 @@ module Masking
     def run
       option_parser.parse(argv)
       Masking.run
-    rescue Masking::Error => error
-      warn(Masking::Cli::ErrorMessage.new(error).message(config_file_path: Masking.config.target_columns_file_path))
+    rescue Masking::Error => e
+      warn(Masking::Cli::ErrorMessage.new(e).message(config_file_path: Masking.config.target_columns_file_path))
       exit(false)
     end
 

data/lib/masking/config/target_columns/column.rb

@@ -6,8 +6,7 @@ module Masking
   class Config
     class TargetColumns
       class Column
-        attr_reader :name, :table_name, :method_value
-        attr_accessor :index
+        attr_reader :name, :table_name, :method_value, :method
 
         def initialize(name, table_name:, method_value:)
           raise ColumnNameIsNil if name.nil?
@@ -18,17 +17,10 @@ module Masking
           @method       = Method.new(method_value)
         end
 
-        def masked_value
-          method.call
-        end
-
         def ==(other)
           name == other.name && table_name == other.table_name && method_value == other.method_value
         end
 
-        private
-
-        attr_reader :method
         class ColumnNameIsNil < StandardError; end
       end
     end

data/lib/masking/config/target_columns/method.rb

@@ -18,7 +18,7 @@ module Masking
 
         private
 
-        # rubocop:disable Layout/AlignHash
+        # rubocop:disable Layout/HashAlignment
         MAPPING = {
           ::String     => StringBinaryDistinctor,
           ::Integer    => Integer,
@@ -29,7 +29,7 @@ module Masking
           ::FalseClass => Boolean,
           ::NilClass   => Null
         }.freeze
-        # rubocop:enable Layout/AlignHash
+        # rubocop:enable Layout/HashAlignment
 
         def mapping(klass)
           MAPPING[klass] || raise(UnknownType)

data/lib/masking/config/target_columns.rb

@@ -34,7 +34,7 @@ module Masking
       private
 
       def data
-        @data ||= YAML.safe_load(file_path.read, [Date, Time])
+        @data ||= YAML.safe_load(file_path.read, permitted_classes: [Date, Time])
       rescue Psych::SyntaxError
         raise Masking::Error::ConfigFileIsNotValidYaml
       end

data/lib/masking/data_mask_processor/cache.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Masking
+  class DataMaskProcessor
+    class Cache
+      def self.fetch_or_store_if_no_cache(table:, proc:)
+        @cache ||= {}
+
+        if @cache.key?(table)
+          @cache[table]
+        else
+          @cache[table] = proc.call
+        end
+      end
+
+      # onlu for test
+      def self.clear
+        @cache = {}
+      end
+    end
+  end
+end

data/lib/masking/data_mask_processor.rb

@@ -1,51 +1,59 @@
 # frozen_string_literal: true
 
+require 'masking/data_mask_processor/cache'
 require 'masking/config/target_columns'
 require 'masking/insert_statement'
 
 module Masking
-  # TODO: find better naming/modeling of DataMaskProcessor
   class DataMaskProcessor
-    class << self
-      def process(insert_statement_line, target_columns: ::Masking.config.target_columns)
-        new(insert_statement_line, target_columns: target_columns).send(:process)
-      end
-    end
-
-    private
-
-    attr_reader :raw_line, :target_columns, :insert_statement
-
-    def initialize(insert_statement_line, target_columns:)
+    def initialize(
+      insert_statement_line,
+      target_columns: ::Masking.config.target_columns,
+      insert_statement: InsertStatement.new(insert_statement_line),
+      cache_store: Cache
+    )
       @raw_line         = insert_statement_line
       @target_columns   = target_columns
-      @insert_statement = InsertStatement.new(insert_statement_line)
+      @insert_statement = insert_statement
+      @cache_store      = cache_store
     end
 
-    # TODO: define insert_statement.mask_values(column, mask_method) method & refactoring
-    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     def process
       return raw_line unless target_table?
 
-      columns = target_columns.columns(table_name: insert_statement.table)
-      if columns.first.index.nil?
-        columns.each do |target_column|
-          target_column.index = insert_statement.columns.index(target_column.name)
-        end
-      end
+      column_indexes_mask_methods.each do |column_index, mask_method|
+        next if column_index.nil?
 
-      insert_statement.values.each do |values|
-        columns.each do |target_column|
-          values[target_column.index] = target_column.masked_value unless target_column.index.nil?
-        end
+        insert_statement.mask_value(
+          column_index: column_index,
+          mask_method: mask_method
+        )
       end
 
       insert_statement.sql
     end
-    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength
+
+    private
+
+    attr_reader :raw_line, :target_columns, :insert_statement, :cache_store
 
     def target_table?
-      target_columns.contains?(table_name: insert_statement.table)
+      target_columns.contains?(table_name: table_name)
+    end
+
+    def column_indexes_mask_methods
+      cache_store.fetch_or_store_if_no_cache(
+        table: table_name,
+        proc: proc {
+          target_columns.columns(table_name: table_name).map do |column|
+            [insert_statement.column_index(column.name), column.method]
+          end
+        }
+      )
+    end
+
+    def table_name
+      @table_name = insert_statement.table
     end
   end
 end

data/lib/masking/insert_statement/sql_builder.rb

@@ -3,25 +3,20 @@
 module Masking
   class InsertStatement
     class SQLBuilder
-      class << self
-        def build(table:, columns:, values:)
-          new(table: table, columns: columns, values: values).send(:build)
-        end
-      end
-
-      private
-
-      attr_reader :table, :columns, :values
       def initialize(table:, columns:, values:)
         @table   = table
         @columns = columns
         @values  = values
       end
 
-      def build
+      def sql
         %(INSERT INTO `#{table}` #{columns_section} VALUES #{values_section};\n)
       end
 
+      private
+
+      attr_reader :table, :columns, :values
+
       def columns_section
         '(' + columns.map { |column| "`#{column}`" }.join(', ') + ')'
       end

data/lib/masking/insert_statement.rb

@@ -7,8 +7,9 @@ module Masking
   class InsertStatement
     attr_reader :raw_statement, :table
 
-    def initialize(raw_statement)
+    def initialize(raw_statement, sql_builder: SQLBuilder)
       @raw_statement = raw_statement
+      @sql_builder = sql_builder
 
       PARSE_REGEXP.match(raw_statement).tap do |match_data|
         raise Error::InsertStatementParseError if match_data.nil?
@@ -20,24 +21,32 @@ module Masking
     end
 
     def columns
-      # NOTE: define and extract to ColumnSet class?
       @columns ||= columns_section.scan(COLUMNS_REGEXP).flatten.map(&:to_sym)
     end
 
+    def column_index(column_name)
+      columns.index(column_name)
+    end
+
     def values
-      # NOTE: define and extract to ValueSet class?
       @values ||= values_section.split(VALUE_ROW_SPLITTER)
                                 .tap { |rows| rows.each_with_index { |_, i| recursive_pattern_value_concat(rows, i) } }
                                 .flat_map { |row| row.scan(values_regexp) }
     end
 
+    def mask_value(column_index:, mask_method:)
+      values.each do |value|
+        value[column_index] = mask_method.call
+      end
+    end
+
     def sql
-      SQLBuilder.build(table: table, columns: columns, values: values)
+      sql_builder.new(table: table, columns: columns, values: values).sql
     end
 
     private
 
-    attr_reader :columns_section, :values_section
+    attr_reader :columns_section, :values_section, :sql_builder
 
     VALUE_ROW_SPLITTER = '),('
     PARSE_REGEXP = /INSERT INTO `(?<table>.+)` \((?<columns_section>.+)\) VALUES (?<values_section>.+);/.freeze

data/lib/masking/sql_dump_line.rb

@@ -4,21 +4,36 @@ require 'masking/data_mask_processor'
 
 module Masking
   class SQLDumpLine
-    def initialize(line)
+    def initialize(line, mask_processor: DataMaskProcessor)
       @line = line
+      @mask_processor = mask_processor
     end
 
-    def output
-      insert_statement? ? DataMaskProcessor.process(line) : line
+    def mask
+      processor.new(line).process
+    end
+
+    def insert_statement?
+      line.match?(INSERT_STATEMENT_REGEXP)
     end
 
     private
 
-    attr_reader :line
+    attr_reader :line, :mask_processor
     INSERT_STATEMENT_REGEXP = /^INSERT/.freeze
 
-    def insert_statement?
-      line.match?(INSERT_STATEMENT_REGEXP)
+    def processor
+      insert_statement? ? mask_processor : NoMaskProcessor
+    end
+
+    class NoMaskProcessor
+      def initialize(line)
+        @line = line
+      end
+
+      def process
+        @line # do nothing
+      end
     end
   end
 end

data/lib/masking/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Masking
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/masking.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'masking/version'
 require 'masking/cli'
 require 'masking/config'
 require 'masking/sql_dump_line'
@@ -13,19 +12,20 @@ module Masking
   end
 
   class Main
-    def initialize(input: $stdin, output: $stdout)
+    def initialize(input: $stdin, output: $stdout, line_processor: SQLDumpLine)
       @input  = input.set_encoding(Encoding::ASCII_8BIT, Encoding::ASCII_8BIT)
       @output = output.set_encoding(Encoding::ASCII_8BIT, Encoding::ASCII_8BIT)
+      @line_processor = line_processor
     end
 
     def run
       input.each_line do |line|
-        output.print SQLDumpLine.new(line).output
+        output.print line_processor.new(line).mask
       end
     end
 
     private
 
-    attr_reader :input, :output
+    attr_reader :input, :output, :line_processor
   end
 end

data/masking.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rake-notes'
   spec.add_development_dependency 'ruby-prof'
 
@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
 
   # test
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'codecov'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
 
   # debug

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: masking
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chikahiro Tokoro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-notes
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,16 +112,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,9 @@ files:
 - acceptance/masking.yml
 - acceptance/run_test.sh
 - acceptance/tmp/.keep
-- bin/benchmark.rb
+- benchmark/masking.yml
+- benchmark/run.rb
+- benchmark/users.sql
 - bin/console
 - bin/masking_profile
 - bin/setup
@@ -250,6 +252,7 @@ files:
 - lib/masking/config/target_columns/method/time.rb
 - lib/masking/config/target_columns/table.rb
 - lib/masking/data_mask_processor.rb
+- lib/masking/data_mask_processor/cache.rb
 - lib/masking/errors.rb
 - lib/masking/insert_statement.rb
 - lib/masking/insert_statement/sql_builder.rb
@@ -263,7 +266,7 @@ homepage: https://github.com/kibitan/masking
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -271,15 +274,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Command line tool for anonymizing databese records
 test_files: []