monarchy 1.1.5 → 2.0.0.pre.beta.1

data/dummy/db/migrate/20160220215254_monarchy_create_users.rb

@@ -0,0 +1,7 @@
+class MonarchyCreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.timestamps null: false
+    end
+  end
+end

data/dummy/db/migrate/20160221132205_monarchy_create_hierarchies.rb

@@ -0,0 +1,22 @@
+class MonarchyCreateHierarchies < ActiveRecord::Migration
+  def change
+    create_table :monarchy_hierarchies do |t|
+      t.integer :parent_id
+      t.integer :resource_id, null: false
+      t.string :resource_type, null: false
+      t.timestamps null: false
+    end
+
+    create_table :monarchy_hierarchy_hierarchies, id: false do |t|
+      t.integer :ancestor_id, null: false
+      t.integer :descendant_id, null: false
+      t.integer :generations, null: false
+    end
+
+    add_index :monarchy_hierarchy_hierarchies, [:ancestor_id, :descendant_id, :generations],
+              unique: true,
+              name: 'hierarchy_anc_desc_idx'
+
+    add_index :monarchy_hierarchy_hierarchies, [:descendant_id], name: 'hierarchy_desc_idx'
+  end
+end

data/dummy/db/migrate/20160221133215_monarchy_create_memberships.rb

@@ -0,0 +1,38 @@
+class MonarchyCreateMemberships < ActiveRecord::Migration
+  def change
+    create_table :monarchy_members do |t|
+      t.belongs_to :user
+      t.belongs_to :hierarchy
+      t.timestamps null: false
+    end
+
+    create_table :monarchy_roles do |t|
+      t.string :name, null: false
+      t.integer :level, default: 0, null: false
+      t.integer :inherited_role_id
+      t.boolean :inherited, default: false, null: false
+      t.timestamps null: false
+    end
+
+    create_table :monarchy_members_roles do |t|
+      t.belongs_to :role
+      t.belongs_to :member
+      t.timestamps null: false
+    end
+
+    add_index :monarchy_hierarchies, :parent_id
+    add_index :monarchy_hierarchies, :resource_id
+
+    add_index :monarchy_members, :hierarchy_id
+    add_index :monarchy_members, :user_id
+
+    add_index :monarchy_roles, :level
+    add_index :monarchy_roles, :inherited
+    add_index :monarchy_roles, :inherited_role_id
+    add_index :monarchy_roles, :name, unique: true
+
+    add_index :monarchy_members_roles, [:role_id, :member_id], unique: true
+    add_index :monarchy_members_roles, :member_id
+    add_index :monarchy_members_roles, :role_id
+  end
+end

data/dummy/db/migrate/20160221142305_create_memo_resource.rb

@@ -0,0 +1,8 @@
+class CreateMemoResource < ActiveRecord::Migration
+  def change
+    create_table :memos do |t|
+      t.string :name
+      t.timestamps null: false
+    end
+  end
+end

data/dummy/db/migrate/20160221142309_create_project_resource.rb

@@ -0,0 +1,8 @@
+class CreateProjectResource < ActiveRecord::Migration
+  def change
+    create_table :projects do |t|
+      t.string :name
+      t.timestamps null: false
+    end
+  end
+end

data/dummy/db/migrate/20160221154113_create_resource_resource.rb

@@ -0,0 +1,8 @@
+class CreateResourceResource < ActiveRecord::Migration
+  def change
+    create_table :resources do |t|
+      t.string :name
+      t.timestamps null: false
+    end
+  end
+end

data/dummy/db/migrate/20160306124820_add_memo_to_resource.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class AddMemoToResource < ActiveRecord::Migration
+  def change
+    add_column :resources, :memo_id, :integer
+  end
+end

data/dummy/db/migrate/20160502212213_parent_as_setup.rb

@@ -0,0 +1,7 @@
+class ParentAsSetup < ActiveRecord::Migration
+  def change
+    remove_column :resources, :memo_id
+    add_column :projects, :resource_id, :integer
+    add_column :memos, :project_id, :integer
+  end
+end

data/dummy/db/migrate/20160815163909_task_model.rb

@@ -0,0 +1,10 @@
+class TaskModel < ActiveRecord::Migration
+  def change
+    create_table :tasks do |t|
+      t.string :name
+      t.integer :resource_id
+      t.string :resource_type
+      t.timestamps null: false
+    end
+  end
+end

data/dummy/db/migrate/20160818205534_status.rb

@@ -0,0 +1,9 @@
+class Status < ActiveRecord::Migration
+  def change
+    create_table :statuses do |t|
+      t.string :name
+      t.integer :project_id
+      t.timestamps null: false
+    end
+  end
+end

data/dummy/db/schema.rb

@@ -0,0 +1,111 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20160818205534) do
+
+  create_table "memos", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer  "project_id"
+  end
+
+  create_table "monarchy_hierarchies", force: :cascade do |t|
+    t.integer  "parent_id"
+    t.integer  "resource_id",   null: false
+    t.string   "resource_type", null: false
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+  end
+
+  add_index "monarchy_hierarchies", ["parent_id"], name: "index_monarchy_hierarchies_on_parent_id"
+  add_index "monarchy_hierarchies", ["resource_id"], name: "index_monarchy_hierarchies_on_resource_id"
+
+  create_table "monarchy_hierarchy_hierarchies", id: false, force: :cascade do |t|
+    t.integer "ancestor_id",   null: false
+    t.integer "descendant_id", null: false
+    t.integer "generations",   null: false
+  end
+
+  add_index "monarchy_hierarchy_hierarchies", ["ancestor_id", "descendant_id", "generations"], name: "hierarchy_anc_desc_idx", unique: true
+  add_index "monarchy_hierarchy_hierarchies", ["descendant_id"], name: "hierarchy_desc_idx"
+
+  create_table "monarchy_members", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "hierarchy_id"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
+  end
+
+  add_index "monarchy_members", ["hierarchy_id"], name: "index_monarchy_members_on_hierarchy_id"
+  add_index "monarchy_members", ["user_id"], name: "index_monarchy_members_on_user_id"
+
+  create_table "monarchy_members_roles", force: :cascade do |t|
+    t.integer  "role_id"
+    t.integer  "member_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "monarchy_members_roles", ["member_id"], name: "index_monarchy_members_roles_on_member_id"
+  add_index "monarchy_members_roles", ["role_id", "member_id"], name: "index_monarchy_members_roles_on_role_id_and_member_id", unique: true
+  add_index "monarchy_members_roles", ["role_id"], name: "index_monarchy_members_roles_on_role_id"
+
+  create_table "monarchy_roles", force: :cascade do |t|
+    t.string   "name",                              null: false
+    t.integer  "level",             default: 0,     null: false
+    t.integer  "inherited_role_id"
+    t.boolean  "inherited",         default: false, null: false
+    t.datetime "created_at",                        null: false
+    t.datetime "updated_at",                        null: false
+  end
+
+  add_index "monarchy_roles", ["inherited"], name: "index_monarchy_roles_on_inherited"
+  add_index "monarchy_roles", ["inherited_role_id"], name: "index_monarchy_roles_on_inherited_role_id"
+  add_index "monarchy_roles", ["level"], name: "index_monarchy_roles_on_level"
+  add_index "monarchy_roles", ["name"], name: "index_monarchy_roles_on_name", unique: true
+
+  create_table "projects", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+    t.integer  "resource_id"
+  end
+
+  create_table "resources", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "statuses", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "project_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "tasks", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "resource_id"
+    t.string   "resource_type"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+end

data/dummy/public/404.html

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <div>
+      <h1>The page you were looking for doesn't exist.</h1>
+      <p>You may have mistyped the address or the page may have moved.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>

data/dummy/public/422.html

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <div>
+      <h1>The change you wanted was rejected.</h1>
+      <p>Maybe you tried to change something you didn't have access to.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>

data/dummy/public/500.html

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>

data/dummy/spec

@@ -0,0 +1 @@
+dummy/../spec

data/lib/generators/templates/config.rb

@@ -1,11 +1,48 @@
 Monarchy.configure do |config|
-  config.default_role.name = :guest
-  config.default_role.level = 0
-  config.default_role.inherited = false
+  # REQUIRED SETTINGS
 
-  config.member_class_name = 'Monarchy::Member'
-  config.role_class_name = 'Monarchy::Role'
-  # config.user_class_name = 'User'
+  # You have to define which role will be the default one (read only) during inheritance.
+  # Example role: :guest
+  # Real case on resources:
+  # project: (you have no roles)
+  #   section: (you have no roles)
+  #     task: (you have a member role here)
+  # When you ask for user.roles_for(project) you will get a default role (:guest)
+  # in case when member role has inherited flag set to true
+  # Remember to create that role before setting it up eg:
+  # Monarchy::Role.create(name: :guest, inherited: false, level: 0)
+  config.inherited_default_role = nil # symbol
 
-  # config.member_force_revoke = true
+  # You have to define user class name or an actor class which respond to acts_as_user in your model.
+  # Example of model:
+  # class User < ActiveRecord::Base
+  #   acts_as_user
+  # end
+  config.user_class_name = '' # string
+
+
+  # OPTIONAL SETTINGS
+
+  # If you want to override Member or Role class you have add correct actors to class definition
+  # Available: acts_as_member, acts_as_role, acts_as_hierarchy
+  # Example:
+  # class Member < ActiveRecord::Base
+  #   acts_as_member
+  # end
+  config.role_class_name = 'Monarchy::Role' # string
+  config.member_class_name = 'Monarchy::Member' # string
+  config.hierarchy_class_name = 'Monarchy::Hierarchy' # string
+
+
+  # If this option is setup to true all members bellow the destroying one, will be deleted.
+  config.members_access_revoke = false # boolean
+
+  # Set the revoke strategy using during '#revoke_role!' method
+  # Available: :revoke_member, :revoke_access
+  # Default: :revoke_member
+  # Info:
+  # :revoke_member - after revoking the last role from user's member remove the member
+  # :revoke_access - after revoking the last role from user's member
+  #                  remove the member, and all members bellow which belongs to the user
+  config.revoke_strategy = :revoke_member # symbol
 end

data/lib/monarchy/acts_as_hierarchy.rb

@@ -6,10 +6,13 @@ module Monarchy
     module ClassMethods
       def acts_as_hierarchy
         extend Monarchy::ActsAsHierarchy::SupportMethods
+        self.table_name = 'monarchy_hierarchies'
         has_closure_tree dependent: :destroy
 
         has_many :members, class_name: "::#{Monarchy.member_class}", dependent: :destroy
+        has_many :users, through: :members, class_name: "::#{Monarchy.user_class}"
         belongs_to :resource, polymorphic: true
+
         include_scopes
 
         validates :resource_type, presence: true
@@ -21,21 +24,23 @@ module Monarchy
       private
 
       def include_scopes
-        scope :in, (lambda do |resource|
-          where(monarchy_hierarchies: { parent_id: resource.hierarchy.self_and_descendant_ids })
+        scope :in, (lambda do |hierarchy, descendants = true|
+          Monarchy::Validators.hierarchy(hierarchy)
+          where(id: descendants ? hierarchy.descendants : hierarchy.children)
         end)
 
         scope :accessible_for, (lambda do |user|
-          where(id: accessible_roots(user)).union(where(id: accessible_leaves(user)))
+          Monarchy::Validators.user(user)
+          where(id: accessible_roots(user).union(accessible_leaves(user)))
         end)
       end
 
       def accessible_roots(user)
-        joins('INNER JOIN "monarchy_hierarchy_hierarchies" ON '\
+        unscoped.joins('INNER JOIN "monarchy_hierarchy_hierarchies" ON '\
           '"monarchy_hierarchies"."id" = "monarchy_hierarchy_hierarchies"."ancestor_id"')
-          .joins('INNER JOIN "monarchy_members" ON '\
+                .joins('INNER JOIN "monarchy_members" ON '\
           '"monarchy_members"."hierarchy_id" = "monarchy_hierarchy_hierarchies"."descendant_id"')
-          .where(monarchy_members: { user_id: user.id }).distinct
+                .where(monarchy_members: { user_id: user.id }).distinct
       end
 
       def accessible_leaves(user)
@@ -48,16 +53,12 @@ module Monarchy
             )
       end
 
-      def default_role_name
-        Monarchy.configuration.default_role.name
-      end
-
       def descendant_leaves_for_user(user)
         descendant_leaves.joins(members: [:roles]).where(monarchy_members: { user_id: user.id })
       end
 
       def descendant_leaves
-        joins('INNER JOIN "monarchy_hierarchy_hierarchies" ON "monarchy_hierarchies"."id" =' \
+        unscoped.joins('INNER JOIN "monarchy_hierarchy_hierarchies" ON "monarchy_hierarchies"."id" =' \
           '"monarchy_hierarchy_hierarchies"."descendant_id"')
       end
     end

data/lib/monarchy/acts_as_member.rb

@@ -23,13 +23,13 @@ module Monarchy
     module SupportMethods
       def include_scopes
         scope :accessible_for, (lambda do |user|
-          where(hierarchy: Monarchy::Hierarchy.accessible_for(user))
+          Monarchy::Validators.user(user)
+          where(hierarchy: Monarchy.hierarchy_class.accessible_for(user))
         end)
       end
 
       def include_callbacks
-        before_create :set_default_role
-        after_destroy :revoke_access, if: :member_force_revoke?
+        after_destroy :revoke_access, if: :members_access_revoke?
       end
 
       def include_validators
@@ -43,33 +43,24 @@ module Monarchy
         has_many :roles, -> { order(level: :desc) }, through: :members_roles, class_name: "::#{Monarchy.role_class}"
 
         belongs_to :user, class_name: "::#{Monarchy.user_class}"
-        belongs_to :hierarchy, class_name: 'Monarchy::Hierarchy'
+        belongs_to :hierarchy, class_name: "::#{Monarchy.hierarchy_class}"
       end
     end
 
     module InstanceMethods
       def resource=(resource)
+        Monarchy::Validators.resource(resource)
         self.hierarchy = resource.hierarchy unless hierarchy
       end
 
       private
 
       def revoke_access
-        user.revoke_access(resource, resource.hierarchy.descendant_ids)
+        user.revoke_access(resource, resource.hierarchy.descendants)
       end
 
-      def member_force_revoke?
-        Monarchy.configuration.member_force_revoke
-      end
-
-      def set_default_role
-        roles = self.roles
-        roles << Monarchy.role_class.find_or_create_by(
-          name: Monarchy.configuration.default_role.name,
-          inherited: Monarchy.configuration.default_role.inherited,
-          level: Monarchy.configuration.default_role.level
-        )
-        self.roles = roles.uniq
+      def members_access_revoke?
+        Monarchy.configuration.members_access_revoke
       end
 
       def hierarchy_or_resource