adminpanel 2.5.3 → 2.5.4

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

@@ -14,9 +14,10 @@ module Adminpanel
         },
         {
           'category_ids' => {
-            'type' => 'has_many',
-            'model' => 'Adminpanel::Category',
-            'label' => 'has_many'
+            'type' => 'checkbox',
+            'options' => Proc.new { |object|
+              Adminpanel::Category.all.map { |o| [o.id, o.name] }
+            }
           }
         },
         {

data/test/dummy/db/schema.rb

@@ -43,6 +43,7 @@ ActiveRecord::Schema.define do
       t.string   :price
       t.string   :name
       t.text     :description
+      t.string   :slug
       t.datetime :created_at,      null: false
       t.datetime :updated_at,      null: false
   end

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

@@ -1,9 +1,10 @@
 first:
-  name: Product saved
+  name: "Product saved"
   price: 123.45
   description: lorem ipsum dolor sit amec
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
+  slug: 'first-product-slug'
 
 limit_images:
   name: Product with limit
@@ -11,3 +12,4 @@ limit_images:
   description: lorem ipsum dolor sit amec
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
+  slug: 'limit-images-slug'

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

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class FriendlyTest < ViewCase
+  fixtures :all
+
+  setup :sign_in
+  teardown :teardown
+
+  def test_match_correct_path
+    visit adminpanel.product_path(adminpanel_products(:first))
+
+    assert current_url.match('productos/first-product-slug')
+  end
+
+  protected
+
+    def sign_in
+      visit adminpanel.signin_path
+      login
+    end
+end

data/test/features/shared/form/checkbox_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class CheckboxTest < ViewCase
+  fixtures :all
+
+  setup :sign_in
+  teardown :teardown
+
+  def test_checkboxes_with_active_record_collection
+    # test permission, which proc in options gives an
+    # activerecord array as a response.
+
+    visit adminpanel.new_role_path
+
+    checkbox_container = find('#permission-relation')
+
+    assert checkbox_container.find('label > label', text: 'Publisher: ')
+    assert checkbox_container.find('label > label', text: 'Creator: ')
+    assert checkbox_container.find('label > label', text: 'Updater: ')
+    assert checkbox_container.find('label > label', text: 'Reader: ')
+    assert checkbox_container.find('label > label', text: 'Deleter: ')
+  end
+
+  def test_checkboxes_with_mapped_result
+    # test select, with proc in options gives an
+    # [['one', '1'], ['two', '2'], ...] as a repsonse (map)
+    # visit adminpanel.new_salesman_path
+    # select_field = find('#salesman_product_id')
+    # assert select_field
+    # assert select_field.find('option', text: 'SuperProduct saved')
+    # assert select_field.find('option', text: 'SuperProduct with limit')
+  end
+
+  private
+    def sign_in
+      visit adminpanel.signin_path
+      login
+    end
+end

data/test/features/shared/form/enum_field_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class EnumFieldTest < ViewCase
+  fixtures :all
+
+  setup :sign_in
+
+  def test_enum_field
+    visit adminpanel.new_permission_path
+    select_selector = find('#permission_action')
+
+    assert select_selector.find('option', text: 'Ver')
+    assert select_selector.find('option', text: 'Publicar en Redes Sociales')
+    assert select_selector.find('option', text: 'Crear')
+    assert select_selector.find('option', text: 'Actualizar')
+    assert select_selector.find('option', text: 'Borrar')
+    assert select_selector.find('option', text: 'Administrar')
+  end
+
+  private
+    def sign_in
+      visit adminpanel.signin_path
+      login
+    end
+end

data/test/features/shared/form/has_many_through_remote_test.rb

@@ -24,7 +24,6 @@ class HasManyThroughRemoteTest < ViewCase
     fill_in 'product_price', with: '12.3'
     submit_modal 'Agregar Producto'
     assert_content 'remote checkbox of product'
-
   end
 
   private

data/test/features/shared/form/{remote_resource_modal_test.rb → modal_contents_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteResourceModalTest < ViewCase
+class ModalContentsTest < ViewCase
   fixtures :all
 
   setup :visit_adminpanel_new_user
@@ -26,7 +26,7 @@ class RemoteResourceModalTest < ViewCase
     assert_no_link 'Agregar Rol'
   end
 
-  def test_modals_exclude_exclude_add_images_button
+  def test_modals_exclude_add_images_button
     # test file_field and non file field
     visit adminpanel.new_salesman_path
     trigger_modal 'Agregar Producto'

data/test/features/shared/form/resource_field_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ResourceFieldTest < ViewCase
+  fixtures :all
+
+  setup :sign_in
+
+  def test_resource_select_with_its_display_names
+    visit adminpanel.new_permission_path
+
+    selector = find('#permission_resource')
+
+    assert selector.find('option', text: 'Categoria')
+    assert selector.find('option', text: 'Producto')
+    assert selector.find('option', text: 'Google Analytics')
+    assert selector.find('option', text: 'Usuario')
+    assert selector.find('option', text: 'Rol')
+    assert selector.find('option', text: 'Permiso')
+    assert selector.find('option', text: 'Sección')
+    assert selector.find('option', text: 'Taza')
+    assert selector.find('option', text: 'Departamento')
+    assert selector.find('option', text: 'Galeria')
+    assert selector.find('option', text: 'FileResource')
+    assert selector.find('option', text: 'Agente')
+    # assert false
+  end
+
+  private
+    def sign_in
+      visit adminpanel.signin_path
+      login
+    end
+end

data/test/features/shared/form/select_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+class SelectTest < ViewCase
+  fixtures :all
+
+  setup :sign_in
+  teardown :teardown
+
+  def test_select_with_active_record_collection
+    # test permission, which proc in options gives an
+    # activerecord array as a response.
+
+    visit adminpanel.new_permission_path
+
+    select_selector = find('#permission_role_id')
+
+    assert select_selector.find('option', text: 'Admin')
+    assert select_selector.find('option', text: 'Superuser')
+    assert select_selector.find('option', text: 'Deleter')
+    assert select_selector.find('option', text: 'Reader')
+    assert select_selector.find('option', text: 'Updater')
+    assert select_selector.find('option', text: 'Creator')
+    assert select_selector.find('option', text: 'Publisher')
+  end
+
+  def test_select_with_mapped_result
+    # test select, with proc in options gives an
+    # [['one', '1'], ['two', '2'], ...] as a repsonse (map)
+    visit adminpanel.new_salesman_path
+    # puts page.
+    select_field = find('#salesman_product_id')
+    assert select_field
+    assert select_field.find('option', text: 'SuperProduct saved')
+    assert select_field.find('option', text: 'SuperProduct with limit')
+  end
+
+  private
+    def sign_in
+      visit adminpanel.signin_path
+      login
+    end
+end

data/test/generators/resource_generator_test.rb

@@ -130,8 +130,9 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
       /'admin_postfiles' => {/,
       /'type' => 'adminpanel_file_field',/,
       /'category_ids' => {/,
-      /'type' => 'has_many'/,
-      /'model' => 'Adminpanel::Category/
+      /'type' => 'checkbox'/,
+      /'options' => Proc.new { |object|/,
+      /Adminpanel::Category.all/
     )
   end
 
@@ -160,10 +161,12 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
     assert_file(
       'app/models/adminpanel/blog.rb',
       /'post_ids' => {/,
-      /'type' => 'has_many'/,
-      /'model' => 'Adminpanel::Post'/,
+      /'type' => 'checkbox'/,
+      /'options' => Proc.new { |object|/,
+      /Adminpanel::Post.all/,
       /'category_ids' => {/,
-      /'model' => 'Adminpanel::Category'/
+      /'options' => Proc.new { |object|/,
+      /Adminpanel::Category.all/
     )
   end
 
@@ -182,7 +185,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
     assert_file(
       'app/uploaders/adminpanel/monkey_avatar_uploader.rb',
       /class MonkeyAvatarUploader </
-    )
+      )
   end
 
   def test_that_runs_without_errors

data/test/helpers/shared_pages_helper_test.rb

@@ -73,9 +73,11 @@ class SharedPagesHelperTest < ActionView::TestCase
     test_object = adminpanel_salesmen(:one)
     attribute = 'product_id'
     properties = {
-      'type' => 'belongs_to',
-      'model' => 'Adminpanel::Product',
+      'type' => 'select',
       'label' => 'product',
+      'model' => Proc.new { |object|
+        Adminpanel::Product.all
+      }
     }
     assert_equal(
       'Product saved',
@@ -83,8 +85,7 @@ class SharedPagesHelperTest < ActionView::TestCase
         properties,
         attribute,
         test_object
-      ),
-      'didn\'t matched belongs_to :('
+      )
     )
   end
 
@@ -92,9 +93,11 @@ class SharedPagesHelperTest < ActionView::TestCase
     test_object = adminpanel_test_objects(:first)
     attribute = 'category_ids'
     properties = {
-      'type' => 'has_many',
-      'model' => 'Adminpanel::Category',
-      'label' => 'hasmany'
+      'type' => 'checkbox',
+      'label' => 'checkbox label',
+      'options' => Proc.new { |object|
+        Adminpanel::Category.all
+      },
     }
     assert_equal(
       content_tag(:ul, nil) do
@@ -114,6 +117,27 @@ class SharedPagesHelperTest < ActionView::TestCase
     )
   end
 
+  def test_enum_in_field_value
+    test_object = adminpanel_permissions(:publish)
+    attribute = 'action'
+    properties = {
+      'type' => 'enum_field',
+      'label' => 'hasmany',
+      'options' => Proc.new { |object|
+        Adminpanel::Category.all
+      },
+    }
+    assert_equal(
+      'Publicar en Redes Sociales',
+      field_value(
+        properties,
+        attribute,
+        test_object
+      ),
+      'didn\'t matched has_many fields :('
+    )
+  end
+
   def test_file_field_in_field_value
     test_object = adminpanel_galleries(:one)
     attribute = 'file'
@@ -140,16 +164,16 @@ class SharedPagesHelperTest < ActionView::TestCase
   end
 
   def test_is_customized_field?
-    assert_equal true, is_customized_field?('adminpanel_file_field')
-    assert_equal true, is_customized_field?('belongs_to')
-    assert_equal true, is_customized_field?('file_field')
-    assert_equal true, is_customized_field?('non_image_file_field')
-    assert_equal true, is_customized_field?('has_many')
+    assert is_customized_field?('adminpanel_file_field')
+    assert is_customized_field?('select')
+    assert is_customized_field?('checkbox')
+    assert is_customized_field?('file_field')
+    assert is_customized_field?('non_image_file_field')
     # some example false values (not everyone)
-    assert_equal false, is_customized_field?('text_field')
-    assert_equal false, is_customized_field?('number_field')
-    assert_equal false, is_customized_field?('text_area')
-    assert_equal false, is_customized_field?('wysiwyg_field')
+    assert_not is_customized_field?('text_field')
+    assert_not is_customized_field?('number_field')
+    assert_not is_customized_field?('text_area')
+    assert_not is_customized_field?('wysiwyg_field')
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -9,30 +9,8 @@ authors:
 - Eduardo Albertos
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDYDCCAkigAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQ8wDQYDVQQDDAZ2aWN0
-  b3IxFDASBgoJkiaJk/IsZAEZFgRjb2RuMRIwEAYKCZImiZPyLGQBGRYCbXgwHhcN
-  MTUwMzIwMTkwMTA4WhcNMTYwMzE5MTkwMTA4WjA7MQ8wDQYDVQQDDAZ2aWN0b3Ix
-  FDASBgoJkiaJk/IsZAEZFgRjb2RuMRIwEAYKCZImiZPyLGQBGRYCbXgwggEiMA0G
-  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmdMzllrIGptczoKmPRuYk4C++SE0S
-  6HI44pD7EBkto4NkpECUJZnaUYf7xTpm7t68O7GwGT+0Vrljpx2W1To42/MonU60
-  fbFbOR8HmOvbb2WQY55axC+utQ6oqITPaBLg6thFYbRPAQwsUBN0F0NqExlPpRL5
-  oSih3LUKzp4qVcimzWMzCXAu127mkPmG+M+Xo4pUUtG4uz9d67ujSG2LX9oxIteQ
-  Ibs2TMh1WXAKttwi1wVBGgQujoHgGrOTq1bX72/a2tfFeIXrAt5H3hYhF7pToWhN
-  OHJRalpyDui37p0EksEz+bFJ8KsUWjlxlOjioemsxxp0YIEjEHZR6/ZNAgMBAAGj
-  bzBtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBTUBDel181sCLrY
-  1ipjHl7bJ7vCijAZBgNVHREEEjAQgQ52aWN0b3JAY29kbi5teDAZBgNVHRIEEjAQ
-  gQ52aWN0b3JAY29kbi5teDANBgkqhkiG9w0BAQUFAAOCAQEABLmaFKUFaGnCO+uq
-  GMCQQRFBh7uJgJUndaAr8CheqaF0U+nJX2Xsggb1VCQDK6TNFVBdvIH+KSYJtu90
-  e6AKGdJKAqNetWKG4Wo9gycWcJdT5CzOWhXgwOi+O+8Z9p3j0pLkDMJTn0Li2+79
-  jb0AfMmll67rqqCq6Mmxx6rQQulE8CB1siuLzf6DfbrfrlGCe2Qy77pwFwqNoEPP
-  P/U4QAtdpmTbKreZ5f2TEXlF/kqXL79j2/ov8sd7B+aWNI3vEXKXiPALa+hupDWs
-  XdmvXYY6Fr9AHqSdbvphaVu+RqBpkBdGUQCcCZ73NjXSUwgJumx1p1A8e4NXrh1e
-  pYh0/Q==
-  -----END CERTIFICATE-----
-date: 2015-03-20 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,6 +106,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.1
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -437,8 +435,6 @@ files:
 - README.md
 - Rakefile
 - adminpanel.gemspec
-- app/assets/fonts/.DS_Store
-- app/assets/fonts/.keep
 - app/assets/images/adminpanel/alpha.png
 - app/assets/images/adminpanel/arrows-active.png
 - app/assets/images/adminpanel/arrows-normal.png
@@ -504,7 +500,6 @@ files:
 - app/assets/stylesheets/adminpanel/datepicker.min.css
 - app/assets/stylesheets/adminpanel/fa-hidden.css.scss
 - app/assets/stylesheets/adminpanel/fullcalendar.css
-- app/assets/stylesheets/adminpanel/fullcalendar.print.css
 - app/assets/stylesheets/adminpanel/google_analytics_chart.css
 - app/assets/stylesheets/adminpanel/select2.css
 - app/assets/stylesheets/adminpanel/sortable.css.scss.erb
@@ -543,6 +538,7 @@ files:
 - app/models/adminpanel/user.rb
 - app/models/concerns/adminpanel/base.rb
 - app/models/concerns/adminpanel/facebook.rb
+- app/models/concerns/adminpanel/friendly.rb
 - app/models/concerns/adminpanel/sitemap.rb
 - app/models/concerns/adminpanel/sortable.rb
 - app/models/concerns/adminpanel/sortable_gallery.rb
@@ -561,10 +557,10 @@ files:
 - app/views/adminpanel/analytics/instagram.html.erb
 - app/views/adminpanel/analytics/twitter.html.erb
 - app/views/adminpanel/form/_adminpanel_file_field.html.erb
-- app/views/adminpanel/form/_belongs_to.html.erb
+- app/views/adminpanel/form/_checkbox.html.erb
 - app/views/adminpanel/form/_file_field.html.erb
-- app/views/adminpanel/form/_has_many.html.erb
 - app/views/adminpanel/form/_non_image_file_field.html.erb
+- app/views/adminpanel/form/_select.html.erb
 - app/views/adminpanel/icons/_delete.html.erb
 - app/views/adminpanel/icons/_edit.html.erb
 - app/views/adminpanel/icons/_facebook.html.erb
@@ -585,13 +581,13 @@ files:
 - app/views/adminpanel/shared/_new_resource_button.html.erb
 - app/views/adminpanel/shared/_remote_form_fields.html.erb
 - app/views/adminpanel/shared/_twitter_publish_modal.html.erb
-- app/views/adminpanel/templates/create_belongs_to.js.erb
-- app/views/adminpanel/templates/create_has_many.js.erb
+- app/views/adminpanel/templates/checkbox.js.erb
 - app/views/adminpanel/templates/edit.html.erb
 - app/views/adminpanel/templates/fb_choose_page.html.erb
 - app/views/adminpanel/templates/index.html.erb
 - app/views/adminpanel/templates/new.html.erb
 - app/views/adminpanel/templates/new.js.erb
+- app/views/adminpanel/templates/option_for_select.js.erb
 - app/views/adminpanel/templates/show.html.erb
 - app/views/layouts/adminpanel/_shim.html.erb
 - app/views/layouts/adminpanel/_side_menu.html.erb
@@ -642,7 +638,6 @@ files:
 - test/dummy/app/controllers/adminpanel/products_controller.rb
 - test/dummy/app/controllers/adminpanel/salesmen_controller.rb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/adminpanel/categorization.rb
 - test/dummy/app/models/adminpanel/category.rb
@@ -693,11 +688,16 @@ files:
 - test/dummy/test/fixtures/adminpanel/users.yml
 - test/dummy/test/fixtures/dog fries.png
 - test/features/session/login_test.rb
+- test/features/shared/concerns/friendly_test.rb
 - test/features/shared/concerns/sortable_gallery_ui_test.rb
 - test/features/shared/concerns/sortable_test.rb
 - test/features/shared/form/belongs_to_remote_test.rb
+- test/features/shared/form/checkbox_test.rb
+- test/features/shared/form/enum_field_test.rb
 - test/features/shared/form/has_many_through_remote_test.rb
-- test/features/shared/form/remote_resource_modal_test.rb
+- test/features/shared/form/modal_contents_test.rb
+- test/features/shared/form/resource_field_test.rb
+- test/features/shared/form/select_test.rb
 - test/features/shared/resource/edit_test.rb
 - test/features/shared/resource/index_test.rb
 - test/features/shared/resource/new_test.rb
@@ -761,7 +761,6 @@ test_files:
 - test/dummy/app/controllers/adminpanel/products_controller.rb
 - test/dummy/app/controllers/adminpanel/salesmen_controller.rb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/adminpanel/categorization.rb
 - test/dummy/app/models/adminpanel/category.rb
@@ -812,11 +811,16 @@ test_files:
 - test/dummy/test/fixtures/adminpanel/users.yml
 - test/dummy/test/fixtures/dog fries.png
 - test/features/session/login_test.rb
+- test/features/shared/concerns/friendly_test.rb
 - test/features/shared/concerns/sortable_gallery_ui_test.rb
 - test/features/shared/concerns/sortable_test.rb
 - test/features/shared/form/belongs_to_remote_test.rb
+- test/features/shared/form/checkbox_test.rb
+- test/features/shared/form/enum_field_test.rb
 - test/features/shared/form/has_many_through_remote_test.rb
-- test/features/shared/form/remote_resource_modal_test.rb
+- test/features/shared/form/modal_contents_test.rb
+- test/features/shared/form/resource_field_test.rb
+- test/features/shared/form/select_test.rb
 - test/features/shared/resource/edit_test.rb
 - test/features/shared/resource/index_test.rb
 - test/features/shared/resource/new_test.rb
@@ -841,3 +845,4 @@ test_files:
 - test/support/view_case.rb
 - test/tasks/adminpanel_rake_test.rb
 - test/test_helper.rb
+has_rdoc: