adminsite 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11c32678a8ab293d0703a6fdc62aa286020c03d6
-  data.tar.gz: c35eeb7d4e9826bff2a4abae767b43c489b279d4
+  metadata.gz: a77aace1878bec05464bc819f93f016b2cb264b9
+  data.tar.gz: 9e2923bfc266f94420be21a62b2156fa00839d59
 SHA512:
-  metadata.gz: 90ce2e5e69b13b7cbcdbd112a64c23b06af461e76d98fd661349c0053c2110f485e9534869cb7e6e3ce20bd51adccf11f1d8eebcf4f35c915c5c5bd39980d49d
-  data.tar.gz: db55ffd765b8f17913496be694d79a9c87a94667037775e9b45f0069e4949861198e7549f8f143c062af49e91cba2fed98f45e5bababe7ced1e7919ab474dc69
+  metadata.gz: a3816534c56c82ef0af32a78355dec3a651ea556b6d4ec4610c247886962b47e45b96d37e5ffa007f0c0a6247a4487e76769d79814493f5f6fb9ae6ee26fa386
+  data.tar.gz: bde740774f9938548bfb0923736e864a18935503a7a2ba601f118f5395d85e3dfcd6f42b8b8208962d4242bbbeae02cacae0be172b723249e92c14bcaeb12978

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adminsite (3.0.0)
+    adminsite (3.1.0)
       actionpack-page_caching
       cancancan (~> 1.10)
       codemirror-rails (>= 4.8)
@@ -213,6 +213,3 @@ DEPENDENCIES
   rspec
   shoulda
   simplecov (>= 0.10.0)
-
-BUNDLED WITH
-   1.10.6

data/app/controllers/adminsite/admin/resources_controller.rb

@@ -63,6 +63,10 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
     self.class.resource_class
   end
 
+  def authorize_resource_class
+    resource_class
+  end
+
   def resource_class_underscore
     @resource_class_underscore ||= resource_class.to_s.underscore.gsub('/','_')
   end

data/app/controllers/adminsite/admin_application_controller.rb

@@ -8,7 +8,7 @@ class Adminsite::AdminApplicationController < ActionController::Base
   before_filter :authenticate_adminsite_admin_user!
 
   include ::CanCan::ControllerAdditions
-  authorize_resource class: lambda { |context| context.resource_class }
+  authorize_resource class: lambda { |context| context.authorize_resource_class }
   # check_authorization
 
   rescue_from CanCan::AccessDenied do |exception|
@@ -21,7 +21,7 @@ class Adminsite::AdminApplicationController < ActionController::Base
     super(action, subject, *args)
   end
 
-  def resource_class
+  def authorize_resource_class
     self
   end
 

data/app/controllers/adminsite/admin_user_sessions_controller.rb

@@ -2,4 +2,9 @@ class Adminsite::AdminUserSessionsController < Devise::SessionsController
   skip_filter :verify_authenticity_token, only: [:destroy]
 
   layout 'adminsite/admin'
+
+  def authorize_resource_class
+    self
+  end
+
 end

data/app/helpers/admin/adminsite_application_helper.rb

@@ -85,15 +85,30 @@ module Admin::AdminsiteApplicationHelper
   end
 
   def menu_item(label, url, child_controller_names = [], klasses = nil, method = nil, admin_menu = label)
-    link = link_to(label, "#{url}?admin_menu=#{admin_menu}", method: method, )
-    result = raw "<li class='#{html_classes(url, nil, klasses, admin_menu, label )}'>#{link}</li>"
+    result = ''
+    child_menus = []
+
+    child_controller_names_authorized = child_controller_names.select do |child_controller_name|
+      controller_class_name = "#{child_controller_name}_controller".classify
+      controller_class = eval("defined?(Adminsite::" + "#{controller_class_name}) ? Adminsite::#{controller_class_name} : Adminsite::Admin::#{controller_class_name}".classify)
+      can?(:read, controller_class.new.authorize_resource_class)
+    end
 
     if current_url?(url, label) || ( child_controller_active?(child_controller_names) && current_admin_menu == admin_menu)
-      child_controller_names.each do |child_controller_name|
-        child_menu = content_menu_item(child_controller_name, admin_menu, nil, nil )
-        content_for(:content_menu, child_menu)
+      child_controller_names_authorized.each do |child_controller_name|
+        child_menus << content_menu_item(child_controller_name, admin_menu, nil, nil )
       end
     end
+    child_menus = child_menus.compact
+
+    if child_controller_names_authorized.count > 0
+      html_options = {method: method}
+      html_options[:title] = current_adminsite_admin_user.email if klasses == 'log_out'
+      link = link_to(label, "#{url}?admin_menu=#{admin_menu}", html_options)
+      result = raw "<li class='#{html_classes(url, nil, klasses, admin_menu, label )}'>#{link}</li>"
+
+      content_for(:content_menu, child_menus.join("\n").html_safe )
+    end
     result
   end
 

data/app/models/adminsite/ability.rb

@@ -9,16 +9,17 @@ module Adminsite
         when :admin
           can :manage, :all
         when :editor
-          can :read, Adminsite::Page
-          can :read, Adminsite::PageLayout
-          can :read, Adminsite::FileAsset
-          can :read, Adminsite::AdminUser
-          can :read, Adminsite::AdminUserRole
+          can :read,   Adminsite::Page
+          can :read,   Adminsite::PageLayout
+          can :read,   Adminsite::FileAsset
+          can :read,   Adminsite::AdminUser
+          can :read,   Adminsite::AdminUserRole
         when :customer
           # can :read, Adminsite::Page
           # can :read, Adminsite::PageLayout
           # can :read, Adminsite::FileAsset
         end
+        can :manage, Adminsite::AdminUserSessionsController
       end
     end
   end

data/app/views/adminsite/admin/shared/_admin_menu.html.haml

@@ -2,5 +2,5 @@
   %ul
     = yield :admin_menu
   %ul
-    = menu_item 'Log out', destroy_adminsite_admin_user_session_path, [], 'log_out', :delete
+    = menu_item 'Log out', destroy_adminsite_admin_user_session_path, ['admin_user_sessions'], 'log_out', :delete
 .clearfix

data/lib/adminsite/version.rb

@@ -1,3 +1,3 @@
 module Adminsite
-  VERSION = "3.0.0" unless defined?(Adminsite::VERSION)
+  VERSION = "3.1.0" unless defined?(Adminsite::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Robin Wunderlin
@@ -247,7 +247,6 @@ files:
 - README.markdown
 - Rakefile
 - USAGE
-- adminsite.gemspec
 - app/admin_configs/adminsite/adminsite_admin_user_admin_config.rb
 - app/admin_configs/adminsite/adminsite_admin_user_role_admin_config.rb
 - app/admin_configs/adminsite/adminsite_file_asset_admin_config.rb
@@ -396,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Basic Admin Backend interface for Ruby on Rails

data/adminsite.gemspec

@@ -1,50 +0,0 @@
-$:.push File.expand_path("../lib", __FILE__)
-
-# Maintain your gem's version:
-require "adminsite/version"
-
-Gem::Specification.new do |s|
-  s.name = "adminsite"
-  s.version =  Adminsite::VERSION
-  s.authors = ["Robin Wunderlin"]
-  s.email = "robin@wunderlin.dk"
-  s.homepage = "http://www.rhg.dk"
-  s.summary = "Basic Admin Backend interface for Ruby on Rails"
-  s.description = "Basic Admin Backend interface for Ruby on Rails"
-
-  s.files = Dir["[A-Z]*", "{app,config,db,public,lib,generators}/**/*"]+ ["LICENSE", "Rakefile", "README.markdown"]
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-
-  s.required_ruby_version = '>= 2.0.0'
-  s.require_paths = ["lib"]
-
-  # s.date = "#{Time.now.to_date}"
-  s.post_install_message = File.open('USAGE').read
-
-  s.add_runtime_dependency(%q<rails>, [">= 4.1"])
-  s.add_runtime_dependency(%q<actionpack-page_caching>, [">= 0"])
-  s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
-
-  s.add_runtime_dependency(%q<domainatrix>, [">= 0"])
-
-  s.add_runtime_dependency(%q<devise>, ["~> 3.4"])
-  s.add_runtime_dependency(%q<cancancan>, ["~> 1.10"])
-  s.add_runtime_dependency(%q<kaminari>, [">= 0.15.0"])
-  s.add_runtime_dependency(%q<ransack>, [">= 1.3"])
-
-  s.add_runtime_dependency(%q<haml>, [">= 0"])
-  s.add_runtime_dependency(%q<formtastic>, [">= 3.1.3"])
-
-  s.add_runtime_dependency(%q<sass-rails>, [">= 0"])
-
-  s.add_dependency "codemirror-rails", '>= 4.8'
-  s.add_runtime_dependency(%q<liquid>, [">= 0"])
-
-  s.add_runtime_dependency(%q<paperclip>, [">= 0"])
-
-  s.add_development_dependency("bundler", ">= 1.5")
-  s.add_development_dependency("rake")
-end
-