filigree 0.3.3 → 0.4.0

data/lib/filigree/object.rb

@@ -1,7 +1,7 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
-# Project: 	Filigree
-# Date:		2013/05/04
-# Description:	Additional features for all objects.
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
+# Project:     Filigree
+# Date:        2013/05/04
+# Description: Additional features for all objects.
 
 ############
 # Requires #
@@ -29,12 +29,15 @@ end
 # Classes and Modules #
 #######################
 
-# Object class extras.
-class Object
-	# A copy and modification helper.
-	#
-	# @return [Object] A copy of the object with the block evaluated in the context of the copy.
-	def clone_with(&block)
-		self.clone.tap { |clone| clone.instance_exec(&block) }
+module Filigree
+
+	# Object class extras.
+	refine Object do
+		# A copy and modification helper.
+		#
+		# @return [Object] A copy of the object with the block evaluated in the context of the copy.
+		def clone_with(&block)
+			self.clone.tap { |clone| clone.instance_exec(&block) }
+		end
 	end
 end

data/lib/filigree/request_file.rb

@@ -1,7 +1,7 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
-# Project: 	Filigree
-# Date:		2014/1/20
-# Description:	A helper for require.
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
+# Project:     Filigree
+# Date:        2014/1/20
+# Description: A helper for require.
 
 ############
 # Requires #

data/lib/filigree/string.rb

@@ -1,7 +1,7 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
-# Project: 	Filigree
-# Date:		2014/01/20
-# Description:	Class extensions for the String class.
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
+# Project:     Filigree
+# Date:        2014/01/20
+# Description: Class extensions for the String class.
 
 ############
 # Requires #
@@ -15,38 +15,40 @@
 # Classes and Modules #
 #######################
 
-class String
-	# Chop up the string into multiple lines so that no line is longer than
-	# the specified number of characters.
-	#
-	# @param [Fixnum]  indent      Indentation to put before each line; it is
-	#   assumed that this indentation is already present for the first line
-	# @param [Fixnum]  max_length  Maximum length per line
-	def segment(indent, max_length = 80)
-		lines = Array.new
+module Filigree
+	refine String do
+		# Chop up the string into multiple lines so that no line is longer than
+		# the specified number of characters.
+		#
+		# @param [Fixnum]  indent      Indentation to put before each line; it is
+		#   assumed that this indentation is already present for the first line
+		# @param [Fixnum]  max_length  Maximum length per line
+		def segment(indent, max_length = 80)
+			lines = Array.new
 
-		words = self.split(/\s/)
-		line  = words.shift
+			words = self.split(/\s/)
+			line  = words.shift
 
-		line_length = indent + line.length
+			line_length = indent + line.length
 
-		words.each do |word|
-			new_length = line_length + 1 + word.length
+			words.each do |word|
+				new_length = line_length + 1 + word.length
 
-			if new_length < max_length
-				line       += " #{word}"
-				line_length = new_length
+				if new_length < max_length
+					line       += " #{word}"
+					line_length = new_length
 
-			else
-				lines << line
+				else
+					lines << line
 
-				line        = word
-				line_length = indent + word.length
+					line        = word
+					line_length = indent + word.length
+				end
 			end
-		end
 
-		lines << line unless line.empty?
+			lines << line unless line.empty?
 
-		lines.join("\n" + (' ' * indent))
+			lines.join("\n" + (' ' * indent))
+		end
 	end
 end

data/lib/filigree/types.rb

@@ -1,7 +1,7 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
-# Project: 	Filigree
-# Date:		2013/05/04
-# Description:	Extensions to help with type checking.
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
+# Project:     Filigree
+# Date:        2013/05/04
+# Description: Extensions to help with type checking.
 
 ############
 # Requires #
@@ -27,7 +27,7 @@ require 'filigree/class_methods_module'
 # @raise [ArgumentError]  An error is raise if the type checking fails.
 #
 # @return [Object]  The object passed as parameter obj
-def check_type(obj, type, blame = nil, nillable = false, strict = false)
+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
@@ -54,7 +54,7 @@ end
 # @raise [ArgumentError]  An error is raise if the type checking fails
 #
 # @return [Object]  The object passed in parameter array
-def check_array_type(array, type, blame = nil, nillable = false, strict = false)
+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))
 
@@ -125,7 +125,7 @@ module Filigree
 			# @return [void]
 			def define_typed_accessor(name, nillable, strict, type, checker)
 				define_method "#{name}=" do |obj|
-					self.instance_variable_set("@#{name}", checker.call(obj, type, name, nillable, strict))
+					self.instance_variable_set("@#{name}", checker.call(obj, type, blame: name, nillable: nillable, strict: strict))
 				end
 			end
 			private :define_typed_accessor
@@ -138,12 +138,11 @@ module Filigree
 			# @param [Boolean]  strict    To use strict checking or not
 			#
 			# @return [void]
-			def typed_ivar(name, type, nillable = false, strict = false)
+			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)]
-				)
+					type.is_a?(Array) ? [type.first, method(:check_array_type)] : [type, method(:check_type)])
 
 				attr_reader name
 			end

data/lib/filigree/version.rb

@@ -1,8 +1,8 @@
-# Author:      Chris Wailes <chris.wailes@gmail.com>
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
 # Project:     Filigree
 # Date:        2013/4/19
 # Description: This file specifies the version number of Filigree.
 
 module Filigree
-	VERSION = '0.3.3'
+	VERSION = '0.4.0'
 end

data/lib/filigree/visitor.rb

@@ -1,4 +1,4 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
+# Author:		Chris Wailes <chris.wailes+filigree@gmail.com>
 # Project: 	Filigree
 # Date:		2014/02/11
 # Description:	An implementation of the Visitor pattern.
@@ -154,7 +154,7 @@ module Filigree
 				add_pattern (mp = OuterPattern.new(pattern, guard, block))
 
 				if block
-					@deferred.each { |pattern| pattern.block = block }
+					@deferred.each { |deferred_pattern| deferred_pattern.block = block }
 					@deferred.clear
 
 				else
@@ -248,18 +248,18 @@ module Filigree
 				# you are iterating over them.
 				while node = nodes.shift
 					nodes += node.children.flatten.compact
-					mod = visitor.visit(node) || mod
+					mod    = visitor.visit(node) || mod
 				end
 
 				mod
 
 			when :postorder
-				res = children.flatten.compact.inject(false) { |mod, child| child.visit(visitor, :postorder) || mod }
+				res = children.flatten.compact.inject(false) { |modified, child| child.visit(visitor, :postorder) || modified }
 				(visitor.visit(self) != MatchError) || res
 
 			when :downup
 				res = (visitor.visit(self) != MatchError)
-				res = children.flatten.compact.inject(false) { |mod, child| child.visit(visitor, :downup) || mod } || res
+				res = children.flatten.compact.inject(false) { |modified, child| child.visit(visitor, :downup) || modified } || res
 				(visitor.visit(self) != MatchError) || res
 			end
 		end

data/test/tc_abstract_class.rb

@@ -1,4 +1,4 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
+# Author:		Chris Wailes <chris.wailes+filigree@gmail.com>
 # Project: 	Filigree
 # Date:		2013/04/19
 # Description:	Test cases for the AbstractClass module.

data/test/tc_application.rb

@@ -1,7 +1,7 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
-# Project: 	Filigree
-# Date:		2013/05/15
-# Description:	Test cases for the Application module.
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
+# Project:     Filigree
+# Date:        2013/05/15
+# Description: Test cases for the Application module.
 
 ############
 # Requires #
@@ -43,7 +43,7 @@ class ApplicationTester < Minitest::Test
 	end
 
 	def test_application
-		assert_raises(NoMethodError)	{ Foo.finalize }
+		assert_raises(NoMethodError) { Foo.finalize }
 		Bar.finalize
 	end
 

data/test/tc_boolean.rb

@@ -1,4 +1,4 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
+# Author:		Chris Wailes <chris.wailes+filigree@gmail.com>
 # Project: 	Filigree
 # Date:		2013/05/04
 # Description:	Test cases for Boolean extensions.
@@ -18,6 +18,9 @@ require 'filigree/boolean'
 #######################
 
 class BooleanTester < Minitest::Test
+
+	using Filigree
+
 	def setup
 
 	end

data/test/tc_class.rb

@@ -1,7 +1,7 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
-# Project: 	Filigree
-# Date:		2013/05/04
-# Description:	Test cases for Class extensions.
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
+# Project:     Filigree
+# Date:        2013/05/04
+# Description: Test cases for Class extensions.
 
 ############
 # Requires #
@@ -18,6 +18,9 @@ require 'filigree/class'
 #######################
 
 class ClassTester < Minitest::Test
+
+	using Filigree
+
 	module Foo; end
 
 	class Bar
@@ -36,10 +39,11 @@ class ClassTester < Minitest::Test
 		assert Bar.includes_module?(Foo)
 
 		assert_equal 'ClassTester::Bar::Baf', Bar::Baf.name
-		assert_equal 'Baf', Bar::Baf.short_name
+		assert_equal 'Baf',                   Bar::Baf.short_name
 
 		assert  Baz.subclass_of?(Bar)
-		assert !Baz.subclass_of?(Fixnum)
+		assert !Baz.subclass_of?(Integer)
+
 		assert_raises(TypeError) { Baz.subclass_of?(1) }
 	end
 end

data/test/tc_class_methods_module.rb

@@ -1,4 +1,4 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
+# Author:		Chris Wailes <chris.wailes+filigree@gmail.com>
 # Project: 	Filigree
 # Date:		2013/05/15
 # Description:	Test cases the InnerClassModule module.

data/test/tc_commands.rb

@@ -1,7 +1,7 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
-# Project: 	Filigree
-# Date:		2013/05/17
-# Description:	Test cases the Commands module.
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
+# Project:     Filigree
+# Date:        2013/05/17
+# Description: Test cases the Commands module.
 
 ############
 # Requires #

data/test/tc_configuration.rb

@@ -1,4 +1,4 @@
-# Author:		Chris Wailes <chris.wailes@gmail.com>
+# Author:		Chris Wailes <chris.wailes+filigree@gmail.com>
 # Project: 	Filigree
 # Date:		2013/05/15
 # Description:	Test cases the Configuration module.
@@ -39,8 +39,8 @@ class ConfigurationTester < Minitest::Test
 		end
 
 		help 'This does daf'
-		option 'daf', 'd' do |*syms|
-			syms.map { |syms| syms.to_sym }
+		option 'daf', 'd' do |*strings|
+			strings.map { |str| str.to_sym }
 		end
 
 		bool_option :bool

data/test/tc_match.rb

@@ -1,4 +1,4 @@
-# Author:      Chris Wailes <chris.wailes@gmail.com>
+# Author:      Chris Wailes <chris.wailes+filigree@gmail.com>
 # Project:     Filigree
 # Date:        2013/05/04
 # Description: Test cases for the match method.
@@ -19,7 +19,7 @@ require 'filigree/match'
 
 class MatchTester < Minitest::Test
 
-	include Filigree
+	using Filigree
 
 	####################
 	# Internal Classes #
@@ -99,33 +99,33 @@ class MatchTester < Minitest::Test
 
 	def match_tester_class_pattern(o)
 		match o do
-			with(Fixnum.as a) { [:Fixnum, a] }
-			with(Float.as a)  { [:Float,  a] }
-			with(String.as a) { [:String, a] }
+			with(Integer.as a) { [:Integer, a] }
+			with(Float.as a)   { [:Float,  a] }
+			with(String.as a)  { [:String, a] }
 		end
 	end
 
 	def match_tester_literal(o)
 		match o do
-			with(Literal(Fixnum)) { :Fixnum }
-			with(Literal(Float))  { :Float  }
-			with(Literal(/a/))    { :Regexp }
+			with(Literal(Integer)) { :Integer }
+			with(Literal(Float))   { :Float  }
+			with(Literal(/a/))     { :Regexp }
 		end
 	end
 
 	def match_tester_squiggle_bind(o)
 		match o do
-			with(Fixnum.as(~:a)) { [:Fixnum, a] }
-			with(Float.as(~:a))  { [:Float,  a] }
-			with(String.as(~:a)) { [:String, a] }
+			with(Integer.as(~:a)) { [:Integer, a] }
+			with(Float.as(~:a))   { [:Float,  a] }
+			with(String.as(~:a))  { [:String, a] }
 		end
 	end
 
 	def match_tester_manual_bind(o)
 		match o do
-			with(Fixnum.as(Bind(:a))) { [:Fixnum, a] }
-			with(Float.as(Bind(:a)))  { [:Float,  a] }
-			with(String.as(Bind(:a))) { [:String, a] }
+			with(Integer.as(Bind(:a))) { [:Integer, a] }
+			with(Float.as(Bind(:a)))   { [:Float,  a] }
+			with(String.as(Bind(:a)))  { [:String, a] }
 		end
 	end
 
@@ -154,7 +154,7 @@ class MatchTester < Minitest::Test
 	end
 
 	def match_tester_tuple(*touple)
-		match *touple do
+		match(*touple) do
 			with(1, 2) { :FOO }
 			with(3, 4) { :BAR }
 			with(5)    { :BAF }
@@ -162,7 +162,7 @@ class MatchTester < Minitest::Test
 	end
 
 	def match_tester_tuple_wildcard(*touple)
-		match *touple do
+		match(*touple) do
 			with(1)
 			with(2, 3) { :DEF }
 			with(4, _) { :PART_WILD }
@@ -195,7 +195,7 @@ class MatchTester < Minitest::Test
 	end
 
 	def test_class_pattern
-		assert_equal [:Fixnum, 42],    match_tester_class_pattern(42)
+		assert_equal [:Integer, 42],   match_tester_class_pattern(42)
 		assert_equal [:Float, 42.0],   match_tester_class_pattern(42.0)
 		assert_equal [:String, 'foo'], match_tester_class_pattern('foo')
 	end
@@ -236,19 +236,19 @@ class MatchTester < Minitest::Test
 	end
 
 	def test_literals
-		assert_equal :Fixnum, match_tester_literal(Fixnum)
-		assert_equal :Float,  match_tester_literal(Float)
-		assert_equal :Regexp, match_tester_literal(/a/)
+		assert_equal :Integer, match_tester_literal(Integer)
+		assert_equal :Float,   match_tester_literal(Float)
+		assert_equal :Regexp,  match_tester_literal(/a/)
 	end
 
 	def test_squiggle_bind
-		assert_equal [:Fixnum, 42],    match_tester_squiggle_bind(42)
+		assert_equal [:Integer, 42],   match_tester_squiggle_bind(42)
 		assert_equal [:Float, 42.0],   match_tester_squiggle_bind(42.0)
 		assert_equal [:String, 'foo'], match_tester_squiggle_bind('foo')
 	end
 
 	def test_manual_bind
-		assert_equal [:Fixnum, 42],    match_tester_manual_bind(42)
+		assert_equal [:Integer, 42],   match_tester_manual_bind(42)
 		assert_equal [:Float, 42.0],   match_tester_manual_bind(42.0)
 		assert_equal [:String, 'foo'], match_tester_manual_bind('foo')
 	end