effective_developer 0.6.13 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfed3c4234c2a0daa3fb45b3b236cae324cec1231afd7bc8d93b91ed898ade1
-  data.tar.gz: ca49f594afb5fce78e734d7d12b8392e972c69fdcbe068b7d8f6b6e17f66c5e9
+  metadata.gz: bb9fc81f4fa250e8837722612ae2c349b863b57fb07e01e6f05bfddd4845a6f6
+  data.tar.gz: 8c41521fa64be2d74b8179628c84d9071c7610b0ab64646d2916eb29794711af
 SHA512:
-  metadata.gz: 7cc5dc29827ce9f27de5e6693aeecfaf1756892de8673a695b0ada344ae1158a6623f0ec86695d31294215bfe266bcc67d6df26e0f6a3b6c33e227ff14082e4a
-  data.tar.gz: 86967b90b6044a4e553f81bb1f7cffb0bb55d4608e97e3fd9b6d5e4a89e3db39cb24a7070b97b31c4b53547f177a346a7769076825ff5a53e39b690b63fa8279
+  metadata.gz: 50c82d38e666ecb1c6b4237e543a7c27471cbfc828f049deb09563141d99014a84384a0803901b777e8e27e5a27ffe7a8d69c102b0390c373e7b4d5409890d4e
+  data.tar.gz: a072c91f4c049b98763f426380eee988496c829796f2e1ed6e5937de9b2019f414fa07f4076349fd6f7e392d9b74f120788c5fe0a5a6b5b6fea8ae41af8e1d58

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.6.13'.freeze
+  VERSION = '0.6.15'.freeze
 end

data/lib/generators/effective/controller_generator.rb

@@ -35,7 +35,12 @@ module Effective
       end
 
       def create_controller
-        template 'controllers/controller.rb', resource.controller_file
+        if admin_effective_scaffold?
+          template "#{scaffold_path}/controllers/controller.rb", resource.admin_effective_controller_file
+        else
+          template "#{scaffold_path}/controllers/controller.rb", resource.controller_file
+        end
+
       end
 
     end

data/lib/generators/effective/datatable_generator.rb

@@ -37,7 +37,14 @@ module Effective
         end
 
         with_resource_tenant do
-          template 'datatables/datatable.rb', resource.datatable_file
+          if admin_effective_scaffold?
+            template "#{scaffold_path}/datatables/datatable.rb", resource.admin_effective_datatable_file
+          elsif effective_scaffold?
+            template "#{scaffold_path}/datatables/datatable.rb", resource.effective_datatable_file
+          else
+            template "#{scaffold_path}/datatables/datatable.rb", resource.datatable_file
+          end
+
         end
 
       end

data/lib/generators/effective/form_generator.rb

@@ -18,7 +18,6 @@ module Effective
       desc 'Creates a _form.html.haml in your app/views/model/ folder.'
 
       argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
-      class_option :tabbed, type: :string, default: 'true'
 
       def validate_resource
         exit unless resource_valid?
@@ -33,20 +32,18 @@ module Effective
         say_status :invoke, :form, :white
       end
 
-      def create_flat_form
+      def create_form
         with_resource_tenant do
-          if options[:tabbed] == 'false'
-            template 'forms/flat/_form.html.haml', resource.view_file('form', partial: true)
+          if admin_effective_scaffold?
+            template "#{scaffold_path}/views/_form.html.haml", resource.admin_effective_view_file('form', partial: true)
+            template "#{scaffold_path}/views/_form_resource.html.haml", resource.admin_effective_view_file("form_#{resource.name}", partial: true)
+          elsif effective_scaffold?
+            template "#{scaffold_path}/views/_form_resource.html.haml", resource.view_file("form", partial: true)
+          else
+            template "#{scaffold_path}/views/_form.html.haml", resource.view_file('form', partial: true)
+            template "#{scaffold_path}/views/_form_resource.html.haml", resource.view_file("form_#{resource.name}", partial: true)
           end
-        end
-      end
 
-      def create_tabbed_form
-        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
 
@@ -103,7 +100,7 @@ module Effective
         end
 
         html = ERB.new(
-          File.read("#{File.dirname(__FILE__)}/../../scaffolds/forms/fields/_field_#{partial}.html.haml")
+          File.read("#{File.dirname(__FILE__)}/../../scaffolds/fields/_field_#{partial}.html.haml")
         ).result(b).split("\n").map { |line| ('  ' * depth) + line }
 
         html.length > 1 ? (html.join("\n") + "\n") : html.join

data/lib/generators/effective/helpers.rb

@@ -4,6 +4,36 @@ module Effective
 
       protected
 
+      # Based on the resource, effective or basic
+      def scaffold_path
+        return 'admin_effective' if admin_effective_scaffold?
+        return 'effective' if effective_scaffold?
+        'basic'
+      end
+
+      def admin_scaffold?
+        Array(resource.namespaces).include?('admin')
+      end
+
+      def admin_effective_scaffold?
+        admin_scaffold? &&  effective_scaffold?
+      end
+
+      def basic_scaffold?
+        resource.klass.name.start_with?('Effective::') == false
+      end
+
+      def effective_scaffold?
+        resource.klass.name.start_with?('Effective::')
+      end
+
+      # Returns effective_messaging if run from that directory to scaffold
+      def effective_gem_name
+        path = Dir.pwd.split('/').last.to_s
+        raise('effective gem name not supported') unless path.start_with?('effective_')
+        path
+      end
+
       # This is kind of a validate for the resource
       def resource_valid?
         if resource.klass.blank?

data/lib/generators/effective/model_generator.rb

@@ -20,13 +20,13 @@ module Effective
       end
 
       def create_model
-        template 'models/model.rb', resource.model_file
+        template "#{scaffold_path}/models/model.rb", resource.model_file
       end
 
       protected
 
       def parent_class_name
-        options[:parent] || (Rails::VERSION::MAJOR > 4 ? 'ApplicationRecord' : 'ActiveRecord::Base')
+        options[:parent] || 'ApplicationRecord'
       end
 
       def to_s_attribute

data/lib/generators/effective/views_generator.rb

@@ -31,8 +31,17 @@ module Effective
 
       def create_views
         if invoked_actions.include?('show') || non_crud_actions.present?
-          template 'views/_resource.html.haml', resource.view_file(resource.name, partial: true)
+          if admin_effective_scaffold?
+            template "#{scaffold_path}/views/_resource.html.haml", resource.admin_effective_view_file(resource.name, partial: true)
+          else
+            template "#{scaffold_path}/views/_resource.html.haml", resource.view_file(resource.name, partial: true)
+          end
         end
+
+        if effective_scaffold?
+          template "#{scaffold_path}/views/_layout.html.haml", resource.view_file('layout', partial: true)
+        end
+
       end
 
     end

data/lib/scaffolds/admin_effective/controllers/controller.rb

@@ -0,0 +1,15 @@
+module Admin
+  class <%= resource.class_name.sub('Effective::', '') %>Controller < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :<%= effective_gem_name %>) }
+
+    include Effective::CrudController
+
+    private
+
+    def permitted_params
+      params.require(:<%= resource.resource_name %>).permit!
+    end
+
+  end
+end

data/lib/scaffolds/admin_effective/datatables/datatable.rb

@@ -0,0 +1,30 @@
+module Admin
+  class Effective<%= resource.class_name.sub('Effective::', '') %>sDatatable < 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).each do |name, _| -%>
+      col :<%= name %>
+<% end -%>
+
+      actions_col
+    end
+
+    collection do
+      <%= resource.class_name %>.deep.all
+    end
+  end
+end

data/lib/scaffolds/admin_effective/views/_form.html.haml

@@ -0,0 +1,15 @@
+= tabs do
+  = tab '<%= resource.human_name.titleize %>' do
+    = render '<%= resource.view_file_path("form_#{resource.name}").sub('effective/', '') %>', <%= resource.name %>: <%= resource.name %>
+
+<%- if resource.nested_resources.present? || resource.instance.respond_to?(:log_changes_datatable) %>
+  - if <%= resource.name %>.persisted?
+<%- resource.nested_resources.each do |nested_resource| -%>
+    = tab '<%= nested_resource.plural_name.titleize %>' do
+      = render_datatable(<%= nested_resource.klass.name %>Datatable.new(<%= resource.name %>_id: <%= resource.name %>.id))
+
+<%- end -%>
+<% end -%>
+  - if <%= resource.name %>.persisted? && <%= resource.name %>.respond_to?(:log_changes_datatable)
+    = tab 'Logs' do
+      = render_datatable(<%= resource.name %>.log_changes_datatable)

data/lib/scaffolds/admin_effective/views/_form_resource.html.haml

@@ -0,0 +1,13 @@
+<% if resource.namespace.present? -%>
+= effective_form_with(model: [:<%= resource.namespace %>, <%= resource.name %>], engine: true) do |f|
+<% else -%>
+= effective_form_with(model: <%= resource.name %>, engine: true) do |f|
+<% end -%>
+<% resource.belong_tos.each do |reference| -%>
+<%= render_field(reference, depth: 1) %>
+<% end -%>
+<% attributes.each do |attribute| -%>
+<%= render_field(attribute, depth: 1) %>
+<% end -%>
+
+  = effective_submit(f)

data/lib/scaffolds/admin_effective/views/_resource.html.haml

@@ -0,0 +1 @@
+= render 'effective/<%= resource.plural_name %>/<%= resource.name %>', <%= resource.name %>: <%= resource.name %>, admin: true

data/lib/scaffolds/basic/importers/csv_importer.rb

@@ -0,0 +1,14 @@
+module CsvImporters
+  class <%= klass %>Importer < Effective::CsvImporter
+    def columns
+      {<% columns.each_with_index do |column, index| %>
+        <%= column.to_s.underscore.tap { |name| [' ', '/', '(', ')', '__'].each { |str| name.gsub!(str, '_') } }.to_sym %>: <%= (letters[index] || index) %><%= ',' unless (index+1) == columns.length %><% end %>
+      }
+    end
+
+    def process_row
+      # assign_columns(<%= klass.singularize %>.new).save!
+      raise 'todo'
+    end
+  end
+end

data/lib/scaffolds/basic/models/model.rb

@@ -0,0 +1,30 @@
+<% module_namespacing do -%>
+class <%= resource.class_name %> < <%= parent_class_name.classify %>
+<% resource.belong_tos.each do || ass -%>
+  belongs_to :<%= ass.name %><%= ', polymorphic: true' if ass.polymorphic? %>
+<% end -%>
+
+  effective_resource do
+<% invoked_attributes.each do |name, (type, _)| -%>
+    <%= name.to_s.ljust(max_attribute_name_length) %> :<%= type %>
+<% end -%>
+
+    timestamps
+  end
+
+  scope :deep, -> { all }
+
+<% invoked_attributes.each do |name, (type, _)| -%>
+  validates :<%= name %>, presence: true
+<% end -%>
+
+  def to_s
+<% if to_s_attribute.present? -%>
+    <%= to_s_attribute %> || 'New <%= resource.human_name %>'
+<% else %>
+    '<%= resource.human_name %>'
+<% end -%>
+  end
+
+end
+<% end -%>

data/lib/scaffolds/basic/views/_form.html.haml

@@ -0,0 +1,15 @@
+= tabs do
+  = tab '<%= resource.human_name.titleize %>' do
+    = render '<%= resource.view_file_path("form_#{resource.name}") %>', <%= resource.name %>: <%= resource.name %>
+
+<%- if resource.nested_resources.present? %>
+  - if <%= resource.name %>.persisted?
+<%- resource.nested_resources.each do |nested_resource| -%>
+    = tab '<%= nested_resource.plural_name.titleize %>' do
+      = render_datatable(<%= nested_resource.klass.name %>Datatable.new(<%= resource.name %>_id: <%= resource.name %>.id))
+
+<%- end -%>
+<% end -%>
+  - if <%= resource.name %>.persisted? && <%= resource.name %>.respond_to?(:logs_datatable)
+    = tab 'Logs' do
+      = render_datatable(<%= resource.name %>.logs_datatable, inline: true)

data/lib/scaffolds/effective/controllers/controller.rb

@@ -0,0 +1,15 @@
+<% if resource.module_name.present? -%>
+module <%= resource.module_name %>
+  class <%= resource.module_namespaced %>Controller < <%= resource.module_namespace %>ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::CrudController
+  end
+end
+<% else -%>
+class <%= resource.namespaced_class_name.pluralize %>Controller < <%= resource.module_namespace %>ApplicationController
+  before_action(:authenticate_user!) if defined?(Devise)
+
+  include Effective::CrudController
+end
+<% end -%>

data/lib/scaffolds/effective/datatables/datatable.rb

@@ -0,0 +1,28 @@
+class <%= resource.module_name %><%= 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).each do |name, _| -%>
+    col :<%= name %>
+<% end -%>
+
+    actions_col
+  end
+
+  collection do
+    <%= resource.class_name %>.deep.all
+  end
+end

data/lib/scaffolds/effective/importers/csv_importer.rb

@@ -0,0 +1,14 @@
+module CsvImporters
+  class <%= klass %>Importer < Effective::CsvImporter
+    def columns
+      {<% columns.each_with_index do |column, index| %>
+        <%= column.to_s.underscore.tap { |name| [' ', '/', '(', ')', '__'].each { |str| name.gsub!(str, '_') } }.to_sym %>: <%= (letters[index] || index) %><%= ',' unless (index+1) == columns.length %><% end %>
+      }
+    end
+
+    def process_row
+      # assign_columns(<%= klass.singularize %>.new).save!
+      raise 'todo'
+    end
+  end
+end

data/lib/scaffolds/effective/models/model.rb

@@ -0,0 +1,30 @@
+<% module_namespacing do -%>
+class <%= resource.class_name %> < <%= parent_class_name.classify %>
+<% resource.belong_tos.each do || ass -%>
+  belongs_to :<%= ass.name %><%= ', polymorphic: true' if ass.polymorphic? %>
+<% end -%>
+
+  effective_resource do
+<% invoked_attributes.each do |name, (type, _)| -%>
+    <%= name.to_s.ljust(max_attribute_name_length) %> :<%= type %>
+<% end -%>
+
+    timestamps
+  end
+
+  scope :deep, -> { all }
+
+<% invoked_attributes.each do |name, (type, _)| -%>
+  validates :<%= name %>, presence: true
+<% end -%>
+
+  def to_s
+<% if to_s_attribute.present? -%>
+    <%= to_s_attribute %> || 'New <%= resource.human_name %>'
+<% else %>
+    '<%= resource.human_name %>'
+<% end -%>
+  end
+
+end
+<% end -%>

data/lib/scaffolds/effective/views/_form_resource.html.haml

@@ -0,0 +1,13 @@
+<% if resource.namespace.present? -%>
+= effective_form_with(model: [:<%= resource.namespace %>, <%= resource.name %>], engine: true) do |f|
+<% else -%>
+= effective_form_with(model: <%= resource.name %>, engine: true) do |f|
+<% end -%>
+<% resource.belong_tos.each do |reference| -%>
+<%= render_field(reference, depth: 1) %>
+<% end -%>
+<% attributes.each do |attribute| -%>
+<%= render_field(attribute, depth: 1) %>
+<% end -%>
+
+  = effective_submit(f)

data/lib/scaffolds/effective/views/_layout.html.haml

@@ -0,0 +1,2 @@
+.effective-<%= resource.name %>
+  = yield

data/lib/scaffolds/effective/views/_resource.html.haml

@@ -0,0 +1,13 @@
+= render 'effective/<%= resource.plural_name %>/layout' do
+  %table.table
+    %tbody
+<% resource.belong_tos.each do |reference| -%>
+      %tr
+        %th <%= reference.name.to_s.titleize %>
+        %td= <%= resource.name %>.<%= reference.name %>
+<% end -%>
+<% attributes.each do |name, (type, _)| -%>
+      %tr
+        %th <%= name.to_s.titleize %>
+        %td= <%= resource.name %>.<%= name %>
+<% end -%>

data/lib/tasks/pg_pull.rake

@@ -130,10 +130,12 @@ namespace :pg do
 
     puts "=== Loading #{args.filename} into local '#{db[:database]}' database"
 
-    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"
+    command = "export PGPASSWORD=#{db[:password]}; pg_restore --no-acl --no-owner --clean --if-exists -h #{db[:host]} -U #{db[:username]} -d #{db[:database]} #{args.filename}"
+
+    if system(command)
+      puts "\nLoading database completed"
     else
-      abort "Error loading database"
+      abort "\nLoading database completed with errors. It probably worked just fine."
     end
   end
 
@@ -183,7 +185,9 @@ namespace :pg do
 
     exclude_table_data = "--exclude-table-data=logs" unless (args.logs == 'true')
 
-    if system("export PGPASSWORD=#{db[:password]}; pg_dump -Fc --no-acl --no-owner #{exclude_table_data} -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} #{db[:database]} > #{args.filename}")
+    command = "export PGPASSWORD=#{db[:password]}; pg_dump -Fc --no-acl --no-owner #{exclude_table_data} -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} #{db[:database]} > #{args.filename}"
+
+    if system(command)
       puts "Saving database completed"
     else
       abort "Error saving database"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,32 +71,46 @@ files:
 - lib/generators/effective/scaffold_generator.rb
 - lib/generators/effective/views_generator.rb
 - lib/generators/effective_developer/install_generator.rb
-- lib/scaffolds/controllers/controller.rb
-- lib/scaffolds/datatables/datatable.rb
-- lib/scaffolds/forms/fields/_field_belongs_to.html.haml
-- lib/scaffolds/forms/fields/_field_boolean.html.haml
-- lib/scaffolds/forms/fields/_field_date.html.haml
-- lib/scaffolds/forms/fields/_field_datetime.html.haml
-- lib/scaffolds/forms/fields/_field_decimal.html.haml
-- lib/scaffolds/forms/fields/_field_email.html.haml
-- lib/scaffolds/forms/fields/_field_float.html.haml
-- lib/scaffolds/forms/fields/_field_hstore.html.haml
-- lib/scaffolds/forms/fields/_field_inet.html.haml
-- lib/scaffolds/forms/fields/_field_integer.html.haml
-- lib/scaffolds/forms/fields/_field_nested_resource.html.haml
-- lib/scaffolds/forms/fields/_field_phone.html.haml
-- lib/scaffolds/forms/fields/_field_price.html.haml
-- lib/scaffolds/forms/fields/_field_select.html.haml
-- lib/scaffolds/forms/fields/_field_select_constant.html.haml
-- lib/scaffolds/forms/fields/_field_string.html.haml
-- lib/scaffolds/forms/fields/_field_text.html.haml
-- lib/scaffolds/forms/fields/_nested_resource_fields.html.haml
-- lib/scaffolds/forms/flat/_form.html.haml
-- lib/scaffolds/forms/tabbed/_form.html.haml
-- lib/scaffolds/forms/tabbed/_form_resource.html.haml
-- lib/scaffolds/importers/csv_importer.rb
-- lib/scaffolds/models/model.rb
-- lib/scaffolds/views/_resource.html.haml
+- lib/scaffolds/admin_effective/controllers/controller.rb
+- lib/scaffolds/admin_effective/datatables/datatable.rb
+- lib/scaffolds/admin_effective/importers/csv_importer.rb
+- lib/scaffolds/admin_effective/models/model.rb
+- lib/scaffolds/admin_effective/views/_form.html.haml
+- lib/scaffolds/admin_effective/views/_form_resource.html.haml
+- lib/scaffolds/admin_effective/views/_resource.html.haml
+- lib/scaffolds/basic/controllers/controller.rb
+- lib/scaffolds/basic/datatables/datatable.rb
+- lib/scaffolds/basic/importers/csv_importer.rb
+- lib/scaffolds/basic/models/model.rb
+- lib/scaffolds/basic/views/_form.html.haml
+- lib/scaffolds/basic/views/_form_resource.html.haml
+- lib/scaffolds/basic/views/_resource.html.haml
+- lib/scaffolds/effective/controllers/controller.rb
+- lib/scaffolds/effective/datatables/datatable.rb
+- lib/scaffolds/effective/importers/csv_importer.rb
+- lib/scaffolds/effective/models/model.rb
+- lib/scaffolds/effective/views/_form.html.haml
+- lib/scaffolds/effective/views/_form_resource.html.haml
+- lib/scaffolds/effective/views/_layout.html.haml
+- lib/scaffolds/effective/views/_resource.html.haml
+- lib/scaffolds/fields/_field_belongs_to.html.haml
+- lib/scaffolds/fields/_field_boolean.html.haml
+- lib/scaffolds/fields/_field_date.html.haml
+- lib/scaffolds/fields/_field_datetime.html.haml
+- lib/scaffolds/fields/_field_decimal.html.haml
+- lib/scaffolds/fields/_field_email.html.haml
+- lib/scaffolds/fields/_field_float.html.haml
+- lib/scaffolds/fields/_field_hstore.html.haml
+- lib/scaffolds/fields/_field_inet.html.haml
+- lib/scaffolds/fields/_field_integer.html.haml
+- lib/scaffolds/fields/_field_nested_resource.html.haml
+- lib/scaffolds/fields/_field_phone.html.haml
+- lib/scaffolds/fields/_field_price.html.haml
+- lib/scaffolds/fields/_field_select.html.haml
+- lib/scaffolds/fields/_field_select_constant.html.haml
+- lib/scaffolds/fields/_field_string.html.haml
+- lib/scaffolds/fields/_field_text.html.haml
+- lib/scaffolds/fields/_nested_resource_fields.html.haml
 - lib/tasks/annotate.rake
 - lib/tasks/effective_csv_importer.rake
 - lib/tasks/hatchbox.rake

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

@@ -1,9 +0,0 @@
-= effective_form_with(model: <%= form_for %>) do |f|
-<% resource.belong_tos.each do |reference| -%>
-<%= render_field(reference, depth: 1) %>
-<% end -%>
-<% attributes.each do |attribute| -%>
-<%= render_field(attribute, depth: 1) %>
-<% end -%>
-
-  = effective_submit(f)