effective_developer 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b77679e9f8c77843070e3935e2e8b135203700a
-  data.tar.gz: d1a2090b68044a236f141c722d805a9ee43e73c1
+  metadata.gz: 4de366561d47f1314e5ee2960a0a81bc96bc916d
+  data.tar.gz: 90d9f4857b678ea4b12d6809f772666af1673604
 SHA512:
-  metadata.gz: 64d2639f6e25c17cbca8a9ca634716175ea3fbc37404230b5de37938430d766affbe8704b8e1d4db4a9adbe47e468eba91e427350c9ed37b56d608875a984100
-  data.tar.gz: 0ef9f0d3bfc14fd540c87c7ee10d734d9bc7d55369a86514bb17837fb3a03186170f7ccb77f4eb84137c8e671f3a5cadce2aa8cb6df5b61b06ac81526004b8a8
+  metadata.gz: e8b1e735918100416799925391228dff6949c85773aa395335c07a03ac56aedc281ac982682f30501eed99e8dc4a4ba29ee5872a89a5065282f454763d07d34f
+  data.tar.gz: 2bfbfa79274c05ed5727ec2536b06b775eee927e91dd2c35a8f76e46459baa49a2a10297526852058afed538f7fa0c7d79c10ce69611120484196ca6154222e4

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Code and Effect Inc.
+Copyright 2018 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/README.md

@@ -131,14 +131,6 @@ A command line script to delete any git branch that has already been merged into
 > gitsweep
 ```
 
-## BFG Repo-Cleaner
-
-A command line script that calls [BFG Repo-Cleaner](https://rtyley.github.io/bfg-repo-cleaner/) to remove sensitive data from the git repository history.
-
-```console
-> bfg --delete-files id_rsa.pub
-```
-
 # Rake scripts
 
 ## csv:export

data/app/models/effective/code_writer.rb

@@ -22,6 +22,14 @@ module Effective
       end
     end
 
+    # Returns true if the insert happened, nil if no insert
+    def insert_after_first(content, depth: nil, content_depth: nil, &block)
+      index = first(&block)
+      return nil unless index
+
+      insert(content, index, depth: depth, content_depth: content_depth)
+    end
+
     # Returns true if the insert happened, nil if no insert
     def insert_after_last(content, depth: nil, content_depth: nil, &block)
       index = last(&block)

data/app/models/effective/csv_importer.rb

@@ -81,7 +81,7 @@ module Effective
       value = value.to_s
 
       if column.ends_with?('?')  # Boolean
-        ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+        truthy?(value)
       elsif column.ends_with?('_at')  # DateTime
         parse_datetime(column, value)
       elsif column.ends_with?('_on')  # Date
@@ -126,6 +126,43 @@ module Effective
       obj
     end
 
+    def assign_valid_email(user, at: 'example.com')
+      raise 'expected an object that responds to email=' unless user.respond_to?('email=')
+
+      user.email = user.email.to_s.strip.downcase.presence
+
+      if user.email.blank?
+        if user.respond_to?(:first_name) && user.respond_to?(:last_name)
+          user.email ||= [user.first_name.to_s.parameterize.presence, user.last_name.to_s.parameterize.presence].compact.join('.').presence
+        end
+
+        if user.respond_to?(:full_name)
+          user.email ||= user.full_name.to_s.parameterize.presence
+        end
+
+        if user.respond_to?(:name)
+          user.email ||= user.name.to_s.parameterize.presence
+        end
+
+        user.email ||= user.object_id
+
+        user.email = "#{user.email}@#{at.sub('@', '')}"
+      end
+
+      # Check for uniqueness
+      unique = 0
+      email = user.email
+
+      while user.class.where(email: email).present?
+        pieces = user.email.split('@')
+        email = pieces.first + "+#{(unique += 1)}@" + pieces.last
+      end
+
+      user.email = email
+
+      user
+    end
+
     def log(message)
       puts "\n#{message}";
     end
@@ -227,6 +264,14 @@ module Effective
       end
     end
 
+    def truthy?(value)
+      if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails <5
+        ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+      else
+        ::ActiveRecord::Type::Boolean.new.cast(value)
+      end
+    end
+
     private
 
     def default_csv_files

data/lib/effective_developer.rb

@@ -9,11 +9,4 @@ module EffectiveDeveloper
     yield self
   end
 
-  def self.authorized?(controller, action, resource)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
-    end
-    true
-  end
-
 end

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.2.12'.freeze
+  VERSION = '0.2.13'.freeze
 end

data/lib/generators/effective/form_generator.rb

@@ -28,29 +28,33 @@ module Effective
 
       def create_default_form
         if resource.nested_resources.blank?
-          template 'forms/default/_form.html.haml', resource.view_file('form', partial: true)
+          template "#{forms_path}/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)
+          template "#{forms_path}/tabpanel/_form.html.haml", resource.view_file('form', partial: true)
+          template "#{forms_path}/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_path}/tabpanel/_tab_nested_resource.html.haml", resource.view_file("form_#{nested_resource.plural_name}", partial: true)
 
           @nested_resource = Effective::Resource.new(nested_resource)
-          template 'forms/fields/_nested_resource_fields.html.haml', File.join('app/views', resource.namespace.to_s, (resource.namespace.present? ? '' : resource.class_path), nested_resource.name.to_s.underscore.pluralize, '_fields.html.haml')
+          template "#{forms_path}/fields/_nested_resource_fields.html.haml", File.join('app/views', resource.namespace.to_s, (resource.namespace.present? ? '' : resource.class_path), nested_resource.name.to_s.underscore.pluralize, '_fields.html.haml')
         end
       end
 
       protected
 
+      def forms_path
+        @forms_path ||= (defined?(EffectiveBootstrap) ? 'forms' : 'simple_form')
+      end
+
       def form_for
         if resource.namespaces.blank?
           resource.name
@@ -62,6 +66,8 @@ module Effective
       def render_field(attribute, depth: 0)
         b = binding
 
+        b.local_variable_set(:resource, resource)
+
         partial = case attribute
         when (ActiveRecord::Reflection::BelongsToReflection rescue false)
           b.local_variable_set(:reference, attribute)
@@ -78,7 +84,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/#{forms_path}/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/menu_generator.rb

@@ -1,6 +1,7 @@
 # rails generate effective:menu NAME
 
 # Adds a menu to namespace/_navbar if present
+# Adds a menu to namespace/_navbar_admin if present
 # rails generate effective:menu Thing
 
 module Effective
@@ -16,20 +17,20 @@ module Effective
         say_status :invoke, :menu, :white
       end
 
+      # layouts/_navbar.html.haml
       def create_menu
+        return unless resource.namespaces.blank?
+
         begin
-          Effective::CodeWriter.new((['app/views'] + resource.namespaces + ['_navbar.html.haml']).join('/')) do |w|
+          Effective::CodeWriter.new('app/views/layouts/_navbar.html.haml') do |w|
             if w.find { |line, _| line == menu_content.last.strip }
-              say_status :identical, resource.action_path(:index), :blue
+              say_status :identical, menu_path, :blue
             else
-              index = w.last { |line, _| line.start_with?('- if can?') }
-
-              if index.blank?
-                say_status(:skipped, :menu, :yellow) and return
+              if (w.insert_after_first(menu_content) { |line, _| line.start_with?('= nav_link_to') })
+                say_status :menu, menu_path, :green
+              else
+                say_status(:skipped, :menu, :yellow)
               end
-
-              w.insert_raw(menu_content, index+1, w.depth_at(index))
-              say_status :menu, resource.action_path(:index), :green
             end
           end
         rescue Errno::ENOENT
@@ -38,41 +39,48 @@ module Effective
         end
       end
 
-      def create_effective_menus
+      # layouts/_navbar_admin.html.haml
+      def create_admin_menu
+        return unless resource.namespaces == ['admin']
+
         begin
-          Effective::CodeWriter.new('lib/tasks/generate/effective_menus.rake') do |w|
-            if w.find { |line, _| line == effective_menus_content }
-              say_status :identical, resource.action_path(:index), :blue
+          Effective::CodeWriter.new('app/views/layouts/_navbar_admin.html.haml') do |w|
+            if w.find { |line, _| line == admin_menu_content.last.strip }
+              say_status :identical, menu_path, :blue
             else
-              index = w.first { |line, _| line.start_with?('item') }
-
-              w.insert(effective_menus_content, index)
+              index = w.last { |line, _| line.start_with?('- if can?') }
 
-              system('rake generate:effective_menus')
+              if index.blank?
+                say_status(:skipped, :menu, :yellow) and return
+              end
 
-              say_status :effective_menus, resource.plural_name + '_path', :green
+              w.insert_raw(admin_menu_content, index+1, w.depth_at(index))
+              say_status(:menu, menu_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
+          say_status :skipped, :menu, :yellow
         end
       end
 
       private
 
       def menu_content
+        ["= nav_link_to '#{resource.plural_name.titleize}', #{menu_path}"]
+      end
+
+      def admin_menu_content
         [
           "\n",
           "- if can? :manage, #{resource.class_name}",
-          "  %li= link_to '#{resource.plural_name.titleize}', #{resource.action_path(:index)}"
+          "  = nav_link_to '#{resource.plural_name.titleize}', #{menu_path}"
         ]
       end
 
-      def effective_menus_content
-        "item '#{resource.plural_name.titleize}', :#{resource.action_path(:index)}"
+      def menu_path
+        [resource.namespace, resource.plural_name, 'path'].compact * '_'
       end
-
     end
   end
 end

data/lib/generators/effective/route_generator.rb

@@ -40,9 +40,9 @@ module Effective
             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, 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' }
+              w.insert_after_last(content, content_depth: 0) { |line, depth| depth == 1 && line.start_with?('resources') } ||
+              w.insert_before_last(content, content_depth: 0) { |line, depth| depth == 1 && line.start_with?('root') } ||
+              w.insert_before_last(content, content_depth: 0) { |line, depth| line == 'end' }
 
               say_status :route, content.join("\n\t\t")
             end

data/lib/generators/effective/scaffold_controller_generator.rb

@@ -30,9 +30,9 @@ module Effective
         Rails::Generators.invoke('effective:ability', [name] + invoked_actions)
       end
 
-      # def invoke_menu
-      #   Rails::Generators.invoke('effective:menu', [name])
-      # end
+      def invoke_menu
+        Rails::Generators.invoke('effective:menu', [name])
+      end
 
       def invoke_datatable
         unless invoked_actions.include?('index')

data/lib/generators/effective/scaffold_generator.rb

@@ -41,9 +41,9 @@ module Effective
         Rails::Generators.invoke('effective:ability', [name] + invoked_actions)
       end
 
-      # def invoke_menu
-      #   Rails::Generators.invoke('effective:menu', [name])
-      # end
+      def invoke_menu
+        Rails::Generators.invoke('effective:menu', [name])
+      end
 
       def invoke_datatable
         unless invoked_actions.include?('index')

data/lib/scaffolds/controllers/controller.rb

@@ -1,7 +1,9 @@
 class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.namespace.try(:classify).presence, ApplicationController].compact.join('::') %>
+<% unless resource.namespace == 'admin' -%>
   before_action :authenticate_user! # Devise enforce user is present
-
+<% end -%>
 <% if use_effective_resources -%>
+
   include Effective::CrudController
 
 <% end -%>
@@ -116,6 +118,12 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
 <% end -%>
   protected
 
+<% if resource.namespace == 'admin' -%>
+  def <%= resource.name %>_params
+    params.require(:<%= resource.name %>).permit!
+  end
+<% end -%>
+<% if resource.namespace != 'admin' -%>
   def <%= resource.name %>_params
     params.require(:<%= resource.name %>).permit(:id,
 <% attributes.each_slice(8).with_index do |slice, index| -%>
@@ -127,6 +135,7 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
 <% end -%>
     )
   end
+<% end -%>
 
 <% if !use_effective_resources -%>
   def redirect_path

data/lib/scaffolds/datatables/datatable.rb

@@ -26,7 +26,7 @@ class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Data
 <% if non_crud_actions.present? -%>
     actions_col do |<%= singular_name %>|
 <% non_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 %>
+      icon_to('ok', <%= resource.action_path_helper(action, at: false) %>, title: '<%= action.titleize %>')<%= ' +' if (index+1) < (invoked_actions - crud_actions).length %>
 <% end -%>
     end
 <% else -%>
@@ -35,7 +35,7 @@ class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Data
   end
 
   collection do
-    <%= resource.class_name %>.all
+    <%= resource.class_name %>.deep.all
   end
 
 end

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

@@ -1,4 +1,4 @@
-= simple_form_for(<%= form_for %>) do |f|
+= effective_form_with(model: <%= form_for %>) do |f|
 <% resource.belong_tos.each do |reference| -%>
 <%= render_field(reference, depth: 1) %>
 <% end -%>
@@ -6,11 +6,4 @@
 <%= render_field(attribute, depth: 1) %>
 <% end -%>
 
-<% if defined?(EffectiveResources) -%>
-  = simple_form_submit(f)
-<% else -%>
-  .form-actions
-    = 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 -%>
+  = effective_submit(f)

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

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

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

@@ -1 +1 @@
-= f.input :<%= attribute.name %>, as: :boolean
+= f.check_box :<%= attribute.name %>

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

@@ -1 +1 @@
-= f.input :<%= attribute.name %>, as: :effective_date_picker
+= f.date_field :<%= attribute.name %>

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

@@ -1 +1 @@
-= f.input :<%= attribute.name %>, as: :effective_date_time_picker
+= f.datetime_field :<%= attribute.name %>

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

@@ -1 +1 @@
-= f.input :<%= attribute.name %>
+= f.number_field :<%= attribute.name %>

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

@@ -1 +1 @@
-= f.input :<%= attribute.name %>
+= f.text_field :<%= attribute.name %>

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

@@ -1 +1 @@
-= f.input :<%= attribute.name %>
+= f.number_field :<%= attribute.name %>

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

@@ -0,0 +1 @@
+= f.select :<%= reference.foreign_key.presence || (reference.name.to_s + '_id') %>, <%= reference.name.to_s.classify %>.sorted.all

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

@@ -1 +1 @@
-= f.input :<%= attribute.name %>
+= f.text_field :<%= attribute.name %>

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

@@ -1 +1 @@
-= f.input :<%= attribute.name %>, as: :text
+= f.text_area :<%= attribute.name %>

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

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

data/lib/scaffolds/importers/csv_importer.rb

@@ -2,7 +2,7 @@ module CsvImporters
   class <%= klass %>Importer < Effective::CSVImporter
     def columns
       {<% columns.each_with_index do |column, index| %>
-        <%= column.to_s.underscore.gsub(' ', '_').to_sym %>: <%= (letters[index] || index) %><%= ',' unless (index+1) == columns.length %><% end %>
+        <%= column.to_s.underscore.tap { |name| [' ', '/', '(', ')', '__'].each { |str| name.gsub!(str, '_') } }.to_sym %>: <%= (letters[index] || index) %><%= ',' unless (index+1) == columns.length %><% end %>
       }
     end
 

data/lib/scaffolds/simple_form/default/_form.html.haml

@@ -0,0 +1,16 @@
+= simple_form_for(<%= 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 -%>
+
+<% if defined?(EffectiveResources) -%>
+  = simple_form_submit(f)
+<% else -%>
+  .form-actions
+    = 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/simple_form/fields/_field_belongs_to.html.haml

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

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

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

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

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

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

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

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

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

data/lib/scaffolds/simple_form/fields/_field_inet.html.haml

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

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

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

data/lib/scaffolds/simple_form/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.to_s.titleize.downcase %>

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

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

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

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

data/lib/scaffolds/simple_form/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/simple_form/tabpanel/_form.html.haml

@@ -0,0 +1,33 @@
+= 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 -%>
+  %br
+  .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
+
+  .form-actions
+  <% if defined?(EffectiveResources) -%>
+  = simple_form_submit(f)
+  <% else -%>
+  = 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/simple_form/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/simple_form/tabpanel/_tab_nested_resource.html.haml

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,7 +48,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/models/effective/access_denied.rb
 - app/models/effective/code_writer.rb
 - app/models/effective/csv_importer.rb
 - config/effective_developer.rb
@@ -79,6 +78,7 @@ files:
 - 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_select.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
@@ -87,6 +87,21 @@ files:
 - lib/scaffolds/forms/tabpanel/_tab_nested_resource.html.haml
 - lib/scaffolds/importers/csv_importer.rb
 - lib/scaffolds/models/model.rb
+- lib/scaffolds/simple_form/default/_form.html.haml
+- lib/scaffolds/simple_form/fields/_field_belongs_to.html.haml
+- lib/scaffolds/simple_form/fields/_field_boolean.html.haml
+- lib/scaffolds/simple_form/fields/_field_date.html.haml
+- lib/scaffolds/simple_form/fields/_field_datetime.html.haml
+- lib/scaffolds/simple_form/fields/_field_decimal.html.haml
+- lib/scaffolds/simple_form/fields/_field_inet.html.haml
+- lib/scaffolds/simple_form/fields/_field_integer.html.haml
+- lib/scaffolds/simple_form/fields/_field_nested_resource.html.haml
+- lib/scaffolds/simple_form/fields/_field_string.html.haml
+- lib/scaffolds/simple_form/fields/_field_text.html.haml
+- lib/scaffolds/simple_form/fields/_nested_resource_fields.html.haml
+- lib/scaffolds/simple_form/tabpanel/_form.html.haml
+- lib/scaffolds/simple_form/tabpanel/_tab_fields.html.haml
+- lib/scaffolds/simple_form/tabpanel/_tab_nested_resource.html.haml
 - lib/scaffolds/views/_resource.html.haml
 - lib/scaffolds/views/edit.html.haml
 - lib/scaffolds/views/index.html.haml

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end