adminpanel 2.4.3 → 2.5.0

data/lib/tasks/adminpanel/adminpanel.rake

@@ -1,5 +1,5 @@
 namespace :adminpanel do
-  desc "Interact with adminpanel models :D"
+  desc 'Interact with adminpanel models :D'
 
   task :section, [:name, :section, :type] => :environment do |t, args|
     args.with_defaults(:section => "home", :name => "greeting", :type => "")
@@ -8,12 +8,12 @@ namespace :adminpanel do
     order = Adminpanel::Section.find_by(:page => page_name)
 
     s = Adminpanel::Section.new(
-      :name => args[:name].titleize,
-      :has_description => false,
-      :description => "",
-      :key => (args[:name].downcase.tr(' ','_')),
-      :page => page_name,
-      :has_image => false
+      name: args[:name].titleize,
+      has_description: false,
+      description: "",
+      key: (args[:name].downcase.tr(' ','_')),
+      page: page_name,
+      has_image: false
     )
 
     if order.nil?
@@ -33,56 +33,36 @@ namespace :adminpanel do
     s.save
   end
 
-  task :user => :environment do |t|
+  task user: :environment do |t|
     characters = []
     characters.concat(("a".."z").to_a)
     characters.concat(("A".."Z").to_a)
     characters.concat((0..9).to_a)
     characters.concat(%w[! @ \# $ % ^ & * , _ - + =])
-    password = ""
+    password = ''
     8.times do
       password = password + "#{characters.sample}"
     end
-    puts "Creating/overwriting webmaster@codn.com with password #{password}" unless Rails.env.test?
-    user = Adminpanel::User.find_by_email('webmaster@codn.com')
+    puts "Creating/overwriting webmaster@codn.mx with password #{password}" unless Rails.env.test?
+    user = Adminpanel::User.find_by_email('webmaster@codn.mx')
     if !user.nil?
       user.delete
     end
 
-    role = Adminpanel::Role.find_by_name("Admin")
+    role = Adminpanel::Role.find_by_name('Admin')
     if role.nil?
-      role = Adminpanel::Role.new(:name => "Admin")
+      role = Adminpanel::Role.new(name: 'Admin')
       role.save
     end
     Adminpanel::User.new(
-      :email => 'webmaster@codn.com',
-      :name => 'Webmaster',
-      :password => password,
-      :password_confirmation => password,
-      :role_id => role.id
+      email: 'webmaster@codn.mx',
+      name: 'Webmaster',
+      password: password,
+      password_confirmation: password,
+      role_id: role.id
     ).save
   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|
-        f << "Adminpanel::Section.delete_all\n"
-      Adminpanel::Section.all.each do |section|
-        f << "#{creation_command_section(section)}"
-      end
-    end
-  end
-
-  task :dump_categories => :environment do |t|
-    puts "Dumping adminpanel_categories table into db/seeds.rb"
-    File.open("#{Rails.root.join('db', 'seeds.rb')}", "w") do |f|
-        f << "Adminpanel::Section.delete_all\n"
-      Adminpanel::Section.all.each do |section|
-        f << "#{creation_command_categories(section)}"
-      end
-    end
-  end
-
   task :populate, [:times, :model, :attributes] => :environment do |t, args|
     require 'faker'
     I18n.reload!
@@ -159,28 +139,6 @@ end
 
 private
 
-  def creation_command_section(section)
-    "Adminpanel::Section.new(\n" +
-    "\t:name => \"#{section.name}\",\n" +
-    "\t:has_description => #{section.has_description},\n" +
-    "\t:description => \"#{escape_double_quotes(section.description)}\",\n" +
-    "\t:key => \"#{section.key}\",\n" +
-    "\t:page => \"#{section.page}\",\n" +
-    "\t:has_image => #{section.has_image}\n" +
-    ").save\n"
-  end
-
-  def creation_command_category(category)
-    "Adminpanel::Category.new(\n" +
-    "\t:name => \"#{escape_double_quotes(category.name)}\",\n" +
-    "\t:model => \"#{category.model}\"\n" +
-    ").save\n"
-  end
-
-  def escape_double_quotes(string)
-    string.gsub('"', '\\"')
-  end
-
   def change_dates(instance)
     date = rand(Date.parse('2010-01-01')..Date.today)
     instance.update_attribute(:created_at, date)
@@ -189,5 +147,5 @@ private
 
   def float_random(min_number, max_number)
     width = max_number - min_number
-    return (rand*width)+min_number
+    return (rand*width) + min_number
   end

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

@@ -1,6 +1,6 @@
 module Adminpanel
   class FileResourcefile < ActiveRecord::Base
-    # include Adminpanel::Galleryzation
+    include Adminpanel::Base
 
     mount_uploader :file, FileResourcefileUploader
 

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

@@ -5,6 +5,8 @@ module Adminpanel
 
     mount_uploader :file, Adminpanel::PhotoUploader
 
+    mount_images :galleryfiles
+
     def name
       file
     end
@@ -13,10 +15,16 @@ module Adminpanel
       [
         {
           'file' => {
-            'type' => 'adminpanel_file_field',
+            'type' => 'text',
             'label' => 'file',
 
           }
+        },
+        {
+          'galleryfiles' => {
+            'type' => 'adminpanel_file_fields',
+            'label' => 'images for this gallery'
+          }
         }
       ]
     end
@@ -25,8 +33,5 @@ module Adminpanel
       'Galeria'
     end
 
-    def self.gallery_children
-      'galleryfiles'
-    end
   end
 end

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

@@ -1,7 +1,7 @@
 module Adminpanel
   class Galleryfile < ActiveRecord::Base
     include Adminpanel::Base
-    include Adminpanel::Galleryzation
+    include Adminpanel::SortableGallery
 
     belongs_to :gallery
 
@@ -12,7 +12,7 @@ module Adminpanel
     end
 
     def self.display_name
-      'dsf'
+      'galleryfile'
     end
 
   end

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

@@ -1,7 +1,7 @@
 module Adminpanel
   class Photo < ActiveRecord::Base
     include Adminpanel::Base
-    # include Adminpanel::Galleryzation
+    # include Adminpanel::SortableGallery
     mount_uploader :file, PhotoUploader
     belongs_to :product
 

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

@@ -49,10 +49,6 @@ module Adminpanel
       "Producto"
     end
 
-    # def self.gallery_children
-    #   'photos'
-    # end
-
     def self.icon
       "icon-truck"
     end

data/test/dummy/config/initializers/adminpanel_setup.rb

@@ -19,7 +19,7 @@ Adminpanel.setup do |config|
     :roles,
     :permissions,
     :products,
-    :galleries, # sortable
+    :galleries, # sortable, and galleryfiles sortable too
     :users,
     :mugs,
     :salesmen,

data/test/dummy/test/fixtures/adminpanel/galleryfiles.yml

@@ -16,3 +16,27 @@ third:
   position: 3
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
+fourth:
+  file: hipster.jpg
+  gallery: one
+  position: 4
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+fifth:
+  file: hipster.jpg
+  gallery: one
+  position: 5
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+first_2:
+  file: hipster.jpg
+  gallery: two
+  position: 1
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+second_2:
+  file: hipster.jpg
+  gallery: two
+  position: 2
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>

data/test/features/shared/concerns/sortable_gallery_ui_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class SortableGalleryUiTest < ViewCase
+  fixtures :all
+
+  setup :sign_in
+  teardown :teardown
+
+  def test_including_draggable_td
+    skip '😪'
+    visit adminpanel.gallery_path(adminpanel_galleries(:one))
+
+    p page.body
+
+    # assert for sortable stuff
+    assert_selector 'td.draggable.img'
+  end
+
+  protected
+
+    def sign_in
+      visit adminpanel.signin_path
+      login
+    end
+end

data/test/features/shared/concerns/sortable_test.rb

@@ -5,14 +5,14 @@ class SortableTest < ViewCase
 
   setup :sign_in
   teardown :teardown
+
   def test_including_of_position_and_default_icons
     visit adminpanel.galleries_path
     assert_link 'Crear Galeria'
 
-    # if this 2 icons exists, routes exist too
-    assert_selector 'i.fa.fa-chevron-down'
-    assert_selector 'i.fa.fa-chevron-up'
-    
+    # test for draggable element
+    assert_selector 'td.draggable'
+
     assert_selector 'i.fa.fa-pencil'
     assert_selector 'i.fa.fa-trash-o'
     assert_selector 'i.fa.fa-search-plus'

data/test/features/shared/form/{belongs_to_non_category_modal_test.rb → belongs_to_remote_test.rb}

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'adminpanel/product'
 require 'adminpanel/category'
 
-class BelongsToNonCategoryModalTest < ViewCase
+class BelongsToRemoteTest < ViewCase
 
   setup :visit_adminpanel_new_salesman_path
   teardown :teardown

data/test/features/shared/form/{has_many_through_non_category_modal_test.rb → has_many_through_remote_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'adminpanel/product'
 require 'adminpanel/category'
-class HasManyThroughNonCategoryModalTest < ViewCase
+class HasManyThroughRemoteTest < ViewCase
 
   setup :visit_adminpanel_new_department_path
   teardown :teardown

data/test/generators/dump_generator_test.rb

@@ -10,17 +10,13 @@ class DumpGeneratorTest < Rails::Generators::TestCase
     assert_no_file( 'db/users.json' )
     assert( Adminpanel::User.count > 0 ) #ensure there's something in adminpanel_users
 
-    # Dir.mkdir("#{Rails.root.join('tmp/generators')}/db")
-    # File.open("#{Rails.root.join('tmp/generators')}/db/seeds.rb", 'w') do
-    #   "\n"
-    # end
     run_generator %w(
       user
       -i
       false
     )
 
-    #assert has user fields in json format, in an array.
+    #assert has user fields in json format, in an array dumped
     assert_file(
       'db/users.json',
       /\[{/,
@@ -29,14 +25,6 @@ class DumpGeneratorTest < Rails::Generators::TestCase
       /"email":"user@example.com"/,
       /"role_id":/
     )
-    # haven't been able to assert injection :(
-    # assert_file(
-    #   'db/seeds.rb',
-    #   /objects = JSON.parse(open("#{Rails.root}\/db\/users.json").read)/,
-    #   /objects.each do |element|/,
-    #   /  Adminpanel::User.create element/,
-    #   /end/
-    # )
   end
 
   def test_runs_without_errors

data/test/generators/gallery_generator_test.rb

@@ -32,7 +32,7 @@ class GalleryGeneratorTest < Rails::Generators::TestCase
 
   def test_runs_without_errors
     assert_nothing_raised do
-      run_generator
+      run_generator ['Testname']
     end
   end
 

data/test/generators/initialize_generator_test.rb

@@ -16,22 +16,14 @@ class InitializeGeneratorTest < Rails::Generators::TestCase
     assert_file 'config/initializers/adminpanel_setup.rb'
   end
 
-  def test_the_generation_of_the_categories_files
-    run_generator
-    assert_migration 'db/migrate/create_adminpanel_categories_table.rb'
-    assert_file 'app/models/adminpanel/category.rb'
-  end
-
   def test_the_generation_of_the_section_uploader
     run_generator
     assert_file 'app/uploaders/adminpanel/section_uploader.rb'
   end
 
   def test_the_not_generation_of_files
-    run_generator %w( -c true -u true -m true -p true )
+    run_generator %w( -u true -m true -p true )
     assert_no_file 'config/initializers/adminpanel_setup.rb'
-    assert_no_file 'app/models/adminpanel/category.rb'
-    assert_no_migration 'db/migrate/create_adminpanel_categories_table.rb'
     assert_no_migration 'db/migrate/create_adminpanel_tables'
     assert_no_file 'app/uploaders/adminpanel/section_uploader.rb'
   end

data/test/generators/resource_generator_test.rb

@@ -101,6 +101,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
       description:wysiwyg
       number:float
       flag:boolean
+      avatar:file
       quantity:integer
       date:datepicker
       categories:has_many
@@ -120,6 +121,8 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
       /'type' => 'text_field',/,
       /'flag' => {/,
       /'type' => 'boolean',/,
+      /'avatar' => {/,
+      /'type' => 'file_field',/,
       /'quantity' => {/,
       /'type' => 'number_field',/,
       /'date' => {/,
@@ -160,11 +163,28 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
       /'type' => 'has_many'/,
       /'model' => 'Adminpanel::Post'/,
       /'category_ids' => {/,
-      /'type' => 'has_many'/,
       /'model' => 'Adminpanel::Category'/
     )
   end
 
+  def test_generating_with_single_attachment_file
+    run_generator %w(
+      monkey
+      avatar:file
+    )
+    assert_file(
+      'app/models/adminpanel/monkey.rb',
+      /def name/,
+      /mount_uploader :avatar, MonkeyAvatarUploader/,
+      /'avatar' => {/,
+      /'type' => 'file_field'/
+    )
+    assert_file(
+      'app/uploaders/adminpanel/monkey_avatar_uploader.rb',
+      /class MonkeyAvatarUploader </
+    )
+  end
+
   def test_that_runs_without_errors
     assert_nothing_raised do
       run_generator ["doll", ['name']]

data/test/helpers/router_helper_test.rb

@@ -5,10 +5,6 @@ class RouterHelperTest < ActionView::TestCase
 
   fixtures :all
 
-  def test_get_gallery_childen
-    assert_equal 'galleryfiles', get_gallery_children(:gallery)
-  end
-
   def test_resource_parameters
     assert_equal( { path: 'categorias' }, resources_parameters(:categories) )
     assert_equal( { path: 'articulo-espacios-mayusculas-y-acentos' }, resources_parameters(:items) )