effective_developer 0.5.5 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4f396c9ab5a37dfca3a796aa10d204827c3e34de709bf9d1d8ce1db2af5201
-  data.tar.gz: 4a6034049262d3f56c850dc6a2bc05de3f29201debd3b26ec3ae22851532bfa7
+  metadata.gz: 3d495b7c0e191545d03edac8297a4e6d70b0e73c60e3e750a7746a43a9c45ae0
+  data.tar.gz: fda29335818a87f2e76bd21c4f8018aab29833082682ca931339a127d7a9d1d0
 SHA512:
-  metadata.gz: eaeec872eeb393fe930c08ea2a14d8ebd17af0e9df9a4ac2c7fdb21047b2888386c6d3b4f5afefd2ecd6e78d11dc81816c6ad6ae83e56e5af6877b4a6b903354
-  data.tar.gz: ed971e8f872fa301fbb1dde42fac07f704f1e0eec46b53fb1250f634cc67e7787362a829d958f160c9084195f459daedd74d4fae6015f2012759318d33c49c64
+  metadata.gz: 4bbed134e5bc6f0b78231501cd866a581a878dd4b5734ca74b480bfc49bc014c25a5e2a23074a62ccdc4ac90d40220ed6a7f5fb42a8c68c44979fd909d427635
+  data.tar.gz: b97abb74e30855a39100c9ca66785e89148bfda8e1cc427170b67767007078a5818e194adf34541806d6c4809a3b45bf1bfba97305bff663c4643c21c319d347

data/app/models/effective/annotator.rb

@@ -0,0 +1,81 @@
+# Writes the effective_resource do .. end block into the model file
+module Effective
+  class Annotator
+
+    def initialize(resource: 'All', folders: 'app/models/')
+      @resources = Array(resource).map { |resource| resource.to_s.classify }
+      @folders = Array(folders)
+    end
+
+    def annotate!
+      @folders.each do |folder|
+        Dir.glob(folder + '**/*').each do |path|
+          next if File.directory?(path)
+
+          name = path.sub(folder, '').split('.')[0...-1].join('.')
+          resource = Effective::Resource.new(name)
+          klass = resource.klass
+
+          next if klass.blank?
+          next unless klass.ancestors.include?(ActiveRecord::Base)
+          next if klass.abstract_class?
+          next unless @resources.include?('All') || @resources.include?(klass.name)
+
+          annotate(resource, path)
+        end
+      end
+
+      puts 'All Done. Have a great day.'
+      true
+    end
+
+    private
+
+    def annotate(resource, path)
+      puts "Annotate: #{path}"
+
+      Effective::CodeWriter.new(path) do |writer|
+        index = find_insert_at(writer)
+        content = build_content(resource)
+
+        remove_existing(writer)
+        writer.insert(content, index)
+      end
+    end
+
+    def find_insert_at(writer)
+      index = writer.first { |line| line.include?('effective_resource do') || line.include?('structure do') }
+
+      index ||= begin
+        index = writer.first { |line| line.include?('validates :') || line.include?('scope :') || line.include?('def ') }
+        index - 1 if index
+      end
+
+      [1, index.to_i-1].max
+    end
+
+    def remove_existing(writer)
+      from = writer.first { |line| line.include?('effective_resource do') || line.include?('structure do') }
+      return unless from.present?
+
+      to = writer.first(from: from) { |line| line == 'end' || line == '# end' }
+      return unless to.present?
+
+      writer.remove(from: from, to: to+1)
+    end
+
+    def build_content(resource)
+      attributes = resource.klass_attributes(all: true)
+      atts = attributes.except(resource.klass.primary_key.to_sym, :created_at, :updated_at)
+
+      max = atts.map { |k, v| k.to_s.length }.max.to_i + 4
+      max = max + 1 unless (max % 2 == 0)
+
+      lines = atts.map { |k, v| k.to_s + (' ' * (max - k.to_s.length)) + ":#{v.first}" }
+      lines += ['', 'timestamps'] if attributes.key?(:created_at) && attributes.key?(:updated_at)
+
+      ['effective_resource do'] + lines + ['end']
+    end
+
+  end
+end

data/app/models/effective/code_writer.rb

@@ -228,13 +228,17 @@ module Effective
       lines.each { |line| @changed = true if line.gsub!(source, target) }
     end
 
+    def remove(from:, to:)
+      raise('expected from to be less than to') unless from.present? && to.present? && (from < to)
+      @changed = true
+      (to - from).times { lines.delete_at(from) }
+    end
+
     def replace(index, content)
       @changed = true
       lines[index].replace(content.to_s)
     end
 
-    private
-
     def write!
       return false unless changed?
 
@@ -245,6 +249,8 @@ module Effective
       true
     end
 
+    private
+
     def open?(content)
       stripped = ss(content)
 

data/app/models/effective/form_upgrader.rb

@@ -0,0 +1,197 @@
+# Upgrades simple_form_for to effective_form_with
+module Effective
+  class FormUpgrader
+
+    def initialize(folder: 'app/views/')
+      @folders = Array(folder)
+    end
+
+    def upgrade!
+      @folders.each do |folder|
+        Dir.glob(folder + '**/*').each do |path|
+          next if File.directory?(path)
+          next unless path.include?('.html')
+
+          writer = Effective::CodeWriter.new(path)
+
+          name = path.split('/')[0...-1] - ['app', 'views']
+          resource = Effective::Resource.new(name)
+
+          if writer.find { |line| line.include?('simple_form_for') }
+            upgrade_simple_form(writer, resource)
+          elsif writer.find { |line| line.include?('semantic_form_for') }
+            upgrade_formtastic(writer, resource)
+          elsif writer.find { |line| line.include?('form_for') }
+            upgrade_form_for(writer, resource)
+          else
+            next # Nothing to do
+          end
+
+          writer.write!
+        end
+      end
+
+      puts 'All Done. Have a great day.'
+      true
+    end
+
+    private
+
+    SIMPLE_FORM_FOR_REGEX = /simple_form_for( |\()(\[:[^,]+, ?[^,]+\])?(([^,]+),)?.+do \|(\w+)\|/
+    SIMPLE_FORM_INPUT_ATTRIBUTE = /\.input( |\():(\w+)/
+    SIMPLE_FORM_INPUT_AS_ONE = /(as: :(\w+))/
+    SIMPLE_FORM_INPUT_AS_TWO = /(:as => :(\w+))/
+    SIMPLE_FORM_INPUT_COLLECTION_ONE = /(collection: ([^,]+?))(,|$)/
+    SIMPLE_FORM_INPUT_COLLECTION_TWO = /(:collection => :([^,]+?))(,|$)/
+
+    def upgrade_simple_form(writer, resource)
+      puts "Upgrading simple form: #{writer.filename}"
+
+      letter = nil
+      model = nil
+
+      # Replace simple_form_for
+      writer.all { |line| line.include?('simple_form_for') }.each do |line|
+        content = writer.lines[line]
+        matched = content.match(SIMPLE_FORM_FOR_REGEX)
+        raise("unable to match simple_form_for from:\n#{content}") unless matched.present?
+
+        original = matched[0]
+        model = matched[2] || matched[4]
+        letter = matched[5]
+
+        raise("unable to determine simple_form_for subject from:\n#{content}") unless original && model && letter
+
+        content.sub!(original, "effective_form_with(model: #{model}) do |#{letter}|")
+        writer.replace(line, content)
+      end
+
+      # Try to figure out klass again if its missing from filename
+      if resource.klass.blank? && model.present?
+        name = model.sub('[', '').sub(']', '').sub(' ', '').split(',').map do |value|
+          value.sub('current_', '').sub('@', '').sub(':', '')
+        end
+
+        resource = Effective::Resource.new(name)
+      end
+
+      if resource.klass.blank? && writer.filename.include?('/devise/')
+        resource = Effective::Resource.new('user')
+      end
+
+      if resource.klass.blank?
+        puts " => Warning: Unable to determine klass of #{model}"
+      end
+
+      # Replace .input
+      writer.all { |line| line.include?('.input :') }.each do |line|
+        content = writer.lines[line]
+        attribute = content.match(SIMPLE_FORM_INPUT_ATTRIBUTE)
+        raise("unable to match simple_form_for input attribute from\n#{content}") unless attribute.present?
+
+        as = content.match(SIMPLE_FORM_INPUT_AS_ONE) || content.match(SIMPLE_FORM_INPUT_AS_TWO)
+        collection = content.match(SIMPLE_FORM_INPUT_COLLECTION_ONE) || content.match(SIMPLE_FORM_INPUT_COLLECTION_TWO)
+
+        if as.present?
+          content.sub!(",#{as[0]}", '')
+          content.sub!(", #{as[0]}", '')
+        end
+
+        if collection.present?
+          content.sub!(",#{collection[0]}", ',')
+          content.sub!(", #{collection[0]}", ',')
+          content.sub!(attribute[0], "#{attribute[0]} #{collection[2]},")
+        end
+
+        input_type = find_input_type(resource: resource, attribute: attribute[2], as: (as[2] if as))
+
+        content.sub!('input', input_type)
+        writer.replace(line, content)
+      end
+
+      # Replace simple_fields_for
+      writer.all { |line| line.include?(".simple_fields_for") }.each do |line|
+        content = writer.lines[line]
+
+        content.sub!(".simple_fields_for", ".has_many")
+        writer.replace(line, content)
+      end
+
+      # Replace f.submit
+      writer.all { |line| line.include?("#{letter}.submit") }.each do |line|
+        content = writer.lines[line]
+
+        content.sub!("#{letter}.submit", "#{letter}.save")
+        writer.replace(line, content)
+      end
+
+      # Replace f.button :submit
+      writer.all { |line| line.include?(".button :submit,") }.each do |line|
+        content = writer.lines[line]
+
+        content.sub!(".button :submit,", ".submit")
+        writer.replace(line, content)
+      end
+
+      # Replace .form-actions
+      writer.all { |line| line == '.form-actions' }.each do |line|
+        content = writer.lines[line]
+
+        content.sub!('.form-actions', "= #{letter}.submit do")
+        writer.replace(line, content)
+      end
+    end
+
+    def upgrade_formtastic(writer, resource)
+      puts "Detected formtastic: #{writer.filename}"
+    end
+
+    def upgrade_form_for(writer, resource)
+      puts "Detected rails form_for: #{writer.filename}"
+    end
+
+    def find_input_type(attribute:, resource:, as: nil)
+      input_type = (as || resource.sql_type(attribute)).to_s
+
+      case input_type
+      when 'asset_box_simple_form' then 'file_field'
+      when 'belongs_to', 'belongs_to_polymorphic' then 'select'
+      when 'boolean' then 'check_box'
+      when 'check_boxes' then 'checks'
+      when 'date' then 'date_field'
+      when 'datetime' then 'datetime_field'
+      when 'decimal' then 'float_field'
+      when 'effective_ckeditor_text_area' then 'rich_text_area' # I guess
+      when 'effective_date_picker' then 'date_field'
+      when 'effective_date_time_picker' then 'datetime_field'
+      when 'effective_email' then 'email_field'
+      when 'effective_price' then 'price_field'
+      when 'effective_radio_buttons' then 'radios'
+      when 'effective_select' then 'select'
+      when 'effective_static_control' then 'static_field'
+      when 'effective_tel' then 'phone_field'
+      when 'effective_time_picker' then 'time_field'
+      when 'effective_url' then 'url_field'
+      when 'email' then 'email_field'
+      when 'file' then 'file_field'
+      when 'hidden' then 'hidden_field'
+      when 'integer' then 'number_field'
+      when 'number' then 'number_field'
+      when 'password' then 'password_field'
+      when 'phone' then 'phone_field'
+      when 'price' then 'price_field'
+      when 'radio_buttons' then 'radios'
+      when 'search' then 'search_field'
+      when 'select' then 'select'
+      when 'static_control' then 'static_field'
+      when 'string' then 'text_field'
+      when 'tel', 'telephone' then 'phone_field'
+      when 'text' then 'text_area'
+      when 'url' then 'url_field'
+      else
+        raise("unknown input type #{input_type} (for attribute :#{attribute})")
+      end
+    end
+
+  end
+end

data/app/models/effective/profiler.rb

@@ -32,7 +32,5 @@ module Effective
       retval
     end
 
-
   end
-
 end

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.6.4'.freeze
 end

data/lib/generators/effective/ability_generator.rb

@@ -15,20 +15,26 @@ module Effective
 
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def invoke_ability
         say_status :invoke, :ability, :white
       end
 
       def create_ability
-        unless File.exists?('app/models/ability.rb')
+        unless File.exists?(resource.abilities_file)
           say_status(:skipped, :ability, :yellow) and return
         end
 
-        Effective::CodeWriter.new('app/models/ability.rb') do |w|
-          if w.find { |line, depth| depth == 2 && line == ability }
+        Effective::CodeWriter.new(resource.abilities_file) do |w|
+          if w.find { |line, depth| (depth == 2 || depth == 3) && line == ability }
             say_status :identical, ability, :blue
           else
-            w.insert_into_first(ability) { |line, depth| line.start_with?('def initialize') }
+            w.insert_into_first(ability + "\n") { |line, depth| line.start_with?('def initialize') || line.end_with?('abilities(user)') }
+
+            say_status :ability, ability
           end
         end
       end
@@ -55,7 +61,13 @@ module Effective
             abilities = '[' + abilities.map { |action| ':' + action }.join(', ') + ']'
           end
 
-          "can #{abilities}, #{resource.class_name}"
+          name = if resource.module_name.present?
+            resource.class_name.split('::').last
+          else
+            resource.class_name
+          end
+
+          "can #{abilities}, #{name}"
         )
       end
     end

data/lib/generators/effective/controller_generator.rb

@@ -17,6 +17,10 @@ module Effective
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
       class_option :attributes, type: :array, default: [], desc: 'Included permitted params, otherwise read from model'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def assign_actions
         @actions = invoked_actions
       end

data/lib/generators/effective/datatable_generator.rb

@@ -4,7 +4,7 @@
 
 # Generates a datatable
 # rails generate effective:datatable Thing
-# rails generate effective:controller Thing name:string description:text
+# rails generate effective:datatable Thing name:string description:text
 
 module Effective
   module Generators
@@ -18,6 +18,10 @@ module Effective
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
       class_option :attributes, type: :array, default: [], desc: 'Included permitted params, otherwise read from model'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def assign_attributes
         @attributes = invoked_attributes.presence || resource_attributes(all: true)
         self.class.send(:attr_reader, :attributes)
@@ -32,7 +36,10 @@ module Effective
           say_status(:skipped, :datatable, :yellow) and return
         end
 
-        template 'datatables/datatable.rb', resource.datatable_file
+        with_resource_tenant do
+          template 'datatables/datatable.rb', resource.datatable_file
+        end
+
       end
 
     end

data/lib/generators/effective/form_generator.rb

@@ -20,6 +20,10 @@ module Effective
       argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
       class_option :tabbed, type: :string, default: 'true'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def assign_attributes
         @attributes = invoked_attributes.presence || resource_attributes
         self.class.send(:attr_reader, :attributes)
@@ -30,15 +34,19 @@ module Effective
       end
 
       def create_flat_form
-        if options[:tabbed] == 'false'
-          template 'forms/flat/_form.html.haml', resource.view_file('form', partial: true)
+        with_resource_tenant do
+          if options[:tabbed] == 'false'
+            template 'forms/flat/_form.html.haml', resource.view_file('form', partial: true)
+          end
         end
       end
 
       def create_tabbed_form
-        if options[:tabbed] == 'true'
-          template 'forms/tabbed/_form.html.haml', resource.view_file('form', partial: true)
-          template 'forms/tabbed/_form_resource.html.haml', resource.flat_view_file("form_#{resource.name}", partial: true)
+        with_resource_tenant do
+          if options[:tabbed] == 'true'
+            template 'forms/tabbed/_form.html.haml', resource.view_file('form', partial: true)
+            template 'forms/tabbed/_form_resource.html.haml', resource.view_file("form_#{resource.name}", partial: true)
+          end
         end
       end
 

data/lib/generators/effective/helpers.rb

@@ -4,6 +4,24 @@ module Effective
 
       protected
 
+      # This is kind of a validate for the resource
+      def resource_valid?
+        if resource.klass.blank?
+          say_status(:error, "Unable to find resource klass from #{name}", :red)
+          return false
+        end
+
+        true
+      end
+
+      def with_resource_tenant(&block)
+        if defined?(Tenant) && resource.tenant.present?
+          Tenant.as(resource.tenant) { yield }
+        else
+          yield
+        end
+      end
+
       def resource
         @resource ||= Effective::Resource.new(name)
       end
@@ -55,24 +73,26 @@ module Effective
       end
 
       def resource_attributes(all: false)
-        klass_attributes = resource.klass_attributes(all: all)
+        with_resource_tenant do
+          klass_attributes = resource.klass_attributes(all: all)
 
-        if klass_attributes.blank?
-          if ActiveRecord::Migration.respond_to?(:check_pending!)
-            pending = (ActiveRecord::Migration.check_pending! rescue true)
-          else
-            pending = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)).pending_migrations.present?
-          end
+          if klass_attributes.blank?
+            if ActiveRecord::Migration.respond_to?(:check_pending!)
+              pending = (ActiveRecord::Migration.check_pending! rescue true)
+            else
+              pending = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)).pending_migrations.present?
+            end
 
-          if pending
-            migrate = ask("Unable to read the attributes of #{resource.klass || resource.name}. There are pending migrations. Run db:migrate now? [y/n]")
-            system('bundle exec rake db:migrate') if migrate.to_s.include?('y')
+            if pending
+              migrate = ask("Unable to read the attributes of #{resource.klass || resource.name}. There are pending migrations. Run db:migrate now? [y/n]")
+              system('bundle exec rake db:migrate') if migrate.to_s.include?('y')
+            end
+
+            klass_attributes = resource.klass_attributes(all: all)
           end
 
-          klass_attributes = resource.klass_attributes(all: all)
+          klass_attributes.presence || resource.model_attributes(all: all)
         end
-
-        klass_attributes.presence || resource.model_attributes(all: all)
       end
 
     end

data/lib/generators/effective/menu_generator.rb

@@ -13,6 +13,10 @@ module Effective
 
       desc 'Adds a menu link to an existing _navbar.html.haml'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def invoke_menu
         say_status :invoke, :menu, :white
       end
@@ -22,7 +26,7 @@ module Effective
         return unless resource.namespaces.blank?
 
         begin
-          Effective::CodeWriter.new('app/views/layouts/_navbar.html.haml') do |w|
+          Effective::CodeWriter.new(resource.menu_file) do |w|
             if w.find { |line, _| line == menu_content.second.strip }
               say_status :identical, menu_path, :blue
             else
@@ -44,7 +48,7 @@ module Effective
         return unless resource.namespaces == ['admin']
 
         begin
-          Effective::CodeWriter.new('app/views/layouts/_navbar_admin.html.haml') do |w|
+          Effective::CodeWriter.new(resource.admin_menu_file) do |w|
             if w.find { |line, _| line == menu_content.second.strip }
               say_status :identical, menu_path, :blue
             else
@@ -72,7 +76,8 @@ module Effective
       end
 
       def menu_path
-        [resource.namespace, resource.plural_name, 'path'].compact * '_'
+        path = [resource.namespace, resource.plural_name, 'path'].compact * '_'
+        resource.tenant.present? ? "#{resource.tenant}.#{path}" : path
       end
     end
   end

data/lib/generators/effective/migration_generator.rb

@@ -16,21 +16,47 @@ module Effective
       desc 'Creates a migration.'
 
       argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
+      class_option :database, type: :string, desc: "Database to generate the migration for"
+
+      def validate_resource
+        exit unless resource_valid?
+      end
 
       def invoke_migration
         say_status :invoke, :migration, :white
       end
 
+      # rails generate effective:migration courses body:text --database example
       def create_migration
         if invoked_attributes.present?
-          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + (invokable(invoked_attributes) | timestamps))
-        elsif resource.klass_attributes.present?
-          raise 'klass_attributes already exist.  We cant migrate (yet). Exiting.'
-        elsif resource.model_attributes.present?
-          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + invokable(resource.model_attributes))
-        else
-          raise 'You need to specify some attributes or have a model file present'
+          args = ["create_#{plural_name}"] + (invokable(invoked_attributes) | timestamps)
+          args += ["--database", options['database']] if options['database']
+          Rails::Generators.invoke('migration', args)
+          return
+        end
+
+        return if with_resource_tenant do
+          table_name = resource.klass.table_name
+
+          if ActiveRecord::Base.connection.table_exists?(table_name)
+            say_status(:error, "#{table_name} table already exist. We can't migrate (yet). Exiting.", :red)
+            true
+          end
         end
+
+        if resource.model_attributes.blank?
+          say_status(:error, "No model attributes present. Please add the effective_resource do ... end block and try again", :red)
+          return
+        end
+
+        args = ["create_#{plural_name}"] + invokable(resource.model_attributes) - timestamps
+        args += ["--database", options['database']] if options['database']
+
+        if options['database'].blank? && defined?(Tenant)
+          args += ["--database", resource.klass.name.split('::').first.downcase]
+        end
+
+        Rails::Generators.invoke('migration', args)
       end
 
       protected

data/lib/generators/effective/route_generator.rb

@@ -15,6 +15,10 @@ module Effective
 
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def invoke_route
         say_status :invoke, :route, :white
       end
@@ -22,7 +26,7 @@ module Effective
       def create_route
         blocks = []
 
-        Effective::CodeWriter.new('config/routes.rb') do |w|
+        Effective::CodeWriter.new(resource.routes_file) do |w|
           resource.namespaces.each do |namespace|
             index = nil
 
@@ -54,7 +58,7 @@ module Effective
 
       def resources
         @resources ||= (
-          resources = "resources :#{plural_name}"
+          resources = "resources :#{resource.plural_name}"
 
           if ((crud_actions - ['show']) == invoked_actions)
             resources << ', except: [:show]'

data/lib/generators/effective/views_generator.rb

@@ -16,6 +16,10 @@ module Effective
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
       class_option :attributes, type: :array, default: [], desc: 'Included form attributes, otherwise read from model'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def assign_attributes
         @attributes = (invoked_attributes.presence || resource_attributes).except(:archived)
         self.class.send(:attr_reader, :attributes)

data/lib/scaffolds/controllers/controller.rb

@@ -1,3 +1,11 @@
-class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.namespace.try(:classify).presence, ApplicationController].compact.join('::') %>
+<% if resource.module_name.present? -%>
+module <%= resource.module_name %>
+  class <%= resource.module_namespaced %>Controller < <%= resource.module_namespace %>ApplicationController
+    include Effective::CrudController
+  end
+end
+<% else -%>
+class <%= resource.namespaced_class_name.pluralize %>Controller < <%= resource.module_namespace %>ApplicationController
   include Effective::CrudController
 end
+<% end -%>

data/lib/scaffolds/datatables/datatable.rb

@@ -1,5 +1,40 @@
-class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Datatable
+<% if resource.module_name.present? -%>
+module <%= resource.module_name %>
+  class <%= resource.module_namespaced %>Datatable < Effective::Datatable
+    datatable do
+      order :updated_at
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
 
+<% if resource.belong_tos.present? || resource.has_anys.present? -%>
+<% resource.belong_tos.each do |reference| -%>
+      col :<%= reference.name %>
+<% end -%>
+<% resource.has_anys.each do |reference| -%>
+      col :<%= reference.name %>
+<% end -%>
+
+<% end -%>
+<% attributes.except(:created_at, :updated_at, :id, :archived).each do |name, _| -%>
+      col :<%= name %>
+<% end -%>
+<% if attributes.key?(:archived) -%>
+
+      col :archived, search: { value: false }
+<% end -%>
+
+      actions_col
+    end
+
+    collection do
+      <%= resource.class_name %>.deep.all
+    end
+  end
+end
+<% else -%>
+class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Datatable
   datatable do
     order :updated_at
 
@@ -30,5 +65,5 @@ class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Data
   collection do
     <%= resource.class_name %>.deep.all
   end
-
 end
+<% end -%>

data/lib/scaffolds/forms/tabbed/_form.html.haml

@@ -1,6 +1,6 @@
 = tabs do
   = tab '<%= resource.human_name.titleize %>' do
-    = render '/<%= resource.plural_name %>/form_<%= resource.name %>', <%= resource.name %>: <%= resource.name %>, namespace: <%= resource.namespace ? ":#{resource.namespace}" : 'nil' %>
+    = render '<%= resource.view_file_path("form_#{resource.name}") %>', <%= resource.name %>: <%= resource.name %>
 
 <%- if resource.nested_resources.present? || resource.instance.respond_to?(:log_changes_datatable) %>
   - if <%= resource.name %>.persisted?

data/lib/scaffolds/forms/tabbed/_form_resource.html.haml

@@ -1,4 +1,8 @@
-= effective_form_with(model: [(namespace if defined?(namespace)), <%= resource.name %>]) do |f|
+<% if resource.namespace.present? -%>
+= effective_form_with(model: [:<%= resource.namespace %>, <%= resource.name %>]) do |f|
+<% else -%>
+= effective_form_with(model: <%= resource.name %>) do |f|
+<% end -%>
 <% resource.belong_tos.each do |reference| -%>
 <%= render_field(reference, depth: 1) %>
 <% end -%>

data/lib/tasks/annotate.rake

@@ -0,0 +1,8 @@
+# bundle exec rake annotate
+# bundle exec rake annotate[user]
+
+desc 'Adds an effective_resources do .. end block to all ActiveRecord model files'
+task :annotate, [:resource] => :environment do |t, args|
+  args.with_defaults(resource: 'all')
+  Effective::Annotator.new(resource: args.resource).annotate!
+end

data/lib/tasks/pg_pull.rake

@@ -4,14 +4,35 @@ namespace :pg do
   # bundle exec rake pg:pull
   # bundle exec rake pg:pull[staging]
   # bundle exec rake pg:pull[158.204.33.124]
+
+  # bundle exec rake pg:pull
+  # bundle exec rake pg:pull[staging]
+  # bundle exec rake pg:pull[158.204.33.124]
+  # bundle exec rake pg:pull filename=latest.dump database=example
+  # DATABASE=example bundle exec rake pg:load
   desc 'Creates a new backup on remote server and downloads it to latest.dump'
   task :pull, [:remote] => :environment do |t, args|
+    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'] }
+    keywords = ARGV.map { |a| a.split('=') if a.include?('=') }.compact.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
+    args.with_defaults(defaults.compact.merge(env_keys.compact).merge(keywords))
+
+    # Validate Config
+    config = ActiveRecord::Base.configurations[Rails.env]
+    configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+
+    if configs.length > 1 && args.database.blank?
+      puts "Multiple database configs exist for #{Rails.env} environment."
+      puts "Please run bundle exec rake pg:pull database=x"
+      puts "Where x is one of: #{configs.map { |config| config.name }.to_sentence}"
+      exit
+    end
 
     # Heroku mode
     if `git remote -v | grep heroku`.length > 0
       args.with_defaults(remote: 'heroku')
 
-      puts "=== Pulling remote '#{args.remote}' database into latest.dump"
+      puts "=== Pulling remote '#{args.remote}' #{args.database} database into #{args.filename}"
 
       # Create a backup on heroku
       unless system("heroku pg:backups:capture --remote #{args.remote}")
@@ -19,41 +40,41 @@ namespace :pg do
       end
 
       # Download it to local
-      unless system("curl -o latest.dump `heroku pg:backups:public-url --remote #{args.remote}`")
+      unless system("curl -o #{args.filename} `heroku pg:backups:public-url --remote #{args.remote}`")
         abort("Error downloading database")
       end
 
       # Load it
-      Rake::Task['pg:load'].invoke
+      Rake::Task['pg:load'].invoke(*args)
       exit
     end
 
     # Hatchbox mode
-    if (ENV['HATCHBOX_IP'] || args[:remote]).count('.') == 3
+    if (ENV['HATCHBOX_IP'] || args[:remote]).to_s.count('.') == 3
       args.with_defaults(
         remote: ENV.fetch('HATCHBOX_IP'),
         app: ENV['HATCHBOX_APP'] || `pwd`.split('/').last.chomp,
         user: ENV['HATCHBOX_USER'] || 'deploy'
       )
 
-      puts "=== Pulling hatchbox '#{args.remote}' #{args.app} database into latest.dump"
+      puts "=== Pulling hatchbox '#{args.remote}' #{args.app} #{args.database} database into #{args.filename}"
 
       # SSH into hatchbox and call rake pg:save there to create latest.dump
-      unless(result = `ssh #{args.user}@#{args.remote} << EOF
+      unless(result = `ssh -T #{args.user}@#{args.remote} << EOF
         cd ~/#{args.app}/current/
-        bundle exec rake pg:save[latest.dump]
+        bundle exec rake pg:save database=#{args.database} filename=#{args.filename}
       `).include?('Saving database completed') # The output of pg:save down below
         puts("Error calling ssh #{args.user}@#{args.remote} and running rake pg:save on hatchbox from ~/#{args.app}/current/")
         abort(result)
       end
 
       # SCP to copy the hatchkbox latest.dump to local
-      unless system("scp #{args.user}@#{args.remote}:~/#{args.app}/current/latest.dump ./")
+      unless system("scp #{args.user}@#{args.remote}:~/#{args.app}/current/#{args.filename} ./")
         abort("Error downloading database")
       end
 
       # Load it
-      Rake::Task['pg:load'].invoke
+      Rake::Task['pg:load'].invoke(*args)
       exit
     end
 
@@ -67,6 +88,7 @@ namespace :pg do
   # bundle exec rake pg:load => Will replace the current database with latest.dump
   # bundle exec rake pg:load[something.dump] => Will replace the current database with something.dump
   # bundle exec rake pg:load filename=latest.dump database=example
+  # DATABASE=example bundle exec rake pg:load
   desc 'Loads a postgresql .dump file into the development database (latest.dump by default)'
   task :load, [:filename] => :environment do |t, args|
     defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
@@ -106,19 +128,6 @@ namespace :pg do
 
     puts "=== Loading #{args.filename} into local '#{db[:database]}' database"
 
-    # bin/rails db:environment:set RAILS_ENV=development
-    if Rails.env != 'production'
-      ENV['DISABLE_DATABASE_ENVIRONMENT_CHECK'] = '1'
-    end
-
-    if configs.length > 1
-      Rake::Task["db:drop:#{args.database}"].invoke
-      Rake::Task["db:create:#{args.database}"].invoke
-    else
-      Rake::Task['db:drop'].invoke
-      Rake::Task['db:create'].invoke
-    end
-
     if system("export PGPASSWORD=#{db[:password]}; pg_restore --no-acl --no-owner --clean --if-exists -h #{db[:host]} -U #{db[:username]} -d #{db[:database]} #{args.filename}")
       puts "Loading database completed"
     else

data/lib/tasks/upgrade_forms.rake

@@ -0,0 +1,7 @@
+# bundle exec rake upgrade_forms
+# bundle exec rake upgrade_forms[app/views/admin/]
+desc 'Upgrades simple_form_for to effective_form_with'
+task :upgrade_forms, [:folder] => :environment do |t, args|
+  args.with_defaults(folder: 'app/views/')
+  Effective::FormUpgrader.new(folder: args.folder).upgrade!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,8 +48,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/models/effective/annotator.rb
 - app/models/effective/code_writer.rb
 - app/models/effective/csv_importer.rb
+- app/models/effective/form_upgrader.rb
 - app/models/effective/live_generator.rb
 - app/models/effective/profiler.rb
 - config/effective_developer.rb
@@ -95,10 +97,12 @@ files:
 - lib/scaffolds/importers/csv_importer.rb
 - lib/scaffolds/models/model.rb
 - lib/scaffolds/views/_resource.html.haml
+- lib/tasks/annotate.rake
 - lib/tasks/effective_csv_importer.rake
 - lib/tasks/pg_pull.rake
 - lib/tasks/rename_class.rake
 - lib/tasks/reset_pk_sequence.rake
+- lib/tasks/upgrade_forms.rake
 - lib/tasks/validate.rake
 homepage: https://github.com/code-and-effect/effective_developer
 licenses: