effective_developer 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4f396c9ab5a37dfca3a796aa10d204827c3e34de709bf9d1d8ce1db2af5201
-  data.tar.gz: 4a6034049262d3f56c850dc6a2bc05de3f29201debd3b26ec3ae22851532bfa7
+  metadata.gz: 0db076604fcb663e2f5ad49b01da50837dfde6c9ae38b9be6d6ba3b265504a44
+  data.tar.gz: cd78feba26b117b151bdea4b0f6840d5bb01851b9d522d2e0df4bb68dd669f4e
 SHA512:
-  metadata.gz: eaeec872eeb393fe930c08ea2a14d8ebd17af0e9df9a4ac2c7fdb21047b2888386c6d3b4f5afefd2ecd6e78d11dc81816c6ad6ae83e56e5af6877b4a6b903354
-  data.tar.gz: ed971e8f872fa301fbb1dde42fac07f704f1e0eec46b53fb1250f634cc67e7787362a829d958f160c9084195f459daedd74d4fae6015f2012759318d33c49c64
+  metadata.gz: '0338a8bcac5b91c619acf7b4137c26a992a5398ee79444e50f47efee88051ba2bbf128998c095086de636fec797f246e778e9a2139a4644651b399e1c170863d'
+  data.tar.gz: 90f4c12d302a98c1be2e46da4b0d04bbc123953ddebd4864a8dd79d2837273ebf58a7492bd244fd9e78df3642286729d762dfb82f7a751e080c772001dd025ea

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.6.0'.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 -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails