ryakuzu 0.2.6 → 0.3.0

data/test/services/column_default_service_test.rb

@@ -1,10 +1,17 @@
 require 'test_helper'
 
 class ColumnDefaultServiceTest < ActiveSupport::TestCase
-  test 'valid migration text' do
-    migration = Ryakuzu::ColumnDefaultService.new('table' => 'users', 'column' => 'accepted', 'type' => 'Boolean', 'parameters' => { ':old_type' => 'string' })
+  test 'migration text for string' do
+    migration = Ryakuzu::MigrationText.new('users', 'available', 'string', true)
 
-    except = "remove_column :users, :accepted\nadd_column :users, :accepted, :boolean"
-    assert_equal except, migration.send(:remove_column_text, 'users', 'accepted', %w(type Boolean))
+    except = "remove_column :users, :available\nadd_column :users, :available, :string, default: 'true'"
+    assert_equal except, migration.default_migration
+  end
+
+  test 'migration text for type' do
+    migration = Ryakuzu::MigrationText.new('users', 'available', 'Integer', '')
+
+    except = "remove_column :users, :available\nadd_column :users, :available, :integer"
+    assert_equal except, migration.type_migration
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ryakuzu
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - ID25
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,14 +126,6 @@ files:
 - app/models/ryakuzu/column_defaults.rb
 - app/models/ryakuzu/schema.rb
 - app/models/ryakuzu/table.rb
-- app/services/ryakuzu/add_column_service.rb
-- app/services/ryakuzu/column_default_service.rb
-- app/services/ryakuzu/column_service.rb
-- app/services/ryakuzu/create_table_service.rb
-- app/services/ryakuzu/migration_service.rb
-- app/services/ryakuzu/remove_service.rb
-- app/services/ryakuzu/run_migration.rb
-- app/services/ryakuzu/table_service.rb
 - app/views/ryakuzu/layouts/_cdn.erb
 - app/views/ryakuzu/layouts/_header.html.slim
 - app/views/ryakuzu/layouts/_preload.html.slim
@@ -143,6 +135,7 @@ files:
 - app/views/ryakuzu/main/_column_form.html.slim
 - app/views/ryakuzu/main/error_500.html.slim
 - app/views/ryakuzu/main/index.html.slim
+- app/views/ryakuzu/main/schema_error.html.slim
 - app/views/ryakuzu/tables/_add_column.html.slim
 - app/views/ryakuzu/tables/_add_table.html.slim
 - app/views/ryakuzu/tables/_column.html.slim
@@ -158,12 +151,22 @@ files:
 - app/views/ryakuzu/tables/remove_column.js.erb
 - config/routes.rb
 - lib/ryakuzu.rb
-- lib/ryakuzu/boolean_patch.rb
-- lib/ryakuzu/column_info.rb
 - lib/ryakuzu/engine.rb
-- lib/ryakuzu/ripper.rb
-- lib/ryakuzu/schema_extenstions.rb
-- lib/ryakuzu/schema_service.rb
+- lib/ryakuzu/libs.rb
+- lib/ryakuzu/schema_parsing/column_info.rb
+- lib/ryakuzu/schema_parsing/ripper.rb
+- lib/ryakuzu/schema_parsing/schema_service.rb
+- lib/ryakuzu/services/add_column_service.rb
+- lib/ryakuzu/services/column_default_service.rb
+- lib/ryakuzu/services/column_service.rb
+- lib/ryakuzu/services/create_table_service.rb
+- lib/ryakuzu/services/migration_service.rb
+- lib/ryakuzu/services/remove_service.rb
+- lib/ryakuzu/services/run_migration.rb
+- lib/ryakuzu/services/table_service.rb
+- lib/ryakuzu/tools/boolean_patch.rb
+- lib/ryakuzu/tools/migration_text.rb
+- lib/ryakuzu/tools/schema_extenstions.rb
 - lib/ryakuzu/version.rb
 - lib/tasks/ryakuzu_tasks.rake
 - test/dummy/README.rdoc
@@ -205,7 +208,6 @@ files:
 - test/dummy/public/favicon.ico
 - test/integration/navigation_test.rb
 - test/lib/column_info_test.rb
-- test/lib/schema_service_test.rb
 - test/ryakuzu_test.rb
 - test/services/add_column_service_test.rb
 - test/services/column_default_service_test.rb
@@ -238,7 +240,6 @@ signing_key:
 specification_version: 4
 summary: Ryakuzu helps you to manage your schema.rb
 test_files:
-- test/lib/schema_service_test.rb
 - test/lib/column_info_test.rb
 - test/ryakuzu_test.rb
 - test/integration/navigation_test.rb

data/app/services/ryakuzu/column_default_service.rb

@@ -1,64 +0,0 @@
-require_relative '../../../lib/ryakuzu/boolean_patch'
-
-module Ryakuzu
-  class ColumnDefaultService
-    attr_reader :params, :default, :index, :null, :type, :table, :column,
-                :old_null, :old_default, :parameters, :old_type
-
-    def initialize(params)
-      @params      = params
-      @parameters  = params['parameters']
-      @default     = params['default']
-      @index       = params['index']
-      @null        = params['null']
-      @type        = params['type']
-      @table       = params['table']
-      @column      = params['column']
-      @old_type    = params['parameters'][':old_type']
-      @old_default = params['parameters'][':old_default']
-    end
-
-    def call
-      processing_params
-      current = params.reject { |k, _v| %w(table column).include? k }.except('parameters')
-
-      zip = current.zip(params['parameters'])
-
-      zip.each do |k, v|
-        run_column_default_migration(k, table, column) if k[1] != v[1]
-      end
-    end
-
-    private
-
-    def processing_params
-      # TODO: make index and null select
-      [null, index, old_null].each do |key|
-        case key
-        when 'none' then 'none'
-        when true   then true
-        when false  then false
-        end
-      end
-
-      @default     = '' if default == "\"\""
-      @old_default = '' if old_default == "\"\""
-      type.gsub!('Current: ', '')
-    end
-
-    def run_column_default_migration(type_column, tabl, kolumn)
-      text = remove_column_text(tabl, kolumn, type_column)
-      p tabl
-      p kolumn
-      p type_column
-
-      Ryakuzu::RunMigration.new(table: tabl, column: kolumn).call(kolumn, text, 'column')
-    end
-
-    def remove_column_text(tabl, kolumn, type_column)
-      type_kolumn = type_column[1].downcase.to_sym
-      text        = "remove_column :#{tabl.tableize}, :#{kolumn}\n"
-      text.concat "add_column :#{tabl.tableize}, :#{kolumn}, :#{type_kolumn}"
-    end
-  end
-end

data/lib/ryakuzu/column_info.rb

@@ -1,54 +0,0 @@
-module Ryakuzu
-  class ColumnInfo
-    include Ryakuzu::SchemaExtenstions
-
-    def initialize
-      @file   = File.open(Rails.root.join('db', 'schema.rb'))
-      @schema = Ryakuzu::Ripper.parse(file)
-    end
-
-    def call(table, column)
-      file.each do |line|
-        parts = line.split ' '
-        next if parts.nil? || parts.length < 1 || parts[0] == '#'
-        @table_name = table_name(parts[1]) if parts[0] == 'create_table'
-
-        next unless @table_name == table
-        @field_name = field_name(parts[1]) if parts[0][0] == 't'
-        next unless @field_name == column
-        parts[0][0] = ''
-        schema.each do |schema_line|
-          schema_line[1].each do |part|
-            next unless part == field_name(parts[1])
-            next unless parts[1]
-            hash        = remove_extra_chars(parts[0..1])
-            column      = column_and_type(hash, @table_name)
-            size        = parts[2..parts.count]
-            parameters  = remove_extra_chars(size)
-            temporary   = make_hash(parameters) if parameters
-            @columns    = column.merge!(temporary)
-          end
-        end
-      end
-      Ryakuzu::Column.new(@columns.symbolize_keys).column_info
-    end
-
-    private
-
-    def remove_extra_chars(lines)
-      lines.map { |e| e.gsub(/\W/, '') }
-    end
-
-    def column_and_type(lines, table_name)
-      { table: table_name, type: lines[0], column: lines[1] }
-    end
-
-    def make_hash(parameters)
-      temporary = {}
-      parameters.each_slice(2) do |slice|
-        temporary.merge!(Hash[*slice])
-      end
-      temporary
-    end
-  end
-end

data/lib/ryakuzu/schema_extenstions.rb

@@ -1,19 +0,0 @@
-module Ryakuzu
-  module SchemaExtenstions
-    require 'virtus'
-    require 'csv'
-    require 'fileutils'
-
-    attr_reader :file, :schema, :sch_hash
-
-    private
-
-    def table_name(table)
-      table.delete("\"").delete(',')
-    end
-
-    def field_name(field)
-      field.delete("\",").chomp('t.')
-    end
-  end
-end

data/lib/ryakuzu/schema_service.rb

@@ -1,67 +0,0 @@
-module Ryakuzu
-  class SchemaService
-    include Ryakuzu::SchemaExtenstions
-
-    def initialize
-      @file     = File.readlines(Rails.root.join('db', 'schema.rb'))
-      @schema   = ''
-      @sch_hash = {}
-    end
-
-    def call
-      parse_schema
-      create_hash_from_schema
-    end
-
-    def hash
-      call
-      models = []
-      sch_hash.map { |key, value| models << Ryakuzu::Table.generate_models(key, value) }
-      models
-    end
-
-    def schema_to_csv
-      CSV.open('schema.csv', 'wb') { |csv| sch_hash.to_a.map { |elem| csv << elem } }
-    end
-
-    private
-
-    def parse_schema
-      file.each do |line|
-        parts = line.split ' '
-        next if parts.nil? || parts.length < 1 || parts[0] == '#'
-        if parts[0] == 'create_table'
-          table_name = table_name(parts[1])
-          schema << "__#{table_name},"
-        end
-
-        if parts[0][0] == 't'
-          field_name = field_name(parts[1])
-          schema << "#{field_name}__"
-        end
-      end
-    end
-
-    def create_hash_from_schema
-      return if sch_hash.present?
-      array      = convert_source
-      hash_array = convert_to_hash(array)
-
-      hash_array.each_with_index do |i, _v|
-        sch_hash.merge!(i[0] => i.reject { |k| k == i[0] })
-      end
-    end
-
-    def convert_source
-      @schema = schema.split('__').join(',')
-      schema[0] = ''
-      schema.split(',,')
-    end
-
-    def convert_to_hash(array)
-      arr_m = []
-      array.map { |k, _v| arr_m << k.split(',') }
-      arr_m
-    end
-  end
-end

data/test/lib/schema_service_test.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-class SchemaServiceTest < ActiveSupport::TestCase
-  schema_array = [%w(authorizations user_id provider uid created_at updated_at), %w(bags team_id created_at updated_at), %w(enemies health magic attack exp move created_at updated_at type user_id img_url coins), %w(items name item_params itemable_id itemable_type created_at updated_at used), %w(monsters team_id user_id name health magic created_at updated_at img_link attack exp level previous_health previous_magic armed item_id), %w(shops name created_at updated_at), %w(teams user_id name level created_at updated_at monsters_count monsters_limit exp move to_next_level), %w(users email encrypted_password reset_password_token reset_password_sent_at remember_created_at sign_in_count current_sign_in_at last_sign_in_at current_sign_in_ip last_sign_in_ip created_at updated_at coins)]
-
-  test '#hash' do
-    schema = Ryakuzu::SchemaService.new
-
-    assert_equal schema.hash.map { |e| e.is_a?(Object) }[0], true
-    assert_equal schema.hash.is_a?(Array), true
-  end
-
-  test '#convert_to_hash' do
-    schema = Ryakuzu::SchemaService.new
-
-    schema.send(:parse_schema)
-    source = schema.send(:convert_source)
-
-    assert_equal schema.send(:convert_to_hash, source), schema_array
-  end
-
-  test '#call' do
-    schema = Ryakuzu::SchemaService.new
-
-    assert_equal schema_array, schema.call
-  end
-end