butler 1.8.2 → 1.8.3

data/lib/ruby/array/random.rb

@@ -0,0 +1,17 @@
+class Array
+	# Get a random element of this array
+	# With an argument it gets you n elements without no index used more than once
+	def random(n=nil)
+		unless n then
+			at(rand(length))
+		else
+			raise ArgumentError unless Integer === n and n.between?(0,length)
+			ary = dup
+			n.times { |i|
+				r = rand(n-i)+i
+				ary[r], ary[i] = ary[i], ary[r]
+			}
+			ary.first(n)
+		end
+	end
+end

data/lib/ruby/string/camelcase.rb

@@ -0,0 +1,14 @@
+#--
+# Copyright 2007 by Stefan Rusterholz.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+
+
+class String
+	# CamelCase a string, e.g. "foo_bar" becomes "FooBar"
+	def camelcase
+		scan(/[^_]+/).map { |s| s.capitalize }.join("")
+	end
+end

data/test/test_access.rb

@@ -1,16 +1,26 @@
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)+'/../lib')) if __FILE__ == $0
+
 require 'access'
 require 'fileutils'
 require 'test/unit'
 
 class TestAccess < Test::Unit::TestCase
-	TestDir = "test_access"
+	TestDir = File.expand_path(File.dirname(__FILE__)+"/test_access")
 	def setup
 		#raise "#{TestDir} already exists, aborting test" if File.exist?(TestDir)
 		_teardown if File.exist?(TestDir)
-		Dir.mkdir(TestDir)
-		Dir.mkdir("#{TestDir}/user")
-		Dir.mkdir("#{TestDir}/role")
-		Dir.mkdir("#{TestDir}/privilege")
+		%W[
+			#{TestDir}
+			#{TestDir}/user
+			#{TestDir}/role
+			#{TestDir}/privilege
+		].each { |dir|
+			Dir.mkdir(dir)
+		}
+	end
+	
+	def teardown
+		# _teardown
 	end
 	
 	def _teardown
@@ -24,78 +34,173 @@ class TestAccess < Test::Unit::TestCase
 			Access::YAMLBase.new(Access::Privilege::Base, "#{TestDir}/privilege")
 			#:channel => Access::YAMLBase.new("#{TestDir}/channel", Access::Location)
 		)
+		
+		# no user may yet exist
 		assert(!access.user.exists?("test"))
+
+		# create a user
 		access.user.create("test", "pass")
 		assert(access.user.exists?("test"))
 
-		%w(news news/read news/create news/edit news/delete banners banners/statistics
-		statistics statistics/web statistics/ftp paid_content).each { |priv|
-			assert(!access.privilege.exists?(priv))
-			access.privilege.create(priv, "test-privilege #{priv}")
-			assert(access.privilege.exists?(priv))
-		}
-		
-		access.role.create("editor", "testrole description", %w(news/create news/edit statistics))
-		access.role.create("chiefeditor", "testrole description 2", %w(news), %w(editor))
-
+		# login
+		user = access.login("test", "wrongpass")
+		assert(!user)
 		user = access.login("test", "pass")
 		assert(user)
 		assert(user.logged?)
+		
+		# test setting of being set to active
 		assert(!user.active?)
 		assert(user.inactive?)
 		user.active = true
 		assert(user.active?)
 		assert(!user.inactive?)
-		user = access.user["test", true]
-		assert(user)
-		assert(user.active?)
-		assert(!user.inactive?)
-		assert(!user.logged?)
 		
-		assert(!user.privileged?("foo"))
-		assert(!user.privileged?("foo/bar"))
-		assert(!user.privileged?("foo/baz"))
-		assert(!user.privileged?("bar"))
-		assert(!user.privileged?("bar/foo"))
-		assert(!user.privileged?("baz"))
-
-		assert(!user.authorized?("foo"))
-		assert(!user.authorized?("foo/bar"))
-		assert(!user.authorized?("foo/baz"))
-		assert(!user.authorized?("bar"))
-		assert(!user.authorized?("bar/foo"))
-		assert(!user.authorized?("baz"))
-
-		user.privileges.add(%w(banners statistics/web paid_content))
+		# we do not have any role or privilege
+		assert(!user.privileged?("news"))
+		assert(!user.authorized?("news"))
+
+		# add some privileges
+		%w(
+			news
+			news/read
+			news/create
+			news/edit
+			news/delete
+			banners
+			banners/statistics
+			statistics
+			statistics/web
+			statistics/ftp
+			paid_content
+		).each { |priv|
+			assert(!access.privilege.exists?(priv))
+			access.privilege.create(priv, "test-privilege #{priv}")
+			assert(access.privilege.exists?(priv))
+		}
+		
+		# we have not yet added those privileges so still should not have them
+		assert(!user.privileged?("news"))
+		assert(!user.privileged?("news/read"))
+		assert(!user.privileged?("banners"))
+		assert(!user.privileged?("statistics"))
+		assert(!user.privileged?("statistics/web"))
+		assert(!user.privileged?("paid_content"))
+
+		assert(!user.authorized?("news"))
+		assert(!user.authorized?("news/read"))
+		assert(!user.authorized?("banners"))
+		assert(!user.authorized?("statistics"))
+		assert(!user.authorized?("statistics/web"))
+		assert(!user.authorized?("paid_content"))
+		
+		# add the privileges to the user
+		%w[banners statistics/web paid_content news].each { |priv|
+			user.privileges.add_oid(priv)
+		}
+
+		# now we should have them
+		assert(user.privileged?("news"))
+		assert(user.privileged?("news/read"))
+		assert(user.privileged?("banners"))
+		assert(!user.privileged?("statistics"))
+		assert(user.privileged?("statistics/web"))
+		assert(user.privileged?("paid_content"))
+
+		assert(user.authorized?("news"))
+		assert(user.authorized?("news/read"))
+		assert(user.authorized?("banners"))
+		assert(!user.authorized?("statistics"))
+		assert(user.authorized?("statistics/web"))
+		assert(user.authorized?("paid_content"))
+		
+		# news was an 'accident', let's remove it
+		user.privileges.remove_oid("news")
 
+		# now we should have them
+		assert(!user.privileged?("news"))
+		assert(!user.privileged?("news/read"))
 		assert(user.privileged?("banners"))
-		assert(user.privileged?("banners/statistics"))
+		assert(!user.privileged?("statistics"))
 		assert(user.privileged?("statistics/web"))
+		assert(user.privileged?("paid_content"))
+
+		assert(!user.authorized?("news"))
+		assert(!user.authorized?("news/read"))
+		assert(user.authorized?("banners"))
+		assert(!user.authorized?("statistics"))
+		assert(user.authorized?("statistics/web"))
+		assert(user.authorized?("paid_content"))
+		
+		# add some roles
+		access.role.create("editor",      "testrole description 1", %w(news/create news/edit statistics))
+		access.role.create("chiefeditor", "testrole description 2", %w(news), %w(editor))
+		
+		# add some roles to our user
+		user.roles.add_oid("editor")
+		
+		# we should now have the associated privileges
+		assert(!user.privileged?("news"))
+		assert(user.privileged?("news/edit"))
+		assert(user.privileged?("news/create"))
+		assert(user.privileged?("banners"))
+		assert(user.privileged?("statistics"))
+		assert(user.privileged?("statistics/web"))
+		assert(user.privileged?("paid_content"))
+
+		assert(!user.authorized?("news"))
+		assert(user.authorized?("news/edit"))
+		assert(user.authorized?("news/create"))
+		assert(user.authorized?("banners"))
+		assert(user.authorized?("statistics"))
+		assert(user.authorized?("statistics/web"))
+		assert(user.authorized?("paid_content"))
+
+		# remove the role again
+		user.roles.remove_oid("editor")
+
+		# we should no longer have the associated privileges
+		assert(!user.privileged?("news"))
+		assert(!user.privileged?("news/edit"))
+		assert(!user.privileged?("news/create"))
+		assert(user.privileged?("banners"))
 		assert(!user.privileged?("statistics"))
-		assert(user.privileged?("bar/foo"))
-		assert(user.privileged?("baz"))
-
-		assert(!user.authorized?("foo"))
-		assert(!user.authorized?("foo/bar"))
-		assert(!user.authorized?("foo/baz"))
-		assert(!user.authorized?("bar"))
-		assert(!user.authorized?("bar/foo"))
-		assert(!user.authorized?("baz"))
+		assert(user.privileged?("statistics/web"))
+		assert(user.privileged?("paid_content"))
+
+		assert(!user.authorized?("news"))
+		assert(!user.authorized?("news/edit"))
+		assert(!user.authorized?("news/create"))
+		assert(user.authorized?("banners"))
+		assert(!user.authorized?("statistics"))
+		assert(user.authorized?("statistics/web"))
+		assert(user.authorized?("paid_content"))
+
+		# add it back again to see if reloading works
+		user.roles.add_oid("editor")
+		access = Access.new(
+			Access::YAMLBase.new(Access::User::Base,      "#{TestDir}/user"),
+			Access::YAMLBase.new(Access::Role::Base,      "#{TestDir}/role"),
+			Access::YAMLBase.new(Access::Privilege::Base, "#{TestDir}/privilege")
+			#:channel => Access::YAMLBase.new("#{TestDir}/channel", Access::Location)
+		)
 		
-		user = access.login("test", "pass")
+		assert(access.user.exists?("test"))
+		assert(user = access.login("test", "pass"))
+		assert(!user.privileged?("news"))
+		assert(user.privileged?("news/edit"))
+		assert(user.privileged?("news/create"))
+		assert(user.privileged?("banners"))
+		assert(user.privileged?("statistics"))
+		assert(user.privileged?("statistics/web"))
+		assert(user.privileged?("paid_content"))
 
-		assert(user.privileged?("foo"))
-		assert(user.privileged?("foo/bar"))
-		assert(user.privileged?("foo/baz"))
-		assert(!user.privileged?("bar"))
-		assert(user.privileged?("bar/foo"))
-		assert(user.privileged?("baz"))
-
-		assert(user.authorized?("foo"))
-		assert(user.authorized?("foo/bar"))
-		assert(user.authorized?("foo/baz"))
-		assert(!user.authorized?("bar"))
-		assert(user.authorized?("bar/foo"))
-		assert(user.authorized?("baz"))
+		assert(!user.authorized?("news"))
+		assert(user.authorized?("news/edit"))
+		assert(user.authorized?("news/create"))
+		assert(user.authorized?("banners"))
+		assert(user.authorized?("statistics"))
+		assert(user.authorized?("statistics/web"))
+		assert(user.authorized?("paid_content"))
 	end
 end

data/test/test_access/privilege/banners.statistics.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege banners/statistics
+:oid: banners/statistics

data/test/test_access/privilege/banners.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege banners
+:oid: banners

data/test/test_access/privilege/news.create.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege news/create
+:oid: news/create

data/test/test_access/privilege/news.delete.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege news/delete
+:oid: news/delete

data/test/test_access/privilege/news.edit.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege news/edit
+:oid: news/edit

data/test/test_access/privilege/news.read.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege news/read
+:oid: news/read

data/test/test_access/privilege/news.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege news
+:oid: news

data/test/test_access/privilege/paid_content.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege paid_content
+:oid: paid_content

data/test/test_access/privilege/statistics.ftp.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege statistics/ftp
+:oid: statistics/ftp

data/test/test_access/privilege/statistics.web.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege statistics/web
+:oid: statistics/web

data/test/test_access/privilege/statistics.yaml

@@ -0,0 +1,3 @@
+--- 
+:description: test-privilege statistics
+:oid: statistics

data/test/test_access/role/chiefeditor.yaml

@@ -0,0 +1,7 @@
+--- 
+:description: testrole description 2
+:oid: chiefeditor
+:roles: 
+- editor
+:privileges: 
+  news: 

data/test/test_access/role/editor.yaml

@@ -0,0 +1,9 @@
+--- 
+:description: testrole description 1
+:oid: editor
+:roles: []
+
+:privileges: 
+  news/create: 
+  statistics: 
+  news/edit: 

data/test/test_access/user/test.yaml

@@ -0,0 +1,12 @@
+--- 
+:oid: test
+:roles: 
+- editor
+:privileges: 
+  banners: 
+  statistics/web: 
+  paid_content: 
+:credentials: 2F3BC18C0D3E6B1B8A445075535D26E9
+:active: true
+:meta: 
+:admin: false

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: butler
 version: !ruby/object:Gem::Version 
-  version: 1.8.2
-date: 2007-11-28 00:00:00 +01:00
+  version: 1.8.3
+date: 2007-12-06 00:00:00 +01:00
 summary: Butler - the IRC bot with class
 require_paths: 
 - lib
@@ -79,12 +79,10 @@ files:
 - data/butler/plugins/core/access.rb
 - data/butler/plugins/core/logout.rb
 - data/butler/plugins/core/plugins.rb
-- data/butler/plugins/core/user.rb
 - data/butler/plugins/dev
 - data/butler/plugins/dev/bleakhouse.rb
 - data/butler/plugins/dev/eval.rb
 - data/butler/plugins/dev/nometa.rb
-- data/butler/plugins/dev/onhandlers.rb
 - data/butler/plugins/dev/raw.rb
 - data/butler/plugins/dev/rawlog.rb
 - data/butler/plugins/games
@@ -112,13 +110,33 @@ files:
 - data/butler/plugins/service
 - data/butler/plugins/service/clones.rb
 - data/butler/plugins/service/define.rb
-- data/butler/plugins/service/log.rb
 - data/butler/plugins/service/more.rb
 - data/butler/plugins/service/svn.rb
 - data/butler/plugins/util
+- data/butler/plugins/util/calculator.rb
 - data/butler/plugins/util/cycle.rb
 - data/butler/plugins/util/load.rb
 - data/butler/plugins/util/pong.rb
+- data/butler/services
+- data/butler/services/org.rubyforge.butler
+- data/butler/services/org.rubyforge.butler/calculator
+- data/butler/services/org.rubyforge.butler/calculator/1
+- data/butler/services/org.rubyforge.butler/calculator/1/calculator.rb
+- data/butler/services/org.rubyforge.butler/log
+- data/butler/services/org.rubyforge.butler/log/1
+- data/butler/services/org.rubyforge.butler/log/1/service.rb
+- data/butler/services/org.rubyforge.butler/strings
+- data/butler/services/org.rubyforge.butler/strings/1
+- data/butler/services/org.rubyforge.butler/strings/1/data
+- data/butler/services/org.rubyforge.butler/strings/1/data/en
+- data/butler/services/org.rubyforge.butler/strings/1/data/en/acknowledge.yaml
+- data/butler/services/org.rubyforge.butler/strings/1/data/en/gratitude.yaml
+- data/butler/services/org.rubyforge.butler/strings/1/data/en/hello.yaml
+- data/butler/services/org.rubyforge.butler/strings/1/data/en/ignorance.yaml
+- data/butler/services/org.rubyforge.butler/strings/1/data/en/ignorance_about.yaml
+- data/butler/services/org.rubyforge.butler/strings/1/data/en/insult.yaml
+- data/butler/services/org.rubyforge.butler/strings/1/data/en/rejection.yaml
+- data/butler/services/org.rubyforge.butler/strings/1/service.rb
 - data/butler/strings
 - data/butler/strings/random
 - data/butler/strings/random/acknowledge.en.yaml
@@ -133,9 +151,14 @@ files:
 - lib/access
 - lib/access/admin.rb
 - lib/access/privilege.rb
+- lib/access/privilegelist.rb
+- lib/access/role
+- lib/access/role/base.rb
 - lib/access/role.rb
+- lib/access/rolelist.rb
 - lib/access/savable.rb
 - lib/access/user.rb
+- lib/access/version.rb
 - lib/access/yamlbase.rb
 - lib/access.rb
 - lib/butler
@@ -174,6 +197,8 @@ files:
 - lib/butler/plugin/trigger.rb
 - lib/butler/plugin.rb
 - lib/butler/plugins.rb
+- lib/butler/service.rb
+- lib/butler/services.rb
 - lib/butler/session.rb
 - lib/butler/version.rb
 - lib/butler.rb
@@ -210,6 +235,7 @@ files:
 - lib/ruby
 - lib/ruby/array
 - lib/ruby/array/columnize.rb
+- lib/ruby/array/random.rb
 - lib/ruby/dir
 - lib/ruby/dir/mktree.rb
 - lib/ruby/enumerable
@@ -230,6 +256,7 @@ files:
 - lib/ruby/range/stepped.rb
 - lib/ruby/string
 - lib/ruby/string/arguments.rb
+- lib/ruby/string/camelcase.rb
 - lib/ruby/string/chunks.rb
 - lib/ruby/string/post_arguments.rb
 - lib/ruby/string/unescaped.rb
@@ -243,6 +270,7 @@ files:
 - lib/string.rb
 - lib/templater.rb
 - lib/w3validator.rb
+- test/access
 - test/butler
 - test/butler/plugin
 - test/butler/plugin/mapper.rb
@@ -259,6 +287,24 @@ files:
 - test/irc/serverlistings
 - test/irc/serverlistings/test_rpl_hiddenhost.txt
 - test/irc/users.rb
+- test/test_access
+- test/test_access/privilege
+- test/test_access/privilege/banners.statistics.yaml
+- test/test_access/privilege/banners.yaml
+- test/test_access/privilege/news.create.yaml
+- test/test_access/privilege/news.delete.yaml
+- test/test_access/privilege/news.edit.yaml
+- test/test_access/privilege/news.read.yaml
+- test/test_access/privilege/news.yaml
+- test/test_access/privilege/paid_content.yaml
+- test/test_access/privilege/statistics.ftp.yaml
+- test/test_access/privilege/statistics.web.yaml
+- test/test_access/privilege/statistics.yaml
+- test/test_access/role
+- test/test_access/role/chiefeditor.yaml
+- test/test_access/role/editor.yaml
+- test/test_access/user
+- test/test_access/user/test.yaml
 - test/test_access.rb
 - test/test_configuration.rb
 test_files: []