aurora-data-api 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1c7df96cdee98eea8565914c4918918c98c1f917d91e32a143330d03b5b9d0c
-  data.tar.gz: 63c65eb4a6d6448f5f0ebd5902c6edb71d990ba8e20b01846156eed53fe6af64
+  metadata.gz: 1fe5d2c5a9bbee26fe0eae247070e2a96420fb4ac77c64872dd8925d9f5b539c
+  data.tar.gz: f5bfc26bba7524189b4ebfd10d5f3474ba2d5f1eeb0c6b6ec976b41973214320
 SHA512:
-  metadata.gz: '08580f3de132c79bec933f95fd8fc384c79f7cdf7cdc68063c128d848809625932a3790e58c6501a68c066f9fa6173759e613e3c16d3870b166c9aa5ed6986b2'
-  data.tar.gz: f4597f745ffb462a498d586b582e1360c3bb79c0f6a0276f3e265e3789334b83b7fe7ed868fe7b32a9ef5781b27c3cefd3cb772e6d3f526179767c14de328dca
+  metadata.gz: b3ff7d85e1cdf9eb5d054e2d636f95a0997aa2617b7e7307899029a046ce8608e6458d21c19e6d850f0bb22941da2e51b5a090ad5ca02d0ccaa2561e63579477
+  data.tar.gz: 67a5723d8fa0b6e08fe9672957cbc07155a5c3742241e36a5c33320523b4dcdfab78c26025e9998251663d9dfd9bd452534a9e59b9f328902f76a9702da75a5c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aurora-data-api (0.1.3)
+    aurora-data-api (0.1.4)
       aws-sdk-rdsdataservice (~> 1.35.0)
       thor
       tzinfo

data/Rakefile

@@ -11,8 +11,16 @@ end
 
 require "standard/rake"
 
-task default: %i[test steep standard]
+task default: %i[test steep steep_cli standard]
 
+desc "Steep check lib"
 task :steep do
   sh "bundle exec steep check"
 end
+
+desc "Steep check exe/cli"
+task :steep_cli do
+  FileUtils.cd "exe" do
+    sh "bundle exec steep check"
+  end
+end

data/aurora-data-api.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
     end
   end
   spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.executables = "aurora-data-api"
   spec.require_paths = ["lib"]
 
   spec.add_dependency "aws-sdk-rdsdataservice", "~> 1.35.0"

data/example/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'aurora-data-api'
+gem 'aurora-data-api', github: "hasumikin/aurora-data-api"
 gem 'aws-sdk-lambda'
 
 group :test, :development do

data/example/Gemfile.lock

@@ -1,9 +1,14 @@
-GEM
-  remote: https://rubygems.org/
+PATH
+  remote: ..
   specs:
-    aurora-data-api (0.1.0)
+    aurora-data-api (0.1.3)
       aws-sdk-rdsdataservice (~> 1.35.0)
       thor
+      tzinfo
+
+GEM
+  remote: https://rubygems.org/
+  specs:
     aws-eventstream (1.2.0)
     aws-partitions (1.594.0)
     aws-sdk-core (3.131.1)
@@ -19,6 +24,7 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    concurrent-ruby (1.1.10)
     jmespath (1.6.1)
     power_assert (2.0.1)
     rake (13.0.6)
@@ -29,12 +35,14 @@ GEM
       rr (>= 1.1.1)
       test-unit (>= 2.5.2)
     thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  aurora-data-api
+  aurora-data-api!
   aws-sdk-lambda
   rake
   test-unit-rr

data/example/app/models/user.rb

@@ -4,6 +4,7 @@ class User < AuroraDataApi::Model
   schema do
     col :name,             String
     col :internet_account, String
+    col :banned,           ::AuroraDataApi::Type::Boolean, default: false
     timestamp
   end
 

data/exe/Steepfile

@@ -0,0 +1,5 @@
+target :cli do
+  signature "sig"
+  check "cli"
+  library "time", "date"
+end

data/exe/aurora-data-api

@@ -1,160 +1,8 @@
 #!/usr/bin/env ruby
 
 require "aurora-data-api/version"
-require "thor"
-require "date"
-require "fileutils"
+require "aurora-data-api/type/boolean"
 
-module AuroraDataApi
-  class Error < StandardError; end
-
-  class Schema
-    CREATE_TABLE = []
-    ALTER_TABLE = []
-  end
-
-  class Model
-    SCHEMA = {literal_id: :id}
-
-    def self.literal_id(lit)
-      SCHEMA[:literal_id] = lit
-    end
-
-    def self.table(name)
-      SCHEMA[:table_name] = name
-    end
-
-    def self.schema(&block)
-      converter = Converter.new(SCHEMA, self)
-      converter.head
-      converter.instance_eval(&block)
-      converter.tail
-      Schema::CREATE_TABLE << converter.create_table
-      Schema::ALTER_TABLE << converter.alter_table
-    end
-  end
-
-  class Converter
-    TYPES = {
-      ::Date => "date",
-      ::Time => "timestamp with time zone",
-      ::String => "text",
-      ::Integer => "bigint",
-      ::Float => "double precision"
-    }
-
-    def initialize(schema, klass)
-      @table_name = schema[:table_name] || "#{klass.name.downcase}s"
-      @literal_id = schema[:literal_id]
-      @create_table = []
-      @alter_table = []
-    end
-
-    attr_reader :create_table, :alter_table
-
-    def head
-      @create_table << %/CREATE TABLE "#{@table_name}" (/
-      @create_table << %(  "#{@literal_id}" bigint NOT NULL GENERATED ALWAYS AS IDENTITY,)
-    end
-
-    def tail
-      @create_table << %/  PRIMARY KEY ("#{@literal_id}")/
-      @create_table << %/);\n/
-    end
-
-    def timestamp
-      @create_table << %(  "created_at" #{TYPES[Time]} NOT NULL,)
-      @create_table << %(  "updated_at" #{TYPES[Time]} NOT NULL,)
-    end
-
-    def col(name, type, **params)
-      line = "  "
-      case type
-      when Symbol
-        col_name = "#{name}_#{@literal_id}"
-        line << %("#{col_name}" )
-        line << TYPES[Integer]
-        @alter_table << %/ALTER TABLE ONLY "#{@table_name}" ADD CONSTRAINT "#{@table_name}_#{col_name}_fkey" FOREIGN KEY ("#{col_name}") REFERENCES "#{params[:table]}" ("#{@literal_id}");/
-      else
-        line << %("#{name}" )
-        line << TYPES[type]
-      end
-      params.each do |k, v|
-        case k
-        when :null
-          line << " NOT NULL" unless v
-        when :default
-          line << " DEFAULT "
-          line << case v
-          when String, Symbol
-            "'#{v}'"
-          else
-            v.to_s
-          end
-        when :unique
-          line << " UNIQUE" if v
-        end
-      end
-      line << ","
-      @create_table << line
-    end
-  end
-
-  class Tool < Thor
-    DEFAULT_MODELS_DIR = "app/models"
-    DEFAULT_OUTPUT_PATH = "db/schema.sql"
-
-    desc "version", "Print version"
-    def version
-      puts "aurora-data-api v#{AuroraDataApi::VERSION}"
-    end
-
-    desc "export", "Overwrite #{DEFAULT_OUTPUT_PATH} by aggregating #{DEFAULT_MODELS_DIR}/*.rb"
-    option :models, aliases: :m, default: DEFAULT_MODELS_DIR
-    option :output, aliases: :o, default: DEFAULT_OUTPUT_PATH
-    def export
-      models_dir = options[:models]
-      output_path = options[:output]
-      Dir.glob("#{models_dir}/*.rb").each do |rb|
-        load rb
-      end
-      if Schema::CREATE_TABLE.empty? && Schema::ALTER_TABLE.empty?
-        puts "Nothing to be exported."
-        exit 1
-      end
-      overwrite = false
-      if File.exist? output_path
-        print "#{output_path} exists. Overwrite? [Y/n]: "
-        answer = $stdin.gets.chomp
-        if %w[Y y yes].include?(answer.chomp)
-          overwrite = true
-        else
-          puts "Abort."
-          exit 1
-        end
-      else
-        FileUtils.touch output_path
-        overwrite = true
-      end
-      if overwrite
-        File.open output_path, "w" do |f|
-          f.write <<~COMMENT
-            /*
-             * This file was automatically genarated by the command:
-             *   aurora-data-api export --models #{models_dir} --output #{output_path}
-             *
-             * Genarated at #{Time.now}
-             *
-             * https://github.com/hasumikin/aurora-data-api
-             */\n
-          COMMENT
-          f.write Schema::CREATE_TABLE.flatten.join("\n")
-          f.write "\n"
-          f.write Schema::ALTER_TABLE.flatten.join("\n")
-        end
-      end
-    end
-  end
-end
+require_relative "cli/tool"
 
 AuroraDataApi::Tool.start

data/exe/cli/aurora-data-api/converter.rb

@@ -0,0 +1,70 @@
+require "date"
+
+module AuroraDataApi
+  class Converter
+    TYPES = {
+      ::Date => "date",
+      ::Time => "timestamp with time zone",
+      ::String => "text",
+      ::Integer => "bigint",
+      ::Float => "double precision",
+      ::AuroraDataApi::Type::Boolean => "boolean"
+    }
+
+    def initialize(schema, klass)
+      @table_name = schema[:table_name] || "#{klass.name.downcase}s"
+      @literal_id = schema[:literal_id]
+      @create_table = []
+      @alter_table = []
+    end
+
+    attr_reader :create_table, :alter_table
+
+    def head
+      @create_table << %/CREATE TABLE "#{@table_name}" (/
+      @create_table << %(  "#{@literal_id}" bigint NOT NULL GENERATED ALWAYS AS IDENTITY,)
+    end
+
+    def tail
+      @create_table << %/  PRIMARY KEY ("#{@literal_id}")/
+      @create_table << %/);\n/
+    end
+
+    def timestamp
+      @create_table << %(  "created_at" #{TYPES[Time]} NOT NULL,)
+      @create_table << %(  "updated_at" #{TYPES[Time]} NOT NULL,)
+    end
+
+    def col(name, type, **params)
+      line = "  "
+      case type
+      when Symbol
+        col_name = "#{name}_#{@literal_id}"
+        line << %("#{col_name}" )
+        line << TYPES[Integer]
+        @alter_table << %/ALTER TABLE ONLY "#{@table_name}" ADD CONSTRAINT "#{@table_name}_#{col_name}_fkey" FOREIGN KEY ("#{col_name}") REFERENCES "#{params[:table]}" ("#{@literal_id}");/
+      else
+        line << %("#{name}" )
+        line << TYPES[type]
+      end
+      params.each do |k, v|
+        case k
+        when :null
+          line << " NOT NULL" unless v
+        when :default
+          line << " DEFAULT "
+          line << case v
+          when String, Symbol
+            "'#{v}'"
+          else
+            v.to_s
+          end
+        when :unique
+          line << " UNIQUE" if v
+        end
+      end
+      line << ","
+      @create_table << line
+    end
+  end
+end

data/exe/cli/aurora-data-api/model.rb

@@ -0,0 +1,22 @@
+module AuroraDataApi
+  class Model
+    SCHEMA = {literal_id: :id}
+
+    def self.literal_id(lit)
+      SCHEMA[:literal_id] = lit
+    end
+
+    def self.table(name)
+      SCHEMA[:table_name] = name
+    end
+
+    def self.schema(&block)
+      converter = Converter.new(SCHEMA, self)
+      converter.head
+      converter.instance_eval(&block)
+      converter.tail
+      Schema::CREATE_TABLE << converter.create_table
+      Schema::ALTER_TABLE << converter.alter_table
+    end
+  end
+end

data/exe/cli/aurora-data-api/schema.rb

@@ -0,0 +1,8 @@
+module AuroraDataApi
+  class Error < StandardError; end
+
+  class Schema
+    CREATE_TABLE = []
+    ALTER_TABLE = []
+  end
+end

data/exe/cli/tool.rb

@@ -0,0 +1,66 @@
+require "thor"
+require "fileutils"
+
+require_relative "aurora-data-api/converter"
+require_relative "aurora-data-api/model"
+require_relative "aurora-data-api/schema"
+
+module AuroraDataApi
+  class Error < StandardError; end
+
+  class Tool < Thor
+    DEFAULT_MODELS_DIR = "app/models"
+    DEFAULT_OUTPUT_PATH = "db/schema.sql"
+
+    desc "version", "Print version"
+    def version
+      puts "aurora-data-api v#{AuroraDataApi::VERSION}"
+    end
+
+    desc "export", "Overwrite #{DEFAULT_OUTPUT_PATH} by aggregating #{DEFAULT_MODELS_DIR}/*.rb"
+    option :models, aliases: :m, default: DEFAULT_MODELS_DIR
+    option :output, aliases: :o, default: DEFAULT_OUTPUT_PATH
+    def export
+      models_dir = options[:models]
+      output_path = options[:output]
+      Dir.glob("#{models_dir}/*.rb").each do |rb|
+        load rb
+      end
+      if Schema::CREATE_TABLE.empty? && Schema::ALTER_TABLE.empty?
+        puts "Nothing to be exported."
+        exit 1
+      end
+      overwrite = false
+      if File.exist? output_path
+        print "#{output_path} exists. Overwrite? [Y/n]: "
+        answer = $stdin.gets.chomp
+        if %w[Y y yes].include?(answer.chomp)
+          overwrite = true
+        else
+          puts "Abort."
+          exit 1
+        end
+      else
+        FileUtils.touch output_path
+        overwrite = true
+      end
+      if overwrite
+        File.open output_path, "w" do |f|
+          f.write <<~COMMENT
+            /*
+             * This file was automatically genarated by the command:
+             *   aurora-data-api export --models #{models_dir} --output #{output_path}
+             *
+             * Genarated at #{Time.now}
+             *
+             * https://github.com/hasumikin/aurora-data-api
+             */\n
+          COMMENT
+          f.write Schema::CREATE_TABLE.flatten.join("\n")
+          f.write "\n"
+          f.write Schema::ALTER_TABLE.flatten.join("\n")
+        end
+      end
+    end
+  end
+end

data/exe/sig/converter.rbs

@@ -0,0 +1,25 @@
+# TypeProf 0.21.2
+
+# Classes
+module AuroraDataApi
+  class Converter
+    TYPES: Hash[singleton(Date)
+                | singleton(Float)
+                | singleton(Integer)
+                | singleton(String)
+                | singleton(Time)
+                | singleton(AuroraDataApi::Type::Boolean),
+                String]
+    @table_name: String
+    @literal_id: untyped
+
+    def initialize: (untyped schema, untyped klass) -> void
+    attr_reader create_table: Array[String]
+    attr_reader alter_table: Array[String]
+    def head: -> Array[String]
+    def tail: -> Array[String]
+    def timestamp: -> Array[String]
+    def col: (untyped name, untyped `type`, **untyped) -> Array[String]
+    def instance_eval: () { () -> void } -> void
+  end
+end

data/exe/sig/fileutils.rbs

@@ -0,0 +1,8 @@
+module FileUtils
+  type params_type = Hash[:mtime, Time]
+                   | Hash[:nocreate, bool]
+                   | Hash[:noop, bool]
+                   | Hash[:verbose, bool]
+
+  def self.touch: (String | Array[String] list, ?params_type params)-> void
+end

data/exe/sig/model.rbs

@@ -0,0 +1,12 @@
+# TypeProf 0.21.2
+
+# Classes
+module AuroraDataApi
+  class Model
+    SCHEMA: Hash[Symbol, untyped]
+
+    def self.literal_id: (Symbol lit) -> void
+    def self.table: (Symbol name) -> void
+    def self.schema: () { () -> void } -> void
+  end
+end

data/exe/sig/schema.rbs

@@ -0,0 +1,9 @@
+# TypeProf 0.21.2
+
+# Classes
+module AuroraDataApi
+  class Schema
+    CREATE_TABLE: Array[untyped]
+    ALTER_TABLE: Array[untyped]
+  end
+end

data/exe/sig/thor.rbs

@@ -0,0 +1,4 @@
+class Thor
+  def self.desc: (String, String) -> void
+end
+

data/exe/sig/tool.rbs

@@ -0,0 +1,21 @@
+# TypeProf 0.21.2
+
+# Global variables
+$thor_runner: false
+
+# Classes
+module AuroraDataApi
+  class Error < StandardError
+  end
+
+  class Tool < Thor
+    DEFAULT_MODELS_DIR: String
+    DEFAULT_OUTPUT_PATH: String
+
+    def self.option: (:models | :output, aliases: Symbol, default: String) -> void
+    def options: -> Hash[:models | :output, String]
+
+    def version: -> nil
+    def export: -> void
+  end
+end

data/exe/sig/type.rbs

@@ -0,0 +1 @@
+../../sig/type.rbs

data/exe/sig/version.rbs

@@ -0,0 +1 @@
+../../sig/version.rbs

data/lib/aurora-data-api/model.rb

@@ -55,6 +55,7 @@ module AuroraDataApi
     def initialize(**params)
       @struct = STRUCTS[self.class.model_name].new
       @timestamp = %i[created_at updated_at].all? { |m| members.include?(m) }
+      # @type var params: Hash[Symbol, attribute_value]
       params.each do |col, val|
         if col == literal_id
           @id = val if val.is_a?(Integer)
@@ -87,7 +88,9 @@ module AuroraDataApi
       if string_name[-1] == "="
         @struct[string_name.chop] = args[0]
       elsif string_name[-3, 3] == "_#{literal_id}"
-        @struct[string_name.sub(/_#{literal_id}\z/, "")]&.id || @struct[method_name]
+        @struct[string_name.sub(/_#{literal_id}\z/, "")].then do |rel|
+          rel.is_a?(Model) ? rel.id : @struct[method_name]
+        end
       elsif method_name == literal_id
         @id
       elsif members.include?(method_name)

data/lib/aurora-data-api/type/boolean.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module AuroraDataApi
+  module Type
+    class Boolean
+    end
+  end
+end

data/lib/aurora-data-api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AuroraDataApi
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/aurora-data-api.rb

@@ -4,6 +4,7 @@ require_relative "aurora-data-api/version"
 require_relative "aurora-data-api/model"
 require_relative "aurora-data-api/depot"
 require_relative "aurora-data-api/data_service"
+require_relative "aurora-data-api/type/boolean"
 
 module AuroraDataApi
   class Error < StandardError; end

data/sig/aurora-data-api.rbs

@@ -1,17 +1,3 @@
 module AuroraDataApi
   Error: StandardError
 end
-
-module Aws
-  def self.config: -> Hash[Symbol, untyped]
-
-  class Credentials
-    def initialize: (String, String) -> untyped
-  end
-
-  module RDSDataService
-    class Client
-      def initialize: (Hash[Symbol, String]) -> void
-    end
-  end
-end

data/sig/aws.rbs

@@ -0,0 +1,13 @@
+module Aws
+  def self.config: -> Hash[Symbol, untyped]
+
+  class Credentials
+    def initialize: (String, String) -> untyped
+  end
+
+  module RDSDataService
+    class Client
+      def initialize: (Hash[Symbol, String]) -> void
+    end
+  end
+end

data/sig/model.rbs

@@ -2,22 +2,38 @@
 
 # Classes
 module AuroraDataApi
-  type attribute = Symbol | Time | Date | Integer | Symbol | bool | nil
+  type attribute_value = Model
+                       | Symbol
+                       | Time
+                       | Date
+                       | Integer
+                       | Float
+                       | Symbol
+                       | bool
+                       | nil
   type attribute_type = singleton(String)
                       | singleton(Time)
                       | singleton(Date)
                       | singleton(Integer)
+                      | singleton(Float)
+                      | singleton(Type::Boolean)
                       | Symbol
 
+  class ModelStruct < Struct[untyped]
+    def []: (Symbol | String) -> attribute_value
+    def []=: (Symbol | String, attribute_value) -> void
+    def members: -> Array[Symbol]
+  end
+
   class Model
     SCHEMA: Hash[Symbol, untyped]
     STRUCTS: Hash[Symbol, untyped]
-    @struct: untyped
+    @struct: ModelStruct
 
     type col_opt = Hash[:table, Symbol]
                  | Hash[:null, bool]
                  | Hash[:unique, bool]
-                 | Hash[:default, untyped]
+                 | Hash[:default, String | Integer | Float | bool | nil | Proc ]
 
     def self.model_name: -> Symbol
     def self.literal_id: (Symbol lit) -> Symbol
@@ -27,7 +43,7 @@ module AuroraDataApi
     def self.col: (Symbol name, attribute_type type, ?col_opt opt) -> void
     def self.timestamp: -> void
     def self.relationship_by: (Symbol table_sym) -> [untyped, untyped]?
-    def initialize: (**Hash[Symbol, attribute]) -> void
+    def initialize: (**Hash[Symbol, attribute_value]) -> void
 
     attr_reader id: Integer?
     attr_reader timestamp: bool
@@ -40,12 +56,9 @@ module AuroraDataApi
     def method_missing: (Symbol method_name, *untyped args) -> nil
     def table_name: -> Symbol
     def literal_id: -> Symbol
-    def build_params: (?include_id: bool) -> Hash[Symbol, attribute]
-    def attributes: -> Hash[Symbol, attribute]
+    def build_params: (?include_id: bool) -> Hash[Symbol, attribute_value]
+    def attributes: -> Hash[Symbol, attribute_value]
     def _set_id: (Integer? id) -> void
     def _destroy: -> bool
   end
 end
-
-class AnonymousStruct_generated_1 < Struct[untyped]
-end

data/sig/type.rbs

@@ -0,0 +1,6 @@
+module AuroraDataApi
+  module Type
+    class Boolean
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aurora-data-api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - HASUMI Hitoshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-rdsdataservice
@@ -93,18 +93,34 @@ files:
 - example/package-lock.json
 - example/package.json
 - example/serverless.yml
+- exe/Steepfile
 - exe/aurora-data-api
+- exe/cli/aurora-data-api/converter.rb
+- exe/cli/aurora-data-api/model.rb
+- exe/cli/aurora-data-api/schema.rb
+- exe/cli/tool.rb
+- exe/sig/converter.rbs
+- exe/sig/fileutils.rbs
+- exe/sig/model.rbs
+- exe/sig/schema.rbs
+- exe/sig/thor.rbs
+- exe/sig/tool.rbs
+- exe/sig/type.rbs
+- exe/sig/version.rbs
 - lib/aurora-data-api.rb
 - lib/aurora-data-api/data_service.rb
 - lib/aurora-data-api/depot.rb
 - lib/aurora-data-api/environment.rb
 - lib/aurora-data-api/model.rb
+- lib/aurora-data-api/type/boolean.rb
 - lib/aurora-data-api/version.rb
 - sig/aurora-data-api.rbs
+- sig/aws.rbs
 - sig/data_service.rbs
 - sig/depot.rbs
 - sig/environment.rbs
 - sig/model.rbs
+- sig/type.rbs
 - sig/tzinfo.rbs
 - sig/version.rbs
 homepage: https://github.com/hasumikin/aurora-data-api