adminpanel 2.1.2 → 2.1.3

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

@@ -1,3 +1,3 @@
 <div class="product-image">
-	<%= f.gallery_field :file %>
+  <%= f.gallery_field :file %>
 </div>

data/config/initializers/pluralization_es.rb

@@ -15,5 +15,5 @@ ActiveSupport::Inflector.inflections(:es) do |inflect|
   inflect.irregular('el', 'los')
 
   inflect.irregular('Galería de Inicio', 'Galería de Inicio')
-  inflect.irregular('Google Analytics', 'Google Analytics')
+  inflect.irregular('Analytics', 'Analytics')
 end

data/config/locales/es.yml

@@ -1,6 +1,6 @@
 es:
   model:
-    Analytic: 'Google Analytics'
+    Analytic: 'Analytics'
     Gallery: 'Galería de Inicio'
     Categories: 'Categorías'
     attributes:
@@ -34,7 +34,7 @@ es:
         too_short: 'es muy corta, mínimo 6 caracteres'
   time:
     formats:
-      short: '%d de %B de %Y'
+      default: '%d/%m/%Y'
       estimate: '%Y-%m-%d'
   Add Image: 'Agregar Imagen'
   wysiwyg:
@@ -97,6 +97,42 @@ es:
     show: 'ver'
     signout: 'cerrar-sesion'
     signin: 'iniciar-sesion'
+  analytics:
+    day: 'Hoy'
+    days_28: 'el mes'
+    now: 'Ahora'
+    week: 'Semana'
+    month: 'Mes'
+    search: 'Buscar'
+    impressions: 'Impresiones'
+    unique: 'Únicas'
+    for: 'Estadísticas para '
+    facebook: 'Estadísticas de Facebook'
+    explanation: 'Explicación de las métricas'
+    description:
+      page_stories: '(Periodo) El número de historias creadas acerca de tu página (Cuenta total)'
+      page_consumptions: '(Periodo) El número de clicks en cualquiera de tus contenidos. Clicks generando historias están incluidos en otros clicks. Historias generadas sin clicks en la página (e.g., Darle like a la página en el `Timeline`) no son incluidos. (Cuenta total)'
+      page_consumptions_unique: '(Periodo) El número de clicks de usuarios diferentes en cualquiera de tus contenidos. Clicks generando historias están incluidos en otros clicks. Historias generadas sin clicks en la página (e.g., Darle like a la página en el `Timeline`) no son incluidos. (Usuarios únicos)'
+      page_views: '(Hoy) El total de vistas a la página (Cuenta total)'
+      page_views_unique: '(Hoy) El total de vistas a la página de usuarios loggeados en Facebook (Usuarios únicos)'
+      page_negative_feedback: '(Periodo) El número de veces que la gente te ha dado retroalimentación negativa (Unlike o Escoder página o post)(Cuenta total)'
+      page_negative_feedback_unique: '(Periodo) El número de personas que te ha dado retroalimentación negativa (Unlike o Escoder página o post)(Usuarios únicos)'
+      page_fans: '(Total) El número total de personas que ha dado like(me gusta) a la página (Usuarios únicos)'
+      page_fan_adds: '(Hoy) El número total de personas nuevas que le ha gustado tu página (Cuenta total)'
+      page_impressions_unique: '(Periodo) El número de personas que han visto cualquier contenido asociado con tu página (Usuarios únicos)'
+      page_impressions: '(Período) El número de impresiones vistas de cualquier contenido asociado con la página. (Cuenta Total)'
+    metrics:
+      page_stories: 'Hablando de esto'
+      page_consumptions: 'Clicks Totales'
+      page_consumptions_unique: 'Clicks de usuarios únicos'
+      page_views: 'Vistas a la página'
+      page_views_unique: 'Vistas de usuarios únicos a la página'
+      page_negative_feedback: 'Acciones negativas'
+      page_negative_feedback_unique: 'Acciones negativas de personas diferentes'
+      page_fans: 'Likes Totales'
+      page_fan_adds: 'Likes Nuevos'
+      page_impressions_unique: 'Impresiones de página de personas diferentes'
+      page_impressions: 'Impresiones de página'
   fb:
     posted: 'Publicado en el muro de %{user}'
     confirm_page: 'Seleccionar Cuenta'

data/config/routes.rb

@@ -18,10 +18,11 @@ Adminpanel::Engine.routes.draw do
         end
       end
     when :analytics
-      resources :analytics, resources_parameters(resource).merge(
-        { only: [:index] }.merge(rest_path_names)
-      )
-      get :save_fb_access, to:'analytics#save_fb_access', as: 'fb_callback'
+      resources :analytics, resources_parameters(resource).merge({ only: [:index] }) do
+        collection do
+          get :fb, to:'analytics#fb', as: 'fb', path:'facebook'
+        end
+      end
     else
       if !get_gallery_children(resource).nil?
         # make the resources gallery routes

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

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

@@ -1,11 +1,11 @@
 class CreateAdminpanel<%= class_name.pluralize %> < ActiveRecord::Migration
-	def change
-	  create_table :adminpanel_<%= lower_name.pluralize %> do |t|
+  def change
+    create_table :adminpanel_<%= lower_name.pluralize %> do |t|
 
-			t.integer :<%= reference_name %>_id
-			t.string :file
+      t.integer :<%= reference_name %>_id
+      t.string :file
 
-			t.timestamps
+      t.timestamps
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Adminpanel
     end
 
     def store_dir
-      "uploads/image/#{mounted_as}/#{model.id}"
+      "uploads/image/#{model.class.name.demodulize}/#{model.id}"
     end
 
     # Process files as they are uploaded:

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

@@ -1,65 +1,65 @@
 require 'rails/generators/active_record'
 module Adminpanel
-	class InitializeGenerator < 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
-		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',
-			:default => false,
-			:desc => 'Skip section uploader if true'
-		class_option :'skip-migration',
-			: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'
-		class_option :'skip-setup',
-			:type => :boolean,
-			:aliases => '-y',
-			:default => false,
-			:desc => 'Skip cancan\'s ability.rb'
+  class InitializeGenerator < 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
+    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',
+      :default => false,
+      :desc => 'Skip section uploader if true'
+    class_option :'skip-migration',
+      :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'
+    class_option :'skip-setup',
+      :type => :boolean,
+      :aliases => '-y',
+      :default => false,
+      :desc => 'Skip cancan\'s ability.rb'
 
-		def create_initializer
-			if !options[:'skip-setup']
-				copy_file 'adminpanel_setup.rb', 'config/initializers/adminpanel_setup.rb'
-			end
-		end
+    def create_initializer
+      if !options[:'skip-setup']
+        copy_file 'adminpanel_setup.rb', 'config/initializers/adminpanel_setup.rb'
+      end
+    end
 
-		def create_ability
-			if !options[:'skip-ability']
-				copy_file 'ability.rb', 'app/models/ability.rb'
-			end
-		end
+    def create_ability
+      if !options[:'skip-ability']
+        copy_file 'ability.rb', 'app/models/ability.rb'
+      end
+    end
 
-		def create_category
-			if !options[:'skip-category']
-				copy_file "category_template.rb", 'app/models/adminpanel/category.rb'
+    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
+      end
+    end
 
-		def create_section_uploader
-			if !options[:'skip-section-uploader']
-				copy_file "section_uploader.rb", 'app/uploaders/adminpanel/section_uploader.rb'
-			end
-		end
+    def create_section_uploader
+      if !options[:'skip-section-uploader']
+        copy_file "section_uploader.rb", 'app/uploaders/adminpanel/section_uploader.rb'
+      end
+    end
 
-		def create_adminpanel_migration
-			if !options[:'skip-migration']
+    def create_adminpanel_migration
+      if !options[:'skip-migration']
   			migration_template 'create_adminpanel_tables.rb', 'db/migrate/create_adminpanel_tables.rb'
-			end
-		end
+      end
+    end
 
-	end
+  end
 end

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

@@ -1,7 +1,7 @@
 module Adminpanel
   class Category < ActiveRecord::Base
     include Adminpanel::Base
-    
+
     validates_presence_of :model
     validates_presence_of :name
     validates_uniqueness_of :name

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

@@ -1,11 +1,11 @@
 class CreateAdminpanelCategoriesTable < ActiveRecord::Migration
   	def change
-		create_table :adminpanel_categories do |t|
+    create_table :adminpanel_categories do |t|
 
 
-			t.string :name
-			t.string :model
-			t.timestamps
-		end
+      t.string :name
+      t.string :model
+      t.timestamps
+    end
  	end
 end

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

@@ -1,68 +1,68 @@
 class CreateAdminpanelTables < ActiveRecord::Migration
-	def migrate(direction)
-		super
-		# Create a default user
-		if direction == :up
-			if Rails.env.development?
-				group = Adminpanel::Group.new(:name => "Admin")
-				group.save
-				Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password', :group_id => group.id).save
-				puts "The password for admin@admin.com is: password"
+  def migrate(direction)
+    super
+    # Create a default user
+    if direction == :up
+      if Rails.env.development?
+        group = Adminpanel::Group.new(:name => "Admin")
+        group.save
+        Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password', :group_id => group.id).save
+        puts "The password for admin@admin.com is: password"
 
-			end
-		end
-	end
+      end
+    end
+  end
 
-	def change
-	    create_table :adminpanel_users do |t|
-	      t.string :name
-	      t.string :email
-	      t.string :group_id
-	      t.string :password_digest
-	      t.string :remember_token
-	      t.timestamps
-	    end
-	    add_index :adminpanel_users, [:email]
-	    add_index :adminpanel_users, [:remember_token]
+  def change
+      create_table :adminpanel_users do |t|
+        t.string :name
+        t.string :email
+        t.string :group_id
+        t.string :password_digest
+        t.string :remember_token
+        t.timestamps
+      end
+      add_index :adminpanel_users, [:email]
+      add_index :adminpanel_users, [:remember_token]
 
         create_table :adminpanel_galleries do |t|
-	      t.string :file
-	      t.integer :position
-	      t.timestamps
-	    end
+        t.string :file
+        t.integer :position
+        t.timestamps
+      end
 
-	    create_table :adminpanel_images do |t|
-	      t.string :file
-	      t.integer :section_id
-	      t.timestamps
-	    end
+      create_table :adminpanel_images do |t|
+        t.string :file
+        t.integer :section_id
+        t.timestamps
+      end
 
-	    create_table :adminpanel_groups do |t|
-	      t.string :name
-	      t.timestamps
-	    end
+      create_table :adminpanel_groups do |t|
+        t.string :name
+        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_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
-	      t.text :description
-	      t.string :key
-	      t.string :page
-	      t.boolean :has_image
-	      t.timestamps
-	    end
+      create_table :adminpanel_sections do |t|
+        t.string :name
+        t.boolean :has_description
+        t.text :description
+        t.string :key
+        t.string :page
+        t.boolean :has_image
+        t.timestamps
+      end
 
-	    add_index :adminpanel_sections, [:key]
-	    add_index :adminpanel_sections, [:page]
-	end
+      add_index :adminpanel_sections, [:key]
+      add_index :adminpanel_sections, [:page]
+  end
 end

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

@@ -9,7 +9,7 @@ module Adminpanel
     end
 
     def store_dir
-      "uploads/image/#{mounted_as}/#{model.id}"
+      "uploads/image/#{model.class.name.demodulize}/#{model.id}"
     end
 
     # Process files as they are uploaded:

data/lib/generators/adminpanel/migration/migration_generator.rb

@@ -0,0 +1,44 @@
+require 'rails/generators/active_record'
+require 'generators/adminpanel/resource/resource_generator_helper'
+require 'generators/adminpanel/migration/migration_generator_helper'
+
+module Adminpanel
+  class MigrationGenerator < ActiveRecord::Generators::Base
+    include ResourceGeneratorHelper
+    include MigrationGeneratorHelper
+
+    source_root File.expand_path("../templates", __FILE__)
+    desc "Generate a migration files and updates the model and controller"
+    argument :fields, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
+
+    def change_field_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_migration
+      parameters = fields
+      parameters.delete_if{ |pair| pair.split(':').second == 'has_many' }
+      invoke :migration, [migration_name, parameters]
+    end
+
+    def inject_attributes_into_file
+      inject_into_file(
+        "app/models/adminpanel/#{resource_migrating}.rb",
+        after: '      ['
+      ) do
+        indent ("\n" + get_attribute_hash + ','), 8
+      end
+    end
+
+    def puts_messages
+      puts "don't forget to migrate your database"
+    end
+  end
+end