table_inspector 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dafb1f2e93a8ac7beb1729635132812c7460b4a4bac712c08f011783357bd6ca
-  data.tar.gz: 4656a91cbb769c9465480bdc1798f3b38bec3b074098eb15cd6549f6ac6e9ea8
+  metadata.gz: 66bb18ecff6dea2031545bdff1230cde6380155cb32426d2da0d4fc468aa8f02
+  data.tar.gz: 33b460f855700d11ceb65894004cd47730ebaba01df84f839d644483c41b26aa
 SHA512:
-  metadata.gz: 853d58ade3b5b95304c8633cd8e926cc9b1d7d060a0c0d0d6828561d668fae23baf9bca2583619ad07045cf83ad29de3bf98788eb9af2442c8235f4368d1c133
-  data.tar.gz: 2db47bebcf0715737ebf1e87d3578294be46332ec5023f94bbe3f879bd5fa705506eff47b8c6f30fa5d5254b06f16e30877215cd77c5db7d4e550f01dc1159d0
+  metadata.gz: af82ef5518522d418045544193a5937d23e98ad6c59d402c548b8736c0111a6fcc24db88e0054b27d6d9d510a9ba04d08aa07294b1c0564f996ccf745e183dd5
+  data.tar.gz: 30e2d9dc5f4a8d112cbce43840f89b51ccd2fa4aa1645ace7abdde07ef64890a3fde45ca213ebfa30f8e2a5bd9f2ea37faad81412e49dc2c4ff4fd04fdfe7113

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/version.rb

@@ -1,3 +1,3 @@
 module TableInspector
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 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.2
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.12.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.1
 description: Inspect table structure of ActiveRecord class
 email:
 - ianlynxk@gmail.com
@@ -50,13 +78,14 @@ 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

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