schema2type 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d907bb961b8e4dd1d7c94732012dc0aafd75c4e29aef02027ef5b5c7751889f
-  data.tar.gz: 6494b9e501419c0f9a300ff5b2d056f9224296ddb262b4f709337dd53cabe765
+  metadata.gz: 93dcd338891b9f159af21fd6c79db61c4b6b3fa7ee3b3aeee1b52a35ffef9380
+  data.tar.gz: 58831c346ebfc9fcd9ba867c34f8c83b2a1a9c2a57b09327bdbc504e203eb18e
 SHA512:
-  metadata.gz: 92b851eb75ea3a0a08bbb9a1e9d9f9c097d47b5d81b8d129afc396cd5f9cc27f7e1d8958a702e167457f9adf6c7b8044cd07d4c0a99f59422e5e7b7d3f4c1320
-  data.tar.gz: 8e4cec8d0f67e5835ff6dd7c28a457b364c27458f9ce1734a211961ffb28772b726183d990fcbc6682c56cddca568900a51361df75b859b5c2dcaf338ccfec95
+  metadata.gz: 4d26fd7d40936f4c2720b06fe325583fdd3d6c32995c1176b6edd0498c1c4a8078d6d83a873544592f0be3454becd40cbb8728104ea87a486be25e4447fb1904
+  data.tar.gz: 383af1848ec7e2169ce2d744938790e26b8eec8745ea15af526e448281fcb0041457a9f56a6e0e8d7cdd84c481566865f454d847a359ed3b3c2164c297068731

data/exe/schema2type

@@ -5,4 +5,4 @@ require 'schema2type'
 
 params = ARGV.getopts('s:o:n:', 'snake')
 
-Schema2type.execute(input_file: params['s'], out_file: params['o'], name_space: params['n'], snake_case: params['snake'])
+Schema2type.execute(input_file: params['s'], out_file: params['o'], name_space: params['n'], is_snake_case: params['snake'])

data/lib/schema2type/cli.rb

@@ -3,9 +3,9 @@ module Schema2type
   DEFAULT_SCHEMA_PATH = "./db/schema.rb".freeze
   DEFAULT_NAME_SPACE = "schema".freeze
 
-  def self.execute(input_file:, out_file:, name_space:, snake_case:)
+  def self.execute(input_file:, out_file:, name_space:, is_snake_case:)
 
-    result = eval(File.read(input_file || DEFAULT_SCHEMA_PATH), CovertService.new(snake_case).get_binding)
+    resultHash = eval(File.read(input_file || DEFAULT_SCHEMA_PATH), CovertService.new(is_snake_case).get_binding)
 
     File.open(out_file, "w") do |f|
       f.puts <<~EOS
@@ -13,11 +13,11 @@ module Schema2type
 
         /**
          * auto-generated file
-         * schema version: #{result[:version]}
+         * schema version: #{resultHash[:version]}
          * This file was automatically generated by schema2type
          */
         declare namespace #{name_space || DEFAULT_NAME_SPACE} {
-          #{result[:lines]}
+          #{resultHash[:lines]}
         }
       EOS
     end

data/lib/schema2type/covert_service.rb

@@ -1,28 +1,32 @@
 module Schema2type
   class CovertService
-    def initialize(snake_case)
+    def initialize(is_snake_case)
       @converted_types = []
-      @snake_case = snake_case
+      @is_snake_case = is_snake_case
     end
 
     def get_binding
       binding
     end
 
-    def create_table(table_name, *)
-      converter = SchemaConverter.new(table_name: table_name, snake_case: @snake_case)
+    # mock method for create_table in schema.rb
+    def convert_schema_to_type(table_name, *)
+      converter = SchemaConverter.new(table_name: table_name, is_snake_case: @is_snake_case)
       yield converter
-      @converted_types.concat converter.result
+      @converted_types.concat converter.converted_type_lines
     end
 
     def method_missing(*)
       # To exclude unnecessary methods
+      # TODO: add error handling
     end
 
     def self.method_missing(*)
       # To exclude unnecessary methods
+      # TODO: add error handling
     end
 
+    # mock module and method for shcema.rb
     module ActiveRecord
       module Schema
         def self.define(*arg)
@@ -35,5 +39,7 @@ module Schema2type
         end
       end
     end
+
+    alias create_table convert_schema_to_type
   end
 end

data/lib/schema2type/schema_converter.rb

@@ -3,43 +3,45 @@ require 'active_support/inflector'
 
 module Schema2type
   class SchemaConverter
-    attr_reader :property_lines, :table_name, :snake_case
+    attr_reader :property_lines, :table_name, :is_snake_case
 
     TYPE_STRING = 'string'.freeze
     TYPE_NUMBER = 'number'.freeze
     TYPE_BOOLEAN = 'boolean'.freeze
     TYPE_DATE = 'Date'.freeze
     COLUMN_METHODS = YAML.load_file(File.expand_path(__dir__) + '/conversion_table.yml').to_a
+    ID_PROPERTY_LINE_TEXT = "  id: number;".freeze
 
     def self.define_convert_methods(methods)
       methods.each do |m|
         define_method(m[0]) do |name, *options|
-          push_property_line name: name, type: m[1], options: options
+          convert_property_line_and_push name: name, type: m[1], options: options
         end
       end
     end
 
     define_convert_methods COLUMN_METHODS
 
-    def initialize(table_name:, snake_case: false)
+    def initialize(table_name:, is_snake_case: false)
       @property_lines = []
       @table_name = table_name.singularize.camelize
-      @snake_case = snake_case
+      @is_snake_case = is_snake_case
     end
 
-    def result
-      ["type #{table_name} = {", property_lines, "}\n"].flatten
+    def converted_type_lines
+      ["type #{table_name} = {", ID_PROPERTY_LINE_TEXT, property_lines, "}\n"].flatten
     end
 
     def method_missing(*)
       # To exclude unnecessary methods
+      # TODO: add error handling
     end
 
     private
 
-    def push_property_line(name:, type:, options:)
+    def convert_property_line_and_push(name:, type:, options:)
       is_non_nullable = options[0] && options[0].key?(:null) && !options[0][:null]
-      formatted_name = snake_case ? name.underscore : name.camelcase(:lower)
+      formatted_name = is_snake_case ? name.underscore : name.camelcase(:lower)
       property_line = is_non_nullable ? "#{formatted_name}: #{type};" : "#{formatted_name}: #{type} | null;"
 
       property_lines << "  #{property_line}"

data/lib/schema2type/version.rb

@@ -1,3 +1,3 @@
 module Schema2type
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

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