filigree 0.3.0 → 0.3.1

data/lib/filigree/string.rb

@@ -24,29 +24,29 @@ class String
 	# @param [Fixnum]  max_length  Maximum length per line
 	def segment(indent, max_length = 80)
 		lines = Array.new
-		
+
 		words = self.split(/\s/)
 		line  = words.shift
-		
+
 		line_length = indent + line.length
-		
+
 		words.each do |word|
 			new_length = line_length + 1 + word.length
-			
+
 			if new_length < max_length
 				line       += " #{word}"
 				line_length = new_length
-				
+
 			else
 				lines << line
-				
+
 				line        = word
 				line_length = indent + word.length
 			end
 		end
-		
+
 		lines << line unless line.empty?
-		
+
 		lines.join("\n" + (' ' * indent))
 	end
 end

data/lib/filigree/types.rb

@@ -29,7 +29,7 @@ require 'filigree/class_methods_module'
 # @return [Object]  The object passed as parameter obj
 def check_type(obj, type, blame = nil, nillable = false, strict = false)
 	type_ok = (obj.nil? && nillable) || (strict ? obj.instance_of?(type) : obj.is_a?(type))
-	
+
 	if type_ok
 		obj
 	else
@@ -57,7 +57,7 @@ end
 def check_array_type(array, type, blame = nil, nillable = false, strict = false)
 	array.each do |obj|
 		type_ok = (obj.nil? && nillable) || (strict ? obj.instance_of?(type) : obj.is_a?(type))
-		
+
 		if not type_ok
 			if blame
 				raise TypeError, "Parameter #{blame} must contain instances of the #{type.name} class."
@@ -77,7 +77,7 @@ module Filigree
 	# variables.  This also provides a default constructor.
 	module TypedClass
 		include ClassMethodsModule
-		
+
 		# Set each of the typed instance variables to its corresponding
 		# value.
 		#
@@ -89,7 +89,7 @@ module Filigree
 				self.send("#{name}=", val)
 			end
 		end
-	
+
 		module ClassMethods
 			# Define the default constructor for the including class.
 			#
@@ -103,7 +103,7 @@ module Filigree
 							if self.class.typed_ivars.length != vals.length
 								raise ArgumentError, "#{self.class.typed_ivars.length} arguments expected, #{vals.length} given."
 							end
-				
+
 							self.set_typed_ivars(vals)
 						end
 					else
@@ -113,7 +113,7 @@ module Filigree
 					end
 				end
 			end
-			
+
 			# Define a new typed accessor.
 			#
 			# @param [Symbol]   name      Name of the accessor
@@ -129,7 +129,7 @@ module Filigree
 				end
 			end
 			private :define_typed_accessor
-			
+
 			# Define a typed instance variable.
 			#
 			# @param [Symbol]   name      Name of the accessor
@@ -140,14 +140,14 @@ module Filigree
 			# @return [void]
 			def typed_ivar(name, type, nillable = false, strict = false)
 				typed_ivars << name
-			
+
 				define_typed_accessor(name, nillable, strict, *
 					type.is_a?(Array) ? [type.first, method(:check_array_type)] : [type, method(:check_type)]
 				)
-		
+
 				attr_reader name
 			end
-			
+
 			# Return the typed instance variables for an object.
 			#
 			# @return [Array<Symbol>]  Array of defined typed instance variables

data/lib/filigree/version.rb

@@ -4,5 +4,5 @@
 # Description:	This file specifies the version number of Filigree.
 
 module Filigree
-	VERSION = '0.3.0'
+	VERSION = '0.3.1'
 end

data/lib/filigree/visitor.rb

@@ -20,13 +20,13 @@ require 'filigree/match'
 module Filigree
 	# An implementation of the Visitor pattern.
 	module Visitor
-	
+
 		include ClassMethodsModule
-	
+
 		####################
 		# Instance Methods #
 		####################
-		
+
 		# Find the correct pattern and execute its block on the provided
 		# objects.
 		#
@@ -34,41 +34,57 @@ module Filigree
 		#
 		# @return [Object]  Result of calling the matched pattern's block
 		#
-		# @raise [MatchError]  Raised when no matching pattern is found
+		# @raise [MatchError]  Raised when no matching pattern is found and
+		#                      strict matching is enabled.
 		def visit(*objects)
+			# FIXME: A dirty hack.  Find a better place to initialize this.
+			@match_bindings ||= Array.new
+
+			@match_bindings.push OpenStruct.new
+
 			self.class.patterns.each do |pattern|
-				@match_bindings = OpenStruct.new
-		
-				return pattern.(self, objects) if pattern.match?(objects, self)
+
+				# FIXME: Make these take their arguments in the same order
+				if pattern.match?(objects, self)
+					result = pattern.(self, objects)
+					@match_bindings.pop
+					return result
+				end
+			end
+
+			@match_bindings.pop
+
+			if self.class.strict_match?
+				# If we didn't find anything we raise a MatchError.
+				raise MatchError
+			else
+				nil
 			end
-	
-			# If we didn't find anything we raise a MatchError.
-			raise MatchError
 		end
-	
+
 		#############
 		# Callbacks #
 		#############
-		
+
 		# This is used to get and set binding names
 		def method_missing(name, *args)
-			if args.empty? and @match_bindings.respond_to?(name)
-				@match_bindings.send(name)
+			if args.empty? and @match_bindings.last.respond_to?(name)
+				@match_bindings.last.send(name)
 			elsif name.to_s[-1] == '=' and args.length == 1
-				@match_bindings.send(name, *args)
+				@match_bindings.last.send(name, *args)
 			else
 				super(name, *args)
 			end
 		end
-	
+
 		#################
 		# Class Methods #
 		#################
-	
+
 		module ClassMethods
-		
+
 			attr_reader :patterns
-			
+
 			# Force a name binding.
 			#
 			# @param [Symbol]  name  Name to bind to
@@ -77,7 +93,7 @@ module Filigree
 			def Bind(name)
 				BindingPattern.new(name)
 			end
-			
+
 			# Force a literal comparison.
 			#
 			# @param [Object]  obj  Object to be comapred against
@@ -86,7 +102,7 @@ module Filigree
 			def Literal(obj)
 				LiteralPattern.new(obj)
 			end
-			
+
 			# Inserts a new pattern in the appropriate place in the patterns
 			# list.
 			#
@@ -100,10 +116,10 @@ module Filigree
 						return
 					end
 				end
-				
+
 				@patterns << new_pat
 			end
-			
+
 			# A callback used to pass patterns declared in a parent class to
 			# a subclass.
 			#
@@ -113,15 +129,16 @@ module Filigree
 			def inherited(klass)
 				klass.install_icvars(@patterns.clone)
 			end
-			
+
 			# Install the instance class variables in the including class.
 			#
 			# @return [void]
 			def install_icvars(inherited_patterns = Array.new)
-				@patterns = inherited_patterns
-				@deferred = Array.new
+				@patterns     = inherited_patterns
+				@deferred     = Array.new
+				@strict_match = false
 			end
-			
+
 			# Define a pattern for this visitor.
 			#
 			# @see match  Pattern matching description
@@ -131,24 +148,42 @@ module Filigree
 			#
 			# @return [void]
 			def on(*pattern, &block)
-				guard = if pattern.last.is_a?(Proc) then pattern.pop end 
-				
+				guard = if pattern.last.is_a?(Proc) then pattern.pop end
+
 				pattern = Filigree::wrap_pattern_elements(pattern)
 				add_pattern (mp = OuterPattern.new(pattern, guard, block))
-		
+
 				if block
 					@deferred.each { |pattern| pattern.block = block }
 					@deferred.clear
-			
+
 				else
 					@deferred << mp
 				end
 			end
-		
+
+			# Tell the visitor that it must raise an exception if no match is
+			# found.
+			#
+			# @param [Boolean]  bool  Raise an exception or not.
+			#
+			# @return [void]
+			def strict_match(bool)
+				@strict_match = bool
+			end
+
+			# Accessor for the strict match member.
+			#
+			# @return [Boolean] The value of the class's @strict_match
+			#                   instance variable.
+			def strict_match?
+				@strict_match
+			end
+
 			#############
 			# Callbacks #
 			#############
-			
+
 			# Used to generate wildcard and binding patterns.
 			def method_missing(name, *args)
 				if args.empty?
@@ -157,19 +192,19 @@ module Filigree
 					super(name, *args)
 				end
 			end
-	
+
 			def self.extended(klass)
 				klass.install_icvars
 			end
 		end
 	end
-	
+
 	# This class can be used to call multiple visitors on an object at once.
 	# This could potentialy reduce the number of times data structures are
 	# traversed.
 	class TourGuide
 		attr_reader :visitors
-		
+
 		# Call each visitor on the specified objects.
 		#
 		# @param [Object]  objects  Objects to be visited
@@ -178,7 +213,7 @@ module Filigree
 		def visit(*objects)
 			@visitors.each { |visitor| visitor.visit(*objects) }
 		end
-		
+
 		# Construct a tour guide for a list of visitors.
 		#
 		# @param [Visitor]  visitors  List of visitors
@@ -186,12 +221,12 @@ module Filigree
 			@visitors = visitors
 		end
 	end
-	
+
 	# This module provides a default implementation of three common traversal
 	# patterns: pre-order, post-order, and in-order (level-order).  The
 	# including class must implement the `children` function.
 	module Visitable
-		
+
 		# Visit this object with the provided visitor in pre-, post-, or
 		# in-order traversal.
 		#
@@ -203,18 +238,18 @@ module Filigree
 			case method
 			when :preorder
 				visitor.visit(self)
-				children.compact.each { |child| child.visit(visitor, :preorder) }
-			
+				children.flatten.compact.each { |child| child.visit(visitor, :preorder) }
+
 			when :inorder
 				nodes = [self]
-			
+
 				while node = nodes.shift
-					nodes += node.children.compact
+					nodes += node.children.flatten.compact
 					visitor.visit(node)
 				end
-			
+
 			when :postorder
-				children.compact.each { |child| child.visit(visitor, :postorder) }
+				children.flatten.compact.each { |child| child.visit(visitor, :postorder) }
 				visitor.visit(self)
 			end
 		end

data/test/tc_abstract_class.rb

@@ -20,54 +20,54 @@ require 'filigree/abstract_class'
 class AbstractClassTester < Minitest::Test
 	class Foo
 		extend Filigree::AbstractClass
-		
+
 		abstract_method :foo
 	end
-	
+
 	class Bar < Foo; end
-	
+
 	class Bam < Foo
 		def foo
 			true
 		end
 	end
-	
+
 	class Baf < Foo
 		extend Filigree::AbstractClass
 	end
-	
+
 	class Zap < Baf; end
-	
+
 	def setup
 	end
-	
+
 	def test_abstract_method
 		assert_raises(AbstractMethodError) { Bar.new.foo }
-		
+
 		Bam.new.foo
 	end
-	
+
 	def test_instantiate_abstract_class
 		assert_raises(AbstractClassError) { Foo.new }
 	end
-	
+
 	def test_instantiate_subclass
-		Bar.new 
+		Bar.new
 	end
-	
+
 	def test_multi_level_abstract_hierarchy
 		assert_raises(AbstractClassError) { Baf.new }
-		
+
 		Zap.new
 	end
-	
+
 	def test_multiple_hierarchies
 		baf = Class.new { extend Filigree::AbstractClass }
 		baz = Class.new(baf)
-		
+
 		assert_raises(AbstractClassError) { Foo.new }
 		assert_raises(AbstractClassError) { baf.new }
-		
+
 		Bar.new
 		baz.new
 	end