schema2type 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135c9683ac6c053396ba1a4f5088368c18f5894bbf0fc5c6557bce7a8431ad70
-  data.tar.gz: 23f8800d5cb0f387d2b4cf10a965b035ee6ed60665360a4300a92ef280c30cef
+  metadata.gz: 4d907bb961b8e4dd1d7c94732012dc0aafd75c4e29aef02027ef5b5c7751889f
+  data.tar.gz: 6494b9e501419c0f9a300ff5b2d056f9224296ddb262b4f709337dd53cabe765
 SHA512:
-  metadata.gz: 86d88739e217beec70525f39358ba02dd612f9e974f49df05b7c3da36eeb8efad59230d38f30542a0b6e3fe940f93989e8d9ce868dec85310f7834b41704052e
-  data.tar.gz: 2c3f48ea453a041fcee1662247078f139f11bbc6ba126640d7fc43788ab347867184a05e1e7ff5b2125f8a665cec33ba01ddaa06d97d931b57128d8c08b4e028
+  metadata.gz: 92b851eb75ea3a0a08bbb9a1e9d9f9c097d47b5d81b8d129afc396cd5f9cc27f7e1d8958a702e167457f9adf6c7b8044cd07d4c0a99f59422e5e7b7d3f4c1320
+  data.tar.gz: 8e4cec8d0f67e5835ff6dd7c28a457b364c27458f9ce1734a211961ffb28772b726183d990fcbc6682c56cddca568900a51361df75b859b5c2dcaf338ccfec95

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    schema2type (0.2.0)
+    schema2type (0.2.2)
       activesupport
 
 GEM

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'], snake_case: params['snake'])

data/lib/schema2type/cli.rb

@@ -1,15 +1,11 @@
 module Schema2type
 
-  DEFAULT_SCHEMA_PATH = "./db/schema.rb"
-  DEFAULT_NAME_SPACE = "schema"
+  DEFAULT_SCHEMA_PATH = "./db/schema.rb".freeze
+  DEFAULT_NAME_SPACE = "schema".freeze
 
   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
+    result = eval(File.read(input_file || DEFAULT_SCHEMA_PATH), CovertService.new(snake_case).get_binding)
 
     File.open(out_file, "w") do |f|
       f.puts <<~EOS
@@ -17,38 +13,13 @@ module Schema2type
 
         /**
          * auto-generated file
-         * schema version: #{$schema_version}
+         * schema version: #{result[:version]}
          * This file was automatically generated by schema2type
          */
         declare namespace #{name_space || DEFAULT_NAME_SPACE} {
-          #{convert_type_text}
+          #{result[: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/covert_service.rb

@@ -0,0 +1,39 @@
+module Schema2type
+  class CovertService
+    def initialize(snake_case)
+      @converted_types = []
+      @snake_case = snake_case
+    end
+
+    def get_binding
+      binding
+    end
+
+    def create_table(table_name, *)
+      converter = SchemaConverter.new(table_name: table_name, snake_case: @snake_case)
+      yield converter
+      @converted_types.concat converter.result
+    end
+
+    def method_missing(*)
+      # To exclude unnecessary methods
+    end
+
+    def self.method_missing(*)
+      # To exclude unnecessary methods
+    end
+
+    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
+  end
+end

data/lib/schema2type/schema_converter.rb

@@ -3,7 +3,7 @@ require 'active_support/inflector'
 
 module Schema2type
   class SchemaConverter
-    attr_reader :property_lines, :table_name, :convertion_table, :snake_case
+    attr_reader :property_lines, :table_name, :snake_case
 
     TYPE_STRING = 'string'.freeze
     TYPE_NUMBER = 'number'.freeze

data/lib/schema2type/version.rb

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

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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema2type
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - ryo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,6 +90,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