schema2type 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135c9683ac6c053396ba1a4f5088368c18f5894bbf0fc5c6557bce7a8431ad70
-  data.tar.gz: 23f8800d5cb0f387d2b4cf10a965b035ee6ed60665360a4300a92ef280c30cef
+  metadata.gz: 912e9bb9f837865415f701aec0b4844f10dd80a3064a072dfac0a47f480c0e0c
+  data.tar.gz: 055064e54272d3fd75c6821a438e968165e15f5d4c64d6eecc234a8b0c348ad7
 SHA512:
-  metadata.gz: 86d88739e217beec70525f39358ba02dd612f9e974f49df05b7c3da36eeb8efad59230d38f30542a0b6e3fe940f93989e8d9ce868dec85310f7834b41704052e
-  data.tar.gz: 2c3f48ea453a041fcee1662247078f139f11bbc6ba126640d7fc43788ab347867184a05e1e7ff5b2125f8a665cec33ba01ddaa06d97d931b57128d8c08b4e028
+  metadata.gz: b39374c2b97e67a7caba68cf89dc22882f06f1e4fe9b464cdd95ca3b8901586fe7b5a73e8c4b0ddfb1f7e41ee17074eb822de7138b1c4faf3d82bc7da8c718c6
+  data.tar.gz: c22cc454e307e88f441195e5ae0d55cceca5a169cb2ec40117cb79a2e1192d261274a39260039e8df1389ae2034b2ccc8cd9fb4aa8f2ce270e61f0a02c9b7fb3

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
+ruby '2.7.0'
 
 # Specify your gem's dependencies in schema2type.gemspec
 gemspec

data/Gemfile.lock

@@ -1,39 +1,41 @@
 PATH
   remote: .
   specs:
-    schema2type (0.2.0)
+    schema2type (0.3.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.4)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    i18n (1.5.3)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -41,9 +43,12 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   bundler (~> 2.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   schema2type!
 
+RUBY VERSION
+   ruby 2.7.0p0
+
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/README.md

@@ -22,12 +22,13 @@ Automatically have the following TypesScript type generated.
 ```typescript
 declare namespace schema {
   type User = {
-    name: string | null
-    age: number | null
-    sales: number | null
-    paid: boolean
-    createdAt: Date
-    updatedAt: Date
+    id: number;
+    name: string | null;
+    age: number | null;
+    sales: number | null;
+    paid: boolean;
+    createdAt: Date;
+    updatedAt: Date;
   }
 }
 ```
@@ -81,10 +82,10 @@ the schema2type convert as per this conversion table.
 | float | number |
 | decimal | number |
 | boolean | boolean |
-| date | Date |
-| datetime | Date |
-| timestamp | Date |
-| datetime_with_timezone | Date |
+| date | string |
+| datetime | string |
+| timestamp | string |
+| datetime_with_timezone | string |
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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

@@ -1,4 +1,4 @@
-require "schema2type/version"
+require 'schema2type/version'
 require 'schema2type/schema_converter'
-require "schema2type/cli"
-
+require 'schema2type/covert_service'
+require 'schema2type/cli'

data/lib/schema2type/cli.rb

@@ -1,15 +1,9 @@
 module Schema2type
+  DEFAULT_SCHEMA_PATH = "./db/schema.rb".freeze
+  DEFAULT_NAME_SPACE = "schema".freeze
 
-  DEFAULT_SCHEMA_PATH = "./db/schema.rb"
-  DEFAULT_NAME_SPACE = "schema"
-
-  def self.execute(input_file:, out_file:, name_space:, snake_case:)
-    @@converted_types = []
-    @@snake_case = snake_case
-
-    eval(File.read(input_file || DEFAULT_SCHEMA_PATH))
-
-    convert_type_text = @@converted_types.map { |t| "  #{t}" }.join("\n").strip
+  def self.execute(input_file:, out_file:, name_space:, is_snake_case:)
+    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
@@ -17,38 +11,13 @@ module Schema2type
 
         /**
          * auto-generated file
-         * schema version: #{$schema_version}
+         * schema version: #{resultHash[:version]}
          * This file was automatically generated by schema2type
          */
         declare namespace #{name_space || DEFAULT_NAME_SPACE} {
-          #{convert_type_text}
+          #{resultHash[:lines]}
         }
       EOS
     end
   end
-
-  def self.convert_schema(table_name, *)
-    converter = SchemaConverter.new(table_name: table_name, snake_case: @@snake_case)
-
-    yield converter
-
-    @@converted_types.concat converter.result
-  end
-
-  def self.method_missing(*arg)
-    # To exclude unnecessary methods
-  end
-
-  module ActiveRecord
-    module Schema
-      def self.define(version)
-        $schema_version = version[:version]
-        yield
-      end
-    end
-  end
-
-  class << self
-    alias :create_table :convert_schema
-  end
 end

data/lib/schema2type/conversion_table.yml

@@ -10,7 +10,7 @@ bigint: number
 float: number
 decimal: number
 boolean: boolean
-date: Date
-datetime: Date
-timestamp: Date
-datetime_with_timezone: Date
+date: string
+datetime: string
+timestamp: string
+datetime_with_timezone: string

data/lib/schema2type/covert_service.rb

@@ -0,0 +1,45 @@
+module Schema2type
+  class CovertService
+    def initialize(is_snake_case)
+      @converted_types = []
+      @is_snake_case = is_snake_case
+    end
+
+    def get_binding
+      binding
+    end
+
+    # 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.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)
+          converted_types = yield
+          converted_type_lines = converted_types.map { |t| "  #{t}" }.join("\n").strip
+          {
+            lines: converted_type_lines,
+            version: arg[0][:version]
+          }
+        end
+      end
+    end
+
+    alias create_table convert_schema_to_type
+  end
+end

data/lib/schema2type/schema_converter.rb

@@ -3,43 +3,41 @@ require 'active_support/inflector'
 
 module Schema2type
   class SchemaConverter
-    attr_reader :property_lines, :table_name, :convertion_table, :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.1"
+  VERSION = '0.3.0'
 end

data/schema2type.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema2type
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - ryo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -90,6 +91,7 @@ files:
 - lib/schema2type.rb
 - lib/schema2type/cli.rb
 - lib/schema2type/conversion_table.yml
+- lib/schema2type/covert_service.rb
 - lib/schema2type/schema_converter.rb
 - lib/schema2type/version.rb
 - schema2type.gemspec
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: generate TypeScript type definitions from Rails schema.rb