adminsite 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19d396b76029c39ad67a1f2d2ef6257eaad32cf6
-  data.tar.gz: f3fb9c4f7ef39c13d17caf8550c8d98890da3d69
+  metadata.gz: 11c32678a8ab293d0703a6fdc62aa286020c03d6
+  data.tar.gz: c35eeb7d4e9826bff2a4abae767b43c489b279d4
 SHA512:
-  metadata.gz: c9918c79e62f8c32bbaf4a7d8ae51049180ac3812e04a3adc7e0d13c315d540e0d1b934f7343dc226402b6b06baf04a943fdd3a6cde5103ee3a760082df4b421
-  data.tar.gz: 3027a002d44c0e842ba0c1792046054078925536316564a1539a82eacc02aa38282759a4878dee8e55675f9405c8763c0ca09648f088d59fc521cf4d82cdc901
+  metadata.gz: 90ce2e5e69b13b7cbcdbd112a64c23b06af461e76d98fd661349c0053c2110f485e9534869cb7e6e3ce20bd51adccf11f1d8eebcf4f35c915c5c5bd39980d49d
+  data.tar.gz: db55ffd765b8f17913496be694d79a9c87a94667037775e9b45f0069e4949861198e7549f8f143c062af49e91cba2fed98f45e5bababe7ced1e7919ab474dc69

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    adminsite (2.1.2)
+    adminsite (3.0.0)
       actionpack-page_caching
+      cancancan (~> 1.10)
       codemirror-rails (>= 4.8)
       devise (~> 3.4)
       domainatrix
@@ -56,17 +57,19 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.3)
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     builder (3.2.2)
+    cancancan (1.13.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    codemirror-rails (5.6)
+    codemirror-rails (5.11)
       railties (>= 3.0, < 5)
-    devise (3.5.2)
+    concurrent-ruby (1.0.1)
+    devise (3.5.6)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -78,15 +81,15 @@ GEM
     domainatrix (0.0.11)
       addressable
     erubis (2.7.0)
-    formtastic (3.1.3)
+    formtastic (3.1.4)
       actionpack (>= 3.2.13)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     haml (4.0.7)
       tilt
     i18n (0.7.0)
-    jquery-rails (4.0.5)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
@@ -96,22 +99,24 @@ GEM
     liquid (3.0.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     mimemagic (0.3.0)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (5.7.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
-    paperclip (4.3.1)
+    paperclip (4.3.6)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
-    polyamorous (1.2.0)
+    polyamorous (1.3.0)
       activerecord (>= 3.0)
     rack (1.6.4)
     rack-test (0.6.3)
@@ -133,7 +138,7 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     railties (4.2.3)
       actionpack (= 4.2.3)
@@ -149,8 +154,8 @@ GEM
       polyamorous (~> 1.2)
     rdoc (4.2.0)
       json (~> 1.4)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.1.2)
+      railties (>= 4.2.0, < 5.1)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -164,7 +169,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    sass (3.4.19)
+    sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -182,18 +187,19 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sprockets (3.4.0)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    warden (1.2.3)
+    warden (1.2.6)
       rack (>= 1.0)
 
 PLATFORMS
@@ -207,3 +213,6 @@ DEPENDENCIES
   rspec
   shoulda
   simplecov (>= 0.10.0)
+
+BUNDLED WITH
+   1.10.6

data/adminsite.gemspec

@@ -0,0 +1,50 @@
+$:.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
+

data/app/admin_configs/adminsite/adminsite_admin_user_admin_config.rb

@@ -4,6 +4,7 @@ module Adminsite
     def attributes_index
       [ :name,
         :email,
+        :admin_user_roles,
         :updated_at
       ]
     end
@@ -12,7 +13,8 @@ module Adminsite
       [ :name,
         :email,
         :password,
-        :password_confirmation
+        :password_confirmation,
+        :admin_user_roles
       ]
     end
 

data/app/admin_configs/adminsite/adminsite_admin_user_role_admin_config.rb

@@ -0,0 +1,10 @@
+module Adminsite
+  class AdminsiteAdminUserRoleAdminConfig < Adminsite::AdminConfig::Base
+
+
+    def label_attribute(resource = nil)
+      :name
+    end
+
+  end
+end

data/app/assets/images/adminsite/admin/logo.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 142 142">
+<rect fill="#1D9DD9" width="142" height="142"/>
+<polygon opacity="0.2" fill="#FFFFFF" points="142,142 0,142 142,0 "/>
+<g fill="#FFFFFF">
+	<path d="M38,86.9h-3c-0.5,0-0.8-0.3-0.8-0.8V56.7c0-0.5,0.3-0.8,0.8-0.8h11.3c2.3,0,4.2,0.7,5.5,2
+		c1.3,1.3,2,3.2,2,5.5v4.1c0,3.7-1.5,6-4.6,7v0.2L54.5,86c0.4,0.6,0.1,1-0.6,1h-3c-0.8,0-1.3-0.3-1.5-0.8L44.3,75h-4.9
+		c-0.4,0-0.6,0.2-0.6,0.5v10.6C38.8,86.7,38.5,86.9,38,86.9z M39.3,71.1h6.1c2.4,0,3.6-1.2,3.6-3.5v-4.1c0-2.4-1.2-3.6-3.6-3.6h-6.1
+		c-0.4,0-0.5,0.2-0.5,0.5v10.2C38.8,71,39,71.1,39.3,71.1z"/>
+	<path d="M64.2,86.9h-3c-0.5,0-0.8-0.3-0.8-0.8V56.7c0-0.5,0.3-0.8,0.8-0.8h3c0.5,0,0.8,0.3,0.8,0.8v12.1
+		c0,0.3,0.2,0.5,0.6,0.5h10.2c0.3,0,0.5-0.2,0.5-0.5V56.7c0-0.5,0.3-0.8,0.8-0.8h3.1c0.5,0,0.8,0.3,0.8,0.8v29.4
+		c0,0.5-0.3,0.8-0.8,0.8h-3.1c-0.5,0-0.8-0.3-0.8-0.8V73.9c0-0.3-0.2-0.5-0.5-0.5H65.6c-0.4,0-0.6,0.2-0.6,0.5v12.2
+		C65.1,86.7,64.8,86.9,64.2,86.9z"/>
+	<path d="M100.3,86.9h-5.2c-2.4,0-4.2-0.7-5.5-2c-1.3-1.3-2-3.2-2-5.5V63.4c0-2.4,0.7-4.2,2-5.5c1.3-1.3,3.1-2,5.5-2
+		h5.2c2.4,0,4.2,0.7,5.5,2c1.3,1.3,2,3.1,2,5.5v1.7c0,0.6-0.3,0.9-0.8,0.9h-3c-0.5,0-0.8-0.3-0.8-0.9v-1.5c0-2.4-1.2-3.6-3.5-3.6
+		h-3.8c-2.3,0-3.5,1.2-3.5,3.6v15.7c0,2.4,1.2,3.6,3.5,3.6h3.8c2.3,0,3.5-1.2,3.5-3.6v-4.3c0-0.3-0.2-0.5-0.5-0.5h-3.9
+		c-0.5,0-0.8-0.3-0.8-0.8v-2.5c0-0.5,0.3-0.8,0.8-0.8h8.1c0.7,0,1,0.3,1,1v8.1c0,2.3-0.7,4.2-2,5.5
+		C104.5,86.3,102.7,86.9,100.3,86.9z"/>
+</g>
+</svg>

data/app/assets/stylesheets/adminsite/admin/base.scss

@@ -60,7 +60,6 @@ body.adminsite {
     margin-bottom: 8px;
   }
   #wrapper {
-    overflow: auto;
     margin-left: 20px;
     margin-right: 20px;
   }
@@ -323,7 +322,7 @@ body.adminsite {
     margin-bottom: 10px;
   }
   h1 {
-    background: asset-url("adminsite/admin/logo.png") no-repeat;
+    background: asset-url("adminsite/admin/logo.svg") no-repeat;
     font-size: 135%;
     font-weight: normal;
     padding-left: 124px;
@@ -350,12 +349,14 @@ body.adminsite {
       padding: 0.2em 0.4em;
       font-weight: bold;
     }
-    tr:nth-child(even) {background: #FFF}
-    tr:nth-child(odd) {background: #f4f5f5}
-
+    tbody {
+      tr:nth-child(even) {background: #FFF}
+      tr:nth-child(odd) {background: #f4f5f5}
+    }
     th, td {
       border: 1px solid #cccccc;
       padding: 0.2em 0.4em;
+      vertical-align: top;
     }
     th {
       background: #cccccc;
@@ -363,6 +364,7 @@ body.adminsite {
       text-align: left;
       font-weight: normal;
       font-variant: small-caps;
+      white-space: nowrap;
     }
     tr.old td {
       opacity: 0.5;

data/app/assets/stylesheets/adminsite/admin/pagination.scss

@@ -1,28 +1,30 @@
 $position : left ;
 $primary-color: #efefef;
 $secondary-color: #BBB;
-.pagination
-{
+.pagination {
   text-align: $position ;
   color: #666;
-}
-.pagination a {
-  border-radius: 2px;
-      padding: 0.5em 0.7em;
-  border-color: #aaa;
-  border-style: solid;
-  background-color: #efefef;
-  background-color: $primary-color;
-  border-top: 2px solid $secondary-color ;
-   border: 1px solid $secondary-color ;
-  text-decoration: none;
+  margin:1em 0;
   font-size: smaller;
+  a {
+    border-radius: 2px;
+    padding: 0.5em 0.7em;
+    background-color: $primary-color;
+    border-color: #aaa;
+    border-style: solid;
+    border-top: 2px solid $secondary-color ;
+    border: 1px solid $secondary-color ;
+    text-decoration: none;
+    &:hover, &:focus {
+      background-image: -webkit-linear-gradient(to top, #cfcfcf, #cfcfcf);
+      background-image: linear-gradient(to top, #cfcfcf, #cfcfcf);
+    }
+    &.more {
+      box-shadow: 0 0 0 0 transparent;
+      background: transparent;
+    }
   }
-  .pagination a:hover ,  .pagination a:focus
-  {
-    background-image: -webkit-linear-gradient(top, #cfcfcf, #cfcfcf);
-  }
-  .pagination a.more  {
-    box-shadow: 0 0 0 0 transparent;
-    background: transparent;
+  .current {
+    padding: 0.5em 0.7em;
   }
+}

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

@@ -1,8 +1,19 @@
 module Adminsite
   class Admin::AdminsiteAdminUsersController < Adminsite::Admin::ResourcesController
 
+    def update
+      remove_empty_pw
+      super
+    end
+
     protected
 
+    def remove_empty_pw
+      [:password, :password_confirmation].each do |p|
+        params[:adminsite_admin_user][p] = nil if params[:adminsite_admin_user][p].blank?
+      end
+    end
+
     def self.resource_class
       Adminsite::AdminUser
     end

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

@@ -1,6 +1,4 @@
 class Adminsite::Admin::BaseController < Adminsite::AdminApplicationController
-  layout 'adminsite/admin'
-
   newrelic_ignore if defined?(NewRelic)
 
   protected

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

@@ -85,6 +85,10 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
 
   protected
 
+  def resource_class_with_parent
+    resource_class
+  end
+
   def api_call?
     request.xhr? || request.format.to_sym == :json
   end

data/app/controllers/adminsite/admin_application_controller.rb

@@ -4,6 +4,31 @@
 class Adminsite::AdminApplicationController < ActionController::Base
   helper :all, "admin/adminsite_application"
   layout 'adminsite/admin'
+
   before_filter :authenticate_adminsite_admin_user!
 
+  include ::CanCan::ControllerAdditions
+  authorize_resource class: lambda { |context| context.resource_class }
+  # check_authorization
+
+  rescue_from CanCan::AccessDenied do |exception|
+    render text: exception.message
+  end
+
+  def authorize!(action, subject, *args)
+    subject = subject.call(self) if subject.is_a?(Proc)
+    puts "#{self}#authorize!(#{action}, #{subject}, #{args.inspect})" if Rails.env.development?
+    super(action, subject, *args)
+  end
+
+  def resource_class
+    self
+  end
+
+  protected
+
+  def current_ability
+    @current_ability ||= ::Adminsite::Ability.new(current_adminsite_admin_user)
+  end
+
 end

data/app/helpers/admin/adminsite_application_helper.rb

@@ -36,16 +36,21 @@ module Admin::AdminsiteApplicationHelper
     end
   end
 
-  def format_response_value(value)
+  def format_response_value(value, add_td_wrappers = true)
     value = value.url if defined?(PictureUploader) && value.is_a?(PictureUploader)
-    response = '<td>'
+    response = ''
+    response = '<td>' if add_td_wrappers
     if is_url?(value)
-      response += link_to(value,value, target: :blank)
-      response += "<br/>#{image_tag(value)}" if is_image?(value)
+      response += link_to(value,value, target: '_blank')
+      response += "<br>#{image_tag(value)}" if is_image?(value)
     else
       response += h value
     end
-    response + '</td>'
+    if add_td_wrappers
+      response + '</td>'
+    else
+      response
+    end
   end
 
   def is_url?(value)
@@ -149,7 +154,7 @@ module Admin::AdminsiteApplicationHelper
   end
 
   def link_to_show(resource)
-    link_to image_tag('adminsite/admin/magnifier.png', :size => '16x16'), admin_resource_path(resource.id), target: :blank
+    link_to image_tag('adminsite/admin/magnifier.png', :size => '16x16'), admin_resource_path(resource.id), target: '_blank'
   end
 
   def link_to_edit(resource)
@@ -160,11 +165,17 @@ module Admin::AdminsiteApplicationHelper
     link_to image_tag('adminsite/admin/cross.png', :size => '16x16'), admin_resource_path(resource.id), data: { :confirm => 'Are you sure?'} , :method => :delete
   end
 
-  def display_resource_value(resource, attr)
+  def display_resource_value(resource, attr, add_td_wrappers = true)
     value = nil
     attr.to_s.split('.').each{|a| value = (value || resource).send(a) }
     value = display_referenced_resource(value) if value.is_a?(ActiveRecord::Base)
-    format_response_value(value).html_safe
+    if value.is_a?(ActiveRecord::Associations::CollectionProxy)
+      value = value.collect do |r|
+        label = Adminsite::AdminConfig::Base.admin_config_of_class(r.class, nil, current_adminsite_admin_user).label_attribute(r)
+        display_resource_value(r, label, false)
+      end.join(', ')
+    end
+    format_response_value(value, add_td_wrappers).html_safe
   end
 
   def display_referenced_resource(resource)

data/app/models/adminsite/ability.rb

@@ -0,0 +1,25 @@
+module Adminsite
+  class Ability
+    include CanCan::Ability
+
+    def initialize(user)
+      user ||= AdminUser.new
+      user.admin_user_roles.each do |role|
+        case role.name.to_sym
+        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
+        when :customer
+          # can :read, Adminsite::Page
+          # can :read, Adminsite::PageLayout
+          # can :read, Adminsite::FileAsset
+        end
+      end
+    end
+  end
+end

data/app/models/adminsite/admin_config/base.rb

@@ -80,6 +80,10 @@ module Adminsite
         [ :new ]
       end
 
+      def actions_placement
+        :right
+      end
+
       def label_attribute(resource = nil)
         :title
       end

data/app/models/adminsite/admin_user.rb

@@ -5,6 +5,8 @@ module Adminsite
     devise :database_authenticatable, :registerable,
            :recoverable, :rememberable, :trackable, :validatable
 
+    has_and_belongs_to_many :admin_user_roles
+
   end
 
 end

data/app/models/adminsite/admin_user_role.rb

@@ -0,0 +1,17 @@
+module Adminsite
+  class AdminUserRole < ActiveRecord::Base
+
+    has_and_belongs_to_many :admin_users
+
+    validates :name, presence: true, uniqueness: true
+
+    before_validation :downcase_name
+
+    protected
+
+    def downcase_name
+      self.name = name.try(:downcase)
+    end
+
+  end
+end

data/app/views/adminsite/admin/resources/_list.haml

@@ -1,19 +1,31 @@
+= paginate(@resources, :window => 2)
+
 %table
-  %tr
-    %th
-    - resource_admin_config.attributes_index.each do |attr|
-      %th= sort_link(@q, attr)
-    %th Actions
-  - @resources.each do |resource|
-    %tr{onClick: 'Adminsite.selectedRow(this);'}
-      %td.resource_selection_cell
-        = check_box_tag 'collection_selection[]', resource.id, false, :class => 'collection_selection'
+  %thead
+    %tr
+      - if resource_admin_config.actions_placement == :left
+        %th Actions
+      %th
       - resource_admin_config.attributes_index.each do |attr|
-        = display_resource_value(resource, attr)
-      %td.actions
-        %ul
-          - resource_admin_config.default_member_actions(resource).each do |action|
-            %li= send("link_to_#{action}", resource)
+        %th= sort_link(@q, attr)
+      - if resource_admin_config.actions_placement == :right
+        %th Actions
+  %tbody
+    - @resources.each do |resource|
+      %tr{onclick: 'Adminsite.selectedRow(this);'}
+        - if resource_admin_config.actions_placement == :left
+          %td.actions
+            %ul
+              - resource_admin_config.default_member_actions(resource).each do |action|
+                %li= send("link_to_#{action}", resource)
+        %td.resource_selection_cell
+          = check_box_tag 'collection_selection[]', resource.id, false, :class => 'collection_selection'
+        - resource_admin_config.attributes_index.each do |attr|
+          = display_resource_value(resource, attr)
+        - if resource_admin_config.actions_placement == :right
+          %td.actions
+            %ul
+              - resource_admin_config.default_member_actions(resource).each do |action|
+                %li= send("link_to_#{action}", resource)
 
 = paginate(@resources, :window => 2)
-%br

data/app/views/adminsite/admin/resources/_search_form.html.haml

@@ -1,7 +1,7 @@
 - if resource_admin_config.attributes_search.any?
   .search_form
-    %a#show{onClick: 'Adminsite.showSearchForm();', style: "#{'display:none' if @show_search_form}"  } Show Filters
-    %a#hide{onClick: 'Adminsite.hideSearchForm();', style: "#{'display:none' unless @show_search_form}" } Hide Filters
+    %a#show{onclick: 'Adminsite.showSearchForm();', style: "#{'display:none' if @show_search_form}"  } Show Filters
+    %a#hide{onclick: 'Adminsite.hideSearchForm();', style: "#{'display:none' unless @show_search_form}" } Hide Filters
     = search_form_for(@q, :url => admin_resource_path(nil), method: :get, html: { style: "#{'display:none' unless @show_search_form}"} ) do |f|
       = hidden_field_tag :admin_menu, params[:admin_menu]
       %div{id: "#{controller_name}-search"}
@@ -30,11 +30,6 @@
                       predicate_obj.onchange();
                   - else
                     = f.search_field("#{search_attr}_#{predicates.first}", value: field_value )
-
-
-
         .actions
           = f.submit "Search"
           = link_to "Reset" , admin_resource_path(nil)
-
-

data/db/migrate/20101007000002_create_admin_user_roles.rb

@@ -0,0 +1,20 @@
+class CreateAdminUserRoles < ActiveRecord::Migration
+  def change
+    create_table :adminsite_admin_user_roles do |t|
+      t.string :name, null: false
+      t.timestamps
+    end
+    add_index :adminsite_admin_user_roles, :name, unique: true
+
+    create_table :adminsite_admin_user_roles_users, id: false do |t|
+      t.references :admin_user, null: false
+      t.references :admin_user_role, null: false
+    end
+    add_index :adminsite_admin_user_roles_users, :admin_user_id
+    add_index :adminsite_admin_user_roles_users, :admin_user_role_id
+
+    Adminsite::AdminUserRole.create [{name: 'admin'}, {name: 'editor'},{name: 'customer'}]
+  end
+end
+
+

data/lib/adminsite/engine.rb

@@ -1,6 +1,6 @@
 %w(rails action_controller/page_caching).each{|f| require f }
 %w(paperclip liquid adminsite/liquid/tags/asset).each{|f| require f }
-%w(devise haml formtastic codemirror-rails kaminari ransack).each{|f| require f }
+%w(devise cancancan haml formtastic codemirror-rails kaminari ransack).each{|f| require f }
 
 module Adminsite
   class Engine < Rails::Engine

data/lib/adminsite/version.rb

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

data/lib/generators/adminsite/install/install_generator.rb

@@ -32,6 +32,9 @@ module Adminsite
           "\n  get '/:page_url(.:format)' => 'adminsite/contents#render_404'\n"
         end
 
+        puts "Setting up CanCan"
+        copy_file 'app/models/adminsite/ability.rb', 'app/models/adminsite/ability.rb'
+
         # Locales
         copy_file "config/locales/adminsite.da.yml", 'config/locales/adminsite.da.yml'
         copy_file "config/locales/adminsite.en.yml", 'config/locales/adminsite.en.yml'

data/lib/tasks/adminsite.rake

@@ -13,10 +13,11 @@ namespace :adminsite do
       password = Digest::MD5.hexdigest(Time.now.to_s)[0..9]
     end
 
-    Adminsite::AdminUser.create!( :name                  => name,
+    admin_user = Adminsite::AdminUser.create!( :name     => name,
                                   :email                 => email,
                                   :password              => password,
                                   :password_confirmation => password)
+    admin_user.admin_user_roles << Adminsite::AdminUserRole.find_by_name('admin')
     puts "#{'*'*70}"
     puts "Done! You can access the admin interface at http://yourapp_url/admin"
     puts "I have created an administrator with these credentials:"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Robin Wunderlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: cancancan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +247,9 @@ 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
 - app/admin_configs/adminsite/adminsite_page_admin_config.rb
 - app/admin_configs/adminsite/adminsite_page_layout_admin_config.rb
@@ -245,6 +261,7 @@ files:
 - app/assets/images/adminsite/admin/cross.png
 - app/assets/images/adminsite/admin/logo.gif
 - app/assets/images/adminsite/admin/logo.png
+- app/assets/images/adminsite/admin/logo.svg
 - app/assets/images/adminsite/admin/magnifier.png
 - app/assets/images/adminsite/admin/newspaper_add.png
 - app/assets/images/adminsite/admin/newspaper_delete.png
@@ -277,8 +294,10 @@ files:
 - app/helpers/admin/adminsite_application_helper.rb
 - app/helpers/admin_application_helper.rb
 - app/inputs/adminsite/multi_select_box_input.rb
+- app/models/adminsite/ability.rb
 - app/models/adminsite/admin_config/base.rb
 - app/models/adminsite/admin_user.rb
+- app/models/adminsite/admin_user_role.rb
 - app/models/adminsite/file_asset.rb
 - app/models/adminsite/page.rb
 - app/models/adminsite/page_layout.rb
@@ -318,6 +337,7 @@ files:
 - config/routes.rb
 - db/migrate/20101007000000_create_admin.rb
 - db/migrate/20101007000001_create_cms_tables.rb
+- db/migrate/20101007000002_create_admin_user_roles.rb
 - lib/adminsite.rb
 - lib/adminsite/configuration.rb
 - lib/adminsite/engine.rb
@@ -376,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Basic Admin Backend interface for Ruby on Rails