adminpanel 2.2.5 → 2.3.0

data/config/routes.rb

@@ -7,36 +7,32 @@ Adminpanel::Engine.routes.draw do
     when :sections
       # sections cannot be created or destroyed
       resources :sections, resources_parameters(resource).merge(
-      { except: [:new, :create, :destroy] }.merge(rest_path_names)
+        { except: [:new, :create, :destroy] }.merge(rest_path_names)
       )
-    when :galleries
-      # galleries gallery is different from normal resources galleries
-      resources :galleries, resources_parameters(resource).merge(rest_path_names) do
-        member do
-          put :move_better, as: 'move_to_better', path: 'subir-prioridad'
-          put :move_worst, as: 'move_to_worst', path: 'bajar-prioridad'
-        end
-      end
     when :analytics
       resources :analytics, resources_parameters(resource).merge({ only: [:index] }) do
         collection do
-          get :google, to: 'analytics#google', path: 'google'
-          get :fb, to:'analytics#fb', path:'facebook'
-          get :twitter, to:'analytics#twitter', path:'twitter'
-          post 'reply_to_tweet/:id', to: 'analytics#reply_to_tweet', as: 'reply_to', path: 'twitter/responder/:id'
-          post 'favorite_tweet/:id', to: 'analytics#favorite_tweet', as: 'favorite', path: 'twitter/favorito/:id'
-          post 'retweet_tweet/:id', to: 'analytics#retweet_tweet', as: 'retweet', path: 'twitter/retweet/:id'
-          get :instagram, to:'analytics#instagram'
-          post 'comment_to_instagram/:id', to: 'analytics#instagram_comment', as: 'comment_instagram', path: 'instagram/comentar/:id'
+          get :google,               to: 'analytics#google', path: 'google'
+
+          get :fb,                   to:'analytics#fb',      path:'facebook'
+
+          get :twitter,              to:'analytics#twitter', path:'twitter'
+          post 'reply_to_tweet/:id', to: 'analytics#reply_to_tweet', as: 'reply_to', path: "twitter/#{I18n.t('routes.reply')}/:id"
+          post 'favorite_tweet/:id', to: 'analytics#favorite_tweet', as: 'favorite', path: "twitter/#{I18n.t('routes.favorite')}/:id"
+          post 'retweet_tweet/:id',  to: 'analytics#retweet_tweet',  as: 'retweet',  path: "twitter/#{I18n.t('routes.retweet')}/:id"
+
+          get :instagram,            to:'analytics#instagram'
+          post 'comment_to_instagram/:id', to: 'analytics#instagram_comment', as: 'comment_instagram', path: "instagram/#{I18n.t('routes.comment')}/:id"
         end
       end
     else
-      if !get_gallery_children(resource).nil?
-        # make the resources gallery routes
+      if get_gallery_children(resource)
+        # make the resource's gallery routes
+
         resources get_gallery_children(resource).to_sym, only: [:index] do
           member do
-            put :move_better, as: 'move_to_better', path: 'subir-prioridad'
-            put :move_worst, as: 'move_to_worst', path: 'bajar-prioridad'
+            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')
           end
         end
       end
@@ -49,18 +45,25 @@ Adminpanel::Engine.routes.draw do
               send(request_type, args['path'].to_sym, args['args'])
             end
           end
+
+          if is_sortable?(resource)
+            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')
+          end
+
           if has_fb_share?(resource)
             # if resource is going to be shared on facebook
-            get :fb_choose_page, as: 'fb_choose_page', path: 'publicar-a-pagina-en-fb'
+            get :fb_choose_page, as: 'fb_choose_page', path: I18n.t('routes.publish', location: I18n.t('routes.facebook_page'))
             post :fb_save_token, as: 'fb_save_token', path: 'guardar-token-fb'
-            post :fb_publish, to: "#{resource}#fb_publish", as: 'fb_publish', path: 'publicar-a-facebook'
+            post :fb_publish, to: "#{resource}#fb_publish", as: 'fb_publish', path: I18n.t('routes.publish', location: 'facebook')
           end
           if has_twitter_share?(resource)
-            post :twitter_publish, to: "#{resource}#twitter_publish", as: 'twitter_publish', path: 'publicar-a-twitter'
+            post :twitter_publish, to: "#{resource}#twitter_publish", as: 'twitter_publish', path: I18n.t('routes.publish', location: 'twitter')
           end
         end
         collection do
           # add custom collection routes of the resource
+
           collection_routes(resource).each do |route|
             route.each do |request_type, args|
               send(request_type, args['path'].to_sym, args['args'])

data/lib/adminpanel.rb

@@ -1,6 +1,5 @@
 require 'adminpanel/version'
 require 'adminpanel/engine'
-require 'inherited_resources'
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 require 'google/api_client'
@@ -9,7 +8,10 @@ require 'font-awesome-rails'
 require 'koala'
 require 'twitter'
 require 'omniauth-twitter'
+require 'jquery-rails'
 require 'instagram'
+require 'turbolinks'
+require 'coffee-rails'
 
 module Adminpanel
 end

data/lib/adminpanel/engine.rb

@@ -4,7 +4,7 @@ module Adminpanel
   end
 
   class << self
-  	mattr_accessor :analytics_profile_id,
+    mattr_accessor :analytics_profile_id,
     :analytics_key_path,
     :analytics_key_filename,
     :analytics_account_email,
@@ -24,18 +24,21 @@ module Adminpanel
     self.analytics_account_email = nil
     self.analytics_application_name = 'AdminPanel'
     self.analytics_application_version = '1.0.0'
+
     self.twitter_api_key = nil
     self.twitter_api_secret = nil
+
     self.displayable_resources = [
-      :analytics,
       :users,
-      :galleries,
       :sections
     ]
+
     self.fb_app_id = nil
     self.fb_app_secret = nil
+
     self.twitter_api_key = nil
     self.twitter_api_secret = nil
+
     self.instagram_client_id = nil
     self.instagram_client_secret = nil
   end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.2.5"
+  VERSION = "2.3.0"
 end

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

@@ -0,0 +1,12 @@
+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
+
+    def copy_contact
+      copy_file 'contact_template.rb', 'app/models/contact.rb'
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'rails/generators/active_record'
+module Adminpanel
+  class DumpGenerator < ActiveRecord::Generators::Base
+    desc "Generate a dump for a given resource"
+    # source_root File.expand_path("../templates", __FILE__)
+    argument :name, type: :string, require: true
+    class_option :'inject-into-seeds',
+      :type => :boolean,
+      :aliases => '-i',
+      :default => true,
+      :desc => "Skip injection into seeds.rb"
+
+    def create_json_file
+      resource = name.demodulize.camelize.singularize
+      resource = "Adminpanel::#{resource}".classify.constantize
+      file_name = resource.to_s.pluralize.demodulize.downcase + '.json'
+      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
+      end
+      inject_into_seeds(resource, file_name)
+    end
+
+  private
+    def inject_into_seeds(resource, file_name)
+      if options[:'inject-into-seeds']
+        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) +
+          "end\n"
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,10 @@
 module Adminpanel
   class <%= class_name %> < ActiveRecord::Base
+    # include Adminpanel::Base # required for galleryzation
     # include Adminpanel::Galleryzation
 
+    # belongs_to :<%= reference_name %>
+
     mount_uploader :file, <%= class_name %>Uploader
 
 
@@ -9,5 +12,9 @@ module Adminpanel
     #   '<%= reference_name %>_id'
     # end
 
+    # def self.display_name
+    #   '<%= class_name %>'
+    # end
+
   end
 end

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

@@ -1,6 +1,6 @@
 module Adminpanel
   class <%= class_name %>Uploader < CarrierWave::Uploader::Base
-    include CarrierWave::RMagick
+    include CarrierWave::MiniMagick
 
     storage :file
 
@@ -15,7 +15,7 @@ module Adminpanel
     # Process files as they are uploaded:
     # process :resize_to_fill => [1366, 768]
 
-    # THE THUMB VERSION IS NECESSARY!!!!
+    # THE THUMB VERSION IS NECESSARY BY ADMINPANEL, DON'T REMOVE IT!!!!
     version :thumb do
       process :resize_to_limit => [80, 80]
     end
@@ -25,6 +25,8 @@ module Adminpanel
     #   process :reside_and_pad => [120, 900]
     # end
 
+    # More info at http://www.rubydoc.info/github/jnicklas/carrierwave/CarrierWave/MiniMagick
+
     # resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
     #
     # Resize the image to fit within the specified dimensions while retaining
@@ -42,11 +44,9 @@ module Adminpanel
 
     # resize_to_fill(width, height)
     #
-    # From the RMagick documentation: “Resize the image to fit within the
+    # 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.“
-    #
-    # See even www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
+    # If necessary, crop the image in the larger dimension.
     #
     # width (Integer)
     # the width to scale the image to
@@ -55,13 +55,11 @@ module Adminpanel
 
     # resize_to_fit(width, height)
     #
-    # From the RMagick documentation: “Resize the image to fit within the
+    # 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.“
     #
-    # See even www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
-    #
     # width (Integer)
     # the width to scale the image to
     # height (Integer)

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

@@ -46,9 +46,9 @@ Adminpanel.setup do |config|
   config.displayable_resources = [
     :analytics,
     :users,
-    :rols,
+    :roles,
     :permissions,
-    :galleries,
+    # :auths,
     #:categories,
     :sections
   ]

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

@@ -2,59 +2,47 @@ class CreateAdminpanelTables < ActiveRecord::Migration
   def migrate(direction)
     super
     # Create a default user
-    if direction == :up
-      if Rails.env.development?
-        rol = Adminpanel::Rol.new(:name => "Admin")
-        rol.save
-        Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password', :rol_id => rol.id).save
-        puts "The password for admin@admin.com is: password"
-
-      end
+    if direction == :up && Rails.env.development?
+      role = Adminpanel::Role.new(:name => "Admin")
+      role.save
+      Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password', :role_id => role.id).save
+      puts "The password for admin@admin.com is: password"
     end
   end
 
   def change
     create_users
-    create_galleries
-    create_images
-    create_rols
+    create_roles
     create_permissions
     create_auths
     create_sections
+    create_sectionfiles
   end
 
   private
   def create_users
     create_table :adminpanel_users do |t|
-      t.string :name
-      t.string :email
-      t.string :rol_id
-      t.string :password_digest
-      t.string :remember_token
+      t.string  :name
+      t.string  :email
+      t.integer :role_id
+      t.string  :password_digest
+      t.string  :remember_token
       t.timestamps
     end
     add_index :adminpanel_users, [:email]
     add_index :adminpanel_users, [:remember_token]
   end
 
-  def create_galleries
-    create_table :adminpanel_galleries do |t|
-      t.string :file
-      t.integer :position
-      t.timestamps
-    end
-  end
-
-  def create_images
-    create_table :adminpanel_images do |t|
-      t.string :file
+  def create_sectionfiles
+    create_table :adminpanel_sectionfiles do |t|
+      t.string  :file
       t.integer :section_id
       t.timestamps
     end
   end
 
-  def create_rols
-    create_table :adminpanel_rols do |t|
+  def create_roles
+    create_table :adminpanel_roles do |t|
       t.string :name
       t.timestamps
     end
@@ -62,7 +50,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 
   def create_permissions
     create_table :adminpanel_permissions do |t|
-        t.integer  :rol_id
+        t.integer  :role_id
         t.integer  :action
         t.string   :resource
         t.timestamps
@@ -82,12 +70,13 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 
   def create_sections
     create_table :adminpanel_sections do |t|
-      t.string :name
+      t.string  :name
       t.boolean :has_description
-      t.text :description
-      t.string :key
-      t.string :page
+      t.text    :description
+      t.string  :key
+      t.string  :page
       t.boolean :has_image
+      t.integer :max_files, default: 0
       t.timestamps
     end
     add_index :adminpanel_sections, [:key]

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

@@ -1,6 +1,6 @@
 module Adminpanel
   class SectionUploader < CarrierWave::Uploader::Base
-    include CarrierWave::RMagick
+    include CarrierWave::MiniMagick
 
     storage :file
 
@@ -25,6 +25,8 @@ module Adminpanel
     #   process :reside_and_pad => [120, 900]
     # end
 
+    # More info at http://www.rubydoc.info/github/jnicklas/carrierwave/CarrierWave/MiniMagick
+
     # resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
     #
     # Resize the image to fit within the specified dimensions while retaining
@@ -42,11 +44,9 @@ module Adminpanel
 
     # resize_to_fill(width, height)
     #
-    # From the RMagick documentation: “Resize the image to fit within the
+    # 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.“
-    #
-    # See even www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
+    # If necessary, crop the image in the larger dimension.
     #
     # width (Integer)
     # the width to scale the image to
@@ -55,13 +55,11 @@ module Adminpanel
 
     # resize_to_fit(width, height)
     #
-    # From the RMagick documentation: “Resize the image to fit within the
+    # 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.“
     #
-    # See even www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
-    #
     # width (Integer)
     # the width to scale the image to
     # height (Integer)

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

@@ -9,7 +9,7 @@ module Adminpanel
     class_option :'skip-gallery',
       :type => :boolean,
       :default => true,
-      :desc => 'Choose if we shoud create the gallery for this resource, default: true (skip gallery )'
+      :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]'
 
@@ -25,7 +25,7 @@ module Adminpanel
     end
 
     def generate_model
-  		template 'adminpanel_resource_template.rb', "app/models/adminpanel/#{resource_name}.rb"
+      template 'adminpanel_resource_template.rb', "app/models/adminpanel/#{resource_name}.rb"
     end
 
     def generate_controller
@@ -37,6 +37,7 @@ module Adminpanel
     def generate_migration
       parameters = fields
       parameters.delete_if{ |pair| pair.split(':').second == 'has_many' }
+      parameters << 'created_at:datetime' << 'updated_at:datetime'
       invoke :migration, ["create_adminpanel_#{pluralized_name}", parameters]
     end