thefox-ext 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e9e0bd405074aad6711bbdf8733bcfce7aae887
-  data.tar.gz: e23bf60e2df9ac302b7cfcfa77a9ef22679e8eb7
+  metadata.gz: 0d9d3e3cc6b4f95af03f5bb904259185b8b1a7a9
+  data.tar.gz: 1fa4937f167095f4990acdd2cd3283f873d873ee
 SHA512:
-  metadata.gz: 0360d156805d54c6409b667de7eae6abfe4b0ba400b7d2b1d8f91457d2857a4cc007b1338986b1e381ff0f30b1fd595df7befe9b61c196ae6dbddd0b4aecbff8
-  data.tar.gz: 1514cbc8fd41b1de01e0959dc868c5dfbdc9a8ee308a25de58bf75a367766eca4f5aa90f02cbab951f889d0ca0faa00684de67c160caf498ac2bda7fa9fb1744
+  metadata.gz: d2eb87e909fe0a35dcaf14210f8438882c9021cbf2f1784687a0b4019082a0df6bcdd3b10be785b22dcca8c8851de12c0e9d0f583115efbec18ddd79f3c06c0e
+  data.tar.gz: 647ba64e5aba70994768e5ca3842a98954c5e2ae518218b34f034934461b8d7a406dca91a67955c7ae41dd9bce7025f388ce7d6e1c5dbefea4ab81bb38169714

data/README.md

@@ -24,7 +24,11 @@ Use it in your sources:
 	- UTF-8 Encoding
 	- Intenger 32-bit Array
 - Console Support
-- Date is `today?`
+- Date
+	- `today?`
+	- Get week array for a specific date.
+- Hash
+	- Recursive Merge
 
 ## Project Links
 

data/lib/thefox-ext.rb

@@ -3,6 +3,7 @@ require 'thefox-ext/version'
 
 require 'thefox-ext/ext/date'
 require 'thefox-ext/ext/false'
+require 'thefox-ext/ext/hash'
 require 'thefox-ext/ext/integer'
 require 'thefox-ext/ext/nil'
 require 'thefox-ext/ext/string'

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

@@ -5,4 +5,42 @@ class Date
 	def today?
 		self == Date.today
 	end
+	
+	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/hash.rb

@@ -0,0 +1,58 @@
+
+class Hash
+	
+	def merge_recursive(h2, level = 0, clone = true)
+		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 h2.has_key?(k) && 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
+			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/version.rb

@@ -1,7 +1,7 @@
 
 module TheFox
 	module Ext
-		VERSION = '1.3.0'
-		DATE = '2016-02-07'
+		VERSION = '1.4.0'
+		DATE = '2016-02-13'
 	end
 end

data/tests/tc_date.rb

@@ -16,4 +16,55 @@ class TestDate < MiniTest::Test
 		
 		assert_equal(true, Time.now.to_date.today?)
 	end
+	
+	def test_week_mid
+		e = ['2014-02-17', '2014-02-18', '2014-02-19', '2014-02-20', '2014-02-21', '2014-02-22', '2014-02-23']
+		assert_equal(e, Date.new(2014, 2, 21).week.map{ |d| "#{d}" })
+		
+		e = ['2014-03-31', '2014-04-01', '2014-04-02', '2014-04-03', '2014-04-04', '2014-04-05', '2014-04-06']
+		assert_equal(e, Date.new(2014, 4, 1).week.map{ |d| "#{d}" })
+		
+		e = ['2015-02-16', '2015-02-17', '2015-02-18', '2015-02-19', '2015-02-20', '2015-02-21', '2015-02-22']
+		assert_equal(e, Date.new(2015, 2, 21).week.map{ |d| "#{d}" })
+		
+		e = ['2016-02-15', '2016-02-16', '2016-02-17', '2016-02-18', '2016-02-19', '2016-02-20', '2016-02-21']
+		assert_equal(e, Date.new(2016, 2, 21).week.map{ |d| "#{d}" })
+	end
+	
+	def test_week_jan
+		e = ['2013-12-30', '2013-12-31', '2014-01-01', '2014-01-02', '2014-01-03', '2014-01-04', '2014-01-05']
+		assert_equal(e, Date.new(2014, 1, 1).week.map{ |d| "#{d}" })
+		
+		e = ['2014-12-29', '2014-12-30', '2014-12-31',
+			'2015-01-01', '2015-01-02', '2015-01-03', '2015-01-04']
+		assert_equal(e, Date.new(2015, 1, 1).week.map{ |d| "#{d}" })
+		
+		e = ['2015-12-28', '2015-12-29', '2015-12-30', '2015-12-31',
+			'2016-01-01', '2016-01-02', '2016-01-03']
+		assert_equal(e, Date.new(2016, 1, 1).week.map{ |d| "#{d}" })
+		
+		e = ['2016-12-26', '2016-12-27', '2016-12-28', '2016-12-29', '2016-12-30', '2016-12-31',
+			'2017-01-01']
+		assert_equal(e, Date.new(2017, 1, 1).week.map{ |d| "#{d}" })
+		
+		e = ['2018-01-01', '2018-01-02', '2018-01-03', '2018-01-04', '2018-01-05', '2018-01-06', '2018-01-07']
+		assert_equal(e, Date.new(2018, 1, 1).week.map{ |d| "#{d}" })
+	end
+	
+	def test_week_dec
+		e = ['2014-12-29', '2014-12-30', '2014-12-31',
+			'2015-01-01', '2015-01-02', '2015-01-03', '2015-01-04']
+		assert_equal(e, Date.new(2014, 12, 31).week.map{ |d| "#{d}" })
+		
+		e = ['2015-12-28', '2015-12-29', '2015-12-30', '2015-12-31',
+			'2016-01-01', '2016-01-02', '2016-01-03']
+		assert_equal(e, Date.new(2015, 12, 31).week.map{ |d| "#{d}" })
+		
+		e = ['2016-12-26', '2016-12-27', '2016-12-28', '2016-12-29', '2016-12-30', '2016-12-31',
+			'2017-01-01']
+		assert_equal(e, Date.new(2016, 12, 31).week.map{ |d| "#{d}" })
+		
+		e = ['2017-12-25', '2017-12-26', '2017-12-27', '2017-12-28', '2017-12-29', '2017-12-30', '2017-12-31']
+		assert_equal(e, Date.new(2017, 12, 31).week.map{ |d| "#{d}" })
+	end
 end

data/tests/tc_hash.rb

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+
+require 'minitest/autorun'
+require 'thefox-ext'
+
+
+class TestHash < MiniTest::Test
+	def test_merge_recursive_clone1
+		h1 = {'k1' => 1, 'k2' => 1}
+		h2 = {'k1' => 2, 'k2' => 2}
+		
+		assert_equal({'k1' => 2, 'k2' => 2}, h1.merge_recursive(h2))
+	end
+	
+	def test_merge_recursive_clone2
+		h1 = {'k1' => 1, 'k2' => 1}
+		h2 = {'k1' => 2, 'k3' => 2}
+		
+		assert_equal({'k1' => 2, 'k2' => 1, 'k3' => 2}, h1.merge_recursive(h2))
+	end
+	
+	def test_merge_recursive_clone3
+		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
+		h2 = {'k1' => 2, 'k2' => 2}
+		
+		assert_equal({'k1' => 2, 'k2' => 2}, h1.merge_recursive(h2))
+	end
+	
+	def test_merge_recursive_clone4
+		h1 = {'k1' => 1, 'k2' => 1}
+		h2 = {'k1' => 2, 'k2' => {'sk2' => 2}}
+		
+		assert_equal({'k1' => 2, 'k2' => {'sk2' => 2}}, h1.merge_recursive(h2))
+	end
+	
+	def test_merge_recursive_clone5
+		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
+		h2 = {'k1' => 2, 'k2' => {'sk2' => 2}}
+		
+		assert_equal({'k1' => 2, 'k2' => {'sk1' => 1, 'sk2' => 2}}, h1.merge_recursive(h2))
+	end
+	
+	def test_merge_recursive_clone6
+		h1 = {'k1' => 1, 'k2' => 1, 'k4' => {'sk1' => 1}}
+		h2 = {'k1' => 2, 'k3' => 2, 'k4' => {'sk2' => 2}}
+		
+		assert_equal({'k1' => 2, 'k2' => 1, 'k3' => 2, 'k4' => {'sk1' => 1, 'sk2' => 2}}, h1.merge_recursive(h2))
+	end
+	
+	def test_merge_recursive_self1
+		h1 = {'k1' => 1, 'k2' => 1}
+		h2 = {'k1' => 2, 'k2' => 2}
+		
+		h1.merge_recursive!(h2)
+		
+		assert_equal({'k1' => 2, 'k2' => 2}, h1)
+	end
+	
+	def test_merge_recursive_self2
+		h1 = {'k1' => 1, 'k2' => 1}
+		h2 = {'k1' => 2, 'k3' => 2}
+		
+		h1.merge_recursive!(h2)
+		
+		assert_equal({'k1' => 2, 'k2' => 1, 'k3' => 2}, h1)
+	end
+	
+	def test_merge_recursive_self3
+		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
+		h2 = {'k1' => 2, 'k2' => 2}
+		
+		h1.merge_recursive!(h2)
+		
+		assert_equal({'k1' => 2, 'k2' => 2}, h1)
+	end
+	
+	def test_merge_recursive_self4
+		h1 = {'k1' => 1, 'k2' => 1}
+		h2 = {'k1' => 2, 'k2' => {'sk2' => 2}}
+		
+		h1.merge_recursive!(h2)
+		
+		assert_equal({'k1' => 2, 'k2' => {'sk2' => 2}}, h1)
+	end
+	
+	def test_merge_recursive_self5
+		h1 = {'k1' => 1, 'k2' => {'sk1' => 1}}
+		h2 = {'k1' => 2, 'k2' => {'sk2' => 2}}
+		
+		h1.merge_recursive!(h2)
+		
+		assert_equal({'k1' => 2, 'k2' => {'sk1' => 1, 'sk2' => 2}}, h1)
+	end
+	
+	def test_merge_recursive_self6
+		h1 = {'k1' => 1, 'k2' => 1, 'k4' => {'sk1' => 1}}
+		h2 = {'k1' => 2, 'k3' => 2, 'k4' => {'sk2' => 2}}
+		
+		h1.merge_recursive!(h2)
+		
+		assert_equal({'k1' => 2, 'k2' => 1, 'k3' => 2, 'k4' => {'sk1' => 1, 'sk2' => 2}}, h1)
+	end
+end

data/tests/ts_all.rb

@@ -2,6 +2,7 @@
 
 require_relative 'tc_date'
 require_relative 'tc_false'
+require_relative 'tc_hash'
 require_relative 'tc_integer'
 require_relative 'tc_nil'
 require_relative 'tc_string'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-ext
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -40,6 +40,7 @@ files:
 - lib/thefox-ext/console.rb
 - lib/thefox-ext/ext/date.rb
 - lib/thefox-ext/ext/false.rb
+- lib/thefox-ext/ext/hash.rb
 - lib/thefox-ext/ext/integer.rb
 - lib/thefox-ext/ext/nil.rb
 - lib/thefox-ext/ext/string.rb
@@ -47,6 +48,7 @@ files:
 - lib/thefox-ext/version.rb
 - tests/tc_date.rb
 - tests/tc_false.rb
+- tests/tc_hash.rb
 - tests/tc_integer.rb
 - tests/tc_nil.rb
 - tests/tc_string.rb