ruby_lunardate 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19dbabf87671d56ee610e61a84ad364629cbc6ac
-  data.tar.gz: 74a2287e47276439916d30a4cd6cc36c41eae871
+  metadata.gz: d2d4a3f8dd0e16ee050fea3d77bae6e3965a0ce1
+  data.tar.gz: 1107f26640819db8d0997fac9fc1541022f5bf4d
 SHA512:
-  metadata.gz: 6a68946d3a2d4f7432612eed11af14259ebc22815dafbf8990ccba9f6e0f3cd4cfe59ad5f95e70606dca2eb60c8fdb2fb3a042691a98483ce837bf1323cfaa6b
-  data.tar.gz: dddae6a001770ca66213abe65f7a5cf0c01f5ee054f5555f8b92a2f264e30a6d2dcc0315ed22bb63d469d42ce28b29950612f4bdc72986cd0f2f0fafc023f1cb
+  metadata.gz: d4d678c8d317ad5f2ab42f5da0c852a8da22920c561c808572a0512e9e738e71e45cfbb89cbb6c34de7a92d5c834e15f6d2be7582e3697475eb6a81be73d189d
+  data.tar.gz: 983544452b663aa2d8690e5b1c2f65706a497fbe8572aca467f1dbddaabd17aace8596f46a4d2f35e66153e06c33c57b3105ad3e35ad5dc21b80a6e0fc68e68e

data/lib/ruby_lunardate.rb

@@ -170,7 +170,11 @@ LUNARDAYS_FOR_MONTHTYPE = {
 class Date
   def to_lunar
     days = LunarDate.get_dates(self)
-    return LunarDate.from_days(days, self.class)
+    return LunarDate.lunar_from_days(days, self.class)
+  end
+
+  def to_solar(is_leap_month = false)
+    return LunarDate.to_solar(self.year, self.month, self.day, is_leap_month, self.class)
   end
 end
 
@@ -188,7 +192,7 @@ class LunarDate
   end
 
   def to_s
-  	return "%4d%02d%02d" % [self.year,self.month,self.day]
+    return "%4d%02d%02d" % [self.year,self.month,self.day]
   end
 
   def inspect
@@ -207,11 +211,10 @@ class LunarDate
   	return (solar_date - @start_date).to_i
   end
 
-  def self.to_lunar(year, month, day, locale = :ko)
+  def self.to_lunar(year, month, day)
     solar_date = Date.new(year, month, day)
     days = self.get_dates(solar_date)
-    # @calendar_symbol = locale
-    return self.from_days(days, self)
+    return self.lunar_from_days(days, self)
   end
 
   def self.is_in_this_days(days, left_days)
@@ -222,7 +225,7 @@ class LunarDate
     return self.is_in_this_days(days, left_days) == false
   end
 
-  def self.from_days(days, type)
+  def self.lunar_from_days(days, type)
     start_year = 1900
     target_month = 0
     is_leap_month = false
@@ -260,4 +263,32 @@ class LunarDate
 
     return target_date
   end
+
+  def self.to_solar(year, month, day, is_leap_month = false, type = self)
+    days = 0
+    year_diff = year-1900
+    year_info = self.year_info_map
+
+    year_diff.times do |year_idx|
+      days += year_info[year_idx][0]
+    end
+
+    (month-1).times do |month_idx|
+      total, normal, leap = self.lunardays_for_type(year_info[year_diff][month_idx+1])
+      days += total
+    end
+
+    days += (day-1)
+
+    if is_leap_month && year_info[year_diff][month] > 2
+      days += self.lunardays_for_type(year_info[year_diff][month])[1]
+    end
+
+    solar_date = @start_date+days
+
+    target_date = type.new(solar_date.year, solar_date.month, solar_date.day)
+    target_date.is_leap_month = is_leap_month if type == self
+
+    return target_date
+  end
 end

data/test/test_ruby_lunardate.rb

@@ -8,6 +8,11 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 9)
     assert_equal(date.day, 22)
     assert_equal(date.is_leap_month, false)
+
+    lunar_date = LunarDate.to_solar(1979, 9, 22, false)
+    assert_equal(lunar_date.year, 1979)
+    assert_equal(lunar_date.month, 11)
+    assert_equal(lunar_date.day, 11)
   end
 
   def test_to_lunar_19000101_from_solar_19000131
@@ -16,6 +21,11 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 1)
     assert_equal(date.day, 1)
     assert_equal(date.is_leap_month, false)
+
+    lunar_date = LunarDate.to_solar(1900, 1, 1, false)
+    assert_equal(lunar_date.year, 1900)
+    assert_equal(lunar_date.month, 1)
+    assert_equal(lunar_date.day, 31)
   end
 
   def test_to_lunar_19020101_from_solar_19020208
@@ -24,6 +34,11 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 1)
     assert_equal(date.day, 1)
     assert_equal(date.is_leap_month, false)
+
+    lunar_date = LunarDate.to_solar(1902, 1, 1, false)
+    assert_equal(lunar_date.year, 1902)
+    assert_equal(lunar_date.month, 2)
+    assert_equal(lunar_date.day, 8)
   end
 
   def test_to_lunar_19040101_from_solar_19040216
@@ -32,6 +47,11 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 1)
     assert_equal(date.day, 1)
     assert_equal(date.is_leap_month, false)
+
+    lunar_date = LunarDate.to_solar(1904, 1, 1, false)
+    assert_equal(lunar_date.year, 1904)
+    assert_equal(lunar_date.month, 2)
+    assert_equal(lunar_date.day, 16)
   end
 
   def test_to_lunar_20140930_from_solar_20141023
@@ -40,6 +60,11 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 9)
     assert_equal(date.day, 30)
     assert_equal(date.is_leap_month, false)
+
+    lunar_date = LunarDate.to_solar(2014, 9, 30, false)
+    assert_equal(lunar_date.year, 2014)
+    assert_equal(lunar_date.month, 10)
+    assert_equal(lunar_date.day, 23)
   end
 
   def test_to_lunar_19870621_from_solar_19870815_leap
@@ -48,6 +73,11 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 6)
     assert_equal(date.day, 21)
     assert_equal(date.is_leap_month, true)
+
+    lunar_date = LunarDate.to_solar(1987, 6, 21, true)
+    assert_equal(lunar_date.year, 1987)
+    assert_equal(lunar_date.month, 8)
+    assert_equal(lunar_date.day, 15)
   end
 
   # 3rd MONTHTYPE test case
@@ -57,6 +87,11 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 10)
     assert_equal(date.day, 25)
     assert_equal(date.is_leap_month, false)
+
+    lunar_date = LunarDate.to_solar(2017, 10, 25, false)
+    assert_equal(lunar_date.year, 2017)
+    assert_equal(lunar_date.month, 12)
+    assert_equal(lunar_date.day, 12)
   end
 
   # 4th MONTHTYPE test case
@@ -66,6 +101,11 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 7)
     assert_equal(date.day, 29)
     assert_equal(date.is_leap_month, false)
+
+    lunar_date = LunarDate.to_solar(1987, 7, 29, false)
+    assert_equal(lunar_date.year, 1987)
+    assert_equal(lunar_date.month, 9)
+    assert_equal(lunar_date.day, 21)
   end
 
   # 5th MONTHTYPE test case
@@ -75,13 +115,48 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.month, 11)
     assert_equal(date.day, 19)
     assert_equal(date.is_leap_month, false)
+
+    lunar_date = LunarDate.to_solar(1955, 11, 19, false)
+    assert_equal(lunar_date.year, 1956)
+    assert_equal(lunar_date.month, 1)
+    assert_equal(lunar_date.day, 1)
   end
 
-  def test_to_lunar_from_Date_class_variable_20150908
+  def test_solar_from_lunar_19550329_leap_double_case_check
+    lunar_date = LunarDate.to_solar(1955, 3, 29, false)
+    assert_equal(lunar_date.year, 1955)
+    assert_equal(lunar_date.month, 4)
+    assert_equal(lunar_date.day, 21)
+
+    lunar_date_leap = LunarDate.to_solar(1955, 3, 29, true)
+    assert_equal(lunar_date_leap.year, 1955)
+    assert_equal(lunar_date_leap.month, 5)
+    assert_equal(lunar_date_leap.day, 20)
+  end
+
+  def test_solar_from_lunar_20150908_not_leap_month_case_check
+    lunar_date = LunarDate.to_solar(2015, 7, 26, false)
+    assert_equal(lunar_date.year, 2015)
+    assert_equal(lunar_date.month, 9)
+    assert_equal(lunar_date.day, 8)
+
+    lunar_date_leap = LunarDate.to_solar(2015, 7, 26, true)
+    assert_equal(lunar_date_leap.year, 2015)
+    assert_equal(lunar_date_leap.month, 9)
+    assert_equal(lunar_date_leap.day, 8)
+  end
+
+  def test_to_lunar_solar_from_Date_class_variable_20150908
   	date = Date.new(2015,9,8)
   	date = date.to_lunar
   	assert_equal(date.year, 2015)
     assert_equal(date.month, 7)
     assert_equal(date.day, 26)
+
+    date = Date.new(2015,7,26)
+  	date = date.to_solar
+  	assert_equal(date.year, 2015)
+    assert_equal(date.month, 9)
+    assert_equal(date.day, 8)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_lunardate
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - sunsidew
@@ -10,7 +10,7 @@ bindir: bin
 cert_chain: []
 date: 2015-09-08 00:00:00.000000000 Z
 dependencies: []
-description: Korean Lunar Calendar Library
+description: 'Korean lunar, solar date two-way convert library '
 email: sunsidew.yjw@gmail.com
 executables: []
 extensions: []
@@ -42,7 +42,7 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Korean Lunar Calendar Library
+summary: Korean Lunar/Solar Calendar Library
 test_files:
 - test/test_ruby_lunardate.rb
 has_rdoc: