adminpanel 2.0.1 → 2.1.0

data/app/views/shared/index.html.erb

@@ -49,6 +49,8 @@
                   <%= render 'shared/edit_icon_button', resource: member %>
 
                   <%= render 'shared/delete_icon_button', resource: member %>
+
+                  <%= render 'shared/fb_icon_button', resource: member %>
                 </td>
               </tr>
             <% end %>

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

@@ -13,6 +13,8 @@
         <%= content_tag(:i, nil, class: "fa fa-#{@model.icon}") %>
         <h5><%= @model.display_name.humanize %>
           <%= render 'shared/edit_icon_button', resource: resource, resource_name: @model.display_name %>
+
+          <%= render 'shared/fb_icon_button', resource: resource, resource_name: @model.display_name %>
         </h5>
       </div>
       <div class="widget-body">

data/config/initializers/pluralization_es.rb

@@ -13,4 +13,7 @@ ActiveSupport::Inflector.inflections(:es) do |inflect|
   inflect.singular(/es$/, '')
 
   inflect.irregular('el', 'los')
+
+  inflect.irregular('Galería de Inicio', 'Galería de Inicio')
+  inflect.irregular('Google Analytics', 'Google Analytics')
 end

data/config/locales/es.yml

@@ -1,64 +1,66 @@
 es:
   model:
-    Analytic: 'Google Analítico'
-    Gallery: "Galería de Inicio"
-    Categories: "Categorías"
+    Analytic: 'Google Analytics'
+    Gallery: 'Galería de Inicio'
+    Categories: 'Categorías'
     attributes:
-      adminproject_id: "Proyecto"
-      brief: "Pequeña descripción"
-      body: "Contenido"
-      category_id: "Categoría"
-      client_id: "Cliente"
-      description: "Descripción"
-      email: "Correo electrónico"
-      file: "Imagen"
-      group_id: "Rol de usuario"
-      name: "Nombre"
-      password: "Contraseña"
-      password_confirmation: "Confirmar contraseña"
-      password_digest: "Confirmar contraseña"
-      username: "Nombre de usuario"
+      adminproject_id: 'Proyecto'
+      brief: 'Pequeña descripción'
+      body: 'Contenido'
+      category_id: 'Categoría'
+      client_id: 'Cliente'
+      description: 'Descripción'
+      email: 'Correo electrónico'
+      file: 'Imagen'
+      group_id: 'Rol de usuario'
+      name: 'Nombre'
+      password: 'Contraseña'
+      password_confirmation: 'Confirmar contraseña'
+      password_digest: 'Confirmar contraseña'
+      username: 'Nombre de usuario'
   errors:
-    one: "%{model} no pudo guardarse debido a 1 error"
-    other: "%{model} no pudo guardarse debido a %{count} errores"
+    one: '%{model} no pudo guardarse debido a 1 error'
+    other: '%{model} no pudo guardarse debido a %{count} errores'
   activerecord:
     errors:
       messages:
         not_phone: 'no es un teléfono (10 números)'
         blank: "no puede estar vacío"
-        confirmation: "Deben ser iguales"
-        invalid: "no es un correo"
-        not_a_number: "tienen que ser sólo números"
-        taken: "ya está en uso"
-        too_long: "es muy larga"
-        too_short: "es muy corta, mínimo 6 caracteres"
+        confirmation: 'Deben ser iguales'
+        invalid: 'no es un correo'
+        not_a_number: 'tienen que ser sólo números'
+        taken: 'ya está en uso'
+        too_long: 'es muy larga'
+        too_short: 'es muy corta, mínimo 6 caracteres'
   time:
     formats:
-      short: "%d de %B de %Y"
-      estimate: "%Y-%m-%d"
-  Add Image: "Agregar Imagen"
+      short: '%d de %B de %Y'
+      estimate: '%Y-%m-%d'
+  Add Image: 'Agregar Imagen'
   wysiwyg:
-    description: "Escriba la descripción aquí"
-  Panel title: "Panel Administrativo"
-  actions: "Acciones"
+    description: 'Escriba la descripción aquí'
+  Panel title: 'Panel Administrativo'
+  actions: 'Acciones'
   action:
-    add: "Agregar"
-    create: "Crear"
-    close: "Cerrar"
-    show: "Ver"
-    submitting: "Enviando..."
-    save: "Guardar"
-    save_success: "Se ha guardado con éxito"
-    update: "Actualizar"
-    delete: "Eliminar"
-    view: "Ver"
-    delete confirmation: "Estás seguro que desea eliminar?"
+    add: 'Agregar'
+    create: 'Crear'
+    close: 'Cerrar'
+    delete: 'Eliminar'
+    delete confirmation: 'Estás seguro que desea eliminar?'
+    publish: 'Publicar'
+    share: 'Compartir %{model} en Facebook'
+    show: 'Ver'
+    submitting: 'Enviando...'
+    save: 'Guardar'
+    save_success: 'Se ha guardado con éxito'
+    update: 'Actualizar'
+    view: 'Ver'
     is_true: 'Sí'
     is_false: 'No'
   authentication:
-    welcome: "Bienvenido! Inicia Sesión"
-    signin_error: "Correo y/o Contraseña incorrecta."
-    signin_success: "Bienvenido!"
+    welcome: 'Bienvenido! Inicia Sesión'
+    signin_error: 'Correo y/o Contraseña incorrecta.'
+    signin_success: 'Bienvenido!'
     not_authorized: 'No tienes permisos para acceder'
   gallery:
     container: 'Imágenes'
@@ -66,28 +68,35 @@ es:
     success: 'La imagen ha sido guardada'
     deleted: 'La imagen ha sido eliminada'
     moved : "Se ha actualizado la posición de la galería"
-    not-moved: "No se pudo mover la Imagen"
-    image: "Imagen"
-    position: "Posición"
-    action: "Acción"
+    not-moved: 'No se pudo mover la Imagen'
+    image: 'Imagen'
+    position: 'Posición'
+    action: 'Acción'
   user:
-    new: "Agregar Usuario"
-    success: "El usuario ha sido guardado"
+    new: 'Agregar Usuario'
+    success: 'El usuario ha sido guardado'
   section:
-    name: "Nombre"
-    description: "Descripción"
-    edit: "Editar Sección"
-    default: "Sin Sección"
-  image: "Imagen"
+    name: 'Nombre'
+    description: 'Descripción'
+    edit: 'Editar Sección'
+    default: 'Sin Sección'
+  image: 'Imagen'
   session:
-    password: "Contraseña"
-    email: "Correo electrónico"
+    password: 'Contraseña'
+    email: 'Correo electrónico'
   other:
-    add : "Agregar %{model}"
-    no description: "No tiene descripción aún"
+    add : 'Agregar %{model}'
+    no description: 'No tiene descripción aún'
   routes:
     new: 'nuevo'
     edit: 'editar'
     show: 'ver'
     signout: 'cerrar-sesion'
     signin: 'iniciar-sesion'
+  fb:
+    posted: 'Publicado en el muro de %{user}'
+    not-posted: 'Hubo un error, no fue publicado en ningún muro, por favor intenta otra vez.'
+    pages: 'Publiar como %{name}'
+    page-select: 'Selecciona una cuenta para la publicación'
+    message: 'Mensaje de la publicación'
+    saved-token: 'Se guardó el token de Facebook con éxito, ya puede publicar con la cuenta de Facebook'

data/config/routes.rb

@@ -21,6 +21,7 @@ Adminpanel::Engine.routes.draw do
       resources :analytics, resources_parameters(resource).merge(
         { only: [:index] }.merge(rest_path_names)
       )
+      get :save_fb_access, to:'analytics#save_fb_access', as: 'fb_callback'
     else
       if !get_gallery_children(resource).nil?
         # make the resources gallery routes
@@ -33,7 +34,13 @@ Adminpanel::Engine.routes.draw do
       end
 
       # normal resource
-      resources resource, resources_parameters(resource).merge(rest_path_names)
+      resources resource, resources_parameters(resource).merge(rest_path_names) do
+        member do
+          get :fb_choose_page, as: 'fb_choose_page', path: 'publicar-a-pagina-en-fb'
+          post :fb_save_token, as: 'fb_save_token', path: 'guardar-token'
+          post 'fb_publish/:configuration_id', to: "#{resource}#fb_publish", as: 'fb_publish', path: 'publicar-a-facebook'
+        end
+      end
     end
   end
 

data/lib/adminpanel.rb

@@ -6,6 +6,7 @@ require 'carrierwave/orm/activerecord'
 require 'google/api_client'
 require 'cancan'
 require 'font-awesome-rails'
+require 'koala'
 
 module Adminpanel
 end

data/lib/adminpanel/engine.rb

@@ -5,7 +5,10 @@ module Adminpanel
 
   class << self
   	mattr_accessor :analytics_profile_id, :analytics_key_path, :analytics_key_filename,
-    :displayable_resources
+    :displayable_resources, :fb_app_id, :fb_app_secret
+
+    self.fb_app_id = nil
+    self.fb_app_secret = nil
   	self.analytics_profile_id = nil
   	self.analytics_key_path = "config/analytics"
   	self.analytics_key_filename = nil

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/lib/generators/adminpanel/gallery/gallery_generator.rb

@@ -16,7 +16,7 @@ module Adminpanel
       def generate_migration
         migration_template(
           'gallery_migration.rb',
-          "db/migrate/create_adminpanel_#{lower_name.pluralize}_table.rb"
+          "db/migrate/create_adminpanel_#{lower_name.pluralize}.rb"
         )
         puts "don't forget to add the form_field, the relationship and #{lower_name}s_attributes it to the permited params"
       end
@@ -29,7 +29,7 @@ module Adminpanel
       def lower_name
         "#{reference_name}file"
       end
-      
+
       def class_name
         "#{lower_name.capitalize}"
       end

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

@@ -31,7 +31,7 @@ module Adminpanel
 				:default => false,
 				:desc => 'Skip cancan\'s ability.rb'
 
-			def create_initializers
+			def create_initializer
 				if !options[:'skip-setup']
 					copy_file 'adminpanel_setup.rb', 'config/initializers/adminpanel_setup.rb'
 				end
@@ -43,9 +43,8 @@ module Adminpanel
 				end
 			end
 
-			def create_categories
+			def create_category
 				if !options[:'skip-category']
-					# puts "including category files"
 					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

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

@@ -3,7 +3,7 @@ class Ability
 
   def initialize(user)
 
-    if user.group.name == "Admin"
+    if user.group.name == 'Admin'
       can :manage, :all
     else
       # cannot :manage, Adminpanel::User

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

@@ -10,12 +10,16 @@ Adminpanel.setup do |config|
   # # Path to the key file, defaults to config/analytics
   # config.analytics_key_path = "config/analytics"
 
+  # # Facebook app id
+  # config.fb_app_id = '1234'
+  # # Facebook app secret *MAKE SURE TO DON'T SHARE THIS SECRET*
+  # config.fb_app_secret = '1234'
+
   # # This are the modules that are going to be displayed and order that are going to be displayed
   config.displayable_resources = [
     :analytics,
     :users,
     :galleries,
-    :sections,
-    :categories
+    :sections
   ]
 end

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

@@ -42,6 +42,16 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 	      t.timestamps
 	    end
 
+			create_table :adminpanel_auths do |t|
+				t.string   :name
+				t.string   :key
+				t.string   :value
+				t.datetime :created_at,      :null => false
+				t.datetime :updated_at,      :null => false
+			end
+	    add_index :adminpanel_auths, [:name]
+	    add_index :adminpanel_auths, [:key]
+
 	    create_table :adminpanel_sections do |t|
 	      t.string :name
 	      t.boolean :has_description
@@ -53,5 +63,6 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 	    end
 
 	    add_index :adminpanel_sections, [:key]
+	    add_index :adminpanel_sections, [:page]
 	end
 end

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

@@ -5,8 +5,24 @@ module Adminpanel
 		class ResourceGenerator < ActiveRecord::Generators::Base
   		source_root File.expand_path("../templates", __FILE__)
 			desc "Generate the resource files necessary to use a model"
+			class_option :'include-gallery',
+				:type => :boolean,
+				:aliases => '-g',
+				:default => true,
+				:desc => 'Creates the gallery for this resource'
 
-  		argument :fields, :type => :array, :default => "name:string"
+  		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
+					when 'wysiwyg'
+						fields.delete(attribute)
+						fields << attribute.split(':').first + ':' + 'text'
+					end
+				end
+			end
 
 			def generate_model
     		template 'resource.rb', "app/models/adminpanel/#{lower_singularized_name}.rb"
@@ -19,27 +35,54 @@ module Adminpanel
 			end
 
 			def generate_migrations
-				migration_template(
-					'migration.rb',
-					"db/migrate/create_#{pluralized_name}_table.rb"
-				)
+				parameters = fields
+				parameters.delete_if{ |pair| pair.split(':').second == 'has_many' }
+				invoke :migration, ["create_adminpanel_#{pluralized_name}", parameters]
+			end
+
+			def generate_gallery
+				if has_gallery?
+					invoke 'adminpanel:gallery', [lower_singularized_name]
+				end
+			end
+
+			def add_resource_to_config
+				if setup_is_found?
+					inject_into_file 'config/initializers/adminpanel_setup.rb',
+						after: 'config.displayable_resources = [' do
+						indent "\n:#{pluralized_name},", 4
+					end
+				end
 			end
 
 			def print_messages
-				puts "don't forget to add :#{pluralized_name} to adminpanel_setup.rb"
+				puts "don't forget to restart your server"
 			end
 
 		private
+
+			def setup_is_found?
+				if Dir.exists?('config') && Dir.exists?('config/initializers') && File.exists?('config/initializers/adminpanel_setup.rb')
+					true
+				else
+					false
+				end
+			end
+
 			def is_a_resource?
 				fields.each do |attribute|
 					assign_attributes_variables(attribute)
-					if @attr_type != "belongs_to"
+					if @attr_type != 'belongs_to'
 						return true
 					end
 				end
 				false
 			end
 
+			def has_gallery?
+				options[:'include-gallery']
+			end
+
 			def gallery_name
 				"#{lower_singularized_name}file"
 			end
@@ -68,147 +111,100 @@ module Adminpanel
 				"#{resource.singularize.capitalize}"
 			end
 
-			def models_in_parameter(field)
-				models = []
-				field.split(",").each do |member|
-					models << member.downcase.pluralize
-				end
-				models
-			end
-
 			def assign_attributes_variables(attribute)
+				@attr_field = attribute.split(":").first
 				if attribute.split(":").second.nil?
-					@attr_field = attribute
 					@attr_type = "string"
 				else
-					@attr_field = attribute.split(":").first
 					@attr_type = attribute.split(":").second
 				end
 			end
 
 			def symbolized_attributes
-        attr_string = ''
-        fields.each do |attribute|
+				fields.map do |attribute|
+					assign_attributes_variables(attribute)
+					case @attr_type
+						when 'belongs_to'
+	        		':' + belongs_to_field(@attr_field)
+						when 'has_many'
+							':' + has_many_field(@attr_field)
+						else
+						":#{attribute.split(':').first}"
+					end
+				end.join(",\n")
+			end
 
+			def get_attribute_hash
+				fields.map do |attribute|
 					assign_attributes_variables(attribute)
+					send(@attr_type + '_form_hash')
+				end.join(", \n")
+			end
 
-        	if @attr_type == 'images'
-            	attr_string = attr_string + "{:#{gallery_name.pluralize}_attributes => [:id, :file, :_destroy]}, "
-        	elsif @attr_type == 'belongs_to'
-        		attr_string = "#{attr_string}:#{belongs_to_field(@attr_field)}, "
-        	elsif @attr_type == 'has_many' || @attr_type == 'has_many_through'
-        		if @attr_field.split(',').second == nil
-        			attr_string = "#{attr_string}:#{has_many_field(@attr_field)}, "
-        		else
-        			model_name = models_in_parameter(@attr_field).first
-        			attr_string = "#{attr_string} {:#{has_many_field(model_name)} => []}, "
-        		end
-        	else
-            	attr_string = attr_string + ":#{@attr_field}, "
-        	end
-        end
-        2.times do
-        	attr_string.chop! #to remove the last white space and the last ","
-        end
-        attr_string
-			end
-
-			def adminpanel_form_attributes
-				form_hash = ""
-				fields.each do |attribute|
+			def string_form_hash
+				attribute_hash(@attr_field, 'text_field')
+			end
 
-					assign_attributes_variables(attribute)
-					case(@attr_type)
-					when 'string', 'float'
-						form_hash = form_hash + "#{attribute_hash('text_field')}"
-					when 'text', 'wysiwyg'
-						form_hash = form_hash + "#{attribute_hash('wysiwyg_field')}"
-					when 'integer'
-						form_hash = form_hash + "#{attribute_hash('number_field')}"
-					when 'boolean'
-						form_hash = form_hash + "#{attribute_hash('boolean')}"
-					when 'datepicker'
-						form_hash = form_hash + "#{attribute_hash('datepicker')}"
-					when 'images'
-						form_hash = form_hash + "#{file_field_hash}"
-					when 'belongs_to'
-						form_hash = form_hash + "#{belongs_to_attribute_hash(belongs_to_field(@attr_field))}"
-					when 'has_many', 'has_many_through'
-						if models_in_parameter(@attr_field).second.nil?
-							through_model = @attr_field
-						else
-							through_model = models_in_parameter(@attr_field).first
-						end
-						through_model = resource_class_name(through_model)
-						# form_hash = form_hash + "#{relational_attribute_hash('belongs_to')}"
-						form_hash = form_hash + has_many_attribute_hash(has_many_field(through_model), through_model)
-					end
-				end
-				form_hash
+			def float_form_hash
+				attribute_hash(@attr_field, 'text_field')
 			end
 
-			def attribute_hash(type)
-				"#{attribute_name} => {#{form_type(type)}," +
-				"#{label_type}," +
-				"#{placeholder_type}}\n\t\t\t},"
+			def text_form_hash
+				attribute_hash(@attr_field ,'wysiwyg_field')
 			end
 
-			def file_field_hash
-				"#{starting_hash(gallery_name.pluralize)} => {#{form_type('adminpanel_file_field')}," +
-				"#{label_type}," +
-				"#{placeholder_type}}\n\t\t\t},"
+			def integer_form_hash
+				attribute_hash(@attr_field, 'number_field')
 			end
 
-			def belongs_to_attribute_hash(name)
-				"#{starting_hash(name)} => {#{form_type('belongs_to')}," +
-				"#{model_type(resource_class_name(@attr_field))}," +
-				"#{label_type}," +
-				"#{placeholder_type}}\n\t\t\t},"
+			def boolean_form_hash
+				attribute_hash(@attr_field, 'boolean')
 			end
 
-			def has_many_attribute_hash(name, through_model)
-				"#{starting_hash(name)} => {#{form_type('has_many')}," +
-				"#{model_type(through_model)}," +
-				"#{label_type}," +
-				"#{placeholder_type}}\n\t\t\t},"
+			def datepicker_form_hash
+				attribute_hash(@attr_field, 'datepicker')
 			end
 
-			def attribute_name
-				"\n\t\t\t{\n\t\t\t\t'#{@attr_field}'"
+			def file_field_form_hash
+				attribute_hash(gallery_name.pluralize, 'adminpanel_file_field')
 			end
 
-			def starting_hash(name)
-				"\n\t\t\t{\n\t\t\t\t'#{name}'"
+			def belongs_to_form_hash
+				attribute_hash(belongs_to_field(@attr_field), 'belongs_to', resource_class_name(@attr_field))
+			end
+
+			def has_many_form_hash
+				attribute_hash(has_many_field(resource_class_name(@attr_field)), 'has_many', 'has_many model')
+			end
+
+			def attribute_hash(name, type, model = '')
+				if model != ''
+					model = model_type(model) + ",\n"
+				end
+				"{\n" +
+					indent("'#{name}'" + " => {\n", 2) +
+						indent(form_type(type), 4) + ",\n" +
+						indent(label_type, 4) + ",\n" +
+						indent(placeholder_type, 4) + ",\n" +
+						indent(model, 4) +
+					indent("}\n", 2) +
+				'}'
 			end
 
 			def form_type(type)
-				"\n\t\t\t\t\t'type' => '#{type}'"
+				"'type' => '#{type}'"
 			end
 
 			def label_type
-				"\n\t\t\t\t\t'label' => '#{@attr_field}'"
+				"'label' => '#{@attr_field}'"
 			end
 
 			def placeholder_type
-				"\n\t\t\t\t\t'placeholder' => '#{@attr_field}'\n\t\t\t\t"
+				"'placeholder' => '#{@attr_field}'"
 			end
 
 			def model_type(type)
-				"\n\t\t\t\t\t'model' => 'Adminpanel::#{type}'"
-			end
-
-			def migration_string(field, type)
-				if type == "datepicker"
-					"t.string :#{field}"
-				elsif type == "wysiwyg"
-					"t.text :#{field}"
-				elsif type == "belongs_to"
-					"t.integer :#{belongs_to_field(field)}"
-				elsif type == "images" || type == "has_many" || type == "has_many_through"
-					""# no need for an association here.
-				else
-					"t.#{type} :#{field}"
-				end
+				"'model' => 'Adminpanel::#{type}'"
 			end
 
 			def has_associations?
@@ -227,8 +223,6 @@ module Adminpanel
 					assign_attributes_variables(attribute)
 					if @attr_type == "belongs_to"
 						association = "#{association}#{belongs_to_association(@attr_field)}"
-					elsif @attr_type == "images"
-						association = "#{association}#{image_association}"
 					elsif @attr_type == "has_many" || @attr_type == "has_many_through"
 						association = "#{association}#{has_many_association(@attr_field)}"
 					end
@@ -242,28 +236,16 @@ module Adminpanel
 			end
 
 			def has_many_association(field)
-				if models_in_parameter(field).second.nil?
-					return "has_many :#{models_in_parameter(field).first}\n\t\t" +
-					"has_many :#{models_in_parameter(field).first}, " +
-					":through => :#{models_in_parameter(field).first}ation, " +
-					":dependent => :destroy\n\t\t"
-				else
-					return "has_many :#{models_in_parameter(field).second}\n\t\t" +
-					"has_many :#{models_in_parameter(field).first}, " +
-					":through => :#{models_in_parameter(field).second}, " +
-					":dependent => :destroy\n\t\t"
-				end
+				return "# has_many :categorizations\n\t\t" +
+				"# has_many :#{@attr_field}, " +
+				":through => :categorizations, " +
+				":dependent => :destroy\n\t\t"
 			end
 
-			def image_association
-				generate_gallery
+			def get_gallery
 				return "\n\t\tmount_images :#{gallery_name.pluralize}\n"
 			end
 
-			def generate_gallery
-				generate 'adminpanel:gallery', lower_singularized_name
-			end
-
 		end
 	end
 end