adminpanel 1.2.12 → 2.0.0

data/config/initializers/pluralization_es.rb

@@ -0,0 +1,16 @@
+ActiveSupport::Inflector.inflections(:es) do |inflect|
+  inflect.plural(/$/, 's')
+  inflect.plural(/([^aeéiou])$/i, '\1es')
+  inflect.plural(/([aeiou]s)$/i, '\1')
+  inflect.plural(/z$/i, 'ces')
+  inflect.plural(/á([sn])$/i, 'a\1es')
+  inflect.plural(/é([sn])$/i, 'e\1es')
+  inflect.plural(/í([sn])$/i, 'i\1es')
+  inflect.plural(/ó([sn])$/i, 'o\1es')
+  inflect.plural(/ú([sn])$/i, 'u\1es')
+
+  inflect.singular(/s$/, '')
+  inflect.singular(/es$/, '')
+
+  inflect.irregular('el', 'los')
+end

data/config/locales/en.yml

@@ -0,0 +1,89 @@
+en:
+  model:
+    Analytics: "Google Analytics"
+    Gallery: "Gallery"
+    Categories: "Categories"
+    attributes:
+      adminproject_id: "Proyect"
+      brief: "Brief Description"
+      body: "Body"
+      category_id: "Category"
+      client_id: "Client"
+      description: "Description"
+      email: "Email"
+      file: "File"
+      group_id: "Group"
+      name: "Name"
+      password: "Password"
+      password_confirmation: "Confirm password"
+      password_digest: "Confirm password"
+      username: "Nombre de usuario"
+  errors:
+    one: "%{model} can't be saved, 1 error"
+    other: "%{model} can't be saved, %{count} errors"
+  activerecord:
+    errors:
+      messages:
+        not_phone: "isn't a phone (10 numbers)"
+        blank: "can't be blank"
+        confirmation: "Must be the same"
+        invalid: "isn't an email"
+        not_a_number: "not a number"
+        taken: "alredy in use"
+        too_long: "too long"
+        too_short: "too short, minimum is 6 characters"
+  time:
+    formats:
+      graphic: "%Y-%m-%d %H:%M:%S"
+      long: "%d/%m/%Y %l:%M:%S %p"
+      short: "%d de %B de %Y"
+      estimate: "%Y-%m-%d"
+  Add Image: "Add Image"
+  Write description here: "Write descrition here..."
+  Gallery: "Gallery"
+  Panel title: "Panel Administrativo CoDN"
+  actions: "Actions"
+  action:
+    add: "Add"
+    create: "Create"
+    close: "Close"
+    show: "Show"
+    submitting: "Submitting..."
+    save: "Save"
+    save_success: "Has been saved successfully"
+    update: "Update"
+    delete: "Delete"
+    view: "View"
+    delete confirmation: "Are you sure you wan't to delete?"
+    is_true: 'Yes'
+    is_false: 'No'
+  authentication:
+    welcome: "Welcome! Please, submit your credentials"
+    signin_error: "Email and/or Password wrong."
+    signin_success: "Welcome!"
+    not_authorized: "You don't have access to that"
+  gallery:
+    new: "Add Image"
+    success: "Image has been saved"
+    deleted: "Image has been deleted"
+    moved : "Gallery position has been updated"
+    not-moved: "Image wasn't able to move"
+    image: "Image"
+    position: "Position"
+    action: "Action"
+  user:
+    new: "Add User"
+    success: "User has been saved"
+  section:
+    name: "Name"
+    description: "Description"
+    edit: "Edit Section"
+    default: "Without Section"
+  image: "Image"
+  session:
+    password: "Password"
+    email: "Email"
+  other:
+    add : "Add %{model}"
+    choose: "Chooose related %{model}"
+    no description: "Don't have a description yet"

data/config/locales/es.yml

@@ -6,6 +6,7 @@ es:
     attributes:
       adminproject_id: "Proyecto"
       brief: "Pequeña descripción"
+      body: "Contenido"
       category_id: "Categoría"
       client_id: "Cliente"
       description: "Descripción"
@@ -23,6 +24,7 @@ es:
   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"
@@ -38,7 +40,6 @@ es:
       estimate: "%Y-%m-%d"
   Add Image: "Agregar Imagen"
   Write description here: "Escriba la descripción aquí"
-  Gallery: "Galería"
   Panel title: "Panel Administrativo"
   actions: "Acciones"
   action:
@@ -61,6 +62,7 @@ es:
     signin_success: "Bienvenido!"
     not_authorized: 'No tienes permisos para acceder'
   gallery:
+    name: 'Galeria'
     new: "Agregar Imagen"
     success: "La imagen ha sido guardada"
     deleted: "La imagen ha sido eliminada"
@@ -83,7 +85,5 @@ es:
     email: "Correo electrónico"
   other:
     add : "Agregar %{model}"
-    choose: "Selecciona %{model} pertenecientes"
+    choose: "Selecciona las relaciones con %{model}"
     no description: "No tiene descripción aún"
-  key:
-    telephone: 'Teléfono'

data/config/routes.rb

@@ -5,37 +5,36 @@ Adminpanel::Engine.routes.draw do
   Adminpanel.displayable_resources.each do |resource|
     case resource
     when :sections
-      resources :sections, :except => [:new, :create, :destroy]
-    when :users
-      resources :users
+      # sections cannot be created or destroyed
+      resources :sections, resources_parameters(resource).merge({:except => [:new, :create, :destroy] })
     when :galleries
-      resources :galleries do
+      # galleries gallery is different from normal resources galleries
+      resources :galleries, resources_parameters(resource) do
         member do
-          put :move_better, :as => "move_to_better"
-          put :move_worst, :as => "move_to_worst"
+          put :move_better, :as => 'move_to_better'
+          put :move_worst, :as => 'move_to_worst'
         end
       end
-    when :categories
-      resources :categories
     when :analytics
-      resources :analytics, :only => [:index]
+      resources :analytics, resources_parameters(resource).merge({:only => [:index]})
     else
-      if !acts_as_a_gallery?(resource).nil?
-        resources resource
-        resources acts_as_a_gallery?(resource).to_sym, :only => [:index] do
+      if !gallery_children(resource).nil?
+        # make the resources gallery routes
+        resources gallery_children(resource).to_sym, :only => [:index] do
           member do
             put :move_better, :as => 'move_to_better'
             put :move_worst, :as => 'move_to_worst'
           end
         end
-      else
-        resources resource
       end
+
+      # normal resource
+      resources resource, resources_parameters(resource)
     end
   end
 
   root :to => "#{Adminpanel.displayable_resources.first}#index"
   resources :sessions, :only => [:new, :create, :destroy]
-  match '/signout', :to => 'sessions#destroy', :via => :delete, :as => "signout"
-  match '/signin', :to => 'sessions#new', :as => "signin"
+  delete '/signout', :to => 'sessions#destroy', :as => "signout"
+  get '/signin', :to => 'sessions#new', :as => "signin"
 end

data/lib/adminpanel.rb

@@ -1,11 +1,11 @@
-require "adminpanel/version"
-require "adminpanel/engine"
-require "inherited_resources"
-require "adminpanel/active_record/adminpanel_extension"
-require "carrierwave"
-require "carrierwave/orm/activerecord"
-require "google/api_client"
-require 'cancan'
+require 'adminpanel/version'
+require 'adminpanel/engine'
+require 'inherited_resources'
+require 'carrierwave'
+require 'carrierwave/orm/activerecord'
+require 'google/api_client'
+require 'cancancan'
+require 'font-awesome-rails'
 
 module Adminpanel
 end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "1.2.12"
+  VERSION = "2.0.0"
 end

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

@@ -5,17 +5,20 @@ module Adminpanel
       source_root File.expand_path("../templates", __FILE__)
       desc "Generate the resource files necessary to use a model"
 
-      def create_model
+      def generate_model
         template 'gallery_template.rb', "app/models/adminpanel/#{lower_name}.rb"
       end
 
-      def create_uploader
+      def generate_uploader
         template 'uploader.rb', "app/uploaders/adminpanel/#{lower_name}_uploader.rb"
       end
 
-      def create_migration
-        migration_template 'gallery_migration.rb', "db/migrate/create_adminpanel_#{lower_name.pluralize}_table.rb"
-        puts "don't forget to add the form_field, the relationship and #{lower_name}s_attributes it to attr_accessible"
+      def generate_migration
+        migration_template(
+          'gallery_migration.rb',
+          "db/migrate/create_adminpanel_#{lower_name.pluralize}_table.rb"
+        )
+        puts "don't forget to add the form_field, the relationship and #{lower_name}s_attributes it to the permited params"
       end
 
     private
@@ -23,13 +26,14 @@ module Adminpanel
         name.singularize.downcase
       end
 
+      def lower_name
+        "#{reference_name}file"
+      end
+      
       def class_name
         "#{lower_name.capitalize}"
       end
 
-      def lower_name
-        "#{name.singularize.downcase}file"
-      end
     end
   end
 end

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

@@ -1,13 +1,12 @@
 module Adminpanel
   class <%= class_name %> < ActiveRecord::Base
-    attr_accessible :<%= reference_name %>_id, :file
+    # include Adminpanel::Galleryzation
 
     mount_uploader :file, <%= class_name %>Uploader
 
-    # act_as_a_gallery
 
     # def self.relation_field
-    #   'something_id'
+    #   '<%= reference_name %>_id'
     # end
 
   end

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

@@ -1,6 +1,5 @@
 module Adminpanel
   class Category < ActiveRecord::Base
-    attr_accessible :name, :model #, :product_ids
 
     validates_presence_of :model
     validates_presence_of :name
@@ -32,11 +31,11 @@ module Adminpanel
     end
 
     def self.display_name
-      "Categorías"
+      "Categoria" #singular
     end
 
     def self.icon
-        "icon-bookmark"
+        "bookmark" #fa-{icon}
     end
 
     default_scope { order("model ASC")}

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

@@ -8,20 +8,26 @@ module Adminpanel
 
   		argument :fields, :type => :array, :default => "name:string"
 
-			def create_model
-    		template 'resource.rb', "app/models/adminpanel/#{lower_name}.rb"
+			def generate_model
+    		template 'resource.rb', "app/models/adminpanel/#{lower_singularized_name}.rb"
 			end
 
-			def create_controller
+			def generate_controller
 				if is_a_resource?
 					template "controller.rb", "app/controllers/adminpanel/#{pluralized_name}_controller.rb"
 				end
 			end
 
-			def create_migrations
-				migration_template "migration.rb", "db/migrate/create_#{pluralized_name}_table"
+			def generate_migrations
+				migration_template(
+					'migration.rb',
+					"db/migrate/create_#{pluralized_name}_table.rb"
+				)
 			end
 
+			def print_messages
+				puts "don't forget to add :#{pluralized_name} to adminpanel_setup.rb"
+			end
 
 		private
 			def is_a_resource?
@@ -35,19 +41,19 @@ module Adminpanel
 			end
 
 			def gallery_name
-				"#{lower_name}file"
+				"#{lower_singularized_name}file"
 			end
 
-			def lower_name
+			def lower_singularized_name
 				name.singularize.downcase
 			end
 
 			def capitalized_resource
-				lower_name.capitalize
+				lower_singularized_name.capitalize
 			end
 
 			def pluralized_name
-				"#{lower_name.pluralize}"
+				"#{lower_singularized_name.pluralize}"
 			end
 
 			def belongs_to_field(resource)
@@ -81,21 +87,21 @@ module Adminpanel
 			end
 
 			def symbolized_attributes
-        attr_string = ""
+        attr_string = ''
         fields.each do |attribute|
 
 					assign_attributes_variables(attribute)
 
-        	if @attr_type == "images"
-            	attr_string = attr_string + ":#{gallery_name.pluralize}_attributes, "
-        	elsif @attr_type == "belongs_to"
+        	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
+        	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)}, "
+        			attr_string = "#{attr_string} {:#{has_many_field(model_name)} => []}, "
         		end
         	else
             	attr_string = attr_string + ":#{@attr_field}, "
@@ -184,7 +190,7 @@ module Adminpanel
 			end
 
 			def placeholder_type
-				"\n\t\t\t\t\t'placeholder' => '#{@attr_field}'"
+				"\n\t\t\t\t\t'placeholder' => '#{@attr_field}'\n\t\t\t\t"
 			end
 
 			def model_type(type)
@@ -255,7 +261,7 @@ module Adminpanel
 			end
 
 			def generate_gallery
-				generate "adminpanel:gallery", lower_name
+				generate 'adminpanel:gallery', lower_singularized_name
 			end
 
 		end

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

@@ -1,4 +1,9 @@
 module Adminpanel
   class <%= pluralized_name.capitalize %>Controller < Adminpanel::ApplicationController
+
+    private
+      def <%= lower_singularized_name %>_params
+        params.require(:<%= lower_singularized_name%>).permit(<%= symbolized_attributes %>)
+      end
   end
 end

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

@@ -1,6 +1,6 @@
 module Adminpanel
   class <%= capitalized_resource %> < ActiveRecord::Base
-    attr_accessible <%= symbolized_attributes %>
+    include Adminpanel::Base
 
     <%= associations if has_associations? -%>
 
@@ -10,11 +10,11 @@ module Adminpanel
     end
 
     def self.display_name
-      "<%= capitalized_resource %>"
+      '<%= capitalized_resource %>' #singular
     end
 
     # def self.icon
-    #     "icon-truck"
+    #     "truck" # fa-{icon}
     # end
   end
 end

data/lib/tasks/adminpanel/adminpanel.rake

@@ -1,7 +1,7 @@
 namespace :adminpanel do
   desc "Interact with adminpanel models :D"
 
-  task :section, [:section, :name, :type] => :environment do |t, args|
+  task :section, [:name, :section, :type] => :environment do |t, args|
     args.with_defaults(:section => "home", :name => "greeting", :type => "")
     puts "Creating #{args[:name]} in #{args[:section]} section"
 
@@ -35,8 +35,8 @@ namespace :adminpanel do
     8.times do
       password = password + "#{characters.sample}"
     end
-    puts "Creating/overwriting admin@codn.com with password #{password}"
-    user = Adminpanel::User.find_by_email('admin@codn.com')
+    puts "Creating/overwriting webmaster@codn.com with password #{password}"
+    user = Adminpanel::User.find_by_email('webmaster@codn.com')
     if !user.nil?
       user.delete
     end
@@ -47,8 +47,8 @@ namespace :adminpanel do
       group.save
     end
     Adminpanel::User.new(
-      :email => 'admin@codn.com',
-      :name => 'CoDN',
+      :email => 'webmaster@codn.com',
+      :name => 'Webmaster',
       :password => password,
       :password_confirmation => password,
       :group_id => group.id
@@ -90,15 +90,13 @@ namespace :adminpanel do
   end
 
   task :populate, [:times, :model, :attributes] => :environment do |t, args|
+    require 'faker'
     puts "Generating #{args[:times]} records of #{args[:model]}"
 
     @model = "adminpanel/#{args[:model]}".classify.constantize
 
     attributes = args[:attributes].split(" ")
 
-    init_variables
-
-    has_image = false
     args[:times].to_i.times do |time|
       instance = @model.new
       attributes.each do |attribute|
@@ -106,39 +104,52 @@ namespace :adminpanel do
         type = attribute.split(":").second
 
         case type
-          when "name" #generate a name
-            value = generate_name
-
-          when "category" || "category_name" #generate a category name
-            value = @things.sample.pluralize
+          when 'name' #generate a name
+            value = Faker::Name.name
 
-          when 'lorem_short'
-            value = generate_lorem_name #lorem random short sentence
+          when 'category' || 'category_name' #generate a category name
+            value = Faker::Commerce.product_name
 
-          when "lorem" || "description" #large paragraph.
-            value = generate_lorem
+          when 'lorem' || 'description' #large paragraph.
+            value = Faker::Lorem.paragraph([*1..10].sample)
 
-          when "number" #generate a number
-            value = [*1..5000].sample
+          when 'number' #generate a number
+            value = [*1..7000].sample
 
-          when "id" #assign field_id it to a random instance of Adminpanel::field
+          when 'url' #generate an url
+            value = Faker::Internet.url
+          when 'id' #assign field_id it to a random instance of Adminpanel::field
             field = field.downcase.singularize
             if field != 'category'
-              value = "adminpanel/#{field}".classify.constantize.order("RAND()").first.id
+              value = "adminpanel/#{field}".classify.constantize.order('RAND()').first.id
             else
-              value = "adminpanel/#{field}".classify.constantize.of_model(@model.display_name).order("RAND()").first.id
+              value = "adminpanel/#{field}".classify.constantize.of_model(@model.display_name).order('RAND()').first.id
             end
               field = "#{field}_id"
 
-          when "email" #generates a random email
-            value = generate_email
+          when 'email' #generates a random email
+            value = Faker::Internet.email
+
+          when 'lat_mid'
+            value = float_random(21.046929, 20.903954)
+          when 'lng_mid'
+            value = float_random(-89.699819, -89.567296)
 
-          else #no type
-            value = "#{time + 1} Lorem ipsum dolor sit amec"
+          when 'lat'
+            value = Faker::Address.latitude
+          when 'lng'
+            value = Faker::Address.longitude
+
+          when 'image' || 'images'
+            3.times do
+              instance.send("#{@model.name.demodulize.downcase}files").build
+            end
+          else #no type || not found
+            value = Faker::Lorem.words([*1..6].sample).join(' ') #lorem random short sentence
 
         end
 
-        if(type != "image")
+        if(type != 'image')
           instance.send("#{field}=", value)
         end
       end
@@ -146,7 +157,6 @@ namespace :adminpanel do
       instance.save(:validate => false)
 
       change_dates(instance)
-
     end
 
   end
@@ -172,70 +182,13 @@ private
     ").save\n"
   end
 
-  def generate_lorem
-    value = "#{@lorem.sample}"
-    [*60..80].sample.times do
-      value = "#{value} #{@lorem.sample}"
-    end
-    "#{value}."
-  end
-
-  def generate_lorem_name
-    value = "#{@lorem.sample}"
-    [*0..3].sample.times do
-      value = "#{value} #{@lorem.sample}"
-    end
-    "#{value.titleize}."
-  end
-
-  def generate_email
-    "#{@names.sample.first}#{@l_names.sample}@#{@domains.sample}"
-  end
-
-  def generate_name
-    "#{@prefixes.sample} #{@names.sample} #{@l_names.sample}"
-  end
-
-  def generate_thing
-    "#{@adjective_denominations} #{@things.sample}"
-  end
-
   def change_dates(instance)
-    date = rand(3.years).ago
+    date = rand(Date.parse('2010-01-01')..Date.today)
     instance.update_attribute(:created_at, date)
     instance.update_attribute(:updated_at, date)
   end
 
-  def init_variables
-    @prefixes = %W[Sir CEO Entrepeneur Bgr MVP]
-    @names = %W[Transito Jose Victor John Jane Ramon Katy Sean Emma]
-    @l_names = %W[Camacho Ferreira Gonzalez Lopez Doe Roe Williams Holmes]
-    @lorem = %W[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-      eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad
-      minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex
-      ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
-      velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
-      cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-      est laborum. Sed dapibus condimentum tempor. Curabitur tortor libero,
-      malesuada ac varius at, adipiscing non ante. Ut at neque vitae massa
-      volutpat bibendum a vel purus. Cras adipiscing accumsan placerat. Praesent
-      rhoncus pellentesque felis, vel faucibus ipsum convallis dictum. Donec
-      congue vitae risus quis sagittis. Interdum et malesuada fames ac ante
-      ipsum primis in faucibus. Suspendisse rhoncus tortor ut urna eleifend
-      molestie. Phasellus in viverra tortor. Pellentesque sagittis tortor tortor,
-      at auctor risus elementum non. Morbi sagittis ante tincidunt congue
-      fermentum. Quisque ac tellus in lacus interdum ultrices. Mauris ornare
-      justo nec sapien tempor, sit amet dapibus massa tincidunt. Interdum et
-      malesuada fames ac ante ipsum primis in faucibus. Nullam sodales ac mauris
-      eget egestas. Maecenas rhoncus ac metus quis condimentum. Vestibulum
-      consequat lacus nulla, eu varius leo consectetur vitae. Pellentesque vitae
-      sem mauris. Suspendisse ornare, dui eget elementum aliquam, augue neque
-      condimentum leo, nec ullamcorper lectus massa quis nibh. Etiam id egestas
-      mauris, eget eleifend enim.
-    ]
-    @domains = %W[codn.com gmail.com hotmail.com codn.mx codn.com.mx]
-    @adjective_denominations = %W[Nice Pretty Good Ugly Expensive Cheap Useful]
-    @things = %W[T-shirt Cellphone Laptop iPhone Android Beer Belt Headphone
-      Apple\ TV iMac Macbook\ pro iPod\ touch Github's\ octocat Mug Template
-    ]
-end
+  def float_random(min_number, max_number)
+    width = max_number - min_number
+    return (rand*width)+min_number
+  end