db_schema-definitions 0.1.1 → 0.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae2df87f767542bd232c75d6b0ac42697b0d4fb8
-  data.tar.gz: f6f39c373daa3228b8e4b3d532a91b568e0cfe36
+SHA256:
+  metadata.gz: '09c3d434a88ffdce3c3011e34bec258ffec9c663c55adaa98626df50522cbf75'
+  data.tar.gz: c9e426e1f905e4570623e34a32f9538774d4315b0fb196e84c09c32dc252ce56
 SHA512:
-  metadata.gz: ada6d9fac2caba310326c2934ff79d03fc553c335c9b597790134c1b0745e3430d0c603f5112eef31de2972a1ec371117c6753081c95c271822080455d9993d8
-  data.tar.gz: 8023878809927aa1f241afcd8a0d79f1103b8990e9a38e04e105b4edef6901a827510a5484362634c121ae30df95f4a1401d04475683cd708e666193813bbeb1
+  metadata.gz: b795076bd8068230f48cca952b0343ef32a9eaf982e499cacdbe2cc197c8f9400dc9af9bd366abe89bdb44c3d69ed60de995495b7d6bb8902cbfd430f447be72
+  data.tar.gz: 181ee3609987fa55dc902b3288870e9ee2be7ff85c029ff0ebcece488fe962ccaf6e713699d2cade997d3ea1a23b954d85ccad15eb84b2c720f8d82071ae041d

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-before_install: gem install bundler -v 1.16.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0

data/lib/db_schema/definitions/awesome_print.rb

@@ -0,0 +1,159 @@
+begin
+  require 'awesome_print'
+rescue LoadError
+end
+
+if defined?(AwesomePrint)
+  module AwesomePrint
+    module DbSchema
+      module Definitions
+        def self.included(base)
+          base.send :alias_method, :cast_without_dbschema_definitions, :cast
+          base.send :alias_method, :cast, :cast_with_dbschema_definitions
+        end
+
+        def cast_with_dbschema_definitions(object, type)
+          case object
+          when ::DbSchema::Definitions::Schema
+            :dbschema_definitions_schema
+          when ::DbSchema::Definitions::NullTable,
+               ::DbSchema::Definitions::NullField,
+               ::DbSchema::Definitions::NullIndex,
+               ::DbSchema::Definitions::NullCheckConstraint,
+               ::DbSchema::Definitions::NullForeignKey,
+               ::DbSchema::Definitions::NullEnum
+            :dbschema_definitions_null_object
+          when ::DbSchema::Definitions::Table
+            :dbschema_definitions_table
+          when ::DbSchema::Definitions::Field::Base
+            :dbschema_definitions_field
+          when ::DbSchema::Definitions::Index
+            :dbschema_definitions_index
+          when ::DbSchema::Definitions::Index::Column
+            :dbschema_definitions_index_column
+          when ::DbSchema::Definitions::CheckConstraint
+            :dbschema_definitions_check_constraint
+          when ::DbSchema::Definitions::ForeignKey
+            :dbschema_definitions_foreign_key
+          when ::DbSchema::Definitions::Enum
+            :dbschema_definitions_enum
+          when ::DbSchema::Definitions::Extension
+            :dbschema_definitions_extension
+          else
+            cast_without_dbschema_definitions(object, type)
+          end
+        end
+
+      private
+        def awesome_dbschema_definitions_schema(schema)
+          data = ["tables: #{schema.tables.ai}"]
+          data << "enums: #{schema.enums.ai}" if schema.enums.any?
+          data << "extensions: #{schema.extensions.ai}" if schema.extensions.any?
+
+          data_string = data.join(', ')
+          "#<DbSchema::Definitions::Schema #{data_string}>"
+        end
+
+        def awesome_dbschema_definitions_null_object(object)
+          "#<#{object.class}>"
+        end
+
+        def awesome_dbschema_definitions_table(table)
+          data = ["fields: #{table.fields.ai}"]
+          data << "indexes: #{table.indexes.ai}" if table.indexes.any?
+          data << "checks: #{table.checks.ai}" if table.checks.any?
+          data << "foreign_keys: #{table.foreign_keys.ai}" if table.foreign_keys.any?
+
+          data_string = indent_lines(data.join(', '))
+          "#<DbSchema::Definitions::Table #{table.name.ai} #{data_string}>"
+        end
+
+        def awesome_dbschema_definitions_field(field)
+          options = field.options.map do |k, v|
+            key = colorize("#{k}:", :symbol)
+
+            if (k == :default) && v.is_a?(Symbol)
+              "#{key} #{colorize(v.to_s, :string)}"
+            else
+              "#{key} #{v.ai}"
+            end
+          end.unshift(nil).join(', ')
+
+          if field.custom?
+            "#<DbSchema::Definitions::Field::Custom (#{field.type.ai}) #{field.name.ai}#{options}>"
+          else
+            "#<#{field.class} #{field.name.ai}#{options}>"
+          end
+        end
+
+        def awesome_dbschema_definitions_index(index)
+          columns = format_dbschema_fields(index.columns)
+          using = ' using ' + colorize(index.type.to_s, :symbol) unless index.btree?
+
+          data = [nil]
+          data << colorize('primary key', :nilclass) if index.primary?
+          data << colorize('unique', :nilclass) if index.unique?
+          data << colorize('condition: ', :symbol) + index.condition.ai unless index.condition.nil?
+
+          "#<#{index.class} #{index.name.ai} on #{columns}#{using}#{data.join(', ')}>"
+        end
+
+        def awesome_dbschema_definitions_index_column(column)
+          data = [column.name.ai]
+
+          if column.desc?
+            data << colorize('desc', :nilclass)
+            data << colorize('nulls last', :symbol) if column.nulls == :last
+          else
+            data << colorize('nulls first', :symbol) if column.nulls == :first
+          end
+
+          data.join(' ')
+        end
+
+        def awesome_dbschema_definitions_check_constraint(check)
+          "#<#{check.class} #{check.name.ai} #{check.condition.ai}>"
+        end
+
+        def awesome_dbschema_definitions_foreign_key(fkey)
+          fields = format_dbschema_fields(fkey.fields)
+          references = "#{colorize('references', :class)} #{fkey.table.ai}"
+          references << ' ' + format_dbschema_fields(fkey.keys) unless fkey.references_primary_key?
+
+          data = [nil]
+          data << colorize("on_update:", :symbol) + " #{fkey.on_update.ai}" unless fkey.on_update == :no_action
+          data << colorize("on_delete:", :symbol) + " #{fkey.on_delete.ai}" unless fkey.on_delete == :no_action
+          data << colorize('deferrable', :nilclass) if fkey.deferrable?
+
+          "#<#{fkey.class} #{fkey.name.ai} on #{fields} #{references}#{data.join(', ')}>"
+        end
+
+        def awesome_dbschema_definitions_enum(enum)
+          values = enum.values.map do |value|
+            colorize(value.to_s, :string)
+          end.join(', ')
+
+          "#<#{enum.class} #{enum.name.ai} (#{values})>"
+        end
+
+        def awesome_dbschema_definitions_extension(extension)
+          "#<#{extension.class} #{extension.name.ai}>"
+        end
+
+        def format_dbschema_fields(fields)
+          if fields.one?
+            fields.first.ai
+          else
+            '[' + fields.map(&:ai).join(', ') + ']'
+          end
+        end
+
+        def indent_lines(text, indent_level = 4)
+          text.gsub(/(?<!\A)^/, ' ' * indent_level)
+        end
+      end
+    end
+  end
+
+  AwesomePrint::Formatter.send(:include, AwesomePrint::DbSchema::Definitions)
+end

data/lib/db_schema/definitions/field/base.rb

@@ -2,23 +2,18 @@ module DbSchema
   module Definitions
     module Field
       class Base
-        include Dry::Equalizer(:name, :type, :primary_key?, :options)
+        include Dry::Equalizer(:name, :type, :options)
         attr_reader :name, :default
 
-        def initialize(name, primary_key: false, null: true, default: nil, **attributes)
-          @name        = name
-          @primary_key = primary_key
-          @null        = null
-          @default     = default
-          @attributes  = attributes
-        end
-
-        def primary_key?
-          @primary_key
+        def initialize(name, null: true, default: nil, **attributes)
+          @name       = name
+          @null       = null
+          @default    = default
+          @attributes = attributes
         end
 
         def null?
-          !primary_key? && @null
+          @null
         end
 
         def default_is_expression?
@@ -57,15 +52,19 @@ module DbSchema
         end
 
         def with_type(new_type)
-          Field.build(name, new_type, **options, primary_key: primary_key?)
+          Field.build(name, new_type, **options)
         end
 
         def with_attribute(attr_name, attr_value)
-          Field.build(name, type, **options, primary_key: primary_key?, attr_name => attr_value)
+          Field.build(name, type, **options, attr_name => attr_value)
+        end
+
+        def with_null(null)
+          Field.build(name, type, **options, null: null)
         end
 
         def with_default(new_default)
-          Field.build(name, type, **options, primary_key: primary_key?, default: new_default)
+          Field.build(name, type, **options, default: new_default)
         end
 
         class << self

data/lib/db_schema/definitions/field/serial.rb

@@ -0,0 +1,17 @@
+module DbSchema
+  module Definitions
+    module Field
+      class SmallSerial < Base
+        register :smallserial
+      end
+
+      class Serial < Base
+        register :serial
+      end
+
+      class BigSerial < Base
+        register :bigserial
+      end
+    end
+  end
+end

data/lib/db_schema/definitions/field.rb

@@ -22,6 +22,7 @@ end
 
 require_relative 'field/base'
 require_relative 'field/numeric'
+require_relative 'field/serial'
 require_relative 'field/monetary'
 require_relative 'field/character'
 require_relative 'field/binary'

data/lib/db_schema/definitions/index.rb

@@ -1,17 +1,22 @@
 module DbSchema
   module Definitions
     class Index
-      include Dry::Equalizer(:name, :columns, :unique?, :type, :condition)
+      include Dry::Equalizer(:name, :columns, :primary?, :unique?, :type, :condition)
       attr_reader :name, :columns, :type, :condition
 
-      def initialize(name:, columns:, unique: false, type: :btree, condition: nil)
+      def initialize(name:, columns:, primary: false, unique: false, type: :btree, condition: nil)
         @name      = name.to_sym
         @columns   = columns
+        @primary   = primary
         @unique    = unique
         @type      = type
         @condition = condition
       end
 
+      def primary?
+        @primary
+      end
+
       def unique?
         @unique
       end
@@ -36,6 +41,7 @@ module DbSchema
         Index.new(
           name:      new_name,
           columns:   columns,
+          primary:   primary?,
           unique:    unique?,
           type:      type,
           condition: condition
@@ -46,6 +52,7 @@ module DbSchema
         Index.new(
           name:      name,
           columns:   columns,
+          primary:   primary?,
           unique:    unique?,
           type:      type,
           condition: new_condition

data/lib/db_schema/definitions/table.rb

@@ -47,6 +47,14 @@ module DbSchema
         end
       end
 
+      def primary_key
+        indexes.find(&:primary?) || NullIndex.new
+      end
+
+      def has_primary_key?
+        !primary_key.is_a?(NullIndex)
+      end
+
       def check(check_name)
         checks.find { |check| check.name == check_name } || NullCheckConstraint.new
       end

data/lib/db_schema/definitions/version.rb

@@ -1,5 +1,5 @@
 module DbSchema
   module Definitions
-    VERSION = '0.1.1'
+    VERSION = '0.2.rc1'
   end
 end

data/lib/db_schema/definitions.rb

@@ -8,4 +8,5 @@ require_relative 'definitions/foreign_key'
 require_relative 'definitions/check_constraint'
 require_relative 'definitions/enum'
 require_relative 'definitions/extension'
+require_relative 'definitions/awesome_print'
 require_relative 'definitions/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_schema-definitions
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.rc1
 platform: ruby
 authors:
 - Vsevolod Romashov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
@@ -156,6 +156,7 @@ files:
 - bin/setup
 - db_schema-definitions.gemspec
 - lib/db_schema/definitions.rb
+- lib/db_schema/definitions/awesome_print.rb
 - lib/db_schema/definitions/check_constraint.rb
 - lib/db_schema/definitions/enum.rb
 - lib/db_schema/definitions/extension.rb
@@ -181,6 +182,7 @@ files:
 - lib/db_schema/definitions/field/network.rb
 - lib/db_schema/definitions/field/numeric.rb
 - lib/db_schema/definitions/field/range.rb
+- lib/db_schema/definitions/field/serial.rb
 - lib/db_schema/definitions/field/text_search.rb
 - lib/db_schema/definitions/field/uuid.rb
 - lib/db_schema/definitions/foreign_key.rb
@@ -206,12 +208,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Database object definitions for DbSchema