table_inspector 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dafb1f2e93a8ac7beb1729635132812c7460b4a4bac712c08f011783357bd6ca
-  data.tar.gz: 4656a91cbb769c9465480bdc1798f3b38bec3b074098eb15cd6549f6ac6e9ea8
+  metadata.gz: 7b794452c662ccbfe7471e24a57a86d31ff1919911bd83f2d786e85aca437ef6
+  data.tar.gz: 50c4cbcc08b1b93514377474be25e30c0af3c2823bbbf1e36956ccdf48ec78be
 SHA512:
-  metadata.gz: 853d58ade3b5b95304c8633cd8e926cc9b1d7d060a0c0d0d6828561d668fae23baf9bca2583619ad07045cf83ad29de3bf98788eb9af2442c8235f4368d1c133
-  data.tar.gz: 2db47bebcf0715737ebf1e87d3578294be46332ec5023f94bbe3f879bd5fa705506eff47b8c6f30fa5d5254b06f16e30877215cd77c5db7d4e550f01dc1159d0
+  metadata.gz: 877e2772ea00688c4e1d08d9cf315d8086768ec8e0670abec682fb4aeb8bc51c78faf4351b5bc265d90e44cffa2c8697fc628e3173aab5bf182ee7068859b2c3
+  data.tar.gz: 42a0273f52692a64c1a82af5942038802c377e91b0bcd9f694f4ffb8372746f394943624dd42abd2f780fe007aaf9c769ab05e44b2afbe420bbd23636a1317f8

data/lib/table_inspector/column_validator.rb

@@ -0,0 +1,28 @@
+
+module TableInspector
+  class ColumnValidator
+    attr_accessor :klass, :column_name
+
+    def initialize(klass, column_name)
+      @klass = klass
+      @column_name = column_name
+    end
+
+    def validate!
+      return true if column_exists?
+
+      puts column_is_not_exists_hint
+      false
+    end
+
+    private
+
+    def column_exists?
+      klass.columns.find{|column| column.name == column_name.to_s }
+    end
+
+    def column_is_not_exists_hint
+      puts "Column '#{column_name}' doesn't exists in table '#{klass.table_name}'!"
+    end
+  end
+end

data/lib/table_inspector/model_validator.rb

@@ -0,0 +1,27 @@
+
+module TableInspector
+  class ModelValidator
+    attr_accessor :klass
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def validate!
+      return true if is_model_class?
+
+      puts not_a_model_class_hint
+      false
+    end
+
+    private
+
+    def is_model_class?
+      klass < ActiveRecord::Base
+    end
+
+    def not_a_model_class_hint
+      "#{klass} is not a model class!"
+    end
+  end
+end

data/lib/table_inspector/presenter.rb

@@ -9,6 +9,21 @@ module TableInspector
       @colorize = colorize
     end
 
+    def extract_meta(column)
+      if @colorize
+        extract_meta_with_highlight(column)
+      else
+        extract_meta_without_highlight(column)
+      end
+    end
+
+    def header
+      first_column = klass.columns.first
+      extract_meta(first_column).keys.map(&:humanize)
+    end
+
+    private
+
     def extract_meta_with_highlight(column)
       column_data = column.as_json.merge(column.sql_type_metadata.as_json)
 
@@ -28,21 +43,6 @@ module TableInspector
       column.as_json.merge(column.sql_type_metadata.as_json).slice(*ordered_keys)
     end
 
-    def extract_meta(column)
-      if @colorize
-        extract_meta_with_highlight(column)
-      else
-        extract_meta_without_highlight(column)
-      end
-    end
-
-    def header
-      first_column = klass.columns.first
-      extract_meta(first_column).keys.map(&:humanize)
-    end
-
-    private
-
     def ordered_keys
       %w[name type limit null default precision scale comment].tap do |keys|
         keys << "sql_type" if sql_type

data/lib/table_inspector/version.rb

@@ -1,3 +1,3 @@
 module TableInspector
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

data/lib/table_inspector.rb

@@ -7,25 +7,26 @@ require "table_inspector/indexes"
 require "table_inspector/text"
 require "table_inspector/column"
 require "table_inspector/presenter"
-require "table_inspector/validator"
+require "table_inspector/model_validator"
+require "table_inspector/column_validator"
 
 module TableInspector
   extend self
 
   def ascan(klass, column_name = nil, sql_type: false)
     klass = init_klass!(klass)
-    return unless klass
 
-    return unless Validator.new(klass, column_name)
+    return unless klass
+    return unless validate!(klass, column_name)
 
     render(klass, column_name, sql_type, colorize: true)
   end
 
   def scan(klass, column_name = nil, sql_type: false)
     klass = init_klass!(klass)
-    return unless klass
 
-    return unless Validator.new(klass, column_name)
+    return unless klass
+    return unless validate!(klass, column_name)
 
     render(klass, column_name, sql_type)
   end
@@ -45,6 +46,16 @@ module TableInspector
     klass
   end
 
+  def validate!(klass, column_name)
+    model_validator = ModelValidator.new(klass)
+    unless column_name
+      return model_validator.validate!
+    end
+
+    column_validator = ColumnValidator.new(klass, column_name)
+    model_validator.validate! && column_validator.validate!
+  end
+
   def render(klass, column_name, sql_type, colorize: false)
     if column_name
       Column.new(klass, column_name, sql_type: sql_type, colorize: colorize).render

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_inspector
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,20 +50,21 @@ files:
 - Rakefile
 - lib/table_inspector.rb
 - lib/table_inspector/column.rb
+- lib/table_inspector/column_validator.rb
 - lib/table_inspector/grid.rb
 - lib/table_inspector/indexes.rb
+- lib/table_inspector/model_validator.rb
 - lib/table_inspector/presenter.rb
 - lib/table_inspector/railtie.rb
 - lib/table_inspector/table.rb
 - lib/table_inspector/text.rb
-- lib/table_inspector/validator.rb
 - lib/table_inspector/version.rb
 - lib/tasks/table_inspector_tasks.rake
-homepage: https://github.com/table_inspector
+homepage: https://github.com/otorain/table_inspector
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/table_inspector
+  homepage_uri: https://github.com/otorain/table_inspector
   source_code_uri: https://github.com/otorain/table_inspector
   changelog_uri: https://github.com/otorain/table_inspector/CHANGELOG
 post_install_message:

data/lib/table_inspector/validator.rb

@@ -1,37 +0,0 @@
-
-module TableInspector
-  class Validator
-    def initialize(klass, column_name)
-      @klass = klass
-      @column = column_name
-    end
-
-    def validate!
-
-      if column_name && !validate_column(klass, column_name)
-        puts column_is_not_exists_hint(klass, column_name)
-        return
-      end
-
-      true
-    end
-
-    private
-
-    def is_active_record_class?(klass)
-      klass < ActiveRecord::Base
-    end
-
-    def validate_column(klass, column_name)
-      klass.columns.find{|column| column.name == column_name.to_s }
-    end
-
-    def not_a_model_class_hint(klass)
-      "#{klass} is not a model klass"
-    end
-
-    def column_is_not_exists_hint(klass, column_name)
-      puts "Column '#{column_name}' doesn't exists in table '#{klass.table_name}'"
-    end
-  end
-end