adminpanel 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aafbc35eee8d10953a446e2e0a9c8f499d87d2a
-  data.tar.gz: 37dbeddb83a4a4a1b95b415bd3a9e8a9416ad24b
+  metadata.gz: ba3d85c9a8f1cac45611472dac7b5aecc8194696
+  data.tar.gz: e605db29c0d0995d3500fdae6d02b1d0d21ef866
 SHA512:
-  metadata.gz: 9d96d604d98c7fd68d23763cc2d267b0220f0db279566134f4fa210a452b7d9ca5079f9ef9d230a48969fb90c330d0dac9feb8db425f25e3f2c0d75cbcfc70d5
-  data.tar.gz: b77117eaa2fab041e598175d36ebbe4035692cb67c565cccbc4acac9c8f14964861759544ebf1c7b9206d2545d8f1d2f8a774ddfd93ba39040ca3d182089beff
+  metadata.gz: ffbddd0d680fb5e46461cffd90b0814bc4e3646a1770b703a1f2342b1fdb4c3dbfed53f7b139892e8590f113ddac3327e5c9229da3e821723e25942078da0347
+  data.tar.gz: 3590b94f5be307f4b7148b537ca596c0303ec09bb1a4250ca45aee7be42905058b40dba62670d8fea6161678fc8be34418cd6c4a064c4b6eda8513485d0cdd32

data/app/assets/javascripts/adminpanel/shortcuts.js.coffee

@@ -0,0 +1,5 @@
+$(document).on 'keypress', '#remote-form-modal', 'input', (e) ->
+  if e.keyCode is 13
+    # enter keypress
+    $('#remote-form-modal form').submit()
+    e.preventDefault()

data/app/controllers/adminpanel/application_controller.rb

@@ -26,7 +26,7 @@ module Adminpanel
     end
 
     def set_model
-      @model = params[:controller].classify.constantize
+      @model ||= params[:controller].classify.constantize
     end
 
     def handle_unverified_request

data/app/controllers/adminpanel/sections_controller.rb

@@ -4,17 +4,8 @@ module Adminpanel
       @sections = Section.all
     end
 
-    # def new
-    #   @section = Section.new
-    #   authorize! :create, @section
-    # end
-
     def edit
       @section = Section.find(params[:id])
-      # respond_to do |format|
-        # format.html
-        # format.json {render :json => {:section => @section }}
-      # end
     end
 
     def update
@@ -27,10 +18,6 @@ module Adminpanel
       end
     end
 
-    def show
-      @section = Section.find(params[:id])
-    end
-
     private
     def section_params
       params.require(:section).permit(

data/app/controllers/concerns/adminpanel/rest_actions.rb

@@ -23,7 +23,7 @@ module Adminpanel
     end
 
     def show
-      render 'adminpanel/shared/show' if stale?(last_modified: @resource_instance.updated_at.utc, etag: @resource_instance.cache_key)
+      render 'adminpanel/shared/show' if stale?(@resource_instance, public: true)
     end
 
     def new

data/app/models/adminpanel/permission.rb

@@ -19,7 +19,7 @@ module Adminpanel
     validates_presence_of :resource
 
     def name
-      "#{I18n.t("#{self.class.name.demodulize.downcase}.#{self.action}")} #{symbol_class(self['resource']).display_name}"
+      "#{self.role.name}: #{I18n.t("#{self.class.name.demodulize.downcase}.#{self.action}")} #{symbol_class(self['resource']).display_name}"
     end
 
     def self.form_attributes

data/app/models/adminpanel/section.rb

@@ -64,6 +64,10 @@ module Adminpanel
       end
     end
 
+    def self.routes_options
+      { path: collection_name.parameterize, except: [:new, :create, :destroy] }
+    end
+
     protected
     def has_description?
       !self.has_description.nil? || self.has_description

data/app/views/adminpanel/categories/new.js.erb

@@ -1,2 +1,5 @@
 $("#modal-title").html('Agregar <%= @model.display_name %>');
 $("#modal-container").html('<%= escape_javascript(render "category_form", :resource => @resource_instance) %>');
+setTimeout(function() {
+  $("#remote-form-modal input[type='text']:first").focus();
+}, 500);

data/app/views/adminpanel/icons/_edit.html.erb

@@ -7,7 +7,7 @@
         class: 'fa fa-pencil'
       ),
       [:edit, resource],
-      title: I18n.t('action.update') + " #{resource.name}",
+      title: I18n.t('action.update', name: resource.name),
       class: 'spinner-link'
     )
   %>

data/app/views/adminpanel/icons/_new.html.erb

@@ -0,0 +1,17 @@
+<% if @model.has_route?(:new) && can?(:create, @model) %>
+  <%=
+    link_to(
+      content_tag(
+        :i,
+        nil,
+        class: 'fa fa-plus'
+      ),
+      {
+        controller: params[:controller],
+        action: :new
+      },
+      title: I18n.t('action.create', resource: @model.display_name),
+      class: 'spinner-link'
+    )
+  %>
+<% end %>

data/app/views/adminpanel/sections/edit.html.erb

@@ -8,35 +8,33 @@
       <h5><%= @section.name %></h5>
     </div>
     <%= adminpanel_form_for @section do |f| %>
-      <div class = "widget-body">
-        <div class = "widget-forms clearfix">
-          <%= render 'adminpanel/shared/error_messages', :object => @section %>
+      <%= f.body do %>
+        <%= render 'adminpanel/shared/error_messages', :object => @section %>
 
-          <% if @section.has_description %>
-            <%= f.wysiwyg_field 'description', 'label' => I18n.t('section.description') %>
-          <% else %>
-            <%= f.text_field 'description', 'label' => t("section.description") %>
-          <% end %>
+        <% if @section.has_description %>
+          <%= f.wysiwyg_field 'description', 'label' => I18n.t('section.description') %>
+        <% else %>
+          <%= f.text_field 'description', 'label' => t("section.description") %>
+        <% end %>
 
-          <% if @section.has_image %>
-            <%= content_tag :div, class: 'file-collection-container', data: { max: @section.max_files } do %>
-              <%= f.fields_for :sectionfiles do |builder| %>
-                <%= render 'adminpanel/shared/image_fields', f: builder %>
-              <% end -%>
+        <% if @section.has_image %>
+          <%= content_tag :div, class: 'file-collection-container', data: { max: @section.max_files } do %>
+            <%= f.fields_for :sectionfiles do |builder| %>
+              <%= render 'adminpanel/shared/image_fields', f: builder %>
+            <% end -%>
 
-              <% if @section.max_files != 0 && @section.max_files <= @section.sectionfiles.count %>
-                <% visibility = 'hidden' %>
-              <% else %>
-                <% visibility = 'not-hidden' %>
-              <% end %>
-                <%= link_to_add_fields 'Agregar Imagen', f, :sectionfiles, visibility %>
+            <% if @section.max_files != 0 && @section.max_files <= @section.sectionfiles.count %>
+              <% visibility = 'hidden' %>
+            <% else %>
+              <% visibility = 'not-hidden' %>
             <% end %>
+              <%= link_to_add_fields 'Agregar Imagen', f, :sectionfiles, visibility %>
           <% end %>
-        </div>
-      </div>
-      <div class = "widget-footer">
+        <% end %>
+      <% end %>
+      <%= f.footer do %>
         <%= f.submit t('action.save', resource: @section.name), data: {:disable_with => t("action.submitting")}, :id => "save-button" %>
-      </div>
+      <% end %>
     <% end -%>
   </div>
 </div>

data/app/views/adminpanel/sections/index.html.erb

@@ -7,12 +7,9 @@
         <% current_page = "no-page" %>
         <% @sections.each_with_index do |section, index| %>
           <% if current_page != section.page %>
-          <% if index == 0 %>
-            <li class = "active">
-          <% else %>
-            <li>
-          <% end %>
-              <%= link_to (section.page.capitalize), "#tab#{index}", "data-toggle" => "tab" %></li>
+            <li class="<%= active_tab(index) %>">
+              <%= link_to (section.page.capitalize), "#tab#{index}", "data-toggle" => "tab" %>
+            </li>
             <% current_page = section.page %>
           <% end %>
         <% end %>
@@ -24,11 +21,7 @@
         <% current_page = "no-page" %>
         <% @sections.each_with_index do |section, index| %>
           <% if current_page != section.page %>
-          <% if index == 0 %>
-            <div class="tab-pane active" id="tab<%= index %>">
-          <% else %>
-            <div class="tab-pane" id="tab<%= index %>">
-          <% end %>
+            <div class="tab-pane <%= active_tab(index) %>" id="tab<%= index %>">
               <% section_pages = Adminpanel::Section.of_page section.page %>
               <%= render "sections_table", :sections => section_pages %>
             </div>

data/app/views/adminpanel/shared/_new_resource_button.html.erb

@@ -10,7 +10,7 @@
     ),
     {
       controller: params[:controller],
-      action: 'new'
+      action: :new
     },
     id: 'new-resource-button'
   ) %>

data/app/views/adminpanel/shared/new.js.erb

@@ -1,2 +1,5 @@
 $("#modal-title").html('Agregar <%= @model.display_name %>');
 $("#modal-container").html('<%= escape_javascript(render "adminpanel/shared/remote_form_fields", resource: @resource_instance) %>');
+setTimeout(function() {
+  $("#remote-form-modal input[type='text']:first").focus();
+}, 500);

data/app/views/adminpanel/shared/show.html.erb

@@ -13,13 +13,16 @@
         <%= content_tag(:i, nil, class: "fa fa-#{@model.icon}") %>
         <h5>
           <%= @model.display_name.humanize %>
+        </h5>
+        <div class="widget-buttons">
+          <%= render 'adminpanel/icons/new' %>
 
-          <%= render 'adminpanel/icons/edit',    resource: @resource_instance %>
+          <%= render 'adminpanel/icons/edit',     resource: @resource_instance %>
 
-          <%= render 'adminpanel/icons/facebook',      resource: @resource_instance %>
+          <%= render 'adminpanel/icons/facebook', resource: @resource_instance %>
 
-          <%= render 'adminpanel/icons/twitter', resource: @resource_instance %>
-        </h5>
+          <%= render 'adminpanel/icons/twitter',  resource: @resource_instance %>
+        </div>
       </div>
       <div class="widget-body">
         <div class="widget-tickets widget-tickets-large clearfix">

data/config/locales/en.yml

@@ -84,6 +84,7 @@ en:
     signin_success: 'Welcome!'
     not_authorized: "You don't have access to that"
   gallery:
+    container: 'Images'
     new: 'Add Image'
     success: 'Image has been saved'
     deleted: 'Image has been deleted'

data/config/routes.rb

@@ -4,11 +4,6 @@ Adminpanel::Engine.routes.draw do
 
   Adminpanel.displayable_resources.each do |resource|
     case resource
-    when :sections
-      # sections cannot be created or destroyed
-      resources :sections, resources_parameters(resource).merge(
-        { except: [:new, :create, :destroy] }.merge(rest_path_names)
-      )
     when :analytics
       resources :analytics, resources_parameters(resource).merge({ only: [:index] }) do
         collection do

data/lib/adminpanel.rb

@@ -12,6 +12,7 @@ require 'jquery-rails'
 require 'instagram'
 require 'turbolinks'
 require 'coffee-rails'
+require 'sass'
 
 module Adminpanel
 end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.4.0"
+  VERSION = '2.4.1'
 end

data/lib/generators/adminpanel/contact/contact_generator.rb

@@ -1,12 +1,25 @@
 require 'rails/generators/active_record'
 module Adminpanel
   class ContactGenerator < ActiveRecord::Generators::Base
-    desc "Generate the migrations necessary to start the gem"
-    source_root File.expand_path("../templates", __FILE__)
-    argument :name, :type => :string, :default => "default", :require => false
+    desc 'Generate the contact template to use with a mail form'
+    source_root File.expand_path('../templates', __FILE__)
+    argument :name, type: :string, default: '', required: false
+    argument :fields, type: :array, default: [], required: false
 
     def copy_contact
-      copy_file 'contact_template.rb', 'app/models/contact.rb'
+      fields = extract_fields
+      template 'contact_template.rb', 'app/models/contact.rb'
     end
+
+    private
+      def extract_fields
+        if fields.empty? && name == '' # no fields supplied
+          fields << 'email'
+          fields << 'body'
+        elsif name != '' # at least 1 field supplied
+          fields << name
+        end
+        return fields
+      end
   end
 end

data/lib/generators/adminpanel/contact/templates/contact_template.rb

@@ -3,12 +3,21 @@ class Contact
   include ActiveModel::Conversion
   extend ActiveModel::Naming
 
-  attr_accessor :name, :email, :subject, :body
+  attr_accessor <%= fields.map{|e| ":#{e}" }.join(', ') -%>
 
-  validates_presence_of :name, message: "#{I18n.t('model.attributes.name')} #{I18n.t('activerecord.errors.messages.blank')}"
+<%- if fields.include?('email') -%>
+  # validations for email
   VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
-  validates_format_of :email, :with => VALID_EMAIL_REGEX, message: "#{I18n.t('model.attributes.email')} #{I18n.t('activerecord.errors.messages.invalid')}"
-  validates_presence_of :body, message: "#{I18n.t('model.attributes.body')} #{I18n.t('activerecord.errors.messages.blank')}"
+  validates_format_of :email, with: VALID_EMAIL_REGEX, message: "#{I18n.t('model.attributes.email')} #{I18n.t('activerecord.errors.messages.invalid')}"
+  validates_presence_of :email, message: "#{I18n.t('model.attributes.email')} #{I18n.t('activerecord.errors.messages.blank')}"
+  <%- fields.delete('email') -%>
+<%- end -%>
+
+<%- fields.each do |field| -%>
+  # validations for <%= field %>
+  validates_presence_of :<%= field -%>, message: "#{I18n.t('model.attributes.<%= field -%>')} #{I18n.t('activerecord.errors.messages.blank')}"
+
+<%- end -%>
 
   def initialize(attributes = {})
     attributes.each do |name, value|
@@ -17,7 +26,7 @@ class Contact
   end
 
   def self.display_name
-    'Correo'
+    'Mail'
   end
 
   def self.get_attribute_label(label)

data/lib/generators/adminpanel/dump/dump_generator.rb

@@ -17,7 +17,7 @@ module Adminpanel
       puts "dumping #{resource.display_name.pluralize(I18n.default_locale)} into db/#{file_name}"
 
       create_file "db/#{file_name}" do
-        resource.all.to_a.to_json
+        resource.all.to_a.map{|o| o.attributes}.to_json
       end
       inject_into_seeds(resource, file_name)
     end
@@ -28,7 +28,11 @@ module Adminpanel
         append_to_file 'db/seeds.rb' do
           "\nobjects = JSON.parse(open(\"\#{Rails.root}/db/#{file_name}\").read)\n" +
           "objects.each do |element|\n" +
-            indent("#{resource}.create element\n", 2) +
+            indent("object = #{resource}.new\n", 2) +
+            indent("element.each do |k,v|\n", 2) +
+              indent("object[k] = v\n", 4) +
+            indent("end\n", 2) +
+            indent("object.save\n", 2) +
           "end\n"
         end
       end

data/lib/generators/adminpanel/gallery/templates/uploader.rb

@@ -13,70 +13,76 @@ module Adminpanel
     end
 
     # Process files as they are uploaded:
-    # process :resize_to_fill => [1366, 768]
+    # process resize_to_fill: [1366, 768]
 
     # THE THUMB VERSION IS NECESSARY BY ADMINPANEL, DON'T REMOVE IT!!!!
     version :thumb do
-      process :resize_to_limit => [80, 80]
+      process resize_to_limit: [80, 80]
     end
 
     # however, you can create your own versions:
     # version :awesome do
-    #   process :reside_and_pad => [120, 900]
+    #   process reside_and_pad: [120, 900]
     # end
 
-    # More info at http://www.rubydoc.info/github/jnicklas/carrierwave/CarrierWave/MiniMagick
+    # EXAMPLE: 
+    # original 300 x 300 (this is a square, thanks)
+    #  _________________
+    # |                 |
+    # |        0        |
+    # |       000       |
+    # |        0        |
+    # |       \|/       |
+    # |        |        |
+    # |       / \       |
+    # |                 |
+    # |_________________|
 
-    # resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
-    #
-    # Resize the image to fit within the specified dimensions while retaining
-    # the original aspect ratio. If necessary, will pad the remaining area with
-    # the given color, which defaults to transparent (for gif and png, white for jpeg).
-    #
-    # width (Integer)
-    # the width to scale the image to
-    # height (Integer)
-    # the height to scale the image to
-    # background (String, :transparent)
-    # the color of the background as a hexcode, like “ff45de“
-    # gravity (Magick::GravityType)
-    # how to position the image
+    # resize_and_pad: [700, 300] (fill with transparent to fit size.)
+    #  __________________________________
+    # |TTTTT|                     |TTTTT|
+    # |TTTTT|          0          |TTTTT|
+    # |TTTTT|         000         |TTTTT|
+    # |TTTTT|          0          |TTTTT|
+    # |TTTTT|         \|/         |TTTTT| => [700x300]
+    # |TTTTT|          |          |TTTTT|
+    # |TTTTT|         / \         |TTTTT|
+    # |TTTTT|                     |TTTTT|
+    # |_________________________________|
 
-    # resize_to_fill(width, height)
-    #
-    # Resize the image to fit within the
-    # specified dimensions while retaining the aspect ratio of the original image.
-    # If necessary, crop the image in the larger dimension.
-    #
-    # width (Integer)
-    # the width to scale the image to
-    # height (Integer)
-    # the height to scale the image to
+    # resize_to_fill: [700, 300] (force to fill zooming on the image, crops in half of the image)
+    #  __________________________________
+    # |      00000000000000000000       |
+    # |         000000000000000         |
+    # |              |||||              |
+    # |      \\\\\\\\|||||///////       | => [700x300]
+    # |      \\\\\\\\|||||///////       |
+    # |              |||||              |
+    # |              |||||              |
+    # |_________________________________|
 
-    # resize_to_fit(width, height)
-    #
-    # Resize the image to fit within the
-    # specified dimensions while retaining the original aspect ratio. The image
-    # may be shorter or narrower than specified in the smaller dimension but
-    # will not be larger than the specified values.“
-    #
-    # width (Integer)
-    # the width to scale the image to
-    # height (Integer)
-    # the height to scale the image to
+    # resize_to_fit: [120, 60] (resize to no larger than dimension, while
+    #                             maintaining ratio)
+    #  ____________
+    # |            |
+    # |     0      |
+    # |     \/     |  => [60x60] (no larger than any, original ratio)
+    # |     /|     |
+    # |            |
+    # |____________|
+
+    #  resize_to_limit: [500, 500] resize_to_fit, but only resizing if original image is larger
+    #  _________________
+    # |                 |
+    # |        0        |
+    # |       000       |
+    # |        0        |
+    # |       \|/       | => [300, 300] (original)
+    # |        |        |
+    # |       / \       |
+    # |                 |
+    # |_________________|
 
-    # resize_to_limit(width, height)
-    #
-    # Resize the image to fit within the specified dimensions while retaining
-    # the original aspect ratio. Will only resize the image if it is larger than
-    # the specified dimensions. The resulting image may be shorter or narrower
-    # than specified in the smaller dimension but will not be larger than the
-    # specified values.
-    #
-    # width (Integer)
-    # the width to scale the image to
-    # height (Integer)
-    # the height to scale the image to
     def extension_white_list
       %w(jpg jpeg png)
     end

data/lib/generators/adminpanel/initialize/initialize_generator.rb

@@ -1,29 +1,29 @@
 require 'rails/generators/active_record'
 module Adminpanel
   class InitializeGenerator < ActiveRecord::Generators::Base
-    desc "Generate the migrations necessary to start the gem"
+    desc 'Generate the migrations necessary to start the gem'
     source_root File.expand_path("../templates", __FILE__)
-    argument :name, :type => :string, :default => "default", :require => false
+    argument :name, type: :string, default: 'default', require: false
     class_option :'skip-category',
-      :type => :boolean,
-      :aliases => '-c',
-      :default => false,
-      :desc => "Skip category skeleton and migration for it if true"
+                  type: :boolean,
+                  aliases: '-c',
+                  default: false,
+                  desc: 'Skip category skeleton and migration for it if true'
     class_option :'skip-section-uploader',
-      :type => :boolean,
-      :aliases => '-u',
-      :default => false,
-      :desc => 'Skip section uploader if true'
+                  type: :boolean,
+                  aliases: '-u',
+                  default: false,
+                  desc: 'Skip section uploader if true'
     class_option :'skip-migration',
-      :type => :boolean,
-      :aliases => '-m',
-      :default => false,
-      :desc => 'Skip initial migrations if true'
+                  type: :boolean,
+                  aliases: '-m',
+                  default: false,
+                  desc: 'Skip initial migrations if true'
     class_option :'skip-setup',
-      :type => :boolean,
-      :aliases => '-p',
-      :default => false,
-      :desc => 'Skip setup if true'
+                  type: :boolean,
+                  aliases: '-p',
+                  default: false,
+                  desc: 'Skip setup if true'
 
     def create_initializer
       if !options[:'skip-setup']
@@ -33,20 +33,20 @@ module Adminpanel
 
     def create_category
       if !options[:'skip-category']
-        copy_file "category_template.rb", 'app/models/adminpanel/category.rb'
-  			migration_template 'create_adminpanel_categories_table.rb', 'db/migrate/create_adminpanel_categories_table.rb'
+        copy_file 'category_template.rb', 'app/models/adminpanel/category.rb'
+        migration_template 'create_adminpanel_categories_table.rb', 'db/migrate/create_adminpanel_categories_table.rb'
       end
     end
 
     def create_section_uploader
       if !options[:'skip-section-uploader']
-        copy_file "section_uploader.rb", 'app/uploaders/adminpanel/section_uploader.rb'
+        copy_file 'section_uploader.rb', 'app/uploaders/adminpanel/section_uploader.rb'
       end
     end
 
     def create_adminpanel_migration
       if !options[:'skip-migration']
-  			migration_template 'create_adminpanel_tables.rb', 'db/migrate/create_adminpanel_tables.rb'
+        migration_template 'create_adminpanel_tables.rb', 'db/migrate/create_adminpanel_tables.rb'
       end
     end
 

data/test/dummy/app/models/adminpanel/mug.rb

@@ -27,6 +27,10 @@ module Adminpanel
       'Taza' #singular
     end
 
+    def self.collection_name
+      'Irregular Tazas'
+    end
+
     # def self.icon
     #     "truck" # fa-{icon}
     # end

data/test/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/test/features/shared/resource/show_test.rb

@@ -9,6 +9,7 @@ class ShowTest < ViewCase
     assert_content(adminpanel_products(:first).price)
     assert_content(adminpanel_products(:first).description)
     assert_selector 'i.fa.fa-pencil'
+    assert_selector 'i.fa.fa-plus'
   end
 
   protected

data/test/features/shared/ui/collection_name_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class CollectionNameTest < ViewCase
+  fixtures :all
+
+  setup :sign_in
+
+  def test_collection_name_overwritten
+    visit adminpanel.mugs_path
+    assert_link 'Irregular Tazas'
+  end
+
+  protected
+    def sign_in
+      visit adminpanel.signin_path
+      login
+    end
+
+end

data/test/generators/contact_generator_test.rb

@@ -6,9 +6,38 @@ class ContactGeneratorTest < Rails::Generators::TestCase
   destination Rails.root.join('tmp/generators')
   setup :prepare_destination
 
-  def test_the_generation_of_the_adminpanel_setup_file
-    run_generator
-    assert_file 'app/models/contact.rb'
+  def test_the_generation_of_the_attr_accessor_params
+    run_generator %w(body email name age country)
+    assert_file(
+      'app/models/contact.rb',
+      /attr_accessor :email, :name, :age, :country, :body/
+    )
+  end
+
+  def test_generation_of_validations
+    run_generator %w(body email name age country)
+    assert_file(
+      'app/models/contact.rb',
+      /validates_presence_of :email/,
+      /validates_presence_of :body/,
+      /validates_presence_of :age/,
+      /validates_presence_of :name/,
+      /validates_presence_of :country/
+    )
+  end
+
+  def test_generation_of_email_validations
+    run_generator %w(email body)
+    assert_file(
+      'app/models/contact.rb',
+      /# validations for email/,
+      /VALID_EMAIL_REGEX = \/\\A\[\\w\+\\-.\]\+@\[a-z\\d\\-.\]\+\\.\[a-z\]\+\\z\/i/,
+      /validates_format_of :email, with: VALID_EMAIL_REGEX, message: "\#{I18n.t\('model.attributes.email'\)} \#{I18n.t\('activerecord.errors.messages.invalid'\)}"/
+    )
+  end
+
+  def test_generation
+
   end
 
   def test_runs_without_errors

data/test/models/adminpanel/{gallery_test.rb → galleryzable_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 module Adminpanel
-  class GalleryTest < ActiveSupport::TestCase
+  class GalleryzableTest < ActiveSupport::TestCase
 
     def test_sortable_funcionallity
       gallery = Adminpanel::Gallery.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -421,13 +421,11 @@ files:
 - app/assets/images/adminpanel/icons-small.png
 - app/assets/images/adminpanel/ie-spacer.gif
 - app/assets/images/adminpanel/loguito.png
-- app/assets/images/adminpanel/odinn.jpg
 - app/assets/images/adminpanel/pattern.jpg
 - app/assets/images/adminpanel/pattern_transp.png
 - app/assets/images/adminpanel/progress.gif
 - app/assets/images/adminpanel/quicklook-bg.png
 - app/assets/images/adminpanel/quicklook-icons.png
-- app/assets/images/adminpanel/rails.png
 - app/assets/images/adminpanel/resize.png
 - app/assets/images/adminpanel/saturation.png
 - app/assets/images/adminpanel/select2.png
@@ -457,6 +455,7 @@ files:
 - app/assets/javascripts/adminpanel/jquery.slimscroll.min.js
 - app/assets/javascripts/adminpanel/realm.js
 - app/assets/javascripts/adminpanel/sections.js.coffee
+- app/assets/javascripts/adminpanel/shortcuts.js.coffee
 - app/assets/javascripts/adminpanel/spinner.js.coffee
 - app/assets/javascripts/adminpanel/tables.js
 - app/assets/javascripts/adminpanel/wysiwyg.js.coffee
@@ -540,12 +539,12 @@ files:
 - app/views/adminpanel/icons/_facebook.html.erb
 - app/views/adminpanel/icons/_move_to_better.html.erb
 - app/views/adminpanel/icons/_move_to_worst.html.erb
+- app/views/adminpanel/icons/_new.html.erb
 - app/views/adminpanel/icons/_show.html.erb
 - app/views/adminpanel/icons/_twitter.html.erb
 - app/views/adminpanel/sections/_sections_table.html.erb
 - app/views/adminpanel/sections/edit.html.erb
 - app/views/adminpanel/sections/index.html.erb
-- app/views/adminpanel/sections/show.html.erb
 - app/views/adminpanel/sessions/new.html.erb
 - app/views/adminpanel/shared/_breadcrumb.html.erb
 - app/views/adminpanel/shared/_create_remote_resource_button.html.erb
@@ -680,6 +679,7 @@ files:
 - test/features/shared/resource/new_test.rb
 - test/features/shared/resource/show_test.rb
 - test/features/shared/ui/action_exclution_test.rb
+- test/features/shared/ui/collection_name_test.rb
 - test/features/shared/ui/max_images_gallery_test.rb
 - test/generators/contact_generator_test.rb
 - test/generators/dump_generator_test.rb
@@ -690,7 +690,7 @@ files:
 - test/helpers/router_helper_test.rb
 - test/helpers/shared_pages_helper_test.rb
 - test/models/ability_test.rb
-- test/models/adminpanel/gallery_test.rb
+- test/models/adminpanel/galleryzable_test.rb
 - test/models/adminpanel/section_test.rb
 - test/models/adminpanel/user_test.rb
 - test/support/shared_database.rb
@@ -800,6 +800,7 @@ test_files:
 - test/features/shared/resource/new_test.rb
 - test/features/shared/resource/show_test.rb
 - test/features/shared/ui/action_exclution_test.rb
+- test/features/shared/ui/collection_name_test.rb
 - test/features/shared/ui/max_images_gallery_test.rb
 - test/generators/contact_generator_test.rb
 - test/generators/dump_generator_test.rb
@@ -810,7 +811,7 @@ test_files:
 - test/helpers/router_helper_test.rb
 - test/helpers/shared_pages_helper_test.rb
 - test/models/ability_test.rb
-- test/models/adminpanel/gallery_test.rb
+- test/models/adminpanel/galleryzable_test.rb
 - test/models/adminpanel/section_test.rb
 - test/models/adminpanel/user_test.rb
 - test/support/shared_database.rb

data/app/views/adminpanel/sections/show.html.erb

@@ -1,31 +0,0 @@
-<% provide(:page_title, @section.name.humanize) %>
-<% breadcrumb_add('Secciones', sections_path) %>
-
-<div class="row-fluid">
-  <div class="widget widget-padding span12">
-    <div class="widget-header">
-      <i class="fa fa-tasks"></i>
-      <h5><%= @section.name.humanize %>&nbsp;
-        <%= render 'adminpanel/icons/edit', resource: @section, resource_name: @model.display_name %>
-      </h5>
-    </div>
-    <div class="widget-body row-fluid">
-
-      <div class="span2">
-        <b>Descripción</b>
-      </div>
-      <div class="span10">
-            <% if @section.description.nil? %>
-            	<%= t("other.no description") %>
-            <% else %>
-          <%= @section.description.html_safe %>
-            <% end %>
-      </div>
-      <div class="span12">
-        <% @section.sectionfiles.each do |image|-%>
-          <%= image_tag(image.file_url :thumb) %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>