monarchy 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ee35ff7681e64755e2287e318540e66ef5fd891
-  data.tar.gz: 60d1a4cf7ba3727517250c2a44c40024cc211224
+  metadata.gz: f963493605d696311041686e1851bb817c7ffc79
+  data.tar.gz: 911449908792e86543e9e2f5f27419c83259f9dc
 SHA512:
-  metadata.gz: 66f9f19fe4eaffd3e31f4324b55d69f4b5ed8afaf9d1adf6b370ff990b12a1ee9300b2ebdc9f159f81242535fbfc208f35d2417179afc3406ce19f7c37973b07
-  data.tar.gz: ecca2c24e3c2eb3f830d52e720ad6dc0ec54e876fe4a4596b768a981ba3004d496a05d8680668af9a2a80d54f642474c1f3eca81e8390e4520bb8714ee47bf79
+  metadata.gz: b4f3cf8d4938a0b8bb4aafcf4b66839ea0c84fd5c2326d391804a5ce2dc0f2d768dba937202b594d07870cbfabd13d0e6e67dde2774963d0d766da547b069dab
+  data.tar.gz: 69f1a19456a597ea7e418ed13721ef42c6864074ba3e24b3d40f63a951ec21af4aec4a4376007c8f83260e6e2e3b2403106458765460bbdfeb1513e18646222a

data/Gemfile.lock

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

data/lib/monarchy.rb

@@ -3,12 +3,14 @@ require 'closure_tree'
 require 'configurations'
 require 'active_record_union'
 
+require 'monarchy/tasks'
+require 'monarchy/engine'
+
+require 'monarchy/acts_as_user'
 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/engine'
+require 'monarchy/acts_as_hierarchy'
 
 module Monarchy
   cattr_accessor :resource_classes

data/lib/monarchy/tasks.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+require 'tqdm'
+
+module Monarchy
+  class << self
+    def rebuild!
+      p 'Rebuilding Monarchy...'
+      hierarhization
+      reparentize
+      p 'Rebuilding Monarchy ended!'
+    end
+
+    private
+
+    def hierarhization
+      p 'Monarchy hierarchization...'
+      Monarchy.resource_classes.with_progress.each do |klass|
+        klass.all.each do |model|
+          model.send(:ensure_hierarchy)
+        end
+      end
+      p 'Monarchy hierarchization ended!'
+    end
+
+    def reparentize
+      p 'Monarchy reparentize...'
+
+      Monarchy.resource_classes.with_progress.each do |klass|
+        klass.all.each do |model|
+          model.send(:assign_parent, true)
+        end
+      end
+
+      Monarchy::Hierarchy.rebuild!
+      p 'Monarchy reparentize ended!'
+    end
+  end
+end

data/lib/monarchy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,8 +166,8 @@ files:
 - lib/monarchy/acts_as_role.rb
 - lib/monarchy/acts_as_user.rb
 - lib/monarchy/engine.rb
+- lib/monarchy/tasks.rb
 - lib/monarchy/version.rb
-- lib/tasks/monarchy_tasks.rake
 - monarchy.gemspec
 - monarchy.png
 homepage: https://github.com/Exelord/Monarchy

data/lib/tasks/monarchy_tasks.rake

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-require 'tqdm'
-
-task 'monarchy:reparentize' do
-  p 'Monarchy reparentize...'
-
-  Monarchy.resource_classes.with_progress.each do |klass|
-    klass.all.each do |model|
-      model.send(:assign_parent, true)
-    end
-  end
-
-  Monarchy::Hierarchy.rebuild!
-  p 'Monarchy reparentize ended!'
-end
-
-task 'monarchy:hierarchization' do
-  p 'Monarchy hierarchization...'
-  Monarchy.resource_classes.with_progress.each do |klass|
-    klass.all.each do |model|
-      model.send(:ensure_hierarchy)
-    end
-  end
-  p 'Monarchy hierarchization ended!'
-end
-
-task 'monarchy:rebuild' do
-  p 'Rebuilding Monarchy...'
-
-  Rake::Task['monarchy:hierarchization'].invoke
-  Rake::Task['monarchy:reparentize'].invoke
-
-  p 'Rebuilding Monarchy ended!'
-end