butler 1.8.2 → 1.8.3

data/data/butler/services/org.rubyforge.butler/strings/1/data/en/acknowledge.yaml

@@ -0,0 +1,8 @@
+--- 
+- "Ok"
+- "Will do so"
+- "Aye sir"
+- "Done as asked"
+- "As you wish"
+- "Consider it done"
+- "Aye aye!"

data/data/butler/services/org.rubyforge.butler/strings/1/data/en/gratitude.yaml

@@ -0,0 +1,3 @@
+--- 
+- "Thank you very much"
+- "Thank you"

data/data/butler/services/org.rubyforge.butler/strings/1/data/en/hello.yaml

@@ -0,0 +1,6 @@
+--- 
+- "hi"
+- "heyo"
+- "hello"
+- "howdy"
+- "greetings"

data/data/butler/services/org.rubyforge.butler/strings/1/data/en/ignorance.yaml

@@ -0,0 +1,7 @@
+--- 
+- "*shrugg*"
+- "dunno"
+- "no idea"
+- "no clue"
+- "... eh?"
+- "Don't ask me."

data/data/butler/services/org.rubyforge.butler/strings/1/data/en/ignorance_about.yaml

@@ -0,0 +1,3 @@
+--- 
+- "I don't know about <%= fact %>"
+- "What is <%= fact %>?"

data/data/butler/services/org.rubyforge.butler/strings/1/data/en/insult.yaml

@@ -0,0 +1,3 @@
+--- 
+- "<%= name %>: wanker!"
+- "<%= name %>, you're so stupid you can't find your ass with both hands"

data/data/butler/services/org.rubyforge.butler/strings/1/data/en/rejection.yaml

@@ -0,0 +1,12 @@
+--- 
+- "Nope"
+- "Sorry, I won't do that"
+- "That won't work"
+- "And how could that be done?"
+- "No Sir"
+- "No way I'd do that"
+- "Aw come on, why should I do that?"
+- "Never, read me, NEVER!"
+- "Dude, what the heck makes you think that's my job?"
+- "Go, bother someone else with that boring task."
+- "Naaa, I don't want to."

data/data/butler/services/org.rubyforge.butler/strings/1/service.rb

@@ -0,0 +1,50 @@
+#--
+# Copyright 2007 by Stefan Rusterholz.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+
+
+require 'ruby/array/random'
+require 'templater'
+
+
+
+class Strings
+	def initialize(dir)
+		@dir = dir
+		rescan
+	end
+
+	def rescan
+		strings = Hash.new { |h,k|
+			raise ArgumentError, "No such string key #{k}"
+		}
+		Dir.glob(@dir+'/*') { |dir|
+			language  = dir[/[^\/]+$/]
+			Dir.glob(dir+'/*.yaml') { |file|
+				resort = file.sub(%r{.*/([^/]+).yaml$}, '\1')
+				strings[resort] = {} unless strings.has_key?(resort)
+				strings[resort][language] = YAML.load_file(file).map { |string|
+					Templater.new(string)
+				}
+			}
+		}
+		@strings = strings
+	end
+	
+	def [](resort, language='en', variables={})
+		resort = @strings[resort.to_s]
+		string = (resort[language] || resort["en"])
+		string.random.result(variables)
+	end
+	
+	def answer(message, resort, variables={})
+		message.answer(self[resort, message.language, variables])
+	end
+end
+
+def self.on_load
+	register(Strings.new(@path.base+'/data'))
+end

data/lib/access.rb

@@ -10,7 +10,10 @@ require 'digest/md5'
 require 'access/yamlbase'
 require 'access/user'
 require 'access/role'
+require 'access/role/base'
+require 'access/rolelist'
 require 'access/privilege'
+require 'access/privilegelist'
 
 
 
@@ -28,9 +31,9 @@ class Access
 	#
 	# =Synopsis
 	#   access = Access.new(
-	#     Access::YAMLBase.new(Access::User::Base,      "./access/user"),
-	#     Access::YAMLBase.new(Access::Role::Base,      "./access/role"),
-	#     Access::YAMLBase.new(Access::Privilege::Base, "./access/privilege")
+	#     Access::YAMLBase.new(Access::User::Base,      "./access/user"),     # second arg is optional
+	#     Access::YAMLBase.new(Access::Role::Base,      "./access/role"),     # second arg is optional
+	#     Access::YAMLBase.new(Access::Privilege::Base, "./access/privilege") # second arg is optional
 	#   )
 	#   %w(news news/create news/edit news/delete).each { |privilege|
 	#     access.privilege.create(privilege, "...description...")

data/lib/access/privilege.rb

@@ -7,7 +7,6 @@
 
 
 require 'access'
-require 'access/savable'
 
 
 
@@ -29,111 +28,43 @@ class Access
 			# Restore an Access::Privilege from it's storable data
 			def load(*args) # :nodoc:
 				return nil unless data = super
-				privilege        = new(*data.values_at(:id, :description))
+				privilege        = new(*data.values_at(:oid, :description))
 				privilege.access = access
 				privilege.base   = self
 				privilege
 			end
 		end
 		
-		attr_reader :id
+		attr_reader :oid
 		attr_reader :description
 
 		def initialize(privilege, description=nil)
-			@id          = privilege
+			@oid         = privilege
 			@description = description || "No description"
 		end
 		
 		def storable
 			{
-				:id          => @id,
+				:oid         => @oid,
 				:description => @description,
 			}
 		end
 
 		def eql?(other)
-			self.class == other.class && @id.eql?(other.id)
+			self.class == other.class && @oid.eql?(other.oid)
 		end
 		
 		def hash
-			@id.hash
+			@oid.hash
 		end
 
 		def inspect # :nodoc:
-			"#<%s:0x%08x id=%s description=%s>" %  [
+			"#<%s:0x%08x oid=%s description=%s>" %  [
 				self.class,
 				object_id << 1,
-				@id,
+				@oid,
 				@description
 			]
 		end
 	end
-	
-	class Privileges
-		include Enumerable
-		
-		def initialize(owner, privileges=nil)
-			@owner      = owner
-			@privileges = Hash.new { |h,k| h[k] = [] }.merge(privileges || {})
-		end
-		
-		def storable
-			@privileges
-		end
-		
-		def allow?(privilege, condition=nil)
-			walk(privilege) { |priv|
-				@privileges.has_key?(priv)
-			}
-		end
-		
-		def add(privilege)
-			case privilege
-				when Array: privilege.each { |priv| @privileges[priv] = nil }
-				when Hash:  privilege.each { |priv, cond| @privileges[priv] << cond }
-				else        @privileges[privilege] = nil
-			end
-			@owner.save
-		end
-		
-		def delete(privilege)
-			case privilege
-				when Array
-					privilege.each { |priv| @privileges.delete(priv) }
-				when Hash
-					privilege.each { |priv, cond|
-						@privileges[priv].delete(cond)
-						@privileges.delete(priv) if @privileges[priv].empty?
-					}
-				else
-					@privileges.delete(priv)
-			end
-			@owner.save
-		end
-		
-		def list
-			@privileges
-		end
-
-		def each(&block)
-			@privileges.each(&block)
-		end
-		
-		def walk(priv)
-			until priv.empty?
-				return true if yield(priv)
-				priv = priv.gsub(%r{(?:/|^)[^/]*$}, '')
-			end
-			return true if yield("")
-			false
-		end
-		
-		def inspect # :nodoc:
-			"#<%s:0x%08x %s>" %  [
-				self.class,
-				object_id << 1,
-				@privileges.keys.join(', ')
-			]
-		end
-	end
-end
+end

data/lib/access/privilegelist.rb

@@ -0,0 +1,75 @@
+#--
+# Copyright 2007 by Stefan Rusterholz.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+
+
+require 'access'
+
+
+
+class Access
+	class PrivilegeList
+		include Enumerable
+		
+		def initialize(owner, privileges=nil)
+			@owner      = owner
+			@privileges = Hash.new { |h,k| h[k] = [] }.merge(privileges || {})
+		end
+		
+		def storable
+			@privileges
+		end
+		
+		def allow?(privilege, condition=nil)
+			walk(privilege) { |priv|
+				@privileges.has_key?(priv)
+			}
+		end
+		
+		def add_oid(privilege)
+			case privilege
+				when Array: privilege.each { |priv| @privileges[priv] = nil }
+				when Hash:  privilege.each { |priv, cond| @privileges[priv] << cond }
+				else        @privileges[privilege] = nil
+			end
+			@owner.save
+		end
+		
+		def remove_oid(priv_oid)
+			@privileges.delete(priv_oid)
+			@owner.save
+		end
+		
+		def remove(priv)
+			remove_oid(priv.oid)
+		end
+		
+		def list
+			@privileges
+		end
+
+		def each(&block)
+			@privileges.each(&block)
+		end
+		
+		def walk(priv)
+			until priv.empty?
+				return true if yield(priv)
+				priv = priv.gsub(%r{(?:/|^)[^/]*$}, '')
+			end
+			return true if yield("")
+			false
+		end
+		
+		def inspect # :nodoc:
+			"#<%s:0x%08x %s>" %  [
+				self.class,
+				object_id << 1,
+				@privileges.keys.join(', ')
+			]
+		end
+	end
+end

data/lib/access/role.rb

@@ -6,6 +6,10 @@
 
 
 
+require 'access'
+
+
+
 class Access
 
 	# Access::Role's are a set of privileges with (optionally)
@@ -14,38 +18,8 @@ class Access
 	class Role
 		include Savable
 
-		# The module to extend the Database manager
-		module Base
-
-			# Create a new Role
-			# role is a role-id, should be \w+
-			# description is a piece of text describing the role
-			# privileges are the privileges the role provides
-			def create(role, description=nil, privileges=[])
-				raise "Role #{role} already exists" if exists?(role)
-				role        = Role.new(role, description)
-				role.access = access
-				role.base   = self
-				add(role)
-				role
-			end
-	
-			# Restore an Access::Privilege from it's storable data
-			def load(*args) # :nodoc:
-				return nil unless data = super
-				roles        = access.role
-				data[:roles] = data[:roles].map { |role| roles[role] }
-				array        = data.values_at(:id, :description)
-				array       << data
-				role         = Role.new(*array)
-				role.access  = access
-				role.base    = self
-				role
-			end
-		end
-
-		# The record-id
-		attr_reader :id
+		# The record-oid
+		attr_reader :oid
 		
 		# The description of the role
 		attr_reader :description
@@ -57,13 +31,13 @@ class Access
 		attr_reader :privileges
 
 		# Create a new Role
-		# role is a role-id, should be \w+
+		# role is a role-oid, should be \w+
 		# description is a piece of text describing the role
 		# other: a hash that accepts the keys :privileges and :roles
 		def initialize(role, description=nil, other={})
-			@id          = role
-			@privileges  = Privileges.new(self, other[:privileges])
-			@roles       = Roles.new(self, other[:roles])
+			@oid         = role
+			@privileges  = PrivilegeList.new(self, other[:privileges])
+			@roles       = RoleList.new(self, other[:roles])
 			@description = (description || "No description").freeze
 		end
 		
@@ -77,7 +51,7 @@ class Access
 		# serialize to column => value for storage
 		def storable
 			{
-				:id          => @id,
+				:oid         => @oid,
 				:description => @description,
 				:privileges  => @privileges.storable,
 				:roles       => @roles.storable,
@@ -93,12 +67,12 @@ class Access
 
 		# :nodoc:
 		def eql?(other)
-			self.class == other.class && @id.eql?(other.id)
+			self.class == other.class && @oid.eql?(other.oid)
 		end
 		
 		# :nodoc:
 		def hash
-			@id.hash
+			@oid.hash
 		end
 
 		def inspect # :nodoc:
@@ -111,58 +85,4 @@ class Access
 			]
 		end
 	end
-	
-	# A list of roles
-	class Roles
-		include Enumerable
-
-		# owner must be capable of #save
-		# roles is the list of Role instances (array)
-		def initialize(owner, roles=nil)
-			@owner = owner
-			@roles = roles || []
-		end
-
-		# Tests if any of the roles in self allows a privilege under
-		# given conditions (may be nil to indicate no condition)
-		def allow?(privilege, condition=nil)
-			@roles.any? { |role| role.allows?(privilege, condition) }
-		end
-
-		# add a role (Role instance)
-		def add(role)
-			@roles << role
-			@owner.save
-		end
-		
-		# delete a role (Role instance)
-		def delete(role)
-			@roles.delete(role)
-			@owner.save
-		end
-		
-		# all roles
-		def list
-			@roles.dup
-		end
-
-		# Iterate over the roles
-		def each(&block)
-			@roles.each(&block)
-		end
-		
-		# :nodoc:
-		# prepare for storage
-		def storable
-			@roles.map { |role| role.id }
-		end
-
-		def inspect # :nodoc:
-			"#<%s:0x%08x roles=%s>" %  [
-				self.class,
-				object_id << 1,
-				@roles.map { |r| r.id }.join(', '),
-			]
-		end
-	end
-end
+end