six 0.0.1 → 0.0.2

data/lib/six.rb

@@ -1,14 +1,10 @@
-require "singleton"
-
-module Six
-  class Guard
-    include Singleton
-
+class Six
+  class << self
     attr_accessor :rules_packs
     attr_accessor :current_rule_pack
 
-    def initialize 
-      @rules_packs = {}
+    def rules_packs 
+      @rules_packs ||= {}
     end
 
     def use(name)
@@ -21,7 +17,10 @@ module Six
     end
 
     def remove_pack(name)
-      rules_packs.delete(name.to_sym)
+      if pack_exist?(name)
+        @current_rule_pack = nil if rules_packs[name.to_sym] == @current_rule_pack
+        rules_packs.delete(name.to_sym)
+      end
     end
 
     def valid_rules_object?(object)
@@ -41,5 +40,9 @@ module Six
         rules_packs.values.map { |rp| rp.allowed(object, subject) }.flatten.include?(action)
       end
     end
+
+    def reset_use
+      @current_rule_pack = nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: six
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: