monarchy 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f963493605d696311041686e1851bb817c7ffc79
-  data.tar.gz: 911449908792e86543e9e2f5f27419c83259f9dc
+  metadata.gz: ae3074e01b50dd43b63d376ebb3f2410a9e6f588
+  data.tar.gz: c37f5e0d3bb7dd2998bbab3b0624c989e3027b38
 SHA512:
-  metadata.gz: b4f3cf8d4938a0b8bb4aafcf4b66839ea0c84fd5c2326d391804a5ce2dc0f2d768dba937202b594d07870cbfabd13d0e6e67dde2774963d0d766da547b069dab
-  data.tar.gz: 69f1a19456a597ea7e418ed13721ef42c6864074ba3e24b3d40f63a951ec21af4aec4a4376007c8f83260e6e2e3b2403106458765460bbdfeb1513e18646222a
+  metadata.gz: ba65132a3f0e45e64ceec663be0a0c030013aea2d3c66e8bf5495b908a9e79f8bf04509b0a5a4163728db1828007e707be5cfc1e69de3e946df1ee270bad6cf8
+  data.tar.gz: 9139f0b7de797402b124f2eb31fdb213bd72c317ebe30ef90bedbb4c755297424f7f30bcadf56b243279200b1b09d9958f44c78b9ef2b33c7f983d5c564471a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monarchy (1.1.4)
+    monarchy (1.1.5)
       active_record_union (= 1.2.0)
       closure_tree (= 6.1.0)
       configurations (= 2.2.0)

data/lib/monarchy/acts_as_resource.rb

@@ -10,8 +10,8 @@ module Monarchy
 
         parent_as(options[:parent_as]) if options[:parent_as]
 
-        after_create :ensure_hierarchy
-        after_save :assign_parent
+        after_update :assign_parent
+        after_create :ensure_hierarchy, :assign_parent
 
         has_many :members, through: :hierarchy, class_name: "::#{Monarchy.member_class}"
         has_many :users, through: :members, class_name: "::#{Monarchy.user_class}"
@@ -24,13 +24,14 @@ module Monarchy
     end
 
     module SupportMethods
-      attr_accessor :parentize, :acting_as_resource
+      attr_accessor :parentize, :acting_as_resource, :automatic_hierarchy
 
       private
 
       def setup_acting
         Monarchy.resource_classes << self
         @acting_as_resource = true
+        @automatic_hierarchy = true
       end
 
       def parent_as(name)
@@ -55,7 +56,7 @@ module Monarchy
 
       def parent=(resource)
         if hierarchy
-          hierarchy.update(parent: resource.try(:hierarchy))
+          hierarchy.update(parent: resource.try(:ensure_hierarchy))
         else
           @parent = resource
         end
@@ -70,22 +71,22 @@ module Monarchy
         @children = array
       end
 
-      private
-
-      def ensure_hierarchy
+      def ensure_hierarchy(force = false)
         self.hierarchy ||= Monarchy::Hierarchy.create(
           resource: self,
           parent: parent.try(:hierarchy),
           children: hierarchies_for(children)
-        )
+        ) if self.class.automatic_hierarchy || force
       end
 
+      private
+
       def assign_parent(force = false)
-        parent = self.class.parentize
+        parentize = self.class.parentize
 
-        if parent
-          was_changed = changes["#{parent}_id"] || changes["#{parent}_type"]
-          self.parent = send(parent) if was_changed || force
+        if parentize
+          was_changed = changes["#{parentize}_id"] || changes["#{parentize}_type"]
+          self.parent = send(parentize) if was_changed || force
         end
       end
 

data/lib/monarchy/tasks.rb

@@ -16,7 +16,7 @@ module Monarchy
       p 'Monarchy hierarchization...'
       Monarchy.resource_classes.with_progress.each do |klass|
         klass.all.each do |model|
-          model.send(:ensure_hierarchy)
+          model.send(:ensure_hierarchy, true)
         end
       end
       p 'Monarchy hierarchization ended!'

data/lib/monarchy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails