libaaron 1.1.1 → 1.2

data/VERSION

@@ -1 +1 @@
-Version 1.1.1
+Version 1.2

data/lib/libaaron.rb

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 
-# Version 1.1.1
+# Version 1.2
 
 # Copyright 2008, 2009, 2010 Aaron Lynch
 
@@ -19,6 +19,8 @@ You should have received a copy of the GNU General Public License
 along with this library.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
+LIBAARON_VERSION = "1.2"
+
 class Dir
 	def self.real_entries(directory=".")
 		entries(directory)-[".",".."]
@@ -103,18 +105,41 @@ class Array
 		end
 		return out_arr
 	end
-	def mod(index)
+	def modify(index)
 		self[index] = yield self[index]
 	end
 	def rand
 		self[Kernel.rand(self.length)]
 	end
+	def smart_join(common_separator=", ", end_separator = " and ")
+		if self.length == 1
+			return self.join(common_separator)
+		elsif self.length == 2
+			return %[#{self.first}#{end_separator}#{self.last}]
+		elsif self.length >= 3
+			return (self[0..-2]).join(common_separator) + %[#{end_separator}#{self.last}]
+		else
+			raise "Some funky length for array: #{self.length}"
+		end
+	end
+	def all_true ###TODO rewrite with all?
+		self.select{|e|e}
+	end
+	def all_false
+		self.select{|e|!e}
+	end
+	def all_true?
+		self.all_true == self
+	end
+	def all_false?
+		self.all_false == self
+	end
 end
 
 class Numeric
 	#Taken from a code snippet by tthorley at http://codesnippets.joyent.com/posts/show/1812
-	def self.format(number, value_separator = ",", trailing_zeroes = 2, after = 3, decimal_separator = ".")
-		pre,post = number.to_s.split(".")
+	def format(value_separator = ",", trailing_zeroes = 2, after = 3, decimal_separator = ".")
+		pre,post = self.to_s.split(".")
 		pre.gsub(/(\d)(?=(\d{#{after}})+$)/, '\0' + value_separator)+(post ? "#{decimal_separator}#{post == "0" ? "0"*trailing_zeroes : post}" : "")
 	end
 	def thousand
@@ -131,6 +156,30 @@ class Numeric
 	end
 end
 
+class Integer
+	def f!
+		optional_require 'rubygems'
+		gmp_bindings = optional_require 'gmp'
+		
+		unless gmp_bindings == false
+			return GMP::Z.fac(self).to_i
+		else
+			# do it the slow, ruby way
+			out = 1
+			i = 1
+			while (i<=self)
+				out *= i
+				i += 1
+			end
+			return out
+		end
+	end
+	def choose(number_of_elements)
+		ne = number_of_elements
+		return (self.f!)/(ne.f!*(self-ne).f!)
+	end
+end
+
 class Struct
 	def to_hash
 		hash = Hash.new
@@ -144,7 +193,18 @@ class Struct
 end
 
 module Kernel
-	def numform(*args)
-		Numeric.format(*args)
+	def numform(number, *args)
+		number.format(*args)
 	end
-end
+	def optional_require(library)
+		begin
+			if require library
+				return true
+			else
+				return nil # the library was already loaded; we return nil instead of something more obvious because the standard require method returns false if the library is already loaded, and we want to maintain boolean compatibility
+			end
+		rescue LoadError
+			return false
+		end
+	end
+end

metadata

@@ -1,13 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: libaaron
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Aaron Lynch
@@ -15,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -04:00
+date: 2011-11-14 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -42,27 +40,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: libaaron is a Ruby convenince library of common operations.