thefox-ext 1.5.1 → 1.7.0

data/lib/thefox-ext/ext/array.rb

@@ -1,34 +1,38 @@
 
 class Array
-	
-	# Resolve a range string to an array.
-	# A range string can be like '1, 3..5, 9-11'.
-	# Which will be resolved to [1, 3, 4, 5, 9, 10, 11].
-	def self.resolve_range_str(s)
-		a = Array.new
-		if !s.is_a?(String)
-			return a
-		end
-		
-		s.split(',').map{ |i|
-			ts = i.strip
-			if /\.\./.match(ts) # ( . )( . ) <--- BOOBS
-				b, e = ts.split('..', 2).map{ |r| r.to_i }
-				Range.new(b, e)
-			elsif /-/.match(ts)
-				b, e = ts.split('-', 2).map{ |r| r.to_i }
-				Range.new(b, e)
-			else
-				ts.to_i
-			end
-		}.each do |r|
-			if r.is_a?(Range)
-				a.push(*r.to_a)
-			else
-				a << r
-			end
-		end
-		a
-	end
-	
+
+  # Resolve a range string to an array.
+  # A range string can be like '1, 3..5, 9-11, 12+, 14++, 17+++'.
+  # Which will be resolved to [1, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20].
+  def self.resolve_range_str(original_str)
+    rv = Array.new
+    if !original_str.is_a?(String)
+      return rv
+    end
+
+    original_str.split(',').map{ |item|
+      item_striped = item.strip
+      if /\.\./.match(item_striped) # ( . )( . ) <--- BOOBS
+        Range.new(*item_striped.split('..', 2).map{ |range| range.to_i })
+      elsif /-/.match(item_striped)
+        Range.new(*item_striped.split('-', 2).map{ |range| range.to_i })
+      elsif /\+/.match(item_striped)
+        items = item_striped.split('+')
+        range_begin = items[0].to_i
+        range_end = range_begin + item_striped.count('+')
+        Range.new(range_begin, range_end)
+      else
+        item_striped.to_i
+      end
+    }.each do |range|
+      if range.is_a?(Range)
+        rv.push(*range.to_a)
+      else
+        rv << range
+      end
+    end
+
+    rv
+  end
+
 end

data/lib/thefox-ext/ext/date.rb

@@ -2,46 +2,46 @@
 require 'date'
 
 class Date
-	def today?
-		self == Date.today
-	end
-	
-	# Get all days (as Date objects) for the current week.
-	def week
-		cweek = self.cweek
-		year = self.year
-		month = self.month
-		
-		next_year = year + 1
-		previous_year = year - 1
-		
-		days = Date.new(year)
-			.step(Date.new(year, -1, -1))
-			.select{ |d| d.cweek == cweek }
-		
-		if cweek == 1 && month == 12 ||
-			cweek == 1 && month == 1 ||
-			cweek >= 52 && month == 12 ||
-			cweek >= 52 && month == 1
-			
-			days.keep_if{ |d| d.year == year && d.month == month }
-		end
-		
-		if days.count < 7
-			rest = 7 - days.count
-			
-			rest_days = nil
-			if month == 1
-				rest_days = Date.new(previous_year, 12, 31 - rest + 1).step(Date.new(previous_year, 12, 31))
-			elsif month == 12
-				rest_days = Date.new(next_year).step(Date.new(next_year, 1, rest))
-			end
-			
-			if !rest_days.nil?
-				days += rest_days.to_a
-			end
-		end
-		
-		days.sort[0, 7]
-	end
+  def today?
+    self == Date.today
+  end
+
+  # Get all days (as Date objects) for the current week.
+  def week
+    cweek = self.cweek
+    year = self.year
+    month = self.month
+
+    next_year = year + 1
+    previous_year = year - 1
+
+    days = Date.new(year)
+      .step(Date.new(year, -1, -1))
+      .select{ |d| d.cweek == cweek }
+
+    if cweek == 1 && month == 12 ||
+      cweek == 1 && month == 1 ||
+      cweek >= 52 && month == 12 ||
+      cweek >= 52 && month == 1
+
+      days.keep_if{ |d| d.year == year && d.month == month }
+    end
+
+    if days.count < 7
+      rest = 7 - days.count
+
+      rest_days = nil
+      if month == 1
+        rest_days = Date.new(previous_year, 12, 31 - rest + 1).step(Date.new(previous_year, 12, 31))
+      elsif month == 12
+        rest_days = Date.new(next_year).step(Date.new(next_year, 1, rest))
+      end
+
+      if !rest_days.nil?
+        days += rest_days.to_a
+      end
+    end
+
+    days.sort[0, 7]
+  end
 end

data/lib/thefox-ext/ext/false.rb

@@ -1,9 +1,9 @@
 
 class FalseClass
-	
-	# bool.to_i
-	def to_i
-		0
-	end
-	
+
+  # bool.to_i
+  def to_i
+    0
+  end
+
 end

data/lib/thefox-ext/ext/hash.rb

@@ -1,65 +1,65 @@
 
 class Hash
-	
-	def merge_recursive(h2, level = 0, clone = true)
-		if !h2.is_a?(Hash)
-			raise ArgumentError, "Argument is not a Hash -- #{h2.class} given"
-		end
-		
-		has_subhashes = false
-		
-		h1 = self
-		if clone
-			# We want to modify only the clone.
-			h1 = self.clone
-		end
-		
-		# Iterate Hash 1
-		h1.each do |k, v|
-			if v.is_a?(Hash)
-				has_subhashes = true
-				
-				# If Hash 2 also has the same key.
-				if h2.has_key?(k)
-					if h2[k].is_a?(Hash)
-						# Inception! Go one level deeper.
-						h1[k] = v.merge_recursive(h2[k], level + 1)
-					else
-						h1[k] = h2[k]
-					end
-				end
-			else
-				# Value of Hash 1 is no Subhash.
-				
-				# Only overwrite Hash 1 Value with Hash 2 Value
-				# if a Hash 2 Key exist.
-				if h2.has_key?(k)
-					h1[k] = h2[k]
-				end
-			end
-		end
-		
-		# Iterate Hash 2
-		# Because we also want Key from Hash 2
-		# which don't exist in Hash 1.
-		h2.each do |k, v|
-			if !h1.has_key?(k)
-				h1[k] = v
-			end
-		end
-		
-		if !has_subhashes
-			# If there are no subhashes merge
-			# with existing merge function.
-			h1.merge!(h2)
-		end
-		
-		# Return h1 modified clone.
-		return h1
-	end
-	
-	def merge_recursive!(h2)
-		self.merge_recursive(h2, 0, false)
-	end
-	
+
+  def merge_recursive(h2, level = 0, clone = true)
+    if !h2.is_a?(Hash)
+      raise ArgumentError, "Argument is not a Hash -- #{h2.class} given"
+    end
+
+    has_subhashes = false
+
+    h1 = self
+    if clone
+      # We want to modify only the clone.
+      h1 = self.clone
+    end
+
+    # Iterate Hash 1
+    h1.each do |k, v|
+      if v.is_a?(Hash)
+        has_subhashes = true
+
+        # If Hash 2 also has the same key.
+        if h2.has_key?(k)
+          if h2[k].is_a?(Hash)
+            # Inception! Go one level deeper.
+            h1[k] = v.merge_recursive(h2[k], level + 1)
+          else
+            h1[k] = h2[k]
+          end
+        end
+      else
+        # Value of Hash 1 is no Subhash.
+
+        # Only overwrite Hash 1 Value with Hash 2 Value
+        # if a Hash 2 Key exist.
+        if h2.has_key?(k)
+          h1[k] = h2[k]
+        end
+      end
+    end
+
+    # Iterate Hash 2
+    # Because we also want Key from Hash 2
+    # which don't exist in Hash 1.
+    h2.each do |k, v|
+      if !h1.has_key?(k)
+        h1[k] = v
+      end
+    end
+
+    if !has_subhashes
+      # If there are no subhashes merge
+      # with existing merge function.
+      h1.merge!(h2)
+    end
+
+    # Return h1 modified clone.
+    return h1
+  end
+
+  def merge_recursive!(h2)
+    self.merge_recursive(h2, 0, false)
+  end
+
 end

data/lib/thefox-ext/ext/integer.rb

@@ -1,6 +1,6 @@
 
 class Integer
-	def to_b
-		!self.zero?
-	end
+  def to_b
+    !self.zero?
+  end
 end

data/lib/thefox-ext/ext/nil.rb

@@ -1,6 +1,6 @@
 
 class NilClass
-	def to_utf8
-		''
-	end
+  def to_utf8
+    ''
+  end
 end

data/lib/thefox-ext/ext/string.rb

@@ -1,66 +1,66 @@
 
 class String
-	
-	# Is a String only made of numbers?
-	def is_digit?
-		r = '0'..'9'
-		self.split('').keep_if{ |c| r.include?(c) }.count == self.length
-	end
-	
-	# Is a String only made of lower-case charaters.
-	def is_lower?
-		r = 'a'..'z'
-		self.split('').keep_if{ |c| r.include?(c) }.count == self.length
-	end
-	
-	# Is a String only made of upper-case charaters.
-	def is_upper?
-		r = 'A'..'Z'
-		self.split('').keep_if{ |c| r.include?(c) }.count == self.length
-	end
-	
-	def is_utf8?
-		begin
-			self.unpack('U*')
-		rescue
-			return false
-		end
-		return true
-	end
-	
-	# Convert 'hello world' to 'Hello World'.
-	def titlecase
-		self
-			.split(/ /)
-			.map{ |word| word.capitalize }
-			.join(' ')
-	end
-	
-	def to_hex
-		self.split('').map{ |c| sprintf '%02x', c.ord }.join
-	end
-	
-	# Convert a String to an Integer 32-bit Array.
-	def to_i32a
-		len = self.length
-		len_w = (len >> 2) + (len & 0x3).to_b.to_i
-		
-		out = (0..(len_w - 1)).map{ |n| [n, 0] }.to_h
-		
-		i = 0
-		self.split('').each do |s|
-			out[i >> 2] |= (s.ord << ((3 - (i & 0x3)) << 3))
-			i += 1
-		end
-		
-		out
-	end
-	
-	def to_utf8
-		if is_utf8?
-			self.force_encoding('UTF-8')
-		else
-			self.force_encoding('ISO-8859-1').encode('UTF-8')
-		end
-	end
+
+  # Is a String only made of numbers?
+  def is_digit?
+    r = '0'..'9'
+    self.split('').keep_if{ |c| r.include?(c) }.count == self.length
+  end
+
+  # Is a String only made of lower-case charaters.
+  def is_lower?
+    r = 'a'..'z'
+    self.split('').keep_if{ |c| r.include?(c) }.count == self.length
+  end
+
+  # Is a String only made of upper-case charaters.
+  def is_upper?
+    r = 'A'..'Z'
+    self.split('').keep_if{ |c| r.include?(c) }.count == self.length
+  end
+
+  def is_utf8?
+    begin
+      self.unpack('U*')
+    rescue
+      return false
+    end
+    return true
+  end
+
+  # Convert 'hello world' to 'Hello World'.
+  def titlecase
+    self
+      .split(/ /)
+      .map{ |word| word.capitalize }
+      .join(' ')
+  end
+
+  def to_hex
+    self.split('').map{ |c| sprintf '%02x', c.ord }.join
+  end
+
+  # Convert a String to an Integer 32-bit Array.
+  def to_i32a
+    len = self.length
+    len_w = (len >> 2) + (len & 0x3).to_b.to_i
+
+    out = (0..(len_w - 1)).map{ |n| [n, 0] }.to_h
+
+    i = 0
+    self.split('').each do |s|
+      out[i >> 2] |= (s.ord << ((3 - (i & 0x3)) << 3))
+      i += 1
+    end
+
+    out
+  end
+
+  def to_utf8
+    if is_utf8?
+      self.force_encoding('UTF-8')
+    else
+      self.force_encoding('ISO-8859-1').encode('UTF-8')
+    end
+  end
 end