roleup 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63b885b52339e6ce02adf525f8aa38357c264e74
-  data.tar.gz: 942bf4261de0d5c678ba77f3b6c372154772d2a3
+  metadata.gz: 5788b1e970d2996a5a2ed6a9d16cabd9d99c25b3
+  data.tar.gz: 4b26ad508625ff3c48f39c5a82ac4b39d8b33df2
 SHA512:
-  metadata.gz: c3e23e86e3e8685bca7f3a70efa7c54aa7405f686df75ed46119baa81c880e03dcc2029c8435f1f7673772891adbaca3f6c70702611b35cca06bb37f33b1c962
-  data.tar.gz: 1b6c743b65b409c48e7ad2088d40e2d92e3b554cd0951b62d802fb9392af84b852f6220ba4bd5dc285e518ce1ffb8eba385764d73f659330e9d36a88ed7d26ea
+  metadata.gz: 4cc8c5aa7f4630c489aecc332c2d8f5be52655d19a33e625dfa8a8ad9bfd08d8f9634994e5599feca8a6a67593ac823acc96859aa758f10ea5b4e48c02d672c6
+  data.tar.gz: 75c9efe1849081f76c38b239d6457bab025e7e7eb24158fbe5e3fdecc84739a6a46475b7ec5a3a38e6b4278f5bcdeec475ff6144a59fd03a6dfbde9b99e99827

data/lib/roleup/has_roles.rb

@@ -11,5 +11,13 @@ module Roleup
     def has_role?(role)
       roles.include? role
     end
+
+    def has_all_roles?(*roles)
+      (self.roles & roles).size == roles.size
+    end
+
+    def has_one_role?(*roles)
+      !(self.roles & roles).empty?
+    end
   end
 end

data/lib/roleup/list.rb

@@ -7,30 +7,39 @@ module Roleup
     def_delegators :inner_list, :each, :length, :size
 
     def initialize(*values)
-      @inner_list = values.flatten.map { |value| standardize(value) }.uniq.sort
+      @inner_list = standardize_values(*values)
     end
 
     def include?(value)
-      inner_list.include? standardize(value)
+      inner_list.include? standardize_value(value)
     end
 
     def push(value)
       return self if include?(value)
-      inner_list << standardize(value)
+      inner_list << standardize_value(value)
     end
 
     alias_method :<<, :push
 
     def delete(value)
-      inner_list.delete standardize(value)
+      inner_list.delete standardize_value(value)
+    end
+
+    def &(*values)
+      inner_list & standardize_values(*values)
     end
 
     protected
 
     attr_reader :inner_list
 
-    def standardize(value)
+    def standardize_value(value)
       value.to_s.downcase.to_sym
     end
+
+    def standardize_values(*values)
+      values.flatten.map { |value| standardize_value(value) }.uniq.sort
+    end
+
   end
 end

data/lib/roleup/version.rb

@@ -1,3 +1,3 @@
 module Roleup
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/test/has_roles_test.rb

@@ -2,23 +2,32 @@ require_relative "test_helper"
 
 module Roleup
   class HasRolesTest < MicroTest::Test
+    class User
+      include HasRoles
+    end
 
     before do
-      class_with_roles = Class.new do
-        include HasRoles
-      end
-
-      @obj_with_roles = class_with_roles.new
-      @obj_with_roles.roles = :admin, :editor
+      @user = User.new
+      @user.roles = :admin, :editor
     end
 
     test "assign roles" do
-      assert @obj_with_roles.roles.to_a == [:admin, :editor]
+      assert @user.roles.to_a == [:admin, :editor]
     end
 
     test "has_role?" do
-      assert @obj_with_roles.has_role?(:admin)
-      assert @obj_with_roles.has_role?(:editor)
+      assert @user.has_role?(:admin)
+      assert @user.has_role?(:editor)
+    end
+
+    test "has_all_roles?" do
+      assert @user.has_all_roles?(:admin, :EDITOR)
+      assert !@user.has_all_roles?(:admin, :editor, :other)
+    end
+
+    test "has_one_role?" do
+      assert @user.has_one_role?(:other, :editor, :VIEWER)
+      assert !@user.has_one_role?(:other, :viewer)
     end
 
   end

data/test/list_test.rb

@@ -40,5 +40,10 @@ module Roleup
       assert @roles.size == @roles.to_a.uniq.size
     end
 
+    test "intersection" do
+      list = @roles & [:editor, :viewer, :other]
+      assert list == [:editor, :viewer]
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roleup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Nathan Hopkins