schema2type 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26eca7d1e46ea5866a0330f948afd4d43b306893e1eed16719fb91ae933541c0
-  data.tar.gz: 6384cd0e436d6c87e7b6f8a2e019c8030fe8c57b00cf1150938e418d6f2598aa
+  metadata.gz: 7c1f92fd874fa9544443fbb63b86d500777d18ed87b4bff1791cc10cb7e505fc
+  data.tar.gz: d896d9566f061ed9012927f62ac0dbd858a942ac74f7fdfec1d22aa62856aaaf
 SHA512:
-  metadata.gz: b08a1c356d90f54a0808304cd99f79e74405e3e64d3895b06eb54337d7a0796199086d8fd69a9ab6c1e70becb2661c89421204bdc19d1b2231f08671c99a4f9e
-  data.tar.gz: d8e94d9555d620d4aafec54af941a055a99db51824a4d54deb86553f36cc158af6df4bf8840209d484725891c5c1ab735c65e9feb20d2c3561d905b8607ae799
+  metadata.gz: 211ab47195029c4e1bdb334c59fa41c42fcff44399af28ebb38d264d30773792c6e3c8a22cb9ca7882ee7349232bf24aa705a1d1388270f9629e05f701754ab2
+  data.tar.gz: df37e175322b12a30b51215e68b00319213b8f055a53aa8105e9de0bcdfec9b526eddf68d51d1b17d2b2bfa4bab7c97e6d9b082688cfb14c1aa6256ac5222c47

data/lib/schema2type/cli.rb

@@ -1,18 +1,16 @@
 require 'date'
 
 module Schema2type
-
   $convert_types = []
   $schema_version = ''
 
   def self.execute(input_file:, out_file:, name_space:)
-
     eval(File.read(input_file))
 
     convert_type_text = $convert_types.map { |t| "  #{t}" }.join("\n").strip
 
     File.open(out_file, "w") do |f|
-    f.puts <<-EOS
+      f.puts <<-EOS
 /* eslint no-unused-vars: 0 */
 
 /**
@@ -23,12 +21,10 @@ module Schema2type
 declare namespace #{name_space ||= "schema"} {
   #{convert_type_text}
 }
-      EOS
+EOS
     end
   end
 
-  private
-
   def self.create_table(table_name, *arg, &block)
     converter = SchemaConverter.new(table_name: table_name)
     block.call(converter)

data/lib/schema2type/schema_converter.rb

@@ -1,84 +1,51 @@
-require "active_support/inflector"
+require 'active_support/inflector'
 
 module Schema2type
   class SchemaConverter
     attr_accessor :out_text
     attr_reader :table_name
 
-    TYPE_STRING = "string"
-    TYPE_NUMBER = "number"
-    TYPE_BOOLEAN = "string"
-    TYPE_DATE = "Date"
+    TYPE_STRING = 'string'.freeze
+    TYPE_NUMBER = 'number'.freeze
+    TYPE_BOOLEAN = 'string'.freeze
+    TYPE_DATE = 'Date'.freeze
+    COLUMN_METHODS = [
+      { string: TYPE_STRING },
+      { inet: TYPE_STRING },
+      { integer: TYPE_NUMBER },
+      { bigint: TYPE_NUMBER },
+      { float: TYPE_NUMBER },
+      { text: TYPE_STRING },
+      { boolean: TYPE_BOOLEAN },
+      { decimal: TYPE_NUMBER },
+      { json: TYPE_STRING },
+      { jsonb: TYPE_STRING },
+      { binary: TYPE_STRING },
+      { date: TYPE_DATE },
+      { datetime: TYPE_DATE },
+      { timestamp: TYPE_DATE },
+      { datetime_with_timezone: TYPE_DATE }
+    ].map(&:freeze).freeze
 
     def initialize(table_name:)
       @out_text = []
-      @table_name = table_name
+      @table_name = table_name.singularize.camelize
     end
 
     def finalize
-      @out_text.unshift "type #{@table_name.singularize.camelize} = {"
+      @out_text.unshift "type #{@table_name} = {"
       @out_text << "}\n"
     end
 
-    def date(name, *options)
-      push_property_line name: name, type: TYPE_STRING, options: options
+    def self.define_convert_methods(methods)
+      methods.each do |m|
+        define_method(m.keys[0]) do |name, *options|
+          push_property_line name: name, type: m.values[0], options: options
+        end
+      end
     end
 
-    def string(name, *options)
-      push_property_line name: name, type: TYPE_STRING, options: options
-    end
-
-    def inet(name, *options)
-      push_property_line name: name, type: TYPE_STRING, options: options
-    end
-
-    def integer(name, *options)
-      push_property_line name: name, type: TYPE_NUMBER, options: options
-    end
-
-    def bigint(name, *options)
-      push_property_line name: name, type: TYPE_NUMBER, options: options
-    end
-
-    def float(name, *options)
-      push_property_line name: name, type: TYPE_NUMBER, options: options
-    end
-
-    def text(name, *options)
-      push_property_line name: name, type: TYPE_STRING, options: options
-    end
-
-    def boolean(name, *options)
-      push_property_line name: name, type: TYPE_BOOLEAN, options: options
-    end
-
-    def decimal(name, *options)
-      push_property_line name: name, type: TYPE_NUMBER, options: options
-    end
-
-    def json(name, *options)
-      push_property_line name: name, type: TYPE_STRING, options: options
-    end
-
-    def jsonb(name, *options)
-      push_property_line name: name, type: TYPE_STRING, options: options
-    end
-
-    def binary(name, *options)
-      push_property_line name: name, type: TYPE_STRING, options: options
-    end
-
-    def datetime(name, *options)
-      push_property_line name: name, type: TYPE_DATE, options: options
-    end
-
-    def timestamp(name, *options)
-      push_property_line name: name, type: TYPE_DATE, options: options
-    end
-
-    def datetime_with_timezone(name, *options)
-      push_property_line name: name, type: TYPE_DATE, options: options
-    end
+    define_convert_methods COLUMN_METHODS
 
     def method_missing(*arg)
       # To exclude unnecessary methods
@@ -87,9 +54,9 @@ module Schema2type
     private
 
     def push_property_line(name:, type:, options:)
-      is_non_nullable = options[0] && options[0].has_key?(:null) && !options[0][:null]
-      camelizeName = name.camelcase(:lower)
-      property_line = is_non_nullable ? "#{camelizeName}: #{type}" : "#{camelizeName}: #{type} | null"
+      is_non_nullable = options[0] && options[0].key?(:null) && !options[0][:null]
+      camelize_name = name.camelcase(:lower)
+      property_line = is_non_nullable ? "#{camelize_name}: #{type}" : "#{camelize_name}: #{type} | null"
 
       @out_text << "  #{property_line}"
     end

data/lib/schema2type/version.rb

@@ -1,3 +1,3 @@
 module Schema2type
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema2type
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ryo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport