localtower 0.5.0 → 1.0.0

data/app/views/localtower/pages/new_migration.html.erb

@@ -0,0 +1,103 @@
+<% content_for :title do %>New Migration<% end %>
+<div class="row">
+  <div class="col-md-12">
+    <div class="card">
+      <div class="header">
+        <% if @models.empty? %>
+          <%= render partial: 'alert_no_models' %>
+        <% end %>
+        <div class="alert alert-warning">
+          <span>Remember, you can always edit your migration files manually before running "rails db:migrate"</span>
+        </div>
+      </div>
+      <div class="content">
+        <%= form_tag migrations_path, class: "form" do %>
+          <div class="row">
+            <div class="container-table" data-selector="table">
+              <table class="table table-hover table-striped">
+                <thead>
+                  <th> <span data-selector=''>On Model</span></th>
+                  <th> <span data-selector=''>Action</span></th>
+                  <th> <span data-selector='belongs_to_label'>Belongs To</span></th>
+                  <th> <span data-selector='column_label'>Column</span></th>
+                  <th> <span data-selector='default_label'>Default</span></th>
+                  <th> <span data-selector='new_column_name_label'>New Column Name</span></th>
+                  <th> <span data-selector='column_type_label'>Type</span></th>
+                  <th> <span data-selector='index_options_label'>Index Options</span></th>
+                  <th> <span data-selector='nullable_label'>Can be null?</span></th>
+                  <th> <span data-selector=''></span></th>
+                </thead>
+                <tbody data-selector="tbody">
+                  <tr data-selector="tr">
+                    <td style='width: 300px;'>
+                      <%= select_tag "migrations[][table_name]", options_for_select(Localtower::Tools.models.collect {|p| [ p, p.table_name ] }), class: "form-control" %>
+                    </td>
+                    <td style='width: 220px;'>
+                      <%= select_tag "migrations[][action]", options_for_select(::Localtower::Generators::Migration::ACTIONS), class: "form-control", "data-selector" => "action" %>
+                    </td>
+                    <td>
+                      <%= select_tag "migrations[][belongs_to]", options_for_select(Localtower::Tools.models.collect {|p| [ p, p.table_name ] }), class: "form-control", "data-selector" => "belongs_to" %>
+                    </td>
+                    <td class="text-center">
+                      <input type="text" name="migrations[][column]" class="form-control" data-selector="column_text">
+                      <%= select_tag "migrations[][column_list]", options_for_select(::Localtower::Tools.all_columns), class: "form-control", include_blank: true, "data-selector" => "column_list" %>
+                    </td>
+                    <td>
+                      <%= select_tag "migrations[][default]", options_for_select(::Localtower::Generators::ServiceObjects::InsertDefaults::DEFAULTS), class: "form-control", include_blank: true, "data-selector" => "default_input" %>
+                    </td>
+                    <td>
+                      <input type="text" name="migrations[][new_column_name]" class="form-control" data-selector="new_column_name">
+                    </td>
+                    <td>
+                      <%= select_tag "migrations[][column_type]", options_for_select(::Localtower::Generators::Migration::TYPES), class: "form-control", "data-selector" => "column_type" %>
+                    </td>
+                    <td>
+                      <div data-selector="index_options">
+                        <div class="row">
+                          <div class="col-md-4">
+                            index: <br>
+                            <%= select_tag "migrations[][index][using]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::USING - ['none']), class: "form-control" %>
+                          </div>
+                          <div class="col-md-4">
+                            unique:
+                            <br>
+                            <%= select_tag "migrations[][index][unique]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::UNIQUE), class: "form-control" %>
+                          </div>
+                          <div class="col-md-4">
+                            algorithm
+                            <br>
+                            <%= select_tag "migrations[][index][algorithm]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::ALGO), class: "form-control" %>
+                          </div>
+                        </div>
+                      </div>
+                    </td>
+                    <td>
+                      <input data-selector="nullable_input" type="checkbox" value="true" name="migrations[][nullable]" class="form-control" checked>
+                    </td>
+                    <td>
+                      <div class="pull-right">
+                        <button class="btn btn-danger btn-xs pointer" data-selector="removeLineMigration">Remove line</button>
+                      </div>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-12 text-center">
+              <i class="pe-7s-plus pointer" data-selector="duplicateLineNewMigration" style="font-size: 3em;"></i>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-12 text-right">
+              <button type="submit" value="true" class="btn btn-success btn-fill" data-selector="submitNewMigration">
+                Generate the migration
+              </button>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/localtower/pages/new_model.html.erb

@@ -0,0 +1,87 @@
+<% content_for :title do %>New Model<% end %>
+<div class="row">
+  <div class="col-md-12">
+    <div class="card">
+      <div class="header">
+        <div class="alert alert-warning">
+          <span>Remember, you can always edit your migration files manually before running "rails db:migrate"</span>
+        </div>
+      </div>
+      <div class="content">
+        <%= form_tag models_path, class: "form" do %>
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group">
+                <label>Name of the Model</label>
+                <input type="text" data-selector="modelName" name="model[model_name]" class="form-control">
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <table class="table table-hover table-striped">
+              <thead>
+                <th>Type</th>
+                <th>Column Name</th>
+                <th>Default</th>
+                <th>Index Options</th>
+                <th>Can be null?</th>
+                <th></th>
+              </thead>
+              <tbody data-selector="tbody">
+                <tr data-selector="tr">
+                  <td>
+                    <%= select_tag "model[attributes][][attribute_type]", options_for_select(::Localtower::Generators::Migration::TYPES), class: "form-control" %>
+                  </td>
+                  <td>
+                    <input type="text" data-selector="attributeName" name="model[attributes][][attribute_name]" class="form-control">
+                  </td>
+                  <td>
+                    <%= select_tag "model[attributes][][default]", options_for_select(::Localtower::Generators::ServiceObjects::InsertDefaults::DEFAULTS), class: "form-control" %>
+                  </td>
+                  <td style='min-width: 240px'>
+                    <div class="row">
+                      <div class="col-md-4">
+                        index: <br>
+                        <%= select_tag "model[attributes][][index][using]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::USING), class: "form-control" %>
+                      </div>
+                      <div class="col-md-4">
+                        unique:
+                        <br>
+                        <%= select_tag "model[attributes][][index][unique]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::UNIQUE), class: "form-control" %>
+                      </div>
+                      <div class="col-md-4">
+                        algorithm
+                        <br>
+                        <%= select_tag "model[attributes][][index][algorithm]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::ALGO), class: "form-control" %>
+                      </div>
+                    </div>
+                  </td>
+                  <td>
+                    <input type="checkbox" value="true" name="model[attributes][][nullable]" class="form-control" checked>
+                  </td>
+                  <td>
+                    <div class="pull-right">
+                      <button class="btn btn-danger btn-xs pointer" data-selector="removeLineModel">Remove line</button>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div class="row">
+            <div class="col-md-12 text-center">
+              <i class="pe-7s-plus pointer" data-selector="duplicateLineNewModel" style="font-size: 3em;"></i>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-12 text-right">
+              <button type="submit" value="true" class="btn btn-success btn-fill" data-selector="submitNewModel">
+                Generate the migration (and the model)
+              </button>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/config/routes.rb

@@ -1,13 +1,13 @@
 Localtower::Engine.routes.draw do
+  get 'migrations/new', to: 'pages#new_migration', as: :new_migration
   get 'migrations', to: 'pages#migrations', as: :migrations
   post 'migrations', to: 'pages#post_migrations'
 
+  get 'models/new', to: 'pages#new_model', as: :new_model
   get 'models', to: 'pages#models', as: :models
   post 'models', to: 'pages#post_models'
 
-  # get ':v/:asset', to: 'pages#asset_render', as: 'asset_render', :constraints => { :v => /[^\/]*/, :asset => /[^\/]*/ }
-  get 'schema', to: 'pages#schema', as: 'schema'
-  post 'actions', to: 'pages#post_actions', as: 'actions'
+  post 'actions', to: 'pages#post_actions', as: :actions
 
-  root :to => redirect('models')
+  root :to => redirect('models/new')
 end

data/lib/localtower/generators/migration.rb

@@ -5,24 +5,16 @@ module Localtower
       include Thor::Actions
 
       no_commands do
-        # data = {last_migration_file: "", column_type: "", table_name: "", column: "", nullable: true, index: true}
         def migration_add_column(data)
-          file = data["last_migration_file"]
-
           # Special case for array
-          if %w(array).include?(data["column_type"])
-            line  = "    add_column :#{data['table_name']}, :#{data['column']}, :text"
+          if %w[array].include?(data["column_type"])
+            line  = "    add_column :#{data['table_name']}, :#{data['column']}, :string"
             line << ", default: []"
             line << ", array: true"
-
-            # Add an gin inde as well:
-            line << "\n"
-            line << "    add_index :#{data['table_name']}, :#{data['column']}, using: :gin"
           else
             line  = "    add_column :#{data['table_name']}, :#{data['column']}, :#{data['column_type']}"
             line << ", default: #{data['default']}" if data['default'].present?
-            line << ", null: false" if not data['nullable']
-            line << ", index: true" if data['index'] == true
+            line << ", null: false" if data['nullable'] == false
           end
 
           line << "\n"
@@ -31,90 +23,68 @@ module Localtower
         end
 
         def migration_remove_column(data)
-          file = data['last_migration_file']
-
           line = "    remove_column :#{data['table_name']}, :#{data['column']}\n"
 
           inject_in_migration(file, line)
         end
 
         def migration_rename_column(data)
-          file = data['last_migration_file']
-
           line = "    rename_column :#{data['table_name']}, :#{data['column']}, :#{data['new_column_name']}\n"
 
           inject_in_migration(file, line)
         end
 
         def migration_change_column_type(data)
-          file = data['last_migration_file']
-
           line = "    change_column :#{data['table_name']}, :#{data['column']}, :#{data['new_column_type']}\n"
 
           inject_in_migration(file, line)
         end
 
         def migration_add_index_to_column(data)
-          file = data['last_migration_file']
-
-          line = "    add_index :#{data["table_name"]}, :#{data["column"]}\n"
+          line = "    add_index :#{data['table_name']}, :#{data['column']}\n"
 
           inject_in_migration(file, line)
-        end
-
-        # def migration_add_index_to_column_combined(data)
-        #   file = data["last_migration_file"]
-        #   attr_names = data["column"].split(",")
 
-        #   #     add_index :relationships, [:follower_id, :followed_id], unique: true
-        #   line = "    add_index :#{data["table_name"]}, [#{attr_names.map { |i| ":#{i}"}.join(', ')}]"
-        #   line << ", unique: true" if data["unique"]
-        #   line << "\n"
-
-        #   inject_in_migration(file, line)
-        # end
+          # Custom options:
+          params = [data]
+          .select { |attr| attr.dig('index', 'using').present? }
+          .reject { |attr| attr.dig('index', 'using') == 'none' }
+          .each_with_object([]) do |attr, arr|
+            arr << Hash[attr['column'], attr['index']]
+          end
+          ::Localtower::Generators::ServiceObjects::InsertIndexes.new(params).call
+        end
 
         def migration_remove_index_to_column(data)
-          file = data["last_migration_file"]
-
-          line = "    remove_index :#{data["table_name"]}, :#{data["column"]}\n"
+          line = "    remove_index :#{data['table_name']}, :#{data['column']}\n"
 
           inject_in_migration(file, line)
         end
 
         def migration_belongs_to(data)
-          file = data["last_migration_file"]
-
-          line = "    add_reference :#{data["table_name"]}, :#{data["column"]}, foreign_key: true, index: true\n"
+          line = "    add_reference :#{data['table_name']}, :#{data['column']}, foreign_key: true, index: true\n"
 
           inject_in_migration(file, line)
 
-          file = "#{Rails.root}/app/models/#{data["table_name"].underscore.singularize}.rb"
+          file = "#{Rails.root}/app/models/#{data['table_name'].underscore.singularize}.rb"
           after = /class #{data["table_name"].camelize.singularize} < ApplicationRecord\n/
-          line1 = "  belongs_to :#{data["column"].singularize.underscore}\n"
-
-          ::Localtower::Tools::ThorTools.new.insert_after_word(file, after, line1)
+          line1 = "  # belongs_to :#{data['column'].singularize.underscore}\n"
 
+          if File.exist?(file)
+            ::Localtower::Tools::ThorTools.new.insert_after_word(file, after, line1)
+          end
 
-          file = "#{Rails.root}/app/models/#{data["column"].underscore.singularize}.rb"
+          file = "#{Rails.root}/app/models/#{data['column'].underscore.singularize}.rb"
           after = /class #{data["column"].camelize.singularize} < ApplicationRecord\n/
-          line1 = "  has_many :#{data["table_name"].pluralize.underscore}\n"
-
-          ::Localtower::Tools::ThorTools.new.insert_after_word(file, after, line1)
-        end
-
-        def migration_create_table(data)
-          file = data["last_migration_file"]
-
-          line = "    create_table :#{data["table_name"]}\n"
+          line1 = "  # has_many :#{data['table_name'].pluralize.underscore}\n"
 
-          inject_in_migration(file, line)
+          if File.exist?(file)
+            ::Localtower::Tools::ThorTools.new.insert_after_word(file, after, line1)
+          end
         end
 
         def migration_drop_table(data)
-          file = data["last_migration_file"]
-
-          line = "    drop_table :#{data["table_name"]}, force: :cascade\n"
+          line = "    drop_table :#{data['table_name']}\n"
 
           inject_in_migration(file, line)
         end
@@ -122,55 +92,42 @@ module Localtower
         private
 
         def inject_in_migration(file, line)
-          inject_into_file(file, line,  after: "def change\n")
+          inject_into_file(file, line, before: "  end\nend")
+        end
+
+        def file
+          Localtower::Tools.last_migration
         end
       end
     end
 
     class Migration
-      TYPES = %w(string datetime text uuid integer float json jsonb decimal binary boolean array references).freeze
-      ACTIONS = [
-        'add_column',
-        'remove_column',
-        'rename_column',
-        'change_column_type',
-        'add_index_to_column',
-        'belongs_to',
-        'remove_index_to_column',
-        'drop_table',
+      TYPES = %w[string datetime date text uuid integer float json jsonb decimal binary boolean array references].freeze
+      ACTIONS = %w[
+        add_column
+        add_index_to_column
+        remove_index_to_column
+        belongs_to
+        remove_column
+        change_column_type
+        rename_column
+        drop_table
       ].freeze
 
-      DEFAULTS = [
-        "true", "false", "nil", "0"
-      ]
-
       # @opts =
-      def initialize(opts)
+      def initialize(migrations)
         @thor = ThorGeneratorMigration.new
-        @opts = JSON[opts.to_json]
+        @migrations = JSON[migrations.to_json]
       end
 
-      # @opts['migrations'] = []
-      # @opts['run_migrate'] = true
       def run
-        model_names = @opts['migrations'].map { |line| line['table_name'].camelize }.join
-
-        cmd = "Change#{model_names}#{@opts['migration_name']}At#{Time.now.to_i}"
-        ::Localtower::Tools.perform_migration(cmd, true)
+        model_names = migrations.map { |line| line['table_name'].camelize }.uniq.join
 
-        @opts['migrations'].each do |action_line|
-          next unless action_line['action'].present?
+        cmd = "Change#{model_names}At#{Time.now.to_i}"
+        ::Localtower::Tools.perform_migration(cmd)
 
-          # table_name = action_line['table_name']
-          # column = action_line['column']
-          # index = action_line['index']
-          # default = action_line['default']
-          # null = action_line['null']
-          # unique = action_line['unique']
-          # column_type = action_line['column_type']
-          # new_column_type = action_line['new_column_type']
-          # new_column_name = action_line['new_column_name']
-          action_line["last_migration_file"] = last_migration_file
+        migrations.each do |action_line|
+          next if action_line['action'].blank?
 
           {
             'add_column' => -> { add_column(action_line) },
@@ -180,24 +137,15 @@ module Localtower
             'add_index_to_column' => -> { add_index_to_column(action_line) },
             'belongs_to' => -> { belongs_to(action_line) },
             'remove_index_to_column' => -> { remove_index_to_column(action_line) },
-            'create_table' => -> { create_table(action_line) },
             'drop_table' => -> { drop_table(action_line) }
-            }[action_line['action'].downcase].call
-        end
-
-        if @opts['run_migrate']
-          run_migration_or_nil
+          }[action_line['action']].call
         end
       end
 
-      #====================================
-      def last_migration_file
-        Dir["#{Rails.root}/db/migrate/*"].sort.last
-      end
-
-      # VALIDATION before continuing:
       private
 
+      attr_reader :migrations
+
       def add_column(data)
         @thor.migration_add_column(data)
       end
@@ -229,26 +177,9 @@ module Localtower
         @thor.migration_remove_index_to_column(data)
       end
 
-      def create_table(data)
-        @thor.migration_create_table(data)
-      end
-
       def drop_table(data)
         @thor.migration_drop_table(data)
       end
-
-      def run_migration_or_nil
-        if last_migration_changed?
-          ::Localtower::Tools.perform_cmd('rake db:migrate')
-        else
-          File.delete(last_migration_file)
-          nil
-        end
-      end
-
-      def last_migration_changed?
-        File.readlines(last_migration_file).join != ~ /def change\n  end/
-      end
     end
   end
 end

data/lib/localtower/generators/model.rb

@@ -3,52 +3,76 @@ module Localtower
     class Model
       def initialize(opts)
         @opts = JSON[opts.to_json] # stringify keys
+        @model_name = @opts['model_name']
+        @attributes = @opts['attributes']
+
+        raise "No model_name provided" if @model_name.blank?
+        raise "No attributes provided" if @attributes.blank?
       end
 
-      # data = {attributes: "", model_name: ""}
       def run
-        return nil if @opts['attributes'].blank?
-        return nil if @opts['model_name'].blank?
-
-        attributes_list = []
+        attributes_str = parse_attributes.join(" ")
+        cmd = "rails generate model #{model_name.camelize} #{attributes_str}"
 
-        @opts['attributes'].each do |attribute_data|
-          str = "#{attribute_data["attribute_name"]}:#{attribute_data["attribute_type"]}"
-          str << ":index" if attribute_data["index"]
+        ::Localtower::Tools.perform_cmd(cmd)
 
-          attributes_list << str
-        end
+        insert_non_nullable_values
+        insert_default_values
+        insert_array
+        insert_indexes
+      end
 
-        attributes_str = attributes_list.join(" ")
-        cmd = "rails g model #{@opts['model_name'].camelize} #{attributes_str}"
+      private
 
-        ::Localtower::Tools.perform_cmd(cmd, false)
+      attr_reader :model_name
+      attr_reader :attributes
 
-        if defaults_present?
-          insert_default_values.call
+      def parse_attributes
+        attributes.map do |attr_hash|
+          [
+            attr_hash['attribute_name'],
+            (attr_hash['attribute_type'] == 'array' ? 'string' : attr_hash['attribute_type']), # we need this transformation of "array"
+            (attr_hash.dig('index', 'using') != 'none') ? 'index' : nil
+          ].compact.join(':')
         end
+      end
 
-        if @opts['run_migrate']
-          ::Localtower::Tools.perform_cmd('rake db:migrate', false)
-        end
+      def insert_array
+        params = attributes
+          .select { |attr| attr['attribute_type'] == 'array' }
+          .map { |attr| attr['attribute_name'] }
 
-        self
+        Localtower::Generators::ServiceObjects::InsertArray.new(params).call
       end
 
-      private
+      def insert_default_values
+        params = attributes
+          .reject { |attr| attr['default'] == nil }
+          .reject { |attr| attr['default'] == '' }
+          .each_with_object([]) do |attr, arr|
+          arr << Hash[attr['attribute_name'], attr['default']]
+        end
 
-      def defaults_present?
-        @opts['attributes'].any? { |attr| attr["defaults"].present? }
+        Localtower::Generators::ServiceObjects::InsertDefaults.new(params).call
       end
 
-      def params_for_defaults
-        @opts['attributes'].each_with_object([]) do |attr, arr|
-          arr << Hash[ attr['attribute_name'], attr['defaults'] ] unless attr['defaults'].empty?
-        end
+      def insert_non_nullable_values
+        params = attributes
+          .select { |attr| attr['nullable'] == false }
+          .map{ |attr| attr['attribute_name'] }
+
+        ::Localtower::Generators::ServiceObjects::InsertNullable.new(params).call
       end
 
-      def insert_default_values
-        ::Localtower::Generators::ServiceObjects::InsertDefaults.new(params_for_defaults)
+      def insert_indexes
+        params = attributes
+          .select { |attr| attr.dig('index', 'using').present? }
+          .reject { |attr| attr.dig('index', 'using') == 'none' }
+          .each_with_object([]) do |attr, arr|
+            arr << Hash[attr['attribute_name'], attr['index']]
+          end
+
+        ::Localtower::Generators::ServiceObjects::InsertIndexes.new(params).call
       end
     end
   end

data/lib/localtower/generators/service_objects/insert_array.rb

@@ -0,0 +1,23 @@
+module Localtower
+  module Generators
+    module ServiceObjects
+      class InsertArray
+        def initialize(attributes)
+          @attributes = attributes
+        end
+
+        def call
+          attributes.each do |attribute|
+            line_str = File.read(Localtower::Tools.last_migration).match(/((.*)t\.string :#{attribute})/)[0]
+            content = File.read(Localtower::Tools.last_migration).gsub(line_str, "#{line_str}, array: true")
+            File.write(Localtower::Tools.last_migration, content)
+          end
+        end
+
+        private
+
+        attr_reader :attributes
+      end
+    end
+  end
+end