adminpanel 2.2.5 → 2.3.0

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

@@ -66,7 +66,7 @@ module Adminpanel
           when 'belongs_to'
             ':' + belongs_to_field(@attr_field)
           when 'has_many'
-            has_many_field(@attr_field) + ': []'
+            "{ #{has_many_field(@attr_field)}: [] }"
           else
           ":#{attribute.split(':').first}"
         end
@@ -113,13 +113,11 @@ module Adminpanel
     end
 
     def has_many_form_hash
-      attribute_hash(has_many_field(resource_class_name(@attr_field)), 'has_many', 'has_many model')
+      attribute_hash(has_many_field(resource_class_name(@attr_field.downcase.singularize + 's')), 'has_many', @attr_field.capitalize.singularize)
     end
 
     def attribute_hash(name, type, model = '')
-      if model != ''
-        model = model_type(model) + ",\n"
-      end
+      model = model_type(model) + ",\n" if model != ''
       "{\n" +
         indent("'#{name}'" + " => {\n", 2) +
           indent(form_type(type), 4) + ",\n" +
@@ -175,9 +173,9 @@ module Adminpanel
     end
 
     def has_many_association(field)
-      return "# has_many :categorizations\n\t\t" +
-      "# has_many :#{@attr_field}, " +
-      ":through => :categorizations, " +
+      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"
     end
 

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

@@ -1,5 +1,5 @@
 module Adminpanel
-  class <%= pluralized_name.capitalize %>Controller < Adminpanel::ApplicationController
+  class <%= camelized_resource.pluralize %>Controller < Adminpanel::ApplicationController
 
     private
       def <%= resource_name %>_params

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

@@ -7,7 +7,7 @@ module Adminpanel
 
     def self.form_attributes
       [
-<%= indent(get_attribute_hash, 8) + ',' %>
+<%= indent(get_attribute_hash, 8) + "," %>
 <%= indent(file_field_form_hash, 8) if has_gallery? %>
       ]
     end
@@ -17,7 +17,7 @@ module Adminpanel
     end
 
     # def self.icon
-    #   'truck' # fa-{icon}
+    #   "truck" # fa-{icon}
     # end
   end
 end

data/lib/tasks/adminpanel/adminpanel.rake

@@ -3,7 +3,7 @@ namespace :adminpanel do
 
   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"
+    puts "Creating #{args[:name]} in #{args[:section]} section" unless Rails.env.test?
 
     s = Adminpanel::Section.new(
       :name => args[:name].titleize,
@@ -35,40 +35,26 @@ namespace :adminpanel do
     8.times do
       password = password + "#{characters.sample}"
     end
-    puts "Creating/overwriting webmaster@codn.com with password #{password}"
+    puts "Creating/overwriting webmaster@codn.com with password #{password}" unless Rails.env.test?
     user = Adminpanel::User.find_by_email('webmaster@codn.com')
     if !user.nil?
       user.delete
     end
 
-    rol = Adminpanel::Rol.find_by_name("Admin")
-    if rol.nil?
-      rol = Adminpanel::Rol.new(:name => "Admin")
-      rol.save
+    role = Adminpanel::Role.find_by_name("Admin")
+    if role.nil?
+      role = Adminpanel::Role.new(:name => "Admin")
+      role.save
     end
     Adminpanel::User.new(
       :email => 'webmaster@codn.com',
       :name => 'Webmaster',
       :password => password,
       :password_confirmation => password,
-      :rol_id => rol.id
+      :role_id => role.id
     ).save
   end
 
-  task :dump => :environment do |t|
-    puts "Dumping adminpanel_sections and adminpanel_categories into db/seeds.rb"
-    File.open("#{Rails.root.join('db', 'seeds.rb')}", "w+") do |f|
-        f << "Adminpanel::Section.delete_all\n"
-        f << "Adminpanel::Category.delete_all\n"
-      Adminpanel::Section.all.each do |section|
-        f << "#{creation_command_section(section)}"
-      end
-      Adminpanel::Category.all.each do |category|
-        f << "#{creation_command_category(category)}"
-      end
-    end
-  end
-
   task :dump_sections => :environment do |t|
     puts "Dumping adminpanel_sections table into db/seeds.rb"
     File.open("#{Rails.root.join('db', 'seeds.rb')}", "w") do |f|
@@ -91,7 +77,8 @@ namespace :adminpanel do
 
   task :populate, [:times, :model, :attributes] => :environment do |t, args|
     require 'faker'
-    puts "Generating #{args[:times]} records of #{args[:model]}"
+    I18n.reload!
+    puts "Generating #{args[:times]} records of #{args[:model]}" unless Rails.env.test?
 
     @model = "adminpanel/#{args[:model]}".classify.constantize
 
@@ -130,9 +117,9 @@ namespace :adminpanel do
           when 'email' #generates a random email
             value = Faker::Internet.email
 
-          when 'lat_mid'
+          when 'lat_mid' #latitude for merida, yucatan, mx.
             value = float_random(21.046929, 20.903954)
-          when 'lng_mid'
+          when 'lng_mid' #longitude for merida, yucatan, mx.
             value = float_random(-89.699819, -89.567296)
 
           when 'lat'

data/lib/tasks/adminpanel/sections.rake

@@ -0,0 +1,65 @@
+namespace :adminpanel do
+  namespace :test do
+    desc "Testing adminpanel performance and other stuff"
+
+    task single_section_ips: :environment do |t|
+      puts "Benchmark retrieving a single section (Iteration Per Second)"
+      Benchmark.ips do |x|
+        x.report("DQ-where-:key-=>-\"value\"") { Adminpanel::Section.where(:key => "contact-email").first() }
+        x.report("where-:key-=>-'value'") { Adminpanel::Section.where(:key => 'contact-email').first() }
+        x.report("DQ-where-key:-\"value\"") { Adminpanel::Section.where(key: "contact-email").first() }
+        x.report("where-key:-'value'") { Adminpanel::Section.where(key: 'contact-email').first() }
+        x.report("DQ-find_by_key(\"key\")") { Adminpanel::Section.find_by_key("contact-email") }
+        x.report("find_by_key('key')") { Adminpanel::Section.find_by_key('contact-email') }
+      end
+    end
+
+    task find_with_conditions: :environment do |t|
+      puts "Benchmark retrieving a section with find_by_key vs find_by(key: 'value')"
+      Benchmark.ips do |x|
+        x.report("find_by_key('key')") { Adminpanel::Section.find_by_key('contact-email') }
+        x.report("find_by(key: 'key')") { Adminpanel::Section.find_by(key: 'contact-email') }
+      end
+    end
+
+    task collections_of_a_page_ips: :environment do |t|
+      puts "Benchmark retrieving a collection (Iteration Per Second)"
+      Benchmark.ips do |x|
+        x.report("DQ-where-:page-=>-\"Areas\"") do
+          @sections = Adminpanel::Section.where(:page => "Areas")
+          @about = @sections.where(:key => "acerca-de-nosotros")
+          @mission = @sections.where(:key => "mision")
+          @history = @sections.where(:key => "historia")
+        end
+        x.report("where-:page-=>-'Areas'") do
+          @sections = Adminpanel::Section.where(:page => 'Areas')
+          @about = @sections.where(:key => 'acerca-de-nosotros')
+          @mission = @sections.where(:key => 'mision')
+          @history = @sections.where(:key => 'historia')
+        end
+        x.report("DQ-where-page:-\"Areas\"") do
+          @sections = Adminpanel::Section.where(page: "Areas")
+          @about = @sections.where(key: "acerca-de-nosotros")
+          @mission = @sections.where(key: "mision")
+          @history = @sections.where(key: "historia")
+        end
+        x.report("where-page:-'Areas'") do
+          @sections = Adminpanel::Section.where(page: 'Areas')
+          @about = @sections.where(key: 'acerca-de-nosotros')
+          @mission = @sections.where(key: 'mision')
+          @history = @sections.where(key: 'historia')
+        end
+        x.report("DQ-find_by_key-each") do
+          @about = Adminpanel::Section.find_by_key("acerca-de-nosotros")
+          @mission = Adminpanel::Section.find_by_key("mision")
+          @history = Adminpanel::Section.find_by_key("historia")
+        end
+        x.report("find_by_key-each") do
+          @about = Adminpanel::Section.find_by_key('acerca-de-nosotros')
+          @mission = Adminpanel::Section.find_by_key('mision')
+          @history = Adminpanel::Section.find_by_key('historia')
+        end
+      end
+    end
+  end
+end

data/test/dummy/app/controllers/adminpanel/file_resources_controller.rb

@@ -0,0 +1,12 @@
+module Adminpanel
+  class FileResourcesController < Adminpanel::ApplicationController
+
+    private
+      def file_test_params
+        params.require(:file_test).permit(
+          { file_testfiles_attributes: [:id, :file, :_destroy] },
+          :name
+        )
+      end
+  end
+end

data/test/dummy/app/controllers/adminpanel/galleries_controller.rb

@@ -0,0 +1,4 @@
+module Adminpanel
+  class GalleriesController < Adminpanel::ApplicationController
+  end
+end

data/test/dummy/app/controllers/adminpanel/products_controller.rb

@@ -4,11 +4,11 @@ module Adminpanel
     private
     def product_params
       params.require(:product).permit(
-      :price,
-      :name,
-      :category_ids,
-      :description,
-      :photos_attributes => [:product_id, :file]
+        :price,
+        :name,
+        :category_ids,
+        :description,
+        :photos_attributes => [:product_id, :file]
       )
     end
 

data/test/dummy/app/models/adminpanel/category.rb

@@ -7,6 +7,8 @@ module Adminpanel
     has_many :categorizations
     has_many :products, :through => :categorizations, :dependent => :destroy
 
+    has_and_belongs_to_many :test_objects,
+        join_table: "adminpanel_test_object_category"
 
     def self.form_attributes
       [

data/test/dummy/app/models/adminpanel/file_resource.rb

@@ -0,0 +1,34 @@
+module Adminpanel
+  class FileResource < ActiveRecord::Base
+    include Adminpanel::Base
+
+		mount_images :file_resourcefiles
+
+    def self.form_attributes
+      [
+        {
+          'name' => {
+            'type' => 'text_field',
+            'label' => 'name',
+            'placeholder' => 'name',
+          }
+        },
+        {
+          'file_resourcefiles' => {
+            'type' => 'adminpanel_file_field',
+            'label' => 'name',
+            'placeholder' => 'name'
+          }
+        }
+      ]
+    end
+
+    def self.display_name
+      'FileResource' #singular
+    end
+
+    # def self.icon
+    #   "truck" # fa-{icon}
+    # end
+  end
+end

data/test/dummy/app/models/adminpanel/file_resourcefile.rb

@@ -0,0 +1,13 @@
+module Adminpanel
+  class FileResourcefile < ActiveRecord::Base
+    # include Adminpanel::Galleryzation
+
+    mount_uploader :file, FileResourcefileUploader
+
+
+    # def self.relation_field
+    #   'file_test_id'
+    # end
+
+  end
+end

data/test/dummy/app/models/adminpanel/gallery.rb

@@ -0,0 +1,32 @@
+module Adminpanel
+  class Gallery < ActiveRecord::Base
+    include Adminpanel::Base
+    include Adminpanel::Sortable
+
+    mount_uploader :file, Adminpanel::PhotoUploader
+
+    def name
+      file
+    end
+
+    def self.form_fields
+      [
+        {
+          'file' => {
+            'type' => 'adminpanel_file_field',
+            'label' => 'file',
+
+          }
+        }
+      ]
+    end
+
+    def self.display_name
+      'Galeria'
+    end
+
+    def self.gallery_children
+      'galleryfiles'
+    end
+  end
+end

data/test/dummy/app/models/adminpanel/galleryfile.rb

@@ -0,0 +1,19 @@
+module Adminpanel
+  class Galleryfile < ActiveRecord::Base
+    include Adminpanel::Base
+    include Adminpanel::Galleryzation
+
+    belongs_to :gallery
+
+    mount_uploader :file, Adminpanel::PhotoUploader
+
+    def self.relation_field
+      'gallery_id'
+    end
+
+    def self.display_name
+      'dsf'
+    end
+
+  end
+end

data/test/dummy/app/models/adminpanel/mug.rb

@@ -6,20 +6,20 @@ module Adminpanel
 
     def self.form_attributes
       [
-      {
-        'name' => {
-          'type' => 'text_field',
-          'label' => 'name',
-          'placeholder' => 'name'
-        }
-      },
-      {
-        'number' => {
-          'type' => 'number_field',
-          'label' => 'number',
-          'placeholder' => 'number'
-        }
-      },
+        {
+          'name' => {
+            'type' => 'text_field',
+            'label' => 'name',
+            'placeholder' => 'name'
+          }
+        },
+        {
+          'number' => {
+            'type' => 'number_field',
+            'label' => 'number',
+            'placeholder' => 'number'
+          }
+        },
       ]
     end
 

data/test/dummy/app/models/adminpanel/photo.rb

@@ -3,6 +3,7 @@ module Adminpanel
     include Adminpanel::Base
     # include Adminpanel::Galleryzation
     mount_uploader :file, PhotoUploader
+    belongs_to :product
 
     def self.relation_method
       'product_id'

data/test/dummy/app/models/adminpanel/product.rb

@@ -5,7 +5,7 @@ module Adminpanel
     include Adminpanel::Twitter
 
     has_many :categorizations
-    has_many :categories, :through => :categorizations
+    has_many :categories, through: :categorizations
     mount_images :photos
 
     validates_presence_of :name
@@ -13,8 +13,6 @@ module Adminpanel
     validates_presence_of :description
 
     def self.form_attributes
-
-
       [
       {"category_ids" => {"type" => "has_many", "model" => "Adminpanel::Category", "name" => "category_ids"}},
       {
@@ -33,7 +31,9 @@ module Adminpanel
         'photos' => {
           'type' => 'adminpanel_file_field',
           'label' => 'photo',
-          'placeholder' => 'photo'}
+          'placeholder' => 'photo',
+          'max-files' => 2
+        }
       },
       {
         'description' => {
@@ -49,9 +49,9 @@ module Adminpanel
       "Producto"
     end
 
-    def self.gallery_children
-      'photos'
-    end
+    # def self.gallery_children
+    #   'photos'
+    # end
 
     def self.icon
       "icon-truck"