adminpanel 2.1.7 → 2.2.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

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

@@ -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

@@ -41,17 +41,17 @@ namespace :adminpanel do
       user.delete
     end
 
-    group = Adminpanel::Group.find_by_name("Admin")
-    if group.nil?
-      group = Adminpanel::Group.new(:name => "Admin")
-      group.save
+    rol = Adminpanel::Rol.find_by_name("Admin")
+    if rol.nil?
+      rol = Adminpanel::Rol.new(:name => "Admin")
+      rol.save
     end
     Adminpanel::User.new(
       :email => 'webmaster@codn.com',
       :name => 'Webmaster',
       :password => password,
       :password_confirmation => password,
-      :group_id => group.id
+      :rol_id => rol.id
     ).save
   end
 

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

@@ -28,7 +28,7 @@ module Adminpanel
     end
 
     def self.display_name
-      'Item' #singular
+      'Artículo espacios Mayusculas Y ácento' #singular
     end
 
     # def self.icon

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

@@ -1,6 +1,7 @@
 module Adminpanel
   class Mug < ActiveRecord::Base
     include Adminpanel::Base
+
     validates_presence_of :name
 
     def self.form_attributes

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

@@ -4,5 +4,9 @@ module Adminpanel
     # include Adminpanel::Galleryzation
     mount_uploader :file, PhotoUploader
 
+    def self.relation_method
+      'product_id'
+    end
+
   end
 end

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

@@ -1,6 +1,8 @@
 module Adminpanel
   class Product < ActiveRecord::Base
     include Adminpanel::Base
+    include Adminpanel::Facebook
+    include Adminpanel::Twitter
 
     has_many :categorizations
     has_many :categories, :through => :categorizations
@@ -47,8 +49,12 @@ module Adminpanel
       "Producto"
     end
 
+    def self.gallery_children
+      'photos'
+    end
+
     def self.icon
-        "icon-truck"
+      "icon-truck"
     end
   end
 end

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

@@ -2,6 +2,7 @@ module Adminpanel
   class Salesman < ActiveRecord::Base
     include Adminpanel::Base
     include Adminpanel::Facebook
+    include Adminpanel::Twitter
 
     belongs_to :product
 

data/test/dummy/app/views/layouts/application.html.erb

@@ -10,6 +10,5 @@
     <%= yield %>
 
   		<%= javascript_include_tag "application" %>
-  		<%= yield %>
   </body>
 </html>

data/test/dummy/db/schema.rb

@@ -16,7 +16,7 @@ ActiveRecord::Schema.define do
       t.string   :email
       t.string   :password_digest
       t.string   :remember_token
-      t.integer  :group_id
+      t.integer  :rol_id
       t.datetime :created_at,      :null => false
       t.datetime :updated_at,      :null => false
   end
@@ -76,11 +76,18 @@ ActiveRecord::Schema.define do
       t.datetime :created_at,      :null => false
       t.datetime :updated_at,      :null => false
   end
-  create_table :adminpanel_groups do |t|
+  create_table :adminpanel_rols do |t|
       t.string   :name
       t.datetime :created_at,      :null => false
       t.datetime :updated_at,      :null => false
   end
+  create_table :adminpanel_permissions do |t|
+      t.integer  :rol_id
+      t.integer  :action
+      t.string   :resource
+      t.datetime :created_at,      :null => false
+      t.datetime :updated_at,      :null => false
+  end
   create_table :adminpanel_mugs do |t|
       t.string   :name
       t.integer  :number

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

@@ -0,0 +1,42 @@
+publish:
+  rol: Publisher
+  action: 1
+  resource: product
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+create:
+  rol: Creator
+  action: 2
+  resource: product
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+update:
+  rol: Updater
+  action: 3
+  resource: product
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+read:
+  rol: Reader
+  action: 0
+  resource: product
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+deleter:
+  rol: Deleter
+  action: 4
+  resource: product
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+create_product:
+  rol: Superuser
+  action: 2
+  resource: product
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+update_product:
+  rol: Superuser
+  action: 3
+  resource: product
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>

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

@@ -0,0 +1,28 @@
+Admin:
+  name: Admin
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+Publisher:
+  name: Publisher
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+Creator:
+  name: Creator
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+Updater:
+  name: Updater
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+Reader:
+  name: Reader
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+Deleter:
+  name: Deleter
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+Superuser:
+  name: Superuser
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>

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

@@ -1,5 +1,6 @@
 one:
   name: 'John Doe'
+  product: first
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 two:

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

@@ -3,6 +3,54 @@ valid:
   email: user@example.com
   password_digest: <%= BCrypt::Password.create('foobar') %>
   remember_token: <%= Digest::SHA1.hexdigest("adminSat Feb 25 17:14:00 GMT 20060.236961325863376") %>
-  group_id: <%= ActiveRecord::FixtureSet.identify(:Admin) %>
+  rol: Admin
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+publisher:
+  name: Publisher User
+  email: publisher@example.com
+  password_digest: <%= BCrypt::Password.create('foobar') %>
+  remember_token: <%= Digest::SHA1.hexdigest("adminSat Feb 25 17:14:00 GMT 20060.236961325863376") %>
+  rol: Publisher
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+creator:
+  name: Creator User
+  email: creator@example.com
+  password_digest: <%= BCrypt::Password.create('foobar') %>
+  remember_token: <%= Digest::SHA1.hexdigest("adminSat Feb 25 17:14:00 GMT 20060.236961325863376") %>
+  rol: Creator
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+updater:
+  name: Updator User
+  email: updator@example.com
+  password_digest: <%= BCrypt::Password.create('foobar') %>
+  remember_token: <%= Digest::SHA1.hexdigest("adminSat Feb 25 17:14:00 GMT 20060.236961325863376") %>
+  rol: Updater
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+deleter:
+  name: Deleter User
+  email: deleter@example.com
+  password_digest: <%= BCrypt::Password.create('foobar') %>
+  remember_token: <%= Digest::SHA1.hexdigest("adminSat Feb 25 17:14:00 GMT 20060.236961325863376") %>
+  rol: Deleter
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+reader:
+  name: Reader User
+  email: reader@example.com
+  password_digest: <%= BCrypt::Password.create('foobar') %>
+  remember_token: <%= Digest::SHA1.hexdigest("adminSat Feb 25 17:14:00 GMT 20060.236961325863376") %>
+  rol: Reader
+  created_at: <%= Date.today %>
+  updated_at: <%= Date.today %>
+superuser:
+  name: Super User
+  email: superuser@example.com
+  password_digest: <%= BCrypt::Password.create('foobar') %>
+  remember_token: <%= Digest::SHA1.hexdigest("adminSat Feb 25 17:14:00 GMT 20060.236961325863376") %>
+  rol: Superuser
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>

data/test/features/shared/resource/index_test.rb

@@ -10,6 +10,7 @@ class IndexTest < ViewCase
     assert_selector 'i.fa.fa-pencil'
     assert_selector 'i.fa.fa-search-plus'
     assert_selector 'i.fa.fa-facebook'
+    assert_selector 'i.fa.fa-twitter'
   end
 
   protected

data/test/features/shared/ui/action_exclution_test.rb

@@ -10,6 +10,7 @@ class ActionExclutionTest < ViewCase
     assert_no_selector 'i.fa.fa-pencil'
     assert_no_selector 'i.fa.fa-search-plus'
     assert_no_selector 'i.fa.fa-facebook'
+    assert_no_selector 'i.fa.fa-twitter'
   end
 
   protected

data/test/helpers/breadcrumbs_helper_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class BreadrumbsHelperTest < ActionView::TestCase
+  include Adminpanel::BreadcrumbsHelper
+  include Rails.application.routes.url_helpers
+
+  fixtures :all
+
+  setup :setup
+  teardown :teardown
+
+  def setup
+    breadcrumb_add('controller', 'http://controller.com')
+    breadcrumb_add('action', 'http://action.com')
+  end
+
+  def teardown
+    @breadcrumb = nil
+  end
+
+  def test_breadcrumb_add
+
+    assert_equal( { title: 'Inicio', url: adminpanel.root_url }, @breadcrumb.first)
+    assert_equal( { title: 'controller', url: 'http://controller.com' }, @breadcrumb.second)
+    assert_equal( { title: 'action', url: 'http://action.com' }, @breadcrumb.third)
+  end
+
+  def test_render_breadcrumb
+    assert_equal(
+      render_breadcrumb('divider'),
+      render(partial: 'shared/breadcrumb', locals: { nav: @breadcrumb, divider: 'divider' })
+    )
+  end
+end

data/test/helpers/router_helper_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class RouterHelperTest < ActionView::TestCase
+  include Adminpanel::RouterHelper
+
+  fixtures :all
+
+  def test_get_gallery_childen
+    assert_equal 'photos', get_gallery_children(:products)
+  end
+
+  def test_resource_parameters
+    assert_equal( { path: 'categorias' }, resources_parameters(:categories) )
+    assert_equal( { path: 'articulo-espacios-mayusculas-y-acentos' }, resources_parameters(:items) )
+  end
+
+  def test_has_fb_share?
+    assert_equal false, has_fb_share?(:categories)
+    assert_equal true, has_fb_share?(:products)
+  end
+end

data/test/helpers/shared_pages_helper_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class SharedPagesHelperTest < ActionView::TestCase
+  include Adminpanel::SharedPagesHelper
+  fixtures :all
+
+  def test_belong_to_object_name
+    @model = Adminpanel::Salesman
+    #according to fixtures and dummy app relationships
+    assert_equal 'Product saved', belong_to_object_name(adminpanel_salesmen(:one), 'product')
+    @model = nil
+  end
+
+  def test_pluralize_model
+    assert_equal 'clients', pluralize_model('Adminpanel::Client')
+  end
+
+  def test_relaitionship_ids
+    assert_equal 'client_ids', relationship_ids('Adminpanel::Client')
+  end
+
+  def test_class_name_downcase
+    assert_equal 'category', class_name_downcase(Adminpanel::Category.new)
+  end
+
+  def test_demodulize_class
+    assert_equal 'product', demodulize_class('Adminpanel::Product')
+  end
+
+  def test_active_tab
+    assert_equal 'active', active_tab(0)
+    assert_equal '', active_tab([*1..15].sample)
+  end
+
+end

data/test/models/ability_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+
+class AbilityTest < ActiveSupport::TestCase
+  fixtures :all
+
+  def test_superuser_permission
+    ability = Ability.new(adminpanel_users(:valid))
+
+    assert ability.can?(:manage, :all)
+  end
+
+  def test_read_permission
+    ability = Ability.new(adminpanel_users(:reader))
+
+    assert ability.can?(:read, Adminpanel::Product)
+    assert ability.cannot?(:destroy, Adminpanel::Product)
+    assert ability.cannot?(:update, Adminpanel::Product)
+    assert ability.cannot?(:create, Adminpanel::Product)
+  end
+
+  def test_create_permission
+    ability = Ability.new(adminpanel_users(:creator))
+
+    assert ability.cannot?(:destroy, Adminpanel::Product)
+    assert ability.cannot?(:update, Adminpanel::Product)
+    assert ability.can?(:create, Adminpanel::Product)
+  end
+
+  def test_delete_permission
+    ability = Ability.new(adminpanel_users(:deleter))
+
+    assert ability.can?(:destroy, Adminpanel::Product)
+    assert ability.cannot?(:update, Adminpanel::Product)
+    assert ability.cannot?(:create, Adminpanel::Product)
+  end
+
+  def test_updater_permission
+    ability = Ability.new(adminpanel_users(:updater))
+
+    assert ability.cannot?(:destroy, Adminpanel::Product)
+    assert ability.can?(:update, Adminpanel::Product)
+    assert ability.cannot?(:create, Adminpanel::Product)
+  end
+
+  def test_superuser_permission
+    ability = Ability.new(adminpanel_users(:superuser))
+
+    assert ability.cannot?(:destroy, Adminpanel::Product)
+    assert ability.can?(:update, Adminpanel::Product)
+    assert ability.can?(:create, Adminpanel::Product)
+  end
+end