effective_developer 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf305c231784d1c6bce30322420dc57cf142f28a
-  data.tar.gz: d65e5ccd3796a73b487cffd2d6b76e28fa028371
+  metadata.gz: 5a6c65c15c6025e2d82b06fd85be1dedf34a3b23
+  data.tar.gz: 9fad65447322c44cac74cfa244304877b2dd468d
 SHA512:
-  metadata.gz: f429b820f1e2efac22656c02cb4efee990c2df168d8d8a65621eb9cb4bb294aa14c6170e3cc16266b8efa8032d9ddbb68dc59db79e41cc2a47408739fe1f5f65
-  data.tar.gz: 11bb3454c678fb367542478eaa4d946a22f5d3f29f8d80201b1d4a011ea20d3afe0c44a6debedd9c6042a5fd834ea454a9a37231b0f3d937d49607d26e93f893
+  metadata.gz: db915fe8e34c03a300ce5e5d12f917793415df03305d885743eb8b88080de5125b3f010f049f7ab6852dacc7bf54c5fa58a51d1a77e630139c7af40080a80ffb
+  data.tar.gz: 5d8004e9236644ac16e6e80b699f2e9e1e735101552f783d996694b0c0caa461dc59ead50b2f2980f6789481c09bfdd0327eabceae6f869cff9d4a6ce770e231

data/app/models/effective/code_writer.rb

@@ -1,3 +1,8 @@
+#   Effective::CodeWriter.new('Gemfile') do |w|
+#     @use_effective_resources = w.find { |line| line.include?('effective_resources') }.present?
+#   end
+# end
+
 module Effective
   class CodeWriter
 

data/config/effective_developer.rb

@@ -1,2 +1,5 @@
 EffectiveDeveloper.setup do |config|
+
+  # This doesn't do anything. Yet.
+  config.live = true
 end

data/lib/effective_developer/engine.rb

@@ -7,5 +7,12 @@ module EffectiveDeveloper
       # Set up our defaults, as per our initializer template
       eval File.read("#{config.root}/config/effective_developer.rb")
     end
+
+    # Include acts_as_addressable concern and allow any ActiveRecord object to call it
+    initializer 'effective_developer.effective_resources' do |app|
+      ActiveSupport.on_load :effective_resource do
+      end
+    end
+
   end
 end

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/effective_developer.rb

@@ -4,6 +4,7 @@ require 'effective_developer/engine'
 require 'effective_developer/version'
 
 module EffectiveDeveloper
+  mattr_accessor :live
 
   def self.setup
     yield self

data/lib/generators/effective/controller_generator.rb

@@ -22,7 +22,7 @@ module Effective
       end
 
       def assign_attributes
-        @attributes = invoked_attributes.presence || (resource.belong_tos_attributes + resource_attributes)
+        @attributes = invoked_attributes.presence || resource.belong_tos_attributes.merge(resource_attributes)
         self.class.send(:attr_reader, :attributes)
       end
 
@@ -30,30 +30,10 @@ module Effective
         say_status :invoke, :controller, :white
       end
 
-      # Find if effective_resources is in the app's Gemfile
-      def enable_effective_resources
-        self.class.send(:attr_reader, :use_effective_resources)
-
-        Effective::CodeWriter.new('Gemfile') do |w|
-          @use_effective_resources = w.find { |line| line.include?('effective_resources') }.present?
-        end
-      end
-
       def create_controller
         template 'controllers/controller.rb', resource.controller_file
       end
 
-      protected
-
-      def permitted_param_for(attribute_name)
-        case attribute_name
-        when 'roles'
-          'roles: EffectiveRoles.permitted_params'
-        else
-          ':' + attribute_name
-        end
-      end
-
     end
   end
 end

data/lib/generators/effective/form_generator.rb

@@ -6,6 +6,8 @@
 # rails generate effective:form Thing
 # rails generate effective:form Thing name:string description:text
 
+# rails generate effective:form Thing --tabbed false
+
 module Effective
   module Generators
     class FormGenerator < Rails::Generators::NamedBase
@@ -16,6 +18,7 @@ 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 assign_attributes
         @attributes = invoked_attributes.presence || resource_attributes
@@ -26,35 +29,21 @@ module Effective
         say_status :invoke, :form, :white
       end
 
-      def create_default_form
-        if resource.nested_resources.blank?
-          template "#{forms_path}/default/_form.html.haml", resource.view_file('form', partial: true)
+      def create_flat_form
+        if options[:tabbed] == 'false'
+          template 'forms/flat/_form.html.haml', resource.view_file('form', partial: true)
         end
       end
 
-      def create_tabpanel_form
-        if resource.nested_resources.present?
-          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_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_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')
+      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)
         end
       end
 
       protected
 
-      def forms_path
-        @forms_path ||= (defined?(EffectiveBootstrap) ? 'forms' : 'simple_form')
-      end
-
       def form_for
         if resource.namespaces.blank?
           resource.name
@@ -78,13 +67,25 @@ module Effective
         when Effective::Resource
           b.local_variable_set(:nested_resource, attribute)
           'nested_resource'
-        else
-          b.local_variable_set(:attribute, attribute)
-          (attribute.type || :string).to_s
+        else # [:name, [:string]]
+          name = attribute.first.to_s
+          datatype = ((attribute.last || []).first || :string).to_s
+
+          b.local_variable_set(:attribute, name)
+
+          if name.include?('price')
+            'price'
+          elsif name.include?('_url')
+            'url'
+          elsif name.include?('email')
+            'email'
+          else
+            datatype
+          end
         end
 
         html = ERB.new(
-          File.read("#{File.dirname(__FILE__)}/../../scaffolds/#{forms_path}/fields/_field_#{partial}.html.haml")
+          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

data/lib/generators/effective/helpers.rb

@@ -33,11 +33,15 @@ module Effective
       end
 
       # As per the command line invoked actions. These are Rails Generated Attributes
+      # { :name => [:string], ... }
       def invoked_attributes
         if respond_to?(:attributes)
-          attributes
+          attributes.inject({}) { |h, att| h[att.name.to_sym] = [att.type]; h }
         else
-          Array(options.attributes).compact.map { |att| Rails::Generators::GeneratedAttribute.parse(att) }
+          Array(options.attributes).compact.inject({}) do |h, att|
+            (name, type) = att.split(':')
+            h[name.to_sym] = [type.to_sym] if name && type; h
+          end
         end
       end
 
@@ -47,7 +51,7 @@ module Effective
 
       # Turns the GeneratedAttribute or Effective::Attribute into an array of strings
       def invokable(attributes)
-        attributes.map { |att| "#{att.name}:#{att.type}" }
+        attributes.map { |name, (type, _)| "#{name}:#{type}" }
       end
 
       def resource_attributes(all: false)
@@ -69,7 +73,7 @@ module Effective
           klass_attributes = resource.klass_attributes(all: all)
         end
 
-        klass_attributes.presence || resource.written_attributes
+        klass_attributes.presence || resource.model_attributes
       end
 
     end

data/lib/generators/effective/migration_generator.rb

@@ -26,8 +26,8 @@ module Effective
           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.written_attributes.present?
-          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + invokable(resource.belong_tos_attributes) + (invokable(resource.written_attributes) | timestamps))
+        elsif resource.model_attributes.present?
+          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + invokable(resource.belong_tos_attributes) + (invokable(resource.model_attributes) | timestamps))
         else
           raise 'You need to specify some attributes or have a model file present'
         end

data/lib/generators/effective/model_generator.rb

@@ -30,15 +30,11 @@ module Effective
       end
 
       def to_s_attribute
-        attributes.find { |att| ['display_name', 'name', 'title', 'subject'].include?(att.name) }
-      end
-
-      def archived_attribute
-        attributes.find { |att| att.name == 'archived' && att.type == :boolean }
+        [:display_name, :name, :title, :subject].find { |att| invoked_attributes.key?(att) }
       end
 
       def max_attribute_name_length
-        @max_attribute_name_length ||= (attributes.map { |att| att.name.length }.max || 0)
+        @max_attribute_name_length ||= (invoked_attributes.keys.map { |att| att.to_s.length }.max || 0)
       end
 
     end

data/lib/generators/effective/scaffold_controller_generator.rb

@@ -51,7 +51,7 @@ module Effective
           say_status(:skipped, :form, :yellow) and return
         end
 
-        Rails::Generators.invoke('effective:form', [name] + invoked_attributes)
+        Rails::Generators.invoke('effective:form', [name] + invoked_attributes_args)
       end
 
     end

data/lib/generators/effective/views_generator.rb

@@ -26,25 +26,11 @@ module Effective
       end
 
       def create_views
-        (invoked_actions & available_actions).each do |action|
-          template "views/#{action}.html.haml", resource.view_file(action)
-        end
-
         if invoked_actions.include?('show') || non_crud_actions.present?
           template 'views/_resource.html.haml', resource.view_file(resource.name, partial: true)
         end
       end
 
-      private
-
-      def available_actions
-        if defined?(EffectiveResources) # We don't need any views!
-          []
-        else
-          %w(index new show edit)
-        end
-      end
-
     end
   end
 end

data/lib/scaffolds/controllers/controller.rb

@@ -1,155 +1,3 @@
 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 -%>
-<% if actions.delete('index') && !use_effective_resources -%>
-  def index
-    @page_title = '<%= resource.plural_name.titleize %>'
-    authorize! :index, <%= resource.class_name %>
-
-    @datatable = <%= resource.namespaced_class_name.pluralize %>Datatable.new(self)
-  end
-
-<% end -%>
-<% if actions.delete('new') && !use_effective_resources -%>
-  def new
-    @<%= resource.name %> = <%= resource.class_name %>.new
-
-    @page_title = 'New <%= resource.human_name %>'
-    authorize! :new, @<%= resource.name %>
-  end
-
-<% end -%>
-<% if actions.delete('create') && !use_effective_resources -%>
-  def create
-    @<%= resource.name %> = <%= resource.class_name %>.new(<%= resource.name %>_params)
-
-    @page_title = 'New <%= resource.human_name %>'
-    authorize! :create, @<%= resource.name %>
-
-    if @<%= resource.name %>.save
-      flash[:success] = 'Successfully created <%= resource.name %>'
-      redirect_to(redirect_path)
-    else
-      flash.now[:danger] = "Unable to create <%= resource.name %>: #{@<%= resource.name %>.errors.full_messages.to_sentence}"
-      render :new
-    end
-  end
-
-<% end -%>
-<% if actions.delete('show') && !use_effective_resources -%>
-  def show
-    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
-
-    @page_title = @<%= resource.name %>.to_s
-    authorize! :show, @<%= resource.name %>
-  end
-
-<% end -%>
-<% if actions.delete('edit') && !use_effective_resources -%>
-  def edit
-    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
-
-    @page_title = "Edit #{@<%= resource.name %>}"
-    authorize! :edit, @<%= resource.name %>
-  end
-
-<% end -%>
-<% if actions.delete('update') && !use_effective_resources -%>
-  def update
-    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
-
-    @page_title = "Edit #{@<%= resource.name %>}"
-    authorize! :update, @<%= resource.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 <%= resource.name %>: #{@<%= resource.name %>.errors.full_messages.to_sentence}"
-      render :edit
-    end
-  end
-
-<% end -%>
-<% if actions.delete('destroy') && !use_effective_resources -%>
-  def destroy
-    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
-    authorize! :destroy, @<%= resource.name %>
-
-    if @<%= resource.name %>.destroy
-      flash[:success] = 'Successfully deleted <%= resource.name %>'
-    else
-      flash[:danger] = "Unable to delete <%= resource.name %>: #{@<%= resource.name %>.errors.full_messages.to_sentence}"
-    end
-
-    redirect_to <%= resource.index_path %>
-  end
-
-<% end -%>
-<% if actions.delete('unarchive') -%>
-  def unarchive
-    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
-    authorize! :unarchive, @<%= resource.name %>
-
-    if @<%= resource.name %>.unarchive
-      flash[:success] = 'Successfully restored <%= resource.name %>'
-    else
-      flash.now[:danger] = "Unable to restore <%= resource.name %>: #{@<%= resource.name %>.errors.full_messages.to_sentence}"
-    end
-
-    redirect_to <%= resource.index_path %>
-  end
-
-<% end -%>
-<% actions.each do |action| -%>
-  def <%= action %>
-    @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
-
-    @page_title = "<%= action.titleize %> #{@<%= resource.name %>}"
-    authorize! :<%= action %>, @<%= resource.name %>
-  end
-
-<% 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| -%>
-      <%= 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 = Effective::Resource.new(nested_resource) -%>
-      <%= nested.name %>_attributes: [:id, :_destroy, <%= (nested.belong_tos_attributes + nested.attributes).map { |att| ':' + att.name.to_s }.join(', ') %>]<%= ',' if index < resource.nested_resources.length-1 %>
-<% end -%>
-    )
-  end
-<% end -%>
-
-<% if !use_effective_resources -%>
-  def redirect_path
-    case params[:commit].to_s
-    when 'Save'
-      <%= resource.edit_path_helper %>
-    when 'Save and Continue'
-      <%= resource.index_path_helper %>
-    when 'Save and Add New'
-      <%= resource.new_path_helper %>
-    else
-      raise 'Unexpected redirect path'
-    end
-  end
-
-<% end -%>
 end

data/lib/scaffolds/datatables/datatable.rb

@@ -1,37 +1,29 @@
 class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Datatable
 
   datatable do
-    order :<%= (attributes.find { |att| att.name == 'updated_at' } || attributes.first).name %>
+    length 25
+    order :<%= (attributes[:updated_at] ? :updated_at : attributes.keys.first) %>
 
-<% if attributes.find { |att| att.name == 'updated_at' } -%>
+<% if attributes[:updated_at] -%>
     col :updated_at, visible: false
 <% end -%>
-<% if attributes.find { |att| att.name == 'created_at' } -%>
+<% if attributes[:created_at] -%>
     col :created_at, visible: false
 <% end -%>
-<% if attributes.find { |att| att.name == 'id' } -%>
     col :id, visible: false
 
-<% end -%>
 <% resource.belong_tos.each do |reference| -%>
     col :<%= reference.name %>
 <% end -%>
 <% resource.nested_resources.each do |reference| -%>
     col :<%= reference.name %>
 <% end -%>
-<% attributes.reject { |att| ['created_at', 'updated_at', 'id'].include?(att.name) }.each do |attribute| -%>
-    col :<%= attribute.name %>
-<% end -%>
 
-<% if non_crud_actions.present? -%>
-    actions_col do |<%= singular_name %>|
-<% non_crud_actions.each_with_index do |action, index| -%>
-      icon_to('ok', <%= resource.action_path_helper(action, at: false) %>, title: '<%= action.titleize %>')<%= ' +' if (index+1) < (invoked_actions - crud_actions).length %>
+<% attributes.except(:created_at, :updated_at, :id).each do |name, _| -%>
+    col :<%= name %>
 <% end -%>
-    end
-<% else -%>
+
     actions_col
-<% end -%>
   end
 
   collection do

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,15 @@
+= 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' %>
+
+<%- 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 -%>
+<%- if resource.instance.respond_to?(:log_changes_datatable) -%>
+    = tab 'Logs' do
+      = render_datatable(<%= resource.name %>.log_changes_datatable)
+<% end -%>
+<% end -%>

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

@@ -0,0 +1,9 @@
+= effective_form_with(model: [(namespace if defined?(namespace)), <%= resource.name %>]) 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)

data/lib/scaffolds/models/model.rb

@@ -1,50 +1,28 @@
 <% module_namespacing do -%>
 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 -%>
-<% if attributes.all? { |attribute| attribute.respond_to?(:token?) } -%>
-<% attributes.select(&:token?).each do |attribute| -%>
-  has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
-<% end -%>
-<% end -%>
-<% if attributes.any? { |att| att.respond_to?(:password_digest?) && att.password_digest? } -%>
-  has_secure_password
+<% resource.belong_tos.each do || ass -%>
+  belongs_to :<%= ass.name %><%= ', polymorphic: true' if ass.polymorphic? %>
 <% end -%>
 
-  # Attributes
-<% attributes.each do |attribute| -%>
-  # <%= attribute.name.ljust(max_attribute_name_length) %> :<%= attribute.type %>
+  effective_resource do
+<% invoked_attributes.each do |name, (type, _)| -%>
+    <%= name.to_s.ljust(max_attribute_name_length) %> :<%= type %>
 <% end -%>
-<% if archived_attribute.present? -%>
+  end
 
-  scope :<%= plural_table_name %>, -> { where(archived: false) }
-  scope :archived, -> { where(archived: true) }
-<% end -%>
+  scope :deep, -> { <%= resource.class_name %>.all }
 
-<% attributes.each do |attribute| -%>
-  validates :<%= attribute.name %>, presence: true
+<% invoked_attributes.each do |name, (type, _)| -%>
+  validates :<%= name %>, presence: true
 <% end -%>
 
-<% if to_s_attribute.present? -%>
-  def to_s
-    <%= to_s_attribute.name %> || 'New <%= resource.human_name %>'
-  end
-<% else -%>
   def to_s
+<% if to_s_attribute.present? -%>
+    <%= to_s_attribute %> || 'New <%= resource.human_name %>'
+<% else %>
     '<%= resource.human_name %>'
-  end
 <% end -%>
-<% if archived_attribute.present? -%>
-
-  def destroy
-    update_column(:archived, true) # This intentionally skips validation
   end
 
-  def unarchive
-    update_column(:archived, false) # This intentionally skips validation
-  end
-<% end -%>
-
 end
 <% end -%>

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

@@ -5,8 +5,8 @@
       %th <%= reference.name.to_s.titleize %>
       %td= <%= resource.name %>.<%= reference.name %>
 <% end -%>
-<% attributes.each do |attribute| -%>
+<% attributes.each do |name, (type, _)| -%>
     %tr
-      %th <%= attribute.name.titleize %>
-      %td= <%= resource.name %>.<%= attribute.name %>
+      %th <%= name.to_s.titleize %>
+      %td= <%= resource.name %>.<%= name %>
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,44 +69,29 @@ files:
 - lib/generators/effective_developer/install_generator.rb
 - lib/scaffolds/controllers/controller.rb
 - lib/scaffolds/datatables/datatable.rb
-- 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_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_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/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/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
-- lib/scaffolds/views/new.html.haml
-- lib/scaffolds/views/show.html.haml
 - lib/tasks/effective_csv_importer.rake
 - lib/tasks/pg_pull.rake
 - lib/tasks/rename_class.rake
@@ -132,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Provides some quality of life developer tools.

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

@@ -1,33 +0,0 @@
-= 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/forms/tabpanel/_tab_fields.html.haml

@@ -1,6 +0,0 @@
-<% 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

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

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

@@ -1,16 +0,0 @@
-= 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

@@ -1 +0,0 @@
-= 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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +0,0 @@
-#<%= 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

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

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

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

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

@@ -1,12 +0,0 @@
-.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

@@ -1,33 +0,0 @@
-= 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

@@ -1,6 +0,0 @@
-<% 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

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

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

@@ -1,12 +0,0 @@
-%h1= @page_title
-
-<% if non_crud_actions.present? -%>
-%p.text-right
-<% non_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', <%= resource.name %>: @<%= resource.name %>

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

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

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

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

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

@@ -1,12 +0,0 @@
-%h1= @page_title
-
-<% if non_crud_actions.present? -%>
-%p.text-right
-<% non_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 %>