effective_developer 0.0.10 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9d245ef9985403865d0ff86827272eddb8451a
-  data.tar.gz: 3da5a891679cd2c3abbc30a4feb9a9a3e68f080d
+  metadata.gz: 928a57aff71b27e895d035bdc80c13f5d27f3b27
+  data.tar.gz: 1bc206677f022f78df6dfd28c8b87210dc8ef232
 SHA512:
-  metadata.gz: 960474bc91e9b1ffcfed1daae6db4a2ff64fb54ded9e35574155e9c3e92ab22df7b6e6a8469d622410f71f9a385c102cbfa68d565f1531c57cd536d27df406c9
-  data.tar.gz: cd513a9ee141d261824b2cd536c230cc795f3286d4b1348484c3ed076acb130dd5f05e2bcaed3f9f9ddbd8f3341e57c24c922eb4338a93575c20442bc78661b5
+  metadata.gz: c5a5ddf11e47a7f9ed27287e49c890bd35ad9009d2fdb3043424304f7df8ec631e401df78fc8a3675d8a7e004b2286e703a5d92dc116869519f1f913afc5e8d3
+  data.tar.gz: 557cf3af3b565c4aa7e87ff9ebf9136e80f6c4b7d806ff9654fd4967b827f17946990566ded2c2c17e24d49b45f4e3b8fb68301f7dddbf8a62235481bf240aab

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Code and Effect Inc.
+Copyright 2017 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/models/effective/code_writer.rb

@@ -22,19 +22,19 @@ module Effective
     end
 
     # Returns true if the insert happened, nil if no insert
-    def insert_after_last(content, &block)
+    def insert_after_last(content, depth: nil, content_depth: nil, &block)
       index = last(&block)
       return nil unless index
 
-      insert(content, index)
+      insert(content, index, depth: depth, content_depth: content_depth)
     end
 
     # Returns true if the insert happened, nil if no insert
-    def insert_before_last(content, &block)
+    def insert_before_last(content, depth: nil, content_depth: nil, &block)
       index = last(&block)
       return nil unless index
 
-      insert(content, index-1)
+      insert(content, index-1, depth: depth, content_depth: content_depth)
     end
 
     def within(content, &block)
@@ -53,7 +53,7 @@ module Effective
       @from.pop; @to.pop
     end
 
-    def insert(content, index, depth = nil)
+    def insert(content, index, depth: nil, content_depth: nil)
       contents = (content.kind_of?(Array) ? content : content.split(newline)).map { |str| str.strip }
 
       depth ||= depth_at(index)
@@ -67,7 +67,7 @@ module Effective
         lines.insert(index, newline)
       end
 
-      content_depth = 0
+      content_depth ||= 0
 
       index = index + 1 # Insert after the given line
 
@@ -199,7 +199,7 @@ module Effective
     def open?(content)
       stripped = ss(content)
 
-      [' do'].any? { |end_with| stripped.end_with?(end_with) } ||
+      [' do'].any? { |end_with| stripped.split('#').first.to_s.end_with?(end_with) } ||
       ['class ', 'module ', 'def ', 'if '].any? { |start_with| stripped.start_with?(start_with) }
     end
 

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/lib/generators/effective/ability_generator.rb

@@ -21,7 +21,7 @@ module Effective
 
       def create_ability
         Effective::CodeWriter.new('app/models/ability.rb') do |w|
-          if namespaces.blank?
+          if resource.namespaces.blank?
             if w.find { |line, depth| depth == 2 && line == ability }
               say_status :identical, ability, :blue
             else
@@ -33,7 +33,7 @@ module Effective
             end
           end
 
-          namespaces.each do |namespace|
+          resource.namespaces.each do |namespace|
             w.within("if user.is?(:#{namespace})") do
               if w.find { |line, depth| depth == 1 && line == ability }
                 say_status :identical, ability, :blue
@@ -70,7 +70,7 @@ module Effective
             abilities = '[' + abilities.map { |action| ':' + action }.join(', ') + ']'
           end
 
-          "can #{abilities}, #{class_name}"
+          "can #{abilities}, #{resource.class_name}"
         )
       end
     end

data/lib/generators/effective/controller_generator.rb

@@ -22,10 +22,7 @@ module Effective
       end
 
       def assign_attributes
-        @attributes = (invoked_attributes.presence || klass_attributes).map do |attribute|
-          Rails::Generators::GeneratedAttribute.parse(attribute)
-        end
-
+        @attributes = invoked_attributes.presence || (resource.belong_tos_attributes + resource_attributes)
         self.class.send(:attr_reader, :attributes)
       end
 
@@ -34,7 +31,7 @@ module Effective
       end
 
       def create_controller
-        template 'controllers/controller.rb', File.join('app/controllers', namespace_path, "#{plural_name}_controller.rb")
+        template 'controllers/controller.rb', resource.controller_file
       end
 
       protected

data/lib/generators/effective/datatable_generator.rb

@@ -15,13 +15,11 @@ module Effective
 
       desc 'Creates an Effective::Datatable in your app/datatables folder.'
 
-      argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
+      argument :actions, type: :array, default: ['crud'], banner: 'action action'
+      class_option :attributes, type: :array, default: [], desc: 'Included permitted params, otherwise read from model'
 
       def assign_attributes
-        @attributes = (invoked_attributes.presence || klass_attributes).map do |attribute|
-          Rails::Generators::GeneratedAttribute.parse(attribute)
-        end
-
+        @attributes = invoked_attributes.presence || resource_attributes
         self.class.send(:attr_reader, :attributes)
       end
 
@@ -30,7 +28,7 @@ module Effective
       end
 
       def create_datatable
-        template 'datatables/datatable.rb', File.join('app/datatables', namespace_path, "#{plural_name}_datatable.rb")
+        template 'datatables/datatable.rb', resource.datatable_file
       end
 
     end

data/lib/generators/effective/form_generator.rb

@@ -18,29 +18,70 @@ module Effective
       argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
 
       def assign_attributes
-        @attributes = (invoked_attributes.presence || klass_attributes).map do |attribute|
-          Rails::Generators::GeneratedAttribute.parse(attribute)
-        end
+        @attributes = invoked_attributes.presence || resource_attributes
+        self.class.send(:attr_reader, :attributes)
       end
 
       def invoke_form
         say_status :invoke, :form, :white
       end
 
-      def create_form
-        template 'forms/_form.html.haml', File.join('app/views', namespace_path, (namespace_path.present? ? '' : class_path), plural_name, '_form.html.haml')
+      def create_default_form
+        if resource.nested_resources.blank?
+          template 'forms/default/_form.html.haml', resource.view_file('form', partial: true)
+        end
+      end
+
+      def create_tabpanel_form
+        if resource.nested_resources.present?
+          template 'forms/tabpanel/_form.html.haml', resource.view_file('form', partial: true)
+          template 'forms/tabpanel/_tab_fields.html.haml', resource.view_file("form_#{resource.name}", partial: true)
+        end
+
+        class_eval { attr_accessor :nested_resource }
+
+        resource.nested_resources.each do |_, nested_resource|
+          @nested_resource = nested_resource
+          template 'forms/tabpanel/_tab_nested_resource.html.haml', resource.view_file("form_#{nested_resource.plural_name}", partial: true)
+          template 'forms/fields/_nested_resource_fields.html.haml', File.join('app/views', resource.namespace, (resource.namespace.present? ? '' : resource.class_path), nested_resource.name.to_s.underscore.pluralize, '_fields.html.haml')
+        end
       end
 
       protected
 
       def form_for
-        if namespaces.blank?
-          singular_name
+        if resource.namespaces.blank?
+          resource.name
         else
-          '[' + namespaces.map { |ns| ':' + ns }.join(', ') + ', ' + singular_name + ']'
+          '[' + resource.namespaces.map { |ns| ':' + ns }.join(', ') + ', ' + resource.name + ']'
         end
       end
 
+      def render_field(attribute, depth: 0)
+        b = binding
+
+        partial = case attribute
+        when ActiveRecord::Reflection::BelongsToReflection
+          b.local_variable_set(:reference, attribute)
+          'belongs_to'
+        when ActiveRecord::Reflection::HasManyReflection
+          b.local_variable_set(:nested_resource, attribute)
+          'nested_resource'
+        when Effective::Resource
+          b.local_variable_set(:nested_resource, attribute)
+          'nested_resource'
+        else
+          b.local_variable_set(:attribute, attribute)
+          (attribute.type || :string).to_s
+        end
+
+        html = ERB.new(
+          File.read("#{File.dirname(__FILE__)}/../../scaffolds/forms/fields/_field_#{partial}.html.haml")
+        ).result(b).split("\n").map { |line| ('  ' * depth) + line }
+
+        html.length > 1 ? (html.join("\n") + "\n") : html.join
+      end
+
     end
   end
 end

data/lib/generators/effective/helpers.rb

@@ -4,6 +4,10 @@ module Effective
 
       protected
 
+      def resource
+        @resource ||= Effective::Resource.new(name)
+      end
+
       def crud_actions
         %w(index new create show edit update destroy)
       end
@@ -24,96 +28,37 @@ module Effective
         actions
       end
 
+      # As per the command line invoked actions. These are Rails Generated Attributes
       def invoked_attributes
         if respond_to?(:attributes)
-          attributes.map { |att| "#{att.name}:#{att.type}" }
+          attributes
         else
-          Array(options.attributes).compact
+          Array(options.attributes).compact.map { |att| Rails::Generators::GeneratedAttribute.parse(att) }
         end
       end
 
       def invoked_attributes_args
-        invoked_attributes.present? ? (['--attributes'] + invoked_attributes) : []
+        invoked_attributes.present? ? (['--attributes'] + invokable(invoked_attributes)) : []
       end
 
-      def klass_attributes(verbose: true)
-        klass = class_name.safe_constantize
-        return [] unless klass
-
-        begin
-          attributes = klass.new().attributes
-        rescue ActiveRecord::StatementInvalid => e
-          pending = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)).pending_migrations.present?
-
-          if e.message.include?('PG::UndefinedTable') && pending
-            migrate = ask("Unable to read the attributes of #{class_name}. There are pending migrations. Run db:migrate now? [y/n]")
-            system('bundle exec rake db:migrate') if migrate.to_s.include?('y')
-          end
-        end
-
-        begin
-          attributes = klass.new().attributes
-        rescue => e
-          puts "Unable to call #{class_name}.new().attributes. Continuing with empty attributes." if verbose
-          return []
-        end
-
-        attribute_names = attributes.keys - [klass.primary_key, 'created_at', 'updated_at']
-        attribute_names -= ['site_id'] if klass.respond_to?(:is_site_specific)
-
-        attribute_names.map do |attr|
-          if klass.respond_to?(:column_for_attribute) # Rails 4+
-            "#{attr}:#{klass.column_for_attribute(attr).try(:type) || 'string'}"
-          else
-            "#{attr}:#{klass.columns_hash[attr].try(:type) || 'string'}"
-          end
-        end
+      # Turns the GeneratedAttribute or Effective::Attribute into an array of strings
+      def invokable(attributes)
+        attributes.map { |att| "#{att.name}:#{att.type}" }
       end
 
-      def parent_class_name
-        options[:parent] || (Rails::VERSION::MAJOR > 4 ? 'ApplicationRecord' : 'ActiveRecord::Base')
-      end
+      def resource_attributes
+        klass_attributes = resource.klass_attributes
 
-      # We handle this a bit different than the regular scaffolds
-      def assign_names!(name)
-        @class_path = (name.include?('/') ? name[(name.rindex('/')+1)..-1] : name).split('::')
-        @class_path.map!(&:underscore)
-        @class_path[@class_path.length-1] = @class_path.last.singularize # Always singularize
-        @file_name = @class_path.pop
-      end
-
-      def namespaces
-        @namespaces ||= namespace_path.split('/')
-      end
+        if klass_attributes.blank?
+          pending = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)).pending_migrations.present?
 
-      # admin/effective::things => 'admin'
-      # effective::things => ''
-      def namespace_path
-        name.include?('/') ? name[0...name.rindex('/')] : ''
-      end
+          migrate = ask("Unable to read the attributes of #{resource.klass}. There are pending migrations. Run db:migrate now? [y/n]")
+          system('bundle exec rake db:migrate') if migrate.to_s.include?('y')
 
-      def namespaced_class_name
-        if name.include?('/')
-          name[0...name.rindex('/')].classify + '::' + singular_name.classify.pluralize
-        else
-          singular_name.classify.pluralize
+          klass_attributes = resource.klass_attributes
         end
-      end
-
-      def index_path
-        [namespace_path.underscore.presence, plural_name, 'path'].compact.join('_')
-      end
-
-      def new_path
-        ['new', namespace_path.underscore.presence, singular_name, 'path'].compact.join('_')
-      end
-
-      def edit_path
-        "edit_#{show_path}"
-      end
 
-      def show_path
-        [namespace_path.underscore.presence, singular_name, 'path', "(@#{singular_name})"].compact.join('_')
+        klass_attributes.presence || resource.written_attributes
       end
 
     end

data/lib/generators/effective/menu_generator.rb

@@ -18,9 +18,9 @@ module Effective
 
       def create_menu
         begin
-          Effective::CodeWriter.new((['app/views'] + namespaces + ['_navbar.html.haml']).join('/')) do |w|
-            if w.find { |line, _| line == content.last.strip }
-              say_status :identical, index_path, :blue
+          Effective::CodeWriter.new((['app/views'] + resource.namespaces + ['_navbar.html.haml']).join('/')) do |w|
+            if w.find { |line, _| line == menu_content.last.strip }
+              say_status :identical, resource.index_path, :blue
             else
               index = w.last { |line, _| line.start_with?('- if can?') }
 
@@ -28,8 +28,8 @@ module Effective
                 say_status(:skipped, :menu, :yellow) and return
               end
 
-              w.insert_raw(content, index+1, w.depth_at(index))
-              say_status :menu, index_path, :green
+              w.insert_raw(menu_content, index+1, w.depth_at(index))
+              say_status :menu, resource.index_path, :green
             end
           end
         rescue Errno::ENOENT
@@ -38,15 +38,41 @@ module Effective
         end
       end
 
+      def create_effective_menus
+        begin
+          Effective::CodeWriter.new('lib/tasks/generate/effective_menus.rake') do |w|
+            if w.find { |line, _| line == effective_menus_content }
+              say_status :identical, resource.index_path, :blue
+            else
+              index = w.first { |line, _| line.start_with?('item') }
+
+              w.insert(effective_menus_content, index)
+
+              system('rake generate:effective_menus')
+
+              say_status :effective_menus, resource.plural_name + '_path', :green
+            end
+          end
+        rescue Errno::ENOENT
+          # This will raise an error if the navbar file isn't present
+          say_status :skipped, :effective_menus, :yellow
+        end
+      end
+
       private
 
-      def content
+      def menu_content
         [
           "\n",
-          "- if can? :manage, #{class_name}",
-          "  %li= link_to '#{plural_name.titleize}', #{index_path}"
+          "- if can? :manage, #{resource.class_name}",
+          "  %li= link_to '#{resource.plural_name.titleize}', #{resource.index_path}"
         ]
       end
+
+      def effective_menus_content
+        "item '#{resource.plural_name.titleize}', :#{resource.plural_name}_path"
+      end
+
     end
   end
 end

data/lib/generators/effective/migration_generator.rb

@@ -23,11 +23,11 @@ module Effective
 
       def create_migration
         if invoked_attributes.present?
-          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + (invoked_attributes | timestamps))
-        elsif klass_attributes(verbose: false).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 written_attributes.present?
-          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + (written_attributes | timestamps))
+        elsif resource.written_attributes.present?
+          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + invokable(resource.belong_tos_attributes) + (invokable(resource.written_attributes) | timestamps))
         else
           raise 'You need to specify some attributes or have a model file present'
         end
@@ -35,41 +35,6 @@ module Effective
 
       protected
 
-      # Written attributes include all belong_tos, as well as
-      # any Attributes comments as per our custom 'Attributes' comment block contained in the model file
-
-      # Attributes
-      # name        :string
-      # description :text
-      #
-      # another :string
-
-      def written_attributes
-        @written_attributes ||= (
-          attributes = []
-
-          Effective::CodeWriter.new(File.join('app/models', class_path, "#{file_name}.rb")) do |w|
-            # belong_tos
-            references = w.select { |line| line.start_with?('belongs_to '.freeze) }
-
-            if references.present?
-              attributes += w.map(indexes: references) { |line| [[line.scan(/belongs_to\s+:(\w+)/).flatten.first, 'references']] }
-            end
-
-            # Attributes
-            first = w.find { |line| line == '# Attributes' }
-            break unless first
-
-            last = w.find(from: first) { |line| line.start_with?('#') == false && line.length > 0 }
-            break unless last
-
-            attributes += w.map(from: first+1, to: last-1) { |line| line.scan(/^\W+(\w+)\W+:(\w+)/).presence }
-          end
-
-          attributes.flatten(1).compact.map { |attribute| attribute.join(':') }
-        )
-      end
-
       def timestamps
         ['created_at:datetime', 'updated_at:datetime']
       end

data/lib/generators/effective/model_generator.rb

@@ -20,11 +20,15 @@ module Effective
       end
 
       def create_model
-        template 'models/model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+        template 'models/model.rb', resource.model_file
       end
 
       protected
 
+      def parent_class_name
+        options[:parent] || (Rails::VERSION::MAJOR > 4 ? 'ApplicationRecord' : 'ActiveRecord::Base')
+      end
+
       def to_s_attribute
         attributes.find { |att| ['display_name', 'name', 'title', 'subject'].include?(att.name) }
       end

data/lib/generators/effective/route_generator.rb

@@ -23,7 +23,7 @@ module Effective
         blocks = []
 
         Effective::CodeWriter.new('config/routes.rb') do |w|
-          namespaces.each do |namespace|
+          resource.namespaces.each do |namespace|
             index = nil
 
             w.within(blocks.last) do
@@ -33,15 +33,16 @@ module Effective
             index ? (blocks << index) : break
           end
 
-          content = namespaces[blocks.length..-1].map { |ns| "namespace :#{ns} do"} + [resources].flatten + (['end'] * (namespaces.length - blocks.length))
+          content = resource.namespaces[blocks.length..-1].map { |namespace| "namespace :#{namespace} do"} +
+            [resources].flatten + (['end'] * (resource.namespaces.length - blocks.length))
 
           w.within(blocks.last) do
             if content.length == 1 && w.find { |line, depth| depth == 1 && line == content.first }
               say_status :identical, content.first, :blue
             else
-              w.insert_after_last(content) { |line, depth| depth == 1 && line.start_with?('resources') } ||
-              w.insert_before_last(content) { |line, depth| depth == 1 && line.start_with?('root') } ||
-              w.insert_before_last(content) { |line, depth| line == 'end' }
+              w.insert_after_last(content, content_depth: blocks.length) { |line, depth| depth == 1 && line.start_with?('resources') } ||
+              w.insert_before_last(content, content_depth: blocks.length) { |line, depth| depth == 1 && line.start_with?('root') } ||
+              w.insert_before_last(content, content_depth: blocks.length) { |line, depth| line == 'end' }
 
               say_status :route, content.join("\n\t\t")
             end

data/lib/generators/effective/scaffold_controller_generator.rb

@@ -39,7 +39,7 @@ module Effective
           say_status(:skipped, :datatable, :yellow) and return
         end
 
-        Rails::Generators.invoke('effective:datatable', [name] + invoked_attributes)
+        Rails::Generators.invoke('effective:datatable', [name] + invoked_actions + invoked_attributes_args)
       end
 
       def invoke_views

data/lib/generators/effective/scaffold_generator.rb

@@ -46,7 +46,7 @@ module Effective
           say_status(:skipped, :datatable, :yellow) and return
         end
 
-        Rails::Generators.invoke('effective:datatable', [name] + invoked_attributes)
+        Rails::Generators.invoke('effective:datatable', [name] + invoked_actions + invoked_attributes_args)
       end
 
       def invoke_views

data/lib/generators/effective/views_generator.rb

@@ -17,10 +17,7 @@ module Effective
       class_option :attributes, type: :array, default: [], desc: 'Included form attributes, otherwise read from model'
 
       def assign_attributes
-        @attributes = (invoked_attributes.presence || klass_attributes).map do |attribute|
-          Rails::Generators::GeneratedAttribute.parse(attribute)
-        end
-
+        @attributes = invoked_attributes.presence || resource_attributes
         self.class.send(:attr_reader, :attributes)
       end
 
@@ -30,10 +27,10 @@ module Effective
 
       def create_views
         (invoked_actions & available_actions).each do |action|
-          template "views/#{action}.html.haml", File.join('app/views', namespace_path, (namespace_path.present? ? '' : class_path), plural_name, "#{action}.html.haml")
+          template "views/#{action}.html.haml", resource.view_file(action)
         end
 
-        template "views/_resource.html.haml", File.join('app/views', namespace_path, (namespace_path.present? ? '' : class_path), plural_name, "_#{singular_name}.html.haml")
+        template 'views/_resource.html.haml', resource.view_file(resource.name, partial: true)
       end
 
       private

data/lib/scaffolds/controllers/controller.rb

@@ -1,9 +1,4 @@
-<% if namespaced? -%>
-require_dependency '<%= namespaced_path %>/application_controller'
-
-<% end -%>
-<% module_namespacing do -%>
-class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.presence, ApplicationController].compact.join('::') %>
+class <%= resource.namespaced_class_name %>Controller < <%= [resource.namespace.try(:classify).presence, ApplicationController].compact.join('::') %>
   before_action :authenticate_user! # Devise enforce user is present
 
 <% if defined?(EffectiveResources) -%>
@@ -12,34 +7,34 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
 <% end -%>
 <% if actions.delete('index') && !defined?(EffectiveResources) -%>
   def index
-    @page_title = '<%= plural_name.titleize %>'
-    authorize! :index, <%= class_name %>
+    @page_title = '<%= resource.plural_name.titleize %>'
+    authorize! :index, <%= resource.class_name %>
 
-    @datatable = <%= namespaced_class_name %>Datatable.new(params[:scopes])
+    @datatable = <%= resource.namespaced_class_name %>Datatable.new(params[:scopes])
   end
 
 <% end -%>
 <% if actions.delete('new') && !defined?(EffectiveResources) -%>
   def new
-    @<%= singular_name %> = <%= class_name %>.new
+    @<%= resource.name %> = <%= resource.class_name %>.new
 
-    @page_title = 'New <%= human_name %>'
-    authorize! :new, @<%= singular_name %>
+    @page_title = 'New <%= resource.human_name %>'
+    authorize! :new, @<%= resource.name %>
   end
 
 <% end -%>
 <% if actions.delete('create') && !defined?(EffectiveResources) -%>
   def create
-    @<%= singular_name %> = <%= class_name %>.new(<%= singular_name %>_params)
+    @<%= resource.name %> = <%= resource.class_name %>.new(<%= resource.name %>_params)
 
-    @page_title = 'New <%= human_name %>'
-    authorize! :create, @<%= singular_name %>
+    @page_title = 'New <%= resource.human_name %>'
+    authorize! :create, @<%= resource.name %>
 
-    if @<%= singular_name %>.save
-      flash[:success] = 'Successfully created <%= singular_name %>'
+    if @<%= resource.name %>.save
+      flash[:success] = 'Successfully created <%= resource.name %>'
       redirect_to(redirect_path)
     else
-      flash.now[:danger] = "Unable to create <%= singular_name %>: #{@<%= singular_name %>.errors.full_messages.to_sentence}"
+      flash.now[:danger] = "Unable to create <%= resource.name %>: #{@<%= resource.name %>.errors.full_messages.to_sentence}"
       render :new
     end
   end
@@ -47,34 +42,34 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
 <% end -%>
 <% if actions.delete('show') && !defined?(EffectiveResources) -%>
   def show
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
 
-    @page_title = @<%= singular_name %>.to_s
-    authorize! :show, @<%= singular_name %>
+    @page_title = @<%= resource.name %>.to_s
+    authorize! :show, @<%= resource.name %>
   end
 
 <% end -%>
 <% if actions.delete('edit') && !defined?(EffectiveResources) -%>
   def edit
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
 
-    @page_title = "Edit #{@<%= singular_name %>}"
-    authorize! :edit, @<%= singular_name %>
+    @page_title = "Edit #{@<%= resource.name %>}"
+    authorize! :edit, @<%= resource.name %>
   end
 
 <% end -%>
 <% if actions.delete('update') && !defined?(EffectiveResources) -%>
   def update
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
 
-    @page_title = "Edit #{@<%= singular_name %>}"
-    authorize! :update, @<%= singular_name %>
+    @page_title = "Edit #{@<%= resource.name %>}"
+    authorize! :update, @<%= resource.name %>
 
-    if @<%= singular_name %>.update_attributes(<%= singular_name %>_params)
-      flash[:success] = 'Successfully updated <%= singular_name %>'
+    if @<%= resource.name %>.update_attributes(<%= resource.name %>_params)
+      flash[:success] = 'Successfully updated <%= resource.name %>'
       redirect_to(redirect_path)
     else
-      flash.now[:danger] = "Unable to update <%= singular_name %>: #{@<%= singular_name %>.errors.full_messages.to_sentence}"
+      flash.now[:danger] = "Unable to update <%= resource.name %>: #{@<%= resource.name %>.errors.full_messages.to_sentence}"
       render :edit
     end
   end
@@ -82,62 +77,65 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
 <% end -%>
 <% if actions.delete('destroy') && !defined?(EffectiveResources) -%>
   def destroy
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
-    authorize! :destroy, @<%= singular_name %>
+    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
+    authorize! :destroy, @<%= resource.name %>
 
-    if @<%= singular_name %>.destroy
-      flash[:success] = 'Successfully deleted <%= singular_name %>'
+    if @<%= resource.name %>.destroy
+      flash[:success] = 'Successfully deleted <%= resource.name %>'
     else
-      flash[:danger] = "Unable to delete <%= singular_name %>: #{@<%= singular_name %>.errors.full_messages.to_sentence}"
+      flash[:danger] = "Unable to delete <%= resource.name %>: #{@<%= resource.name %>.errors.full_messages.to_sentence}"
     end
 
-    redirect_to <%= index_path %>
+    redirect_to <%= resource.index_path %>
   end
 
 <% end -%>
 <% if actions.delete('unarchive') -%>
   def unarchive
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
-    authorize! :unarchive, @<%= singular_name %>
+    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
+    authorize! :unarchive, @<%= resource.name %>
 
-    if @<%= singular_name %>.unarchive
-      flash[:success] = 'Successfully restored <%= singular_name %>'
+    if @<%= resource.name %>.unarchive
+      flash[:success] = 'Successfully restored <%= resource.name %>'
     else
-      flash.now[:danger] = "Unable to restore <%= singular_name %>: #{@<%= singular_name %>.errors.full_messages.to_sentence}"
+      flash.now[:danger] = "Unable to restore <%= resource.name %>: #{@<%= resource.name %>.errors.full_messages.to_sentence}"
     end
 
-    redirect_to <%= index_path %>
+    redirect_to <%= resource.index_path %>
   end
 
 <% end -%>
 <% actions.each do |action| -%>
   def <%= action %>
-    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
 
-    @page_title = "<%= action.titleize %> #{@<%= singular_name %>}"
-    authorize! :<%= action %>, @<%= singular_name %>
+    @page_title = "<%= action.titleize %> #{@<%= resource.name %>}"
+    authorize! :<%= action %>, @<%= resource.name %>
   end
 
 <% end -%>
   protected
 
-  def <%= singular_name %>_params
-    params.require(:<%= singular_name %>).permit(:id,
-<% attributes_names.each_slice(8).with_index do |slice, index| -%>
-      <%= slice.map { |name| permitted_param_for(name) }.join(', ') %><%= ',' if ((index+1) * 8) < attributes.length %>
+  def <%= resource.name %>_params
+    params.require(:<%= resource.name %>).permit(:id,
+<% attributes.each_slice(8).with_index do |slice, index| -%>
+      <%= slice.map { |att| permitted_param_for(att.name) }.join(', ') %><%= ',' if (((index+1) * 8) < attributes.length || resource.nested_resources.present?) %>
+<% end -%>
+<% resource.nested_resources.each_with_index do |(_, nested_resource), index| -%>
+      <%= nested_resource.name %>_attributes: [:id, :_destroy, <%= (nested_resource.belong_tos_attributes + nested_resource.attributes).map { |att| ':' + att.name.to_s }.join(', ') %>]<%= ',' if index < resource.nested_resources.length-1 %>
 <% end -%>
     )
   end
 
-<% if !defined?(EffectiveResources) -%>
+<% if defined?(EffectiveResources) -%>
   def redirect_path
     case params[:commit].to_s
     when 'Save'
-      <%= edit_path %>
+      <%= resource.edit_path_helper %>
     when 'Save and Continue'
-      <%= index_path %>
+      <%= resource.index_path %>
     when 'Save and Add New'
-      <%= new_path %>
+      <%= resource.new_path %>
     else
       raise 'Unexpected redirect path'
     end
@@ -145,4 +143,3 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
 
 <% end -%>
 end
-<% end -%>

data/lib/scaffolds/datatables/datatable.rb

@@ -1,14 +1,43 @@
-class <%= namespaced_class_name %>Datatable < Effective::Datatable
-
-  datatable do<% attributes.each do |attribute| %>
-    table_column :<%= attribute.name -%>
+class <%= resource.namespaced_class_name %>Datatable < Effective::Datatable
+<% if resource.scopes.present? -%>
+  scopes do<% ([:all] + resource.scopes).uniq.each_with_index do |scope, index| %>
+    scope :<%= scope -%><%= ', default: true' if index == 0 -%>
 <% end %>
+  end
+
+<% end -%>
+  datatable do
+    default_order :<%= attributes.find { |att| att.name == 'updated_at' } || attributes.first %>, :desc
+
+<% resource.belong_tos.each do |reference| -%>
+    table_column :<%= reference.name %>
+<% end -%>
 
+<% attributes.each do |attribute| -%>
+    table_column :<%= attribute.name %>
+<% end -%>
+
+<% if (invoked_actions - crud_actions).present? -%>
+    actions_column do |<%= singular_name %>|
+<% (invoked_actions - crud_actions).each_with_index do |action, index| -%>
+      glyphicon_to('ok', <%= resource.action_path_helper(action, at: false) %>, title: '<%= action.titleize %>')<%= ' +' if (index+1) < (invoked_actions - crud_actions).length %>
+<% end -%>
+    end
+<% else -%>
     actions_column
+<% end -%>
   end
 
+<% if resource.scopes.blank? -%>
+  def collection
+    <%= resource.class_name %>.all
+  end
+<% else -%>
   def collection
-    <%= class_name %>.all
+    col = <%= resource.class_name %>.all
+    col = col.send(current_scope) if current_scope
+    col
   end
+<% end -%>
 
 end

data/lib/scaffolds/forms/{_form.html.haml → default/_form.html.haml}

@@ -1,8 +1,10 @@
 = simple_form_for(<%= form_for %>) do |f|
-<% for attribute in attributes -%>
-  = f.input :<%= attribute.name %>
+<% resource.belong_tos.each do |reference| -%>
+<%= render_field(reference, depth: 1) %>
+<% end -%>
+<% attributes.each do |attribute| -%>
+<%= render_field(attribute, depth: 1) %>
 <% end -%>
-
 <% if defined?(EffectiveResources) -%>
   = simple_form_submit(f)
 <% else -%>

data/lib/scaffolds/forms/fields/_field_belongs_to.html.haml

@@ -0,0 +1,4 @@
+= f.input :<%= reference.foreign_key.presence || (reference.name.to_s + '_id') %>,
+  as: :effective_select, collection: <%= reference.name.to_s.classify %>.all,
+  hint: ''
+

data/lib/scaffolds/forms/fields/_field_boolean.html.haml

@@ -0,0 +1,2 @@
+= f.input :<%= attribute.name %>, as: :boolean,
+  hint: ''

data/lib/scaffolds/forms/fields/_field_date.html.haml

@@ -0,0 +1,2 @@
+= f.input :<%= attribute.name %>, as: :effective_date_picker,
+  hint: ''

data/lib/scaffolds/forms/fields/_field_datetime.html.haml

@@ -0,0 +1,2 @@
+= f.input :<%= attribute.name %>, as: :effective_date_time_picker,
+  hint: ''

data/lib/scaffolds/forms/fields/_field_decimal.html.haml

@@ -0,0 +1,2 @@
+= f.input :<%= attribute.name %>,
+  hint: ''

data/lib/scaffolds/forms/fields/_field_integer.html.haml

@@ -0,0 +1,2 @@
+= f.input :<%= attribute.name %>,
+  hint: ''

data/lib/scaffolds/forms/fields/_field_nested_resource.html.haml

@@ -0,0 +1,11 @@
+#<%= nested_resource.plural_name %>
+  = f.simple_fields_for :<%= nested_resource.plural_name %>, f.object.<%= nested_resource.plural_name %> do |fields|
+    = render '<%= [resource.namespace.presence, nested_resource.plural_name].compact.join('/') %>/fields', f: fields
+
+  - if can? :update, f.object
+    = f.error :<%= nested_resource.plural_name %>, class: 'alert alert-danger'
+    .links
+      = link_to_add_association(f, :<%= nested_resource.plural_name %>, partial: '<%= [resource.namespace.presence, nested_resource.plural_name].compact.join('/') %>/fields') do
+        %button.btn.btn-success
+          %span.glyphicon.glyphicon-plus-sign
+          Add another <%= nested_resource.name.titleize.downcase %>

data/lib/scaffolds/forms/fields/_field_string.html.haml

@@ -0,0 +1,2 @@
+= f.input :<%= attribute.name %>,
+  hint: ''

data/lib/scaffolds/forms/fields/_field_text.html.haml

@@ -0,0 +1,2 @@
+= f.input :<%= attribute.name %>, as: :text,
+  hint: ''

data/lib/scaffolds/forms/fields/_nested_resource_fields.html.haml

@@ -0,0 +1,12 @@
+.row.nested-fields
+<% nested_resource.belong_tos_attributes.each do |attribute| -%>
+  .col-sm-2<%= render_field(attribute, depth: 1).sub('  ', '') -%>
+
+<% end -%>
+<% nested_resource.attributes.each do |attribute| -%>
+  .col-sm-2<%= render_field(attribute, depth: 1).sub('  ', '') -%>
+
+<% end -%>
+  .col-sm-1
+    = link_to_remove_association(f, data: { confirm: 'Really remove?'}) do
+      %span.glyphicon.glyphicon-trash

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

@@ -0,0 +1,32 @@
+= simple_form_for(<%= form_for %>) do |f|
+  %div{role: 'tabpanel'}
+    %ul.nav.nav-tabs{role: 'tablist'}
+      %li.active{role: 'presentation'}
+        %a{'data-toggle': 'tab', role: 'tab', 'aria-controls': '<%= resource.name %>-tab', href: '#<%= resource.name %>-tab'}
+          <%= resource.human_name.titleize %>
+
+<% resource.nested_resources.each do |_, nested_resource| -%>
+      %li{role: 'presentation'}
+        %a{'data-toggle': 'tab', role: 'tab', 'aria-controls': '<%= nested_resource.plural_name %>-tab', href: '#<%= nested_resource.plural_name %>-tab'}
+          <%= nested_resource.plural_name.titleize %>
+
+<% end -%>
+  .tab-content
+    #<%= resource.name %>-tab.tab-pane.active{role: 'tabpanel'}
+      = render 'form_<%= resource.name %>', f: f
+
+<% resource.nested_resources.each do |_, nested_resource| -%>
+    #<%= nested_resource.plural_name %>-tab.tab-pane{role: 'tabpanel'}
+      = render 'form_<%= nested_resource.plural_name %>', f: f
+
+<% end -%>
+  %hr
+
+<% if defined?(EffectiveResources) -%>
+  = simple_form_submit(f)
+<% else -%>
+  %p.text-right
+    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
+    = f.button :submit, 'Save and Continue', data: { disable_with: 'Saving...' }
+    = f.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
+<% end -%>

data/lib/scaffolds/forms/tabpanel/_tab_fields.html.haml

@@ -0,0 +1,6 @@
+<% resource.belong_tos.each do |reference| -%>
+<%= render_field(reference) %>
+<% end -%>
+<% attributes.each do |attribute| -%>
+<%= render_field(attribute) %>
+<% end -%>

data/lib/scaffolds/forms/tabpanel/_tab_nested_resource.html.haml

@@ -0,0 +1,3 @@
+%p There are #{pluralize(f.object.<%= nested_resource.plural_name %>.length, '<%= nested_resource.name.titleize.downcase %>')}.
+
+<%= render_field(nested_resource) %>

data/lib/scaffolds/models/model.rb

@@ -1,5 +1,5 @@
 <% module_namespacing do -%>
-class <%= class_name %> < <%= parent_class_name.classify %>
+class <%= resource.class_name %> < <%= parent_class_name.classify %>
 <% attributes.select(&:reference?).each do |attribute| -%>
   belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
 <% end -%>
@@ -28,11 +28,11 @@ class <%= class_name %> < <%= parent_class_name.classify %>
 
 <% if to_s_attribute.present? -%>
   def to_s
-    <%= to_s_attribute.name %> || 'New <%= human_name %>'
+    <%= to_s_attribute.name %> || 'New <%= resource.human_name %>'
   end
 <% else -%>
   def to_s
-    '<%= human_name %>'
+    '<%= resource.human_name %>'
   end
 <% end -%>
 <% if archived_attribute.present? -%>

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

@@ -1,7 +1,12 @@
 %table.table
   %tbody
-<% for attribute in attributes -%>
+<% resource.belong_tos.each do |reference| -%>
     %tr
-      %th <%= attribute.human_name %>
-      %td= <%= singular_name %>.<%= attribute.name %>
+      %th <%= reference.name.to_s.titleize %>
+      %td= <%= resource.name %>.<%= reference.name %>
+<% end %>
+<% attributes.each do |attribute| -%>
+    %tr
+      %th <%= attribute.name.titleize %>
+      %td= <%= resource.name %>.<%= attribute.name %>
 <% end %>

data/lib/scaffolds/views/edit.html.haml

@@ -1,3 +1,12 @@
 %h1= @page_title
 
+<% if (invoked_actions - crud_actions).present? -%>
+%p.text-right
+<% (invoked_actions - crud_actions).each do |action| -%>
+  - if can?(:<%= action.to_s %>, @<%= resource.name %>)
+    = link_to '<%= action.titleize %>', <%= resource.action_path_helper(action, at: true) %>, class: 'btn btn-primary',
+      data: { confirm: 'Really <%= action.to_s.titleize %>?' }
+
+<% end -%>
+<% end -%>
 = render 'form', <%= singular_name %>: @<%= singular_name %>

data/lib/scaffolds/views/index.html.haml

@@ -1,10 +1,12 @@
 %h1= @page_title
 
-- if can?(:new, <%= class_name %>)
-  %p.text-right= link_to 'New <%= human_name %>', <%= new_path %>, class: 'btn btn-primary'
+<% if actions.include?('new') -%>
+- if can?(:new, <%= resource.class_name %>)
+  %p.text-right= link_to 'New <%= resource.human_name %>', <%= resource.new_path %>, class: 'btn btn-primary'
 
+<% end -%>
 - if @datatable.present?
   = render_datatable_scopes(@datatable)
   = render_datatable(@datatable)
 - else
-  %p There are no <%= plural_name %>.
+  %p There are no <%= resource.plural_name %>.

data/lib/scaffolds/views/new.html.haml

@@ -1,3 +1,3 @@
 %h1= @page_title
 
-= render 'form', <%= singular_name %>: @<%= singular_name %>
+= render 'form', <%= resource.name %>: @<%= resource.name %>

data/lib/scaffolds/views/show.html.haml

@@ -1,3 +1,12 @@
 %h1= @page_title
 
-= render @<%= singular_name %>
+<% if (invoked_actions - crud_actions).present? -%>
+%p.text-right
+<% (invoked_actions - crud_actions).each do |action| -%>
+  - if can?(:<%= action.to_s %>, @<%= resource.name %>)
+    = link_to '<%= action.titleize %>', <%= resource.action_path_helper(action, at: true) %>, class: 'btn btn-default',
+      data: { confirm: 'Really <%= action.to_s.titleize %>?' }
+
+<% end -%>
+<% end -%>
+= render @<%= resource.name %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: effective_resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides some quality of life developer tools.
 email:
 - info@codeandeffect.com
@@ -56,7 +70,20 @@ files:
 - lib/generators/effective_developer/install_generator.rb
 - lib/scaffolds/controllers/controller.rb
 - lib/scaffolds/datatables/datatable.rb
-- lib/scaffolds/forms/_form.html.haml
+- lib/scaffolds/forms/default/_form.html.haml
+- 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_integer.html.haml
+- lib/scaffolds/forms/fields/_field_nested_resource.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/tabpanel/_form.html.haml
+- lib/scaffolds/forms/tabpanel/_tab_fields.html.haml
+- lib/scaffolds/forms/tabpanel/_tab_nested_resource.html.haml
 - lib/scaffolds/importers/csv_importer.rb
 - lib/scaffolds/models/model.rb
 - lib/scaffolds/views/_resource.html.haml