monarchy 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41ca61cf044e6e4c4ae5a3a2230c6495e662005
-  data.tar.gz: 283d4f647c876b35712a7ff094bd5bcf4e4cfe9d
+  metadata.gz: 7dfc2d0fdc01fa14cb113bb0d1cf87533af6e849
+  data.tar.gz: 6ca7712af3dfbe53c0f309432415471bb1f70cf8
 SHA512:
-  metadata.gz: d79f2aac6d3ebb18b1a361a7ed26c0ae3156d2876de19b4b4a447862e7f05fae6bb29b9d47c8be3d5c17e7eb998350cf286b380588bcfd0ce3c8a1cbab58a471
-  data.tar.gz: d2f3d22b828220881e0f39b55798f6ec686d87bf44ef463b8033570eee9177dfa62f8d24c590ebc65c0a5249563e338ded43fc7733a6b5d1c17e938c56941237
+  metadata.gz: defd04040f7ece731b35b84ee04000f72cb08be7cceef9d63ba043d61b77459e8a11cdee5f15cbdcece69f1898ce3709c3e127816040159997bf49a96be01a16
+  data.tar.gz: fb7b2313b86d63b912b8741038fe245dbf6847ecccce9d681db5575ba370a7f1661bbc5658c6fdeadbdbc650e23e08c809c89db894f49a5a17e51a8247f9ee94

data/Gemfile

@@ -24,6 +24,7 @@ group :development, :test do
   gem 'factory_girl_rails', '4.7.0'
   gem 'ffaker', '2.2.0'
   gem 'database_cleaner', '1.5.3'
+  gem 'tqdm', '0.3.0'
 end
 
 gem 'simplecov', '0.11.2', require: false, group: :test

data/Gemfile.lock

@@ -1,54 +1,55 @@
 PATH
   remote: .
   specs:
-    monarchy (0.3.0)
+    monarchy (0.3.1)
       active_record_union (= 1.1.1)
       closure_tree (= 6.0.0)
       configurations (= 2.2.0)
       rails (~> 4.2, >= 4.2.4)
+      tqdm (= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actionmailer (4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.7)
+      actionview (= 4.2.7)
+      activesupport (= 4.2.7)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_record_union (1.1.1)
       activerecord (>= 4.0)
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
+    activejob (4.2.7)
+      activesupport (= 4.2.7)
       globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.7)
+      activemodel (= 4.2.7)
+      activesupport (= 4.2.7)
       arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
-    ast (2.2.0)
+    ast (2.3.0)
     builder (3.2.2)
     closure_tree (6.0.0)
       activerecord (>= 4.1.0)
@@ -66,7 +67,7 @@ GEM
       factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
     ffaker (2.2.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
     json (1.8.3)
@@ -78,14 +79,16 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.9.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    parser (2.3.1.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    parser (2.3.1.2)
       ast (~> 2.2)
+    pkg-config (1.1.7)
     powerpack (0.1.1)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -94,16 +97,16 @@ GEM
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    rails (4.2.7)
+      actionmailer (= 4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
+      activemodel (= 4.2.7)
+      activerecord (= 4.2.7)
+      activesupport (= 4.2.7)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
+      railties (= 4.2.7)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -113,13 +116,13 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.7)
+      actionpack (= 4.2.7)
+      activesupport (= 4.2.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -156,19 +159,20 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.6.0)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
+    tqdm (0.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.0.5)
+    unicode-display_width (1.1.0)
     with_advisory_lock (3.0.0)
       activerecord (>= 3.2)
       thread_safe
@@ -183,16 +187,17 @@ DEPENDENCIES
   ffaker (= 2.2.0)
   monarchy!
   pry-rails (= 0.3.4)
-  rake (~> 11.1.2)
+  rake (~> 11.1)
   rspec (= 3.4.0)
   rspec-rails (= 3.4.2)
   rubocop (= 0.40.0)
   shoulda-matchers (= 3.1.1)
   simplecov (= 0.11.2)
   sqlite3 (= 1.3.11)
+  tqdm (= 0.3.0)
 
 RUBY VERSION
    ruby 2.3.0p0
 
 BUNDLED WITH
-   1.12.1
+   1.12.5

data/app/models/monarchy/member.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+class Monarchy::Member < ActiveRecord::Base
+  acts_as_member
+end

data/app/models/monarchy/members_role.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+class Monarchy::MembersRole < ActiveRecord::Base
+  self.table_name = 'monarchy_members_roles'
+
+  belongs_to :member, class_name: "::#{Monarchy.member_class}"
+  belongs_to :role, class_name: "::#{Monarchy.role_class}"
+
+  validates :role_id, uniqueness: { scope: :member_id }
+end

data/app/models/monarchy/role.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+class Monarchy::Role < ActiveRecord::Base
+  acts_as_role
+end

data/lib/generators/monarchy/setup_generator.rb

@@ -10,12 +10,9 @@ module Monarchy
 
     def setup_monarchy
       template 'config.rb', 'config/initializers/monarchy.rb'
-      template 'models/user.rb', 'app/models/user.rb'
-      template 'models/hierarchy.rb', 'app/models/monarchy/hierarchy.rb'
 
       migration_template 'migrations/hierarchy.rb', 'db/migrate/monarchy_create_hierarchies.rb'
       migration_template 'migrations/membership.rb', 'db/migrate/monarchy_create_memberships.rb'
-      migration_template 'migrations/user.rb', 'db/migrate/monarchy_create_users.rb'
     end
 
     def self.next_migration_number(dirname)

data/lib/generators/templates/config.rb

@@ -2,4 +2,11 @@ Monarchy.configure do |config|
   config.default_role.name = :guest
   config.default_role.level = 0
   config.default_role.inherited = false
+
+  config.member_class_name = 'Monarchy::Member'
+  config.role_class_name = 'Monarchy::Role'
+  # config.user_class_name = 'User'
+
+  # config.member_force_revoke = true
+  # config.restricted_role_names = ['member']
 end

data/lib/generators/templates/migrations/membership.rb

@@ -9,18 +9,30 @@ class MonarchyCreateMemberships < ActiveRecord::Migration
     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
 
-    add_index :monarchy_roles, :name, unique: true
-
     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/lib/monarchy/acts_as_hierarchy.rb

@@ -8,7 +8,7 @@ module Monarchy
         extend Monarchy::ActsAsHierarchy::SupportMethods
         has_closure_tree dependent: :destroy
 
-        has_many :members, class_name: 'Monarchy::Member', dependent: :destroy
+        has_many :members, class_name: "::#{Monarchy.member_class}", dependent: :destroy
         belongs_to :resource, polymorphic: true, dependent: :destroy
 
         include_scopes
@@ -40,11 +40,30 @@ module Monarchy
       end
 
       def accessible_leaves(user)
-        joins('INNER JOIN "monarchy_hierarchy_hierarchies" ON '\
-          '"monarchy_hierarchies"."id" = "monarchy_hierarchy_hierarchies"."descendant_id"')
-          .joins('INNER JOIN "monarchy_members" ON '\
-          '"monarchy_members"."hierarchy_id" = "monarchy_hierarchy_hierarchies"."ancestor_id"')
-          .where(monarchy_members: { user_id: user.id }).distinct
+        descendant_leaves.where('monarchy_hierarchy_hierarchies.descendant_id': descendant_leaves_for_user(user)
+            .where('monarchy_roles.name': restricted_role_names)
+            .select('monarchy_hierarchy_hierarchies.ancestor_id')).union(
+              descendant_leaves
+                .where('monarchy_hierarchy_hierarchies.ancestor_id': descendant_leaves_for_user(user)
+                .where.not('monarchy_roles.name': restricted_role_names))
+            )
+      end
+
+      def restricted_role_names
+        Array(Monarchy.configuration.restricted_role_names) + [default_role_name]
+      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" =' \
+          '"monarchy_hierarchy_hierarchies"."descendant_id"')
       end
     end
   end

data/lib/monarchy/acts_as_member.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+module Monarchy
+  module ActsAsMember
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def acts_as_member
+        extend Monarchy::ActsAsMember::SupportMethods
+
+        self.table_name = 'monarchy_members'
+
+        delegate :resource, :resource_id, :resource_type, to: :hierarchy
+
+        include_relationships
+        include_validators
+        include_callbacks
+        include_scopes
+
+        include Monarchy::ActsAsMember::InstanceMethods
+      end
+    end
+
+    module SupportMethods
+      def include_scopes
+        scope :accessible_for, (lambda do |user|
+          where(hierarchy: Monarchy::Hierarchy.accessible_for(user))
+        end)
+      end
+
+      def include_callbacks
+        before_create :set_default_role
+        after_destroy :revoke_access, if: :member_force_revoke?
+      end
+
+      def include_validators
+        validates :user_id, uniqueness: { scope: :hierarchy_id }
+        validates :user, presence: true
+        validate :hierarchy_or_resource
+      end
+
+      def include_relationships
+        has_many :members_roles, dependent: :destroy, class_name: 'Monarchy::MembersRole'
+        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'
+      end
+    end
+
+    module InstanceMethods
+      def resource=(resource)
+        self.hierarchy = resource.hierarchy unless hierarchy
+      end
+
+      private
+
+      def revoke_access
+        user.revoke_access(resource, resource.hierarchy.descendant_ids)
+      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
+      end
+
+      def hierarchy_or_resource
+        errors.add(:base, 'Specify a resource or a hierarchy') unless hierarchy
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Monarchy::ActsAsMember

data/lib/monarchy/acts_as_resource.rb

@@ -6,13 +6,15 @@ module Monarchy
     module ClassMethods
       def acts_as_resource(options = {})
         extend Monarchy::ActsAsResource::SupportMethods
+        setup_acting
 
         parent_as(options[:parent_as]) if options[:parent_as]
 
         after_create :ensure_hierarchy
+        after_save :assign_parent
 
-        has_many :members, through: :hierarchy, class_name: 'Monarchy::Member'
-        has_many :users, through: :members, class_name: 'User'
+        has_many :members, through: :hierarchy, class_name: "::#{Monarchy.member_class}"
+        has_many :users, through: :members, class_name: "::#{Monarchy.user_class}"
         has_one :hierarchy, as: :resource, dependent: :destroy, class_name: 'Monarchy::Hierarchy'
 
         include_scopes
@@ -22,24 +24,22 @@ module Monarchy
     end
 
     module SupportMethods
+      attr_accessor :parentize, :acting_as_resource
+
       private
 
-      def parent_as(name)
-        define_method "#{name}=" do |value|
-          self.parent = value
-          super(value)
-        end
+      def setup_acting
+        Monarchy.resource_classes << self
+        @acting_as_resource = true
+      end
 
-        define_method "#{name}_id=" do |id|
-          class_name = name.to_s.camelize.safe_constantize
-          self.parent = class_name.find(id)
-          super(id)
-        end
+      def parent_as(name)
+        self.parentize = name
       end
 
       def include_scopes
         scope :in, (lambda do |resource|
-          joins(:hierarchy).where(monarchy_hierarchies: { parent_id: resource.hierarchy.self_and_descendant_ids })
+          joins(:hierarchy).where(monarchy_hierarchies: { parent_id: resource.hierarchy.self_and_descendants })
         end)
 
         scope :accessible_for, (lambda do |user|
@@ -80,6 +80,11 @@ module Monarchy
         )
       end
 
+      def assign_parent(force = false)
+        parent = self.class.parentize
+        self.parent = send(parent) if parent && (send("#{parent}_id_changed?") || force)
+      end
+
       def children_resources
         c = hierarchy.try(:children)
         return nil if c.nil?

data/lib/monarchy/acts_as_role.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Monarchy
+  module ActsAsRole
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def acts_as_role
+        self.table_name = 'monarchy_roles'
+
+        has_many :members_roles, dependent: :destroy, class_name: 'Monarchy::MembersRole'
+        has_many :members, through: :members_roles, class_name: "::#{Monarchy.member_class}"
+
+        belongs_to :inherited_role, class_name: "::#{Monarchy.role_class}"
+
+        after_create :default_inherited_role
+
+        include Monarchy::ActsAsRole::InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+      private
+
+      def default_inherited_role
+        update(inherited_role_id: id) unless inherited_role
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Monarchy::ActsAsRole

data/lib/monarchy/acts_as_user.rb

@@ -5,17 +5,22 @@ module Monarchy
 
     module ClassMethods
       def acts_as_user
-        has_many :members, class_name: 'Monarchy::Member', dependent: :destroy
+        has_many :members, class_name: "::#{Monarchy.member_class}", dependent: :destroy
         has_many :hierarchies, through: :members, class_name: 'Monarchy::Hierarchy'
 
+        scope :accessible_for, (lambda do |user|
+          where(id: Monarchy::Hierarchy.accessible_for(user)
+                                       .joins(members: [:user]).select(:user_id)).union(where(id: user.id))
+        end)
+
         include Monarchy::ActsAsUser::InstanceMethods
       end
     end
 
     module InstanceMethods
       def roles_for(resource, inheritence = true)
-        return [] unless resource.hierarchy
-        accessible_roles_for(resource, inheritence).group_by(&:level).values.first || []
+        return Monarchy.role_class.none unless resource.hierarchy
+        accessible_roles_for(resource, inheritence)
       end
 
       def member_for(resource)
@@ -28,9 +33,9 @@ module Monarchy
         end
       end
 
-      def revoke_access(resource)
-        self_and_descendant_ids = resource.hierarchy.self_and_descendant_ids
-        members_for(self_and_descendant_ids).destroy_all
+      def revoke_access(resource, hierarchy_ids = nil)
+        hierarchy_ids ||= resource.hierarchy.self_and_descendant_ids
+        members_for(hierarchy_ids).delete_all
       end
 
       def revoke_role(role_name, resource)
@@ -44,30 +49,35 @@ module Monarchy
       private
 
       def accessible_roles_for(resource, inheritnce)
-        accessible_roles = inheritnce ? resource_and_inheritence_roles(resource) : resource_roles(resource)
+        accessible_roles = if inheritnce
+                             resource_and_inheritence_roles(resource)
+                           else
+                             resource_roles(resource).order('level desc')
+                           end
+
         accessible_roles.present? ? accessible_roles : descendant_role(resource)
       end
 
       def resource_and_inheritence_roles(resource)
-        hierarchy_ids = resource.hierarchy.self_and_ancestors_ids
-        Monarchy::Role.joins(:members)
-                      .where("((monarchy_roles.inherited = 't' "\
-                             "AND monarchy_members.hierarchy_id IN (#{hierarchy_ids.join(',')})) "\
-                             "OR (monarchy_members.hierarchy_id = #{resource.hierarchy.id})) "\
-                             "AND monarchy_members.user_id = #{id}")
-                      .distinct.order(level: :desc)
+        hierarchy_ids = resource.hierarchy.ancestors.select(:id)
+        Monarchy.role_class.where(id:
+                      Monarchy.role_class.joins(:members).where('monarchy_members.user_id': id)
+                      .where('monarchy_roles.inherited': 't', 'monarchy_members.hierarchy_id': hierarchy_ids)
+                      .select(:inherited_role_id))
+                .union(resource_roles(resource))
+                .distinct
       end
 
       def resource_roles(resource)
-        Monarchy::Role.joins(:members)
-                      .where('monarchy_members.hierarchy_id': resource.hierarchy.id, 'monarchy_members.user_id': id)
-                      .distinct.order(level: :desc)
+        Monarchy.role_class.joins(:members)
+                .where('monarchy_members.hierarchy_id': resource.hierarchy.id, 'monarchy_members.user_id': id)
+                .distinct
       end
 
       def descendant_role(resource)
         descendant_ids = resource.hierarchy.descendant_ids
         children_access = members_for(descendant_ids).present?
-        children_access ? [default_role] : []
+        children_access ? Monarchy.role_class.where(id: default_role) : Monarchy.role_class.none
       end
 
       def revoking_role(role_name, resource, force = false)
@@ -75,28 +85,29 @@ module Monarchy
         member_roles = member.members_roles
 
         return revoke_access(resource) if last_role?(member_roles, role_name) && force
-        member_roles.joins(:role).where(monarchy_roles: { name: role_name }).destroy_all
+        member_roles.joins(:role).where(monarchy_roles: { name: role_name }).delete_all
       end
 
       def grant_or_create_member(role_name, resource)
-        role = Monarchy::Role.find_by(name: role_name)
-        member = member_for(resource)
+        role = Monarchy.role_class.find_by(name: role_name)
+        raise 'Role does not exist' unless role
 
+        member = member_for(resource)
         if member
           Monarchy::MembersRole.create(member: member, role: role)
         else
-          member = Monarchy::Member.create(user: self, hierarchy: resource.hierarchy, roles: [role])
+          member = Monarchy.member_class.create(user: self, hierarchy: resource.hierarchy, roles: [role])
         end
 
         member
       end
 
       def members_for(hierarchy_ids)
-        Monarchy::Member.where(hierarchy_id: hierarchy_ids, user_id: id)
+        Monarchy.member_class.where(hierarchy_id: hierarchy_ids, user_id: id)
       end
 
       def default_role
-        @default_role ||= Monarchy::Role.find_by(name: Monarchy.configuration.default_role.name)
+        @default_role ||= Monarchy.role_class.find_by(name: Monarchy.configuration.default_role.name)
       end
 
       def last_role?(member_roles, role_name = nil)

data/lib/monarchy/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Monarchy
-  VERSION = '0.3.1'
+  VERSION = '1.0.0'
 end

data/lib/monarchy.rb

@@ -3,16 +3,43 @@ require 'closure_tree'
 require 'configurations'
 require 'active_record_union'
 
+require 'monarchy/acts_as_role'
+require 'monarchy/acts_as_member'
 require 'monarchy/acts_as_hierarchy'
 require 'monarchy/acts_as_resource'
 require 'monarchy/acts_as_user'
-require 'monarchy/membership'
 require 'monarchy/engine'
 
 module Monarchy
+  cattr_accessor :resource_classes
+
+  def self.resource_classes
+    @resource_classes ||= []
+  end
+
   include Configurations
 
+  configuration_defaults do |config|
+    config.member_class_name = 'Monarchy::Member'
+    config.role_class_name = 'Monarchy::Role'
+    config.member_force_revoke = false
+    config.restricted_role_names = []
+  end
+
   not_configured do |prop|
-    raise NoMethodError, "#{prop} must be configured"
+    raise NoMethodError, "Monarchy requires a #{prop} to be configured"
+  end
+
+  def self.member_class
+    Monarchy.configuration.member_class_name.safe_constantize
+  end
+
+  def self.role_class
+    Monarchy.configuration.role_class_name.safe_constantize
+  end
+
+  def self.user_class
+    klass = Monarchy.configuration.user_class_name.safe_constantize
+    klass ? klass : raise(ArgumentError, 'User class has to be initialized or exist!')
   end
 end

data/lib/tasks/monarchy_tasks.rake

@@ -1,5 +1,18 @@
 # frozen_string_literal: true
-# desc "Explaining what the task does"
-# task :monarchy do
-#   # Task goes here
-# end
+require 'tqdm'
+
+task 'monarchy:reparentize' do
+  Monarchy.resource_classes.with_progress.each do |klass|
+    klass.all.each do |model|
+      model.send(:assign_parent, true)
+    end
+  end
+end
+
+task 'monarchy:hierarchization' do
+  Monarchy.resource_classes.with_progress.each do |klass|
+    klass.all.each do |model|
+      model.send(:ensure_hierarchy)
+    end
+  end
+end

data/monarchy.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'closure_tree', '6.0.0'
   s.add_dependency 'configurations', '2.2.0'
   s.add_dependency 'active_record_union', '1.1.1'
+  s.add_dependency 'tqdm', '0.3.0'
 
   s.add_development_dependency 'bundler', '~> 1.10'
   s.add_development_dependency 'rake', '~> 11.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,6 +72,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: tqdm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +147,9 @@ files:
 - README.md
 - Rakefile
 - app/models/monarchy/hierarchy.rb
+- app/models/monarchy/member.rb
+- app/models/monarchy/members_role.rb
+- app/models/monarchy/role.rb
 - bin/console
 - bin/setup
 - lib/generators/monarchy/resource_generator.rb
@@ -141,16 +158,14 @@ files:
 - lib/generators/templates/migrations/hierarchy.rb
 - lib/generators/templates/migrations/membership.rb
 - lib/generators/templates/migrations/resource.rb
-- lib/generators/templates/migrations/user.rb
-- lib/generators/templates/models/hierarchy.rb
 - lib/generators/templates/models/resource.rb
-- lib/generators/templates/models/user.rb
 - lib/monarchy.rb
 - lib/monarchy/acts_as_hierarchy.rb
+- lib/monarchy/acts_as_member.rb
 - lib/monarchy/acts_as_resource.rb
+- lib/monarchy/acts_as_role.rb
 - lib/monarchy/acts_as_user.rb
 - lib/monarchy/engine.rb
-- lib/monarchy/membership.rb
 - lib/monarchy/version.rb
 - lib/tasks/monarchy_tasks.rake
 - monarchy.gemspec

data/lib/generators/templates/migrations/user.rb

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

data/lib/generators/templates/models/hierarchy.rb

@@ -1,4 +0,0 @@
-class Monarchy::Hierarchy < ActiveRecord::Base
-  self.table_name = 'monarchy_hierarchies'
-  acts_as_hierarchy
-end

data/lib/generators/templates/models/user.rb

@@ -1,3 +0,0 @@
-class User < ActiveRecord::Base
-  acts_as_user
-end

data/lib/monarchy/membership.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-module Monarchy
-  class Member < ActiveRecord::Base
-    self.table_name = 'monarchy_members'
-
-    has_many :members_roles, dependent: :destroy, class_name: 'Monarchy::MembersRole'
-    has_many :roles, through: :members_roles, class_name: 'Monarchy::Role'
-
-    belongs_to :user
-    belongs_to :hierarchy, class_name: 'Monarchy::Hierarchy'
-
-    delegate :resource, :resource=, :resource_id, :resource_type, to: :hierarchy
-
-    validates :user_id, uniqueness: { scope: :hierarchy_id }
-    validates :user, presence: true
-
-    validate :hierarchy_or_resource
-
-    before_create :set_default_role
-
-    scope :accessible_for, (lambda do |user|
-      where(hierarchy: Monarchy::Hierarchy.accessible_for(user))
-    end)
-
-    def resource=(resource)
-      self.hierarchy = resource.hierarchy unless hierarchy
-    end
-
-    private
-
-    def set_default_role
-      roles = self.roles
-      roles << Monarchy::Role.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
-    end
-
-    def hierarchy_or_resource
-      errors.add(:base, 'Specify a resource or a hierarchy') unless hierarchy
-    end
-  end
-
-  class Role < ActiveRecord::Base
-    self.table_name = 'monarchy_roles'
-
-    has_many :members_roles, dependent: :destroy, class_name: 'Monarchy::MembersRole'
-    has_many :members, through: :members_roles, class_name: 'Monarchy::Member'
-  end
-
-  class MembersRole < ActiveRecord::Base
-    self.table_name = 'monarchy_members_roles'
-
-    belongs_to :member, class_name: 'Monarchy::Member'
-    belongs_to :role, class_name: 'Monarchy::Role'
-
-    validates :role_id, uniqueness: { scope: :member_id }
-  end
-end