buzzcore 0.5.1 → 0.6.1

data/VERSION

@@ -1,2 +1,2 @@
-0.5.1
+0.6.1
 

data/buzzcore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buzzcore}
-  s.version = "0.5.1"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
-  s.date = %q{2010-09-22}
+  s.date = %q{2011-06-03}
   s.description = %q{buzzcore is the ruby core library developed and used by Buzzware Solutions.}
   s.email = %q{contact@buzzware.com.au}
   s.extra_rdoc_files = [
@@ -41,13 +41,12 @@ Gem::Specification.new do |s|
      "lib/buzzcore/shell_extras.rb",
      "lib/buzzcore/string_utils.rb",
      "lib/buzzcore/text_doc.rb",
-     "lib/buzzcore/tweaks.rb",
      "lib/buzzcore/xml_utils.rb",
      "lib/buzzcore_dev.rb",
-     "rails/init.rb",
      "test/buzzcore_test.rb",
      "test/config_test.rb",
      "test/credentials_test.rb",
+     "test/extend_base_classes_test.rb",
      "test/misc_test.rb",
      "test/shell_test.rb",
      "test/test_helper.rb"
@@ -61,6 +60,7 @@ Gem::Specification.new do |s|
     "test/buzzcore_test.rb",
      "test/config_test.rb",
      "test/credentials_test.rb",
+     "test/extend_base_classes_test.rb",
      "test/misc_test.rb",
      "test/shell_test.rb",
      "test/test_helper.rb"

data/lib/buzzcore/extend_base_classes.rb

@@ -1,38 +1,38 @@
-String.class_eval do    
-  def pad_left(value)
-    increase = value-self.length
-    return self if increase==0
-    if increase > 0
-      return self + ' '*increase
-    else
-      return self[0,value]
-    end
-  end   
-
-  def pad_right(value)
-    increase = value-self.length
-    return self if increase==0
-    if increase > 0
-      return ' '*increase + self
-    else
-      return self[0,value]
-    end
-  end
-
-  # Like chomp! but operates on the leading characters instead.
-  # The aString parameter would not normally be used.
-  def bite!(aValue=$/,aString=self)
-    if aString[0,aValue.length] == aValue
-      aString[0,aValue.length] = ''
-      return aString
-    else
-      return aString
-    end
-  end
-
-  def bite(aValue=$/)
-    bite!(aValue,self.clone)
-  end  
+String.class_eval do
+	def pad_left(value)
+		increase = value-self.length
+		return self if increase==0
+		if increase > 0
+			return self + ' '*increase
+		else
+			return self[0,value]
+		end
+	end
+
+	def pad_right(value)
+		increase = value-self.length
+		return self if increase==0
+		if increase > 0
+			return ' '*increase + self
+		else
+			return self[0,value]
+		end
+	end
+
+	# Like chomp! but operates on the leading characters instead.
+	# The aString parameter would not normally be used.
+	def bite!(aValue=$/,aString=self)
+		if aString[0,aValue.length] == aValue
+			aString[0,aValue.length] = ''
+			return aString
+		else
+			return aString
+		end
+	end
+
+	def bite(aValue=$/)
+		bite!(aValue,self.clone)
+	end
 
 	def begins_with?(aString)
 		self[0,aString.length]==aString
@@ -79,128 +79,128 @@ String.class_eval do
 	def is_f?
 		self.to_float(false) and true
 	end
-	
+
 	# like scan but returns array of MatchData's.
 	# doesn't yet support blocks
 	def scan_md(aPattern)
 		result = []
-		self.scan(aPattern) {|s| result << $~ }		
+		self.scan(aPattern) {|s| result << $~ }
 		result
 	end
-	
+
 	def to_nil(aPattern=nil)
 		return nil if self.empty?
 		if aPattern
 			return nil if (aPattern.is_a? Regexp) && (self =~ aPattern)
-			return nil if aPattern.to_s == self			
+			return nil if aPattern.to_s == self
 		end
 		self
 	end
-	
+
 	def to_b(aDefault=false)
 		return true if ['1','yes','y','true','on'].include?(self.downcase)
 		return false if ['0','no','n','false','off'].include?(self.downcase)
 		aDefault
 	end
-  
-	# uses 
+
+	# uses
 	#URLIZE_PATTERN = /[ \/\\\(\)\[\]]/
 	URLIZE_PATTERN_PS = /[ \\\(\)\[\]_]/
 	def urlize(aSlashChar='+')
 		return self if self.empty?
-		result = self.gsub(URLIZE_PATTERN_PS,'-').downcase.gsub(/[^a-z0-9_\-+,\.\/]/,'')
+		result = self.gsub(URLIZE_PATTERN_PS,'-').downcase.gsub(/[^a-z0-9_\-+,\.\/]/,'').sub(/-+$/,'').sub(/^-+/,'')
 		result.gsub!('/',aSlashChar) unless aSlashChar=='/'
 		result.gsub!(/-{2,}/,'-')
 		result
-	end	
-  
+	end
+
 	private
-  CRC_LOOKUP = [
-    0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
-    0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
-    0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
-    0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
-    0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
-    0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
-    0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
-    0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
-    0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
-    0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
-    0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
-    0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
-    0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
-    0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
-    0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
-    0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
-    0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
-    0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
-    0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
-    0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
-    0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
-    0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
-    0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
-    0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
-    0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
-    0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
-    0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
-    0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
-    0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
-    0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
-    0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
-    0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
-  ]  
-  public
-	
-  def crc16
-    crc = 0x00
-    self.each_byte do |b|
-      crc = ((crc >> 8) & 0xff) ^ CRC_LOOKUP[(crc ^ b) & 0xff]
-    end
-    crc
-  end
-
-  
-end  
+	CRC_LOOKUP = [
+		0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
+		0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
+		0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
+		0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
+		0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
+		0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
+		0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
+		0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
+		0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
+		0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
+		0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
+		0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
+		0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
+		0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
+		0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
+		0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
+		0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
+		0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
+		0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
+		0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
+		0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
+		0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
+		0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
+		0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
+		0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
+		0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
+		0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
+		0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
+		0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
+		0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
+		0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
+		0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
+	]
+	public
+
+	def crc16
+		crc = 0x00
+		self.each_byte do |b|
+			crc = ((crc >> 8) & 0xff) ^ CRC_LOOKUP[(crc ^ b) & 0xff]
+		end
+		crc
+	end
+
+
+end
 
 
 Time.class_eval do
 
-  if !respond_to?(:change)  # no activesupport loaded
-    def change(options)
-      ::Time.send(
-        self.utc? ? :utc : :local,
-        options[:year]  || self.year,
-        options[:month] || self.month,
-        options[:day]   || self.day,
-        options[:hour]  || self.hour,
-        options[:min]   || (options[:hour] ? 0 : self.min),
-        options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
-        options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
-      )
-    end
-
-    def seconds_since_midnight
-      self.to_i - self.change(:hour => 0).to_i + (self.usec/1.0e+6)
-    end
-
-    def beginning_of_day
-      (self - self.seconds_since_midnight).change(:usec => 0)
-    end
-
-    alias :midnight :beginning_of_day
-    alias :at_midnight :beginning_of_day
-    alias :at_beginning_of_day :beginning_of_day
-
-  end
+	if !respond_to?(:change)  # no activesupport loaded
+		def change(options)
+			::Time.send(
+				self.utc? ? :utc : :local,
+				options[:year]  || self.year,
+				options[:month] || self.month,
+				options[:day]   || self.day,
+				options[:hour]  || self.hour,
+				options[:min]   || (options[:hour] ? 0 : self.min),
+				options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
+				options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
+			)
+		end
+
+		def seconds_since_midnight
+			self.to_i - self.change(:hour => 0).to_i + (self.usec/1.0e+6)
+		end
+
+		def beginning_of_day
+			(self - self.seconds_since_midnight).change(:usec => 0)
+		end
+
+		alias :midnight :beginning_of_day
+		alias :at_midnight :beginning_of_day
+		alias :at_beginning_of_day :beginning_of_day
+
+	end
 
 	# offset of local machine from UTC, in seconds eg +9.hours
 	def self.local_offset
-		local(2000).utc_offset	
+		local(2000).utc_offset
 	end
 
-  def date
-    self.at_beginning_of_day
-  end
+	def date
+		self.at_beginning_of_day
+	end
 
 	# index number of this day, from Time.at(0) + utc_offset
 	def day_number
@@ -220,11 +220,11 @@ Time.class_eval do
 	def date_numeric
 		self.strftime('%Y%m%d')
 	end
-	
+
 	def to_universal
-		self.strftime("%d %b %Y")	
+		self.strftime("%d %b %Y")
 	end
-	
+
 	# create a new Time from eg. "20081231"
 	def self.from_date_numeric(aString)
 		return nil unless aString
@@ -239,60 +239,60 @@ Time.class_eval do
 		self.strftime('%Y%m%d-%H%M%S')
 	end
 
-	def to_sql
+	def to_sql_format # was to_sql, but clashed with Rails 3
 		self.strftime('%Y-%m-%d %H:%M:%S')
 	end
 
 	def to_w3c
-		utc.strftime("%Y-%m-%dT%H:%M:%S+00:00") 
+		utc.strftime("%Y-%m-%dT%H:%M:%S+00:00")
 	end
 end
 
 module HashUtils
-  def filter_include!(aKeys,aHash=nil)
-    aHash ||= self
+	def filter_include!(aKeys,aHash=nil)
+		aHash ||= self
 
 		if aKeys.is_a? Regexp
-      return aHash.delete_if {|k,v| not k =~ aKeys }
+			return aHash.delete_if {|k,v| not k =~ aKeys }
 		else
 			aKeys = [aKeys] unless aKeys.is_a? Array
-      return aHash.clear if aKeys.empty?
-      return aHash.delete_if {|key, value| !((aKeys.include?(key)) || (key.is_a?(Symbol) and aKeys.include?(key.to_s)) || (key.is_a?(String) and aKeys.include?(key.to_sym)))}
-      return aHash	# last resort
+			return aHash.clear if aKeys.empty?
+			return aHash.delete_if {|key, value| !((aKeys.include?(key)) || (key.is_a?(Symbol) and aKeys.include?(key.to_s)) || (key.is_a?(String) and aKeys.include?(key.to_sym)))}
+			return aHash	# last resort
 		end
-  end
+	end
 
-  def filter_include(aKeys,aHash=nil)
-    aHash ||= self
-    filter_include!(aKeys,aHash.clone)
-  end
+	def filter_include(aKeys,aHash=nil)
+		aHash ||= self
+		filter_include!(aKeys,aHash.clone)
+	end
 
-  def filter_exclude!(aKeys,aHash=nil)
-    aHash ||= self
+	def filter_exclude!(aKeys,aHash=nil)
+		aHash ||= self
 
 		if aKeys.is_a? Regexp
-      return aHash.delete_if {|k,v| k =~ aKeys }
+			return aHash.delete_if {|k,v| k =~ aKeys }
 		else
 			aKeys = [aKeys] unless aKeys.is_a? Array
-      return aHash if aKeys.empty?
-      return aHash.delete_if {|key, value| ((aKeys.include?(key)) || (key.is_a?(Symbol) and aKeys.include?(key.to_s)) || (key.is_a?(String) and aKeys.include?(key.to_sym)))}
+			return aHash if aKeys.empty?
+			return aHash.delete_if {|key, value| ((aKeys.include?(key)) || (key.is_a?(Symbol) and aKeys.include?(key.to_s)) || (key.is_a?(String) and aKeys.include?(key.to_sym)))}
 		end
-  end
+	end
 
-  def filter_exclude(aKeys,aHash=nil)
-    aHash ||= self
-    filter_exclude!(aKeys,aHash.clone)
-  end
+	def filter_exclude(aKeys,aHash=nil)
+		aHash ||= self
+		filter_exclude!(aKeys,aHash.clone)
+	end
 
 	def has_values_for?(aKeys,aHash=nil)
-    aHash ||= self
+		aHash ||= self
 		# check all keys exist in aHash and their values are not nil
 		aKeys.all? { |k,v| aHash[k] }
 	end
 
 	# give a block to execute without the given key in this hash
 	# It will be replaced after the block (guaranteed by ensure)
-	# eg. 
+	# eg.
 	# hash.without_key(:blah) do |aHash|
 	#		puts aHash.inspect
 	# end
@@ -309,7 +309,7 @@ module HashUtils
 		end
 		return result
 	end
-	
+
 	def symbolize_keys
 		result = {}
 		self.each { |k,v| k.is_a?(String) ? result[k.to_sym] = v : result[k] = v  }
@@ -323,7 +323,7 @@ module HashUtils
 end
 
 Hash.class_eval do
-  include HashUtils
+	include HashUtils
 end
 
 if defined? HashWithIndifferentAccess
@@ -333,40 +333,40 @@ if defined? HashWithIndifferentAccess
 end
 
 module ArrayUtils
-  def filter_include!(aValues,aArray=nil)
-    aArray ||= self
-    if aValues.is_a? Array
-      return aArray if aValues.empty?
-      return aArray.delete_if {|v| not aValues.include? v }
-    elsif aValues.is_a? Regexp
-      return aArray.delete_if {|v| not v =~ aValues }
-    else
-      return filter_include!([aValues],aArray)
-    end
-  end
-
-  def filter_include(aValues,aArray=nil)
-    aArray ||= self
-    filter_include!(aValues,aArray.clone)
-  end
-
-  def filter_exclude!(aValues,aArray=nil)
-    aArray ||= self
-    if aValues.is_a? Array
-      return aArray if aValues.empty?
-      return aArray.delete_if {|v| aValues.include? v }
-    elsif aValues.is_a? Regexp
-      return aArray.delete_if {|v| v =~ aValues }
-    else
-      return filter_exclude!([aValues],aArray)
-    end
-  end
-
-  def filter_exclude(aValues,aArray=nil)
-    aArray ||= self
-    filter_exclude!(aValues,aArray.clone)
-  end
-	
+	def filter_include!(aValues,aArray=nil)
+		aArray ||= self
+		if aValues.is_a? Array
+			return aArray if aValues.empty?
+			return aArray.delete_if {|v| not aValues.include? v }
+		elsif aValues.is_a? Regexp
+			return aArray.delete_if {|v| not v =~ aValues }
+		else
+			return filter_include!([aValues],aArray)
+		end
+	end
+
+	def filter_include(aValues,aArray=nil)
+		aArray ||= self
+		filter_include!(aValues,aArray.clone)
+	end
+
+	def filter_exclude!(aValues,aArray=nil)
+		aArray ||= self
+		if aValues.is_a? Array
+			return aArray if aValues.empty?
+			return aArray.delete_if {|v| aValues.include? v }
+		elsif aValues.is_a? Regexp
+			return aArray.delete_if {|v| v =~ aValues }
+		else
+			return filter_exclude!([aValues],aArray)
+		end
+	end
+
+	def filter_exclude(aValues,aArray=nil)
+		aArray ||= self
+		filter_exclude!(aValues,aArray.clone)
+	end
+
 	def to_nil
 		self.empty? ? nil : self
 	end
@@ -374,7 +374,7 @@ module ArrayUtils
 end
 
 Array.class_eval do
-  include ArrayUtils
+	include ArrayUtils
 
 	# fixes a memory leak in shift in Ruby 1.8 - should be fixed in 1.9
 	# see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/216055
@@ -390,27 +390,27 @@ Kernel.class_eval do
 	end
 end
 
-if defined? ActiveRecord
-	ActiveRecord::Base.class_eval do
-	
-		def self.find_any_id(aId)
-			with_exclusive_scope { find(:first, {:conditions => {:id => aId}}) }
-		end
-	
-		def self.find_any_all(aOptions={})
-			with_exclusive_scope { find(:all, aOptions) }
-		end
-	
-		def self.find_ids(aIds)
-			find(:all, {:conditions=> ["id in (?)",aIds.join(',')]})
-		end
-	
-		def self.find_any_ids(aIds)
-			with_exclusive_scope { find(:all, {:conditions=> ["id in (?)",aIds.join(',')]}) }
-		end
-	
-	end
-end
+#if defined? ActiveRecord
+#	ActiveRecord::Base.class_eval do
+#
+#		def self.find_any_id(aId)
+#			with_exclusive_scope { find(:first, {:conditions => {:id => aId}}) }
+#		end
+#
+#		def self.find_any_all(aOptions={})
+#			with_exclusive_scope { find(:all, aOptions) }
+#		end
+#
+#		def self.find_ids(aIds)
+#			find(:all, {:conditions=> ["id in (?)",aIds.join(',')]})
+#		end
+#
+#		def self.find_any_ids(aIds)
+#			with_exclusive_scope { find(:all, {:conditions=> ["id in (?)",aIds.join(',')]}) }
+#		end
+#
+#	end
+#end
 
 Fixnum.class_eval do
 
@@ -429,57 +429,57 @@ Bignum.class_eval do
 	def to_nil
 		self==0 ? nil : self
 	end
-	
+
 	def to_b(aDefault=false)
 		self==0 ? false : true
 	end
 
 end
 
-NilClass.class_eval do 
+NilClass.class_eval do
 
 	def to_nil
-		nil	
+		nil
 	end
-	
+
 	def to_b(aDefault=false)
 		false
 	end
-	
+
 end
 
-TrueClass.class_eval do 
+TrueClass.class_eval do
 
 	def to_nil
-		self	
+		self
 	end
-	
+
 	def to_b(aDefault=false)
 		self
-	end	
-	
+	end
+
 end
 
-FalseClass.class_eval do 
+FalseClass.class_eval do
 
 	def to_nil
-		nil	
+		nil
 	end
-	
+
 	def to_b(aDefault=false)
 		self
-	end	
-	
+	end
+
 end
 
 
 Math.module_eval do
-  def self.max(a, b)
-    a > b ? a : b
-  end
+	def self.max(a, b)
+		a > b ? a : b
+	end
 
-  def self.min(a, b)
-    a < b ? a : b
-  end
+	def self.min(a, b)
+		a < b ? a : b
+	end
 end
 

data/lib/buzzcore/extra/html_truncate.rb

@@ -30,6 +30,17 @@ module HtmlUtils
 		aHtml = Sanitize.clean(aHtml)
 		StringUtils.simplify_whitespace(aHtml)
 	end
+	
+	def self.plain_words(aHtmlText,aWords)
+		result = CGI.unescapeHTML(Sanitize.clean(aHtmlText))
+		StringUtils.crop_to_word_count(result,aWords)
+	end
+
+	def self.plain_chars(aHtmlText,aMaxLength)
+		result = CGI.unescapeHTML(Sanitize.clean(aHtmlText))
+		result = StringUtils.simplify_whitespace(result)
+		StringUtils.word_safe_truncate(result,aMaxLength)
+	end
 
 end
 	

data/lib/buzzcore/misc_utils.rb

@@ -91,12 +91,9 @@ module MiscUtils
 		return new_dir
 	end
 	
-	def self.mkdir?(aPath,aPermissions)
-		if File.exists?(aPath)
-			File.chmod(aPermissions, aPath)
-		else
-			Dir.mkdir(aPath, aPermissions)
-    end
+	def self.mkdir?(aPath,aPermissions=nil)
+		FileUtils.mkdir_p(aPath) unless File.exists?(aPath)
+		File.chmod(aPermissions, aPath) if aPermissions
   end
 
 	def self.set_permissions_cmd(aFilepath,aUser=nil,aGroup=nil,aMode=nil,aSetGroupId=false,aSudo=true)

data/lib/buzzcore/string_utils.rb

@@ -18,6 +18,13 @@ module StringUtils
 		result = (match ? match.pre_match : aText)
 		result
 	end
+	
+	def self.random_word(min,max)
+		len = min + rand(max-min+1)
+		result = ' '*len
+		(len-1).downto(0) {|i| result[i] = (?a + rand(?z-?a+1)).chr}
+		return result
+	end
 
 	# aTemplate is a string containing tokens like ${SOME_TOKEN}
 	# aValues is a hash of token names eg. 'SOME_TOKEN' and their values to substitute
@@ -90,6 +97,14 @@ module StringUtils
 		aText.squeeze!(' ')
 		aText
 	end
+	
+	def self.clean_tag(aTag)
+		aTag.downcase.gsub('_','-').gsub(/[^a-z0-9-]/,'').bite('-').chomp('-')
+	end
+	
+	def self.clean_tags(aTags)
+		aTags.map {|t| clean_tag(t)}.uniq
+	end
 
 end
 

data/test/extend_base_classes_test.rb

@@ -0,0 +1,23 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require 'rubygems'
+
+require 'test/unit'
+gem 'shoulda'; require 'shoulda'
+
+require 'fileutils'
+
+gem 'buzzcore'; require 'buzzcore'
+
+class ExtendBaseClassesTest < Test::Unit::TestCase
+	
+	should "urlize generate correct url" do
+		s = "Waiting for Grace (ii)"
+		u = s.urlize
+		assert_equal 'waiting-for-grace-ii',u
+	end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buzzcore
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 5
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 1
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors: 
 - buzzware
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 +08:00
+date: 2011-06-03 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,13 +80,12 @@ files:
 - lib/buzzcore/shell_extras.rb
 - lib/buzzcore/string_utils.rb
 - lib/buzzcore/text_doc.rb
-- lib/buzzcore/tweaks.rb
 - lib/buzzcore/xml_utils.rb
 - lib/buzzcore_dev.rb
-- rails/init.rb
 - test/buzzcore_test.rb
 - test/config_test.rb
 - test/credentials_test.rb
+- test/extend_base_classes_test.rb
 - test/misc_test.rb
 - test/shell_test.rb
 - test/test_helper.rb
@@ -128,6 +127,7 @@ test_files:
 - test/buzzcore_test.rb
 - test/config_test.rb
 - test/credentials_test.rb
+- test/extend_base_classes_test.rb
 - test/misc_test.rb
 - test/shell_test.rb
 - test/test_helper.rb

data/lib/buzzcore/tweaks.rb

@@ -1,107 +0,0 @@
-module Buzzcore
-
-	#class Tweak
-  #
-	#	attr_reader :name
-  #
-	#	def initialize(aName)
-	#		@name = aName.to_sym
-	#	end
-  #
-	#	def config
-	#		Tweaks.config_for(name)
-	#	end
-  #
-	#end
-
-	class Tweaks
-
-		@@configs = {}
-		@@switch = {}
-		@@switch_default = {}
-
-		#cattr_accessor :rails_config
-
-		# load all tweaks from a path
-		def self.load_all(aPath)
-			aPath = File.expand_path(aPath)
-			# get list of tweak_files
-			tweak_files = Dir.glob(File.join(aPath,'*_tweak.rb'))
-			tweak_files.each do |f|
-				Tweaks.load(f)
-			end
-		end
-		
-		def self.load(aTweakFile)
-			#name = aTweakFile.scan(/.*\/(.+)_tweak\.rb$/).flatten.pop
-			#@@tweaks[name.to_sym] = Tweak.new(name)
-			if defined? Rails
-				require_dependency aTweakFile
-			else
-				::Kernel.load(aTweakFile)
-			end
-		end
-		
-		def self.enable(*aTweakNames)
-			aTweakNames = [aTweakNames] unless aTweakNames.is_a?(Array)
-			aTweakNames.each do |n|
-				@@switch[n.to_sym] = true
-			end
-		end
-
-		def self.disable(*aTweakNames)
-			aTweakNames = [aTweakNames] unless aTweakNames.is_a?(Array)
-			aTweakNames.each do |n|
-				@@switch[n.to_sym] = false
-			end
-		end
-
-		def self.header_enabled?(aTweak)
-		end
-		
-		def self.header_disabled?(aTweak)
-		end
-
-		# pass a hash to set
-		# returns config hash for modification
-		def self.config_for(aTweak,aHash=nil)
-			aTweak = aTweak.to_sym
-			if !(cf = @@configs[aTweak])
-				cf = {}
-				@@configs[aTweak] = cf
-			end
-			if aHash
-				if cf.is_a?(ConfigClass)
-					cf.reset()
-					cf.read(aHash)
-				else
-					@@configs[aTweak] = cf = aHash	
-				end
-			end
-			cf
-		end
-
-		# pass a hash to set
-		# returns config hash for modification
-		#def self.defaults_for(aTweak,aHash=nil)
-		#	c = config
-		#end
-
-		# called by tweak code (not sure if necessary)
-		# aDefaults creates an optional config object for this tweak with the given defaults and previously given values
-		# aNormally :enabled or :disabled
-		def self.define(aName,aNormally,aDefaults=nil)
-			config = @@configs[aName.to_sym]
-			@@configs[aName.to_sym] = config = ConfigClass.new(aDefaults,config) if aDefaults
-			@@switch_default[aName.to_sym] = (aNormally==:enabled || aNormally==true ? true : false)
-			en = enabled?(aName)
-			yield(config,aName) if en
-			en
-		end
-
-		def self.enabled?(aTweakName)
-			@@switch[aTweakName.to_sym]==nil ? @@switch_default[aTweakName.to_sym] : @@switch[aTweakName.to_sym]
-		end
-
-	end
-end

data/rails/init.rb

@@ -1,16 +0,0 @@
-#gem_root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-#Cms.add_to_rails_paths gem_root
-#
-#throw RuntimeError.new('thumbs_cache folder must exist') unless File.exists? APP_CONFIG[:thumbs_cache]
-#
-#Cms::PageHelper.module_eval do
-#
-#	extend BcmsTools::PageHelper
-#
-#end
-#
-config.after_initialize do
-	#Buzzcore::Tweaks.rails_config = config
-	Buzzcore::Tweaks.load_all(File.join(File.dirname(__FILE__),'../tweaks'))
-	Buzzcore::Tweaks.load_all(File.join(RAILS_ROOT,'tweaks'))
-end