cando 0.1.3 → 0.2.0

data/README.md

@@ -77,7 +77,7 @@ Using the CanDo in your code (working code with an empty database):
       # if passed, this will be executed if the user does not have the
       # asked-for capability (only applies if 'can' is passed a block)
       cannot_block do |user_urn, capability|
-        raise "#{user_urn} can not #{capability}"
+        raise "#{user_urn} can not #{capability} .. user capabilities are: #{capabilities(user_urn)}"
       end
 
       connect "mysql://cando_user:cando_passwd@host:port/database"
@@ -86,9 +86,13 @@ Using the CanDo in your code (working code with an empty database):
     # if the role or a capability does not exist, it'll be created
     define_role("r1", ["capability1", "capability3"])
     define_role("r2", ["capability2"])
+    define_role("r3", ["capability3"])
 
     # if the user does not exist, he'll be created -- the roles must be available
-    assign_roles("user1", ["r1", "r2"])
+    assign_roles("user1", ["r1"])
+    # add other roles by unifying arrays with '|'
+    assign_roles("user1", roles("user1") | ["r2","r3"])
+
     assign_roles("user2", ["r1"])
 
     # use 'can' block syntax

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/cando.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cando"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Bornkessel"]
-  s.date = "2014-05-20"
+  s.date = "2014-05-21"
   s.description = "CanDo is a small gem to implement a simple user access system based on users, roles & capabilites, where:\n\n    each user can have 0, 1 or many roles\n    each role can have 0, 1 or many capabilites\n\nUsers have capabilities by getting roles assigned (role == collection of capabilities). Within the code, the can helper method can be used to test whether a user has a certain capability or not (see below for a working code example)."
   s.email = "daniel@soundcloud.com"
   s.extra_rdoc_files = [

data/lib/cando.rb

@@ -85,4 +85,18 @@ EOF
   def assign_roles(user, roles)
     CanDo::User.find_or_create(:id => user).assign_roles(roles)
   end
+
+  def roles(user)
+    user = CanDo::User.first(:id => user)
+    return [] unless user
+
+    user.roles.map(&:id)
+  end
+
+  def capabilities(user)
+    user = CanDo::User.first(:id => user)
+    return [] unless user
+
+    user.capabilities.map{|x| x.to_sym }
+  end
 end

data/spec/cando_spec.rb

@@ -15,6 +15,29 @@ describe "CanDo module methods" do
     it { expect{ CanDo.cannot_block{|x,y| x} }.to_not raise_error(CanDo::ConfigCannotBlockError) }
   end
 
+  context "CanDo.cannot_block executes in the current context" do
+
+    it "sees local methods" do
+      CanDo.cannot_block{|x,y| local_dummy_method }
+
+      class Dummy
+        include CanDo
+        class DummyException < Exception; end
+
+        def local_dummy_method
+          raise DummyException
+        end
+
+        def foo
+          can("erna",:superpowers) {}
+        end
+      end
+
+      foo = Dummy.new
+      expect{ foo.foo }.to raise_error Dummy::DummyException
+    end
+  end
+
   context "CanDo.connect" do
     it { expect{ CanDo.connect(nil) }.to raise_error(CanDo::ConfigMysqlConnectionError) }
     it { expect{ CanDo.connect("sqlite::memory:") }.to raise_error(CanDo::ConfigMysqlDBError) }
@@ -50,7 +73,7 @@ describe "CanDo module methods" do
 
       context "cleanup" do
         before(:each) do
-          @role = define_role("role", [:capabilty])
+          @role = define_role("role", [:capability])
         end
 
         it { expect{ @role.destroy }.to change{CanDo::Role.count}.from(1).to(0) }
@@ -86,7 +109,7 @@ describe "CanDo module methods" do
 
       context "cleanup" do
         before(:each) do
-          @role = define_role("role", [:capabilty])
+          @role = define_role("role", [:capability])
           @user = assign_roles("user", [@role])
         end
 
@@ -99,7 +122,7 @@ describe "CanDo module methods" do
       include CanDo
 
       before(:each) do
-        @role = define_role("role", [:capability1, :capabilty2])
+        @role = define_role("role", [:capability1, :capability2])
         @user = assign_roles("user", [@role])
       end
 
@@ -112,7 +135,7 @@ describe "CanDo module methods" do
         context "CanDo.cannot_block" do
           class DummyException < RuntimeError; end
           before(:all) do
-            CanDo.cannot_block do |user, capabilty|
+            CanDo.cannot_block do |user, capability|
               raise DummyException
             end
           end
@@ -122,5 +145,29 @@ describe "CanDo module methods" do
         end
       end
     end
+
+    context "CanDo#roles" do
+      include CanDo
+      before(:each) do
+        @role1 = define_role("role1", [:capability1, :capability2])
+        @role2 = define_role("role2", [:capability3, :capability4])
+        @user = assign_roles("user", [@role1,@role2])
+      end
+
+      it { roles("user").sort.should == ["role1","role2"] }
+      it { roles("non-existant-user").sort.should == [] }
+    end
+
+    context "CanDo#capabilities" do
+      include CanDo
+      before(:each) do
+        @role1 = define_role("role1", [:capability1, :capability2])
+        @role2 = define_role("role2", [:capability2, :capability4])
+        @user = assign_roles("user", [@role1,@role2])
+      end
+
+      it { capabilities("user").sort.should == [:capability1, :capability2,:capability4].sort }
+      it { capabilities("non-existant-user").sort.should == [] }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cando
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2350834276738640713
+      hash: 1474018739418741316
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: