adminpanel 2.4.3 → 2.5.0

data/config/initializers/adminpanel/carrierwave_mini_magick_quality.rb

@@ -0,0 +1,11 @@
+module CarrierWave
+  module MiniMagick
+    def quality(percentage)
+      manipulate! do |img|
+        img.quality(percentage.to_s)
+        img = yield(img) if block_given?
+        img
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -10,7 +10,6 @@ en:
       adminproject_id: 'Proyect'
       brief: 'Brief Description'
       body: 'Body'
-      category_id: 'Category'
       client_id: 'Client'
       description: 'Description'
       email: 'Email'
@@ -69,10 +68,10 @@ en:
     submitting: 'Submitting...'
     save: 'Save %{resource}'
     save_success: 'Has been saved successfully'
-    update: 'Update %{name}'
+    update: 'Update %{resource}'
     delete: 'Delete'
     view: 'View'
-    delete confirmation: "Are you sure you wan't to delete?"
+    delete_confirmation: "Are you sure you wan't to delete?"
     is_true: 'Yes'
     is_false: 'No'
   authentication:
@@ -115,10 +114,7 @@ en:
     retweet: 'retweet'
     comment: 'comment'
     publish: 'publish-to-%{location}'
-    move_to_better: 'add-priority'
-    move_to_worst: 'remove-priority'
-    move_gallery_to_better: 'add-priority-gallery'
-    move_gallery_to_worst: 'remove-priority-gallery'
+    move_to_position: 'move-position'
     new: 'new'
     edit: 'edit'
     show: 'show'

data/config/locales/es.yml

@@ -5,7 +5,6 @@ es:
   model:
     Analytic: 'Analytics'
     Categories: 'Categorías'
-    Category: 'Categoría'
     Role: 'Rol'
     User: 'Usuario'
     Permission: 'Permisos'
@@ -14,7 +13,6 @@ es:
       adminproject_id: 'Proyecto'
       brief: 'Pequeña descripción'
       body: 'Contenido'
-      category_id: 'Categoría'
       client_id: 'Cliente'
       description: 'Descripción'
       email: 'Correo electrónico'
@@ -73,8 +71,7 @@ es:
     delete_confirmation: 'Estás seguro que desea eliminar %{resource}?'
     delete: 'Eliminar'
     details: 'Detalles de la foto'
-    move_to_better: 'Mejorar %{resource} de posición'
-    move_to_worst: 'Bajar %{resource} de posición'
+    move_to_position: 'cambiar-posicion'
     is_false: 'No'
     is_true: 'Sí'
     publish: 'Publicar'
@@ -126,10 +123,6 @@ es:
     retweet: 'retweet'
     comment: 'comentar'
     publish: 'publicar-a-%{location}'
-    move_to_better: 'subir-prioridad'
-    move_to_worst: 'bajar-prioridad'
-    move_gallery_to_better: 'subir-prioridad-galeria'
-    move_gallery_to_worst: 'bajar-prioridad-galeria'
     facebook_page: 'pagina-en-facebook'
     new: 'nuevo'
     edit: 'editar'

data/config/routes.rb

@@ -21,12 +21,11 @@ Adminpanel::Engine.routes.draw do
         end
       end
     else
-      if get_gallery_children(resource)
-        # include galleryzation concern
-        resources get_gallery_children(resource).to_sym, only: [:index] do
+      if gallery_is_sortable?(resource)
+        # included sortable_gallery
+        resources sortable_gallery(resource), only: [:index] do
           member do
-            put :move_gallery_better, as: 'move_gallery_to_better', path: I18n.t('routes.move_gallery_to_better')
-            put :move_gallery_worst,  as: 'move_gallery_to_worst', path: I18n.t('routes.move_gallery_to_worst')
+            put :move_to_position, as: 'move_to_position', path: I18n.t('routes.move_to_position')
           end
         end
       end
@@ -40,10 +39,9 @@ Adminpanel::Engine.routes.draw do
             end
           end
 
-          if is_sortable?(resource)
+          if resource_is_sortable?(resource)
             # include sortable concern
-            put :move_to_better, as: 'move_to_better', path: I18n.t('routes.move_to_better')
-            put :move_to_worst,  as: 'move_to_worst',  path: I18n.t('routes.move_to_worst')
+            put :move_to_position, as: 'move_to_position', path: I18n.t('routes.move_to_position')
           end
 
           if has_fb_share?(resource)

data/lib/adminpanel.rb

@@ -1,18 +1,19 @@
-require 'adminpanel/version'
 require 'adminpanel/engine'
+require 'adminpanel/version'
+require 'cancancan'
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
-require 'google/api_client'
-require 'cancancan'
+require 'coffee-rails'
 require 'font-awesome-rails'
+require 'google/api_client'
+require 'instagram'
+require 'jquery-rails'
+require 'jquery-ui-rails'
 require 'koala'
-require 'twitter'
 require 'omniauth-twitter'
-require 'jquery-rails'
-require 'instagram'
-require 'turbolinks'
-require 'coffee-rails'
 require 'sass'
+require 'turbolinks'
+require 'twitter'
 
 module Adminpanel
 end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = '2.4.3'
+  VERSION = '2.5.0'
 end

data/lib/generators/adminpanel/custom_errors/custom_errors_generator.rb

@@ -0,0 +1,37 @@
+require 'rails/generators/active_record'
+
+module Adminpanel
+  class CustomErrorsGenerator < ActiveRecord::Generators::Base
+    desc 'Generate ErrorsController, template and configure the app to show our errors'
+    source_root File.expand_path('../templates', __FILE__)
+    argument :name, type: :string, default: 'default', require: false
+
+    def copy_errors_controller
+      copy_file 'errors_controller.rb', 'app/controllers/errors_controller.rb'
+    end
+
+    def copy_errors_template
+      copy_file 'show.html.erb', 'app/views/errors/show.html.erb'
+    end
+
+    def inject_errors_into_routes
+      inject_into_file 'config/routes.rb', before: "\nend\n" do
+        "\n  get \"(errors)/:status\", to: \"errors#show\", constraints: { status: /\d{3}/ }"
+      end
+    end
+
+    def inject_error_handling_app_in_configuration
+      inject_into_file 'config/application.rb', after: 'class Application < Rails::Application' do
+        "\n    config.exceptions_app = -> (env) { ErrorsController.action(:show).call(env) }"
+      end
+    end
+
+    def print_messages
+      puts "The generator tried it's best to insert into config/routes.rb"
+      puts '  get "(errors)/:status", to: "errors#show", constraints: { status: /\d{3}/ }'
+      puts 'and into config/application.rb'
+      puts '  config.exceptions_app = -> (env) { ErrorsController.action(:show).call(env) }'
+      puts 'Make sure those lines are actually there. You can customize your messages in app/controllers/errors_controller.rb and in app/views/errors/show.html.erb'
+    end
+  end
+end

data/lib/generators/adminpanel/custom_errors/templates/errors_controller.rb

@@ -0,0 +1,14 @@
+class ErrorsController < ActionController::Base
+  # layout to show with your errors. make sure it's not that fancy because we're
+  # handling errors.
+  layout 'application'
+
+  def show
+    @exception  = env['action_dispatch.exception']
+    @status     = ActionDispatch::ExceptionWrapper.new(env, @exception).status_code
+
+    # @response   = ActionDispatch::ExceptionWrapper.rescue_responses[@exception.class.name]
+    # response contains the error name ex: 404 => "not found"
+    render status: @status
+  end
+end

data/lib/generators/adminpanel/custom_errors/templates/show.html.erb

@@ -0,0 +1 @@
+<h1><%= @status %> :'(</h1>

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

@@ -1,12 +1,13 @@
 module Adminpanel
   class <%= class_name %> < ActiveRecord::Base
-    # include Adminpanel::Base # required for galleryzation
-    # include Adminpanel::Galleryzation
+    include Adminpanel::Base
+    # include Adminpanel::SortableGallery
 
-    # belongs_to :<%= reference_name %>
+    belongs_to :<%= reference_name %>
 
     mount_uploader :file, <%= class_name %>Uploader
 
+    before_destroy :remove_attachment
 
     # def self.relation_field
     #   '<%= reference_name %>_id'
@@ -16,5 +17,9 @@ module Adminpanel
     #   '<%= class_name %>'
     # end
 
+    private
+      def remove_attachment
+        self.remove_file!
+      end
   end
 end

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

@@ -15,6 +15,9 @@ module Adminpanel
     # Process files as they are uploaded:
     # process resize_to_fill: [1366, 768]
 
+    # 70 as a good default, make sure you know what's your priority
+    process quality: 70
+
     # THE THUMB VERSION IS NECESSARY BY ADMINPANEL, DON'T REMOVE IT!!!!
     version :thumb do
       process resize_to_limit: [80, 80]
@@ -25,7 +28,7 @@ module Adminpanel
     #   process reside_and_pad: [120, 900]
     # end
 
-    # EXAMPLE: 
+    # EXAMPLE:
     # original 300 x 300 (this is a square, thanks)
     #  _________________
     # |                 |

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

@@ -4,11 +4,6 @@ module Adminpanel
     desc 'Generate the migrations necessary to start the gem'
     source_root File.expand_path("../templates", __FILE__)
     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'
     class_option :'skip-section-uploader',
                   type: :boolean,
                   aliases: '-u',
@@ -31,13 +26,6 @@ module Adminpanel
       end
     end
 
-    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'
-      end
-    end
-
     def create_section_uploader
       if !options[:'skip-section-uploader']
         copy_file 'section_uploader.rb', 'app/uploaders/adminpanel/section_uploader.rb'

data/lib/generators/adminpanel/initialize/templates/adminpanel_setup.rb

@@ -48,8 +48,7 @@ Adminpanel.setup do |config|
     :users,
     :roles,
     :permissions,
-    # :auths,
-    #:categories,
+    #:auths,
     :sections
   ]
 end

data/lib/generators/adminpanel/resource/resource_generator.rb

@@ -7,16 +7,18 @@ module Adminpanel
     source_root File.expand_path('../templates', __FILE__)
     desc 'Generate the resource files necessary to use a model'
     class_option :'skip-gallery',
-      :type => :boolean,
-      :default => true,
-      :desc => 'Choose if we shoud create the gallery for this resource, default: true (skip gallery)'
+      type: :boolean,
+      default: true,
+      desc: 'Choose if we shoud create the gallery for this resource, default: true (skip gallery)'
 
-    argument :fields, :type => :array, :default => [], :banner => 'field[:type][:index] field[:type][:index]'
+    argument :fields,
+      type: :array,
+      default: [],
+      banner: 'field[:type][:index] field[:type][:index]'
 
     def change_fields_aliases
       fields.each do |attribute|
-        type = attribute.split(':').second
-        case type
+        case attribute.split(':').second
         when 'wysiwyg'
           fields.delete(attribute)
           fields << attribute.split(':').first + ':' + 'text'
@@ -35,8 +37,17 @@ module Adminpanel
     end
 
     def generate_migration
-      parameters = fields
-      parameters.delete_if{ |pair| pair.split(':').second == 'has_many' }
+      parameters = fields.dup
+      parameters.delete_if do |pair|
+        pair.split(':').second == 'has_many'
+      end
+      parameters.each do |attribute|
+        case attribute.split(':').second
+        when 'file'
+          parameters.delete(attribute)
+          parameters << attribute.split(':').first + ':' + 'string'
+        end
+      end
       parameters << 'created_at:datetime' << 'updated_at:datetime'
       invoke :migration, ["create_adminpanel_#{pluralized_name}", parameters]
     end
@@ -47,6 +58,16 @@ module Adminpanel
       end
     end
 
+    def generate_files_uploaders
+      fields.each do |attribute|
+        assign_attributes_variables(attribute)
+        case @attr_type
+        when 'file'
+          template '../../gallery/templates/uploader.rb', "app/uploaders/adminpanel/#{class_name.underscore}_uploader.rb"
+        end
+      end
+    end
+
     def add_resource_to_config
       if setup_is_found? && is_a_resource?
         inject_into_file 'config/initializers/adminpanel_setup.rb',

data/lib/generators/adminpanel/resource/resource_generator_helper.rb

@@ -8,6 +8,17 @@ module Adminpanel
       end
     end
 
+    def needs_name?
+      fields.each do |attribute|
+        return false if attribute.split(':').first == 'name'
+      end
+      true
+    end
+
+    def class_name
+      "#{resource_name}_#{@attr_field}".camelize
+    end
+
     def belongs_to_field(resource)
       "#{resource.singularize.downcase}_id"
     end
@@ -96,6 +107,10 @@ module Adminpanel
       attribute_hash(@attr_field, 'number_field')
     end
 
+    def file_form_hash
+      attribute_hash(@attr_field, 'file_field')
+    end
+
     def boolean_form_hash
       attribute_hash(@attr_field, 'boolean')
     end
@@ -147,7 +162,12 @@ module Adminpanel
     def has_associations?
       fields.each do |attribute|
         assign_attributes_variables(attribute)
-        if @attr_type == "images" || @attr_type == "belongs_to" || @attr_type == "has_many" || @attr_type == "has_many_through"
+        if( @attr_type == 'images' ||
+            @attr_type == 'belongs_to' ||
+            @attr_type == 'has_many' ||
+            @attr_type == 'has_many_through' ||
+            @attr_type == 'file' ||
+            has_gallery? )
           return true
         end
       end
@@ -158,13 +178,20 @@ module Adminpanel
       association = ""
       fields.each do |attribute|
         assign_attributes_variables(attribute)
-        if @attr_type == "belongs_to"
+        case @attr_type
+        when 'belongs_to'
           association = "#{association}#{belongs_to_association(@attr_field)}"
-        elsif @attr_type == "has_many" || @attr_type == "has_many_through"
+        when 'has_many' || 'has_many_through'
           association = "#{association}#{has_many_association(@attr_field)}"
+        when 'file'
+          association = "#{association}#{file_assocation(@attr_field)}"
         end
+      end
 
+      if has_gallery?
+        association = "#{association}mount_images :#{gallery_name.pluralize}\n\t\t"
       end
+
       association
     end
 
@@ -175,12 +202,12 @@ module Adminpanel
     def has_many_association(field)
       return "# has_many :#{@attr_field.downcase}zations\n\t\t" +
       "# has_many :#{@attr_field.pluralize.downcase}, " +
-      ":through => :#{@attr_field.downcase}zations, " +
-      ":dependent => :destroy\n\t\t"
+      "through: :#{@attr_field.downcase}zations, " +
+      "dependent: :destroy\n\t\t"
     end
 
-    def get_gallery
-      return "\n\t\tmount_images :#{gallery_name.pluralize}\n"
+    def file_assocation(field)
+      return "mount_uploader :#{field}, #{class_name}Uploader\n\t\t"
     end
 
   end

data/lib/generators/adminpanel/resource/templates/adminpanel_resource_template.rb

@@ -1,9 +1,14 @@
 module Adminpanel
-  class <%= camelized_resource %> < ActiveRecord::Base
+  class <%= camelized_resource -%> < ActiveRecord::Base
     include Adminpanel::Base
 
     <%= associations if has_associations? -%>
-    <%= get_gallery if has_gallery? -%>
+
+<% if needs_name? -%>
+    def name
+      self.id.to_s
+    end
+<% end -%>
 
     def self.form_attributes
       [