localtower 0.2.3 → 0.4.1

data/spec/factories/migration.rb

@@ -1,161 +1,183 @@
-FactoryGirl.define do
-  factory :create_table, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "create_table",
-        table_name: "posts"
-      }
-    ]
+FactoryBot.define do
+  factory :create_table, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "create_table",
+          table_name: "posts"
+        }
+      ]
+    end
   end
 
-  factory :create_table_two, class: Hash do
-    migration_name "User"
-    migrations [
-      {
-        action: "create_table",
-        table_name: "users"
-      }
-    ]
+  factory :create_table_two, class: "Hash" do
+    migration_name { "User" }
+    migrations do
+      [
+        {
+          action: "create_table",
+          table_name: "users"
+        }
+      ]
+    end
   end
 
-  factory :add_column, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "add_column",
-        table_name: "posts",
-        column: "title",
-        column_type: "string",
-        index: true,
-        nullable: true,
-      },
-      {
-        action: "add_column",
-        table_name: "posts",
-        column: "content",
-        column_type: "text",
-        index: false,
-        nullable: true,
-      },
-      {
-        action: "add_column",
-        table_name: "posts",
-        column: "views",
-        column_type: "integer",
-        index: true,
-        default: 0,
-        nullable: false,
-      },
-      {
-        action: "add_column",
-        table_name: "posts",
-        column: "tags",
-        column_type: "array",
-        index: true,
-        nullable: true,
-      }
-    ]
+  factory :add_column, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "add_column",
+          table_name: "posts",
+          column: "title",
+          column_type: "string",
+          index: true,
+          nullable: true,
+        },
+        {
+          action: "add_column",
+          table_name: "posts",
+          column: "content",
+          column_type: "text",
+          index: false,
+          nullable: true,
+        },
+        {
+          action: "add_column",
+          table_name: "posts",
+          column: "views",
+          column_type: "integer",
+          index: true,
+          default: 0,
+          nullable: false,
+        },
+        {
+          action: "add_column",
+          table_name: "posts",
+          column: "tags",
+          column_type: "array",
+          index: true,
+          nullable: true,
+        }
+      ]
+    end
   end
 
-  factory :add_column_fail, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "add_column",
-        table_name: "posts",
-        column: "title",
-        # column_type: "string",
-      }
-    ]
+  factory :add_column_fail, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "add_column",
+          table_name: "posts",
+          column: "title",
+          # column_type: "string",
+        }
+      ]
+    end
   end
 
-  factory :rename_column, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "rename_column",
-        table_name: "posts",
-        column: "content",
-        new_column_name: "content_new",
-      }
-    ]
+  factory :rename_column, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "rename_column",
+          table_name: "posts",
+          column: "content",
+          new_column_name: "content_new",
+        }
+      ]
+    end
   end
 
-  factory :remove_column, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "remove_column",
-        table_name: "posts",
-        column: "title",
-      },
-      {
-        action: "rename_column",
-        table_name: "posts",
-        column: "views",
-        new_column_name: "views_by_users",
-      }
-    ]
+  factory :remove_column, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "remove_column",
+          table_name: "posts",
+          column: "title",
+        },
+        {
+          action: "rename_column",
+          table_name: "posts",
+          column: "views",
+          new_column_name: "views_by_users",
+        }
+      ]
+    end
   end
 
-  factory :change_column_type, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "change_column_type",
-        table_name: "posts",
-        column: "content_new",
-        new_column_type: "string",
-      },
-      {
-        action: "add_index_to_column",
-        table_name: "posts",
-        column: "views_by_users",
-      }
-    ]
+  factory :change_column_type, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "change_column_type",
+          table_name: "posts",
+          column: "content_new",
+          new_column_type: "string",
+        },
+        {
+          action: "add_index_to_column",
+          table_name: "posts",
+          column: "views_by_users",
+        }
+      ]
+    end
   end
 
-  factory :add_index_to_column, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "add_index_to_column",
-        table_name: "posts",
-        column: "content_new",
-      }
-    ]
+  factory :add_index_to_column, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "add_index_to_column",
+          table_name: "posts",
+          column: "content_new",
+        }
+      ]
+    end
   end
 
-  factory :belongs_to, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "belongs_to",
-        table_name: "posts",
-        belongs_to: "users",
-      }
-    ]
+  factory :belongs_to, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "belongs_to",
+          table_name: "posts",
+          belongs_to: "users",
+        }
+      ]
+    end
   end
 
-  factory :remove_index_to_column, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "remove_index_to_column",
-        table_name: "posts",
-        column: "views_by_users",
-      }
-    ]
+  factory :remove_index_to_column, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "remove_index_to_column",
+          table_name: "posts",
+          column: "views_by_users",
+        }
+      ]
+    end
   end
 
-  factory :drop_table, class: Hash do
-    migration_name "Post"
-    migrations [
-      {
-        action: "drop_table",
-        table_name: "posts",
-      }
-    ]
+  factory :drop_table, class: "Hash" do
+    migration_name { "Post" }
+    migrations do
+      [
+        {
+          action: "drop_table",
+          table_name: "posts",
+        }
+      ]
+    end
   end
 end

data/spec/factories/model.rb

@@ -1,36 +1,40 @@
-FactoryGirl.define do
-  factory :post_one, class: Hash do
-    model_name "Post"
-    attributes [
-      {
-        attribute_name: "title",
-        attribute_type: "string",
-        index: true
-      },
-      {
-        attribute_name: "content",
-        attribute_type: "text"
-      }
-    ]
+FactoryBot.define do
+  factory :post_one, class: "Hash" do
+    model_name { "Post" }
+    attributes do
+      [
+        {
+          attribute_name: "title",
+          attribute_type: "string",
+          index: true
+        },
+        {
+          attribute_name: "content",
+          attribute_type: "text"
+        },
+      ]
+    end
   end
 
-  factory :user_one, class: Hash do
-    model_name "User"
-    attributes [
-      {
-        attribute_name: "name",
-        attribute_type: "string",
-        index: true,
-      },
-      {
-        attribute_name: "metadata",
-        attribute_type: "jsonb"
-      },
-    ]
+  factory :user_one, class: "Hash" do
+    model_name { "User" }
+    attributes do
+      [
+        {
+          attribute_name: "name",
+          attribute_type: "string",
+          index: true,
+        },
+        {
+          attribute_name: "metadata",
+          attribute_type: "jsonb"
+        },
+      ]
+    end
   end
 
-  factory :relation_one, class: Hash do
-    model_one_name "User"
-    model_two_name "Post"
+  factory :relation_one, class: "Hash" do
+    model_one_name { "User" }
+    model_two_name { "Post" }
   end
 end

data/spec/lib/localtower/generators/model_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 module Localtower
   module Generators
     describe Model do
-
       before(:all) do
         clean_files
       end
@@ -21,9 +20,9 @@ module Localtower
         expect(::Localtower::Tools.word_in_file?("#{Rails.root}/app/models/post.rb", /class Post/)).to eq(true)
 
         expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /create_table "posts"/)).to eq(true)
-        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.string   "title"/)).to eq(true)
-        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.text     "content"/)).to eq(true)
-        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.index \["title"\], name: "index_posts_on_title", using: :btree/)).to eq(true)
+        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.string(.*)"title"/)).to eq(true)
+        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.text(.*)"content"/)).to eq(true)
+        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.index(.*)\["title"\], name: "index_posts_on_title"/)).to eq(true)
       end
 
       it 'create a user' do
@@ -35,9 +34,9 @@ module Localtower
         expect(File.exist?("#{Rails.root}/app/models/user.rb")).to eq(true)
         expect(::Localtower::Tools.word_in_file?("#{Rails.root}/app/models/user.rb", /class User/)).to eq(true)
         expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /create_table "users"/)).to eq(true)
-        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.string   "name"/)).to eq(true)
-        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.jsonb    "metadata"/)).to eq(true)
-        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.index \["name"\], name: "index_users_on_name", using: :btree/)).to eq(true)
+        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.string(.*)"name"/)).to eq(true)
+        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.jsonb(.*)"metadata"/)).to eq(true)
+        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.index(.*)\["name"\], name: "index_users_on_name"/)).to eq(true)
       end
     end
   end

data/spec/lib/localtower/generators/relation_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 module Localtower
   module Generators
     describe Relation do
-
       before(:all) do
         clean_files
       end
@@ -48,8 +47,12 @@ module Localtower
 
         expect(::Localtower::Tools.word_in_file?("#{Rails.root}/app/models/user_post.rb", /class UserPost/)).to eq(true)
         expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /create_table "user_posts"/)).to eq(true)
-        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.integer  "user_id"/)).to eq(true)
-        expect(::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.integer  "post_id"/)).to eq(true)
+
+        user_id = ::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.integer(.*)"user_id"/) || ::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.bigint(.*)"user_id"/)
+        post_id = ::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.integer(.*)"post_id"/) || ::Localtower::Tools.word_in_file?("#{Rails.root}/db/schema.rb", /t.bigint(.*)"post_id"/)
+
+        expect(user_id).to eq(true)
+        expect(post_id).to eq(true)
 
         expect(::Localtower::Tools.word_in_file?("#{Rails.root}/app/models/user.rb", /has_many :posts, through: :user_posts/)).to eq(true)
         expect(::Localtower::Tools.word_in_file?("#{Rails.root}/app/models/user.rb", /has_many :posts/)).to eq(true)

data/spec/spec_helper.rb

@@ -17,21 +17,13 @@ ENV['RAILS_ENV'] = 'test'
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
-require 'factory_girl'
-
-# require 'simplecov'
-# Dir["#{File.join(File.dirname(__FILE__), '..')}/lib/**/*.rb"].each {|file| load file }
-
-# SimpleCov.start do
-#   add_group 'Lib', '../lib'
-#   add_group 'App', '../app'
-# end
+require 'factory_bot'
 
 Rails.application.eager_load!
 Rails.backtrace_cleaner.remove_silencers!
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
   config.mock_with :rspec
   config.use_transactional_fixtures = false
@@ -41,7 +33,7 @@ RSpec.configure do |config|
   # config.order = 'random'
 
   config.before(:suite) do
-    FactoryGirl.find_definitions
+    FactoryBot.find_definitions
   end
 
   config.before(:all) do
@@ -52,4 +44,3 @@ RSpec.configure do |config|
     clean_files
   end
 end
-