ruby_lunardate 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79c9479030803bf84aa20b43820c3e6b3fdfda4b
-  data.tar.gz: c1f493139625884850cfa81558bf4e9ad01681c8
+  metadata.gz: d318602ae19da19f9def05abac553fce2b683ec5
+  data.tar.gz: cec1f854a1a758b80570de28afb76880caf1fd3d
 SHA512:
-  metadata.gz: b3120394288a3e7cde36df0ff25c909606b290c3f8ccfb01796f63802f843a9a79c752f6f25cdcd62a63938ad6874238090346955a2a0ab18164b77adf5ca31d
-  data.tar.gz: 84f3a499918027decfac616005ea597f142806f0c4f83985750606157690456b67c693d5cba6316e74614ce6d96170d7388fc8cca251da5f65b093a04f3de05c
+  metadata.gz: 79de1c3243893ffcef37729b39b601fff845e9ff1b491262dd91aec3c4c798a137d7d06fc1db04aa9f6d56790281088aad8519662e221e1f42624c1f29b185dd
+  data.tar.gz: 2d79334973cde61e908c1783c9c607157139be534ddb31e8280d4bc9e53d7c9daffdb3df4d6028a8dad3e786cca439f061a50e81ad9350223b3954c9ebb61482

data/lib/ruby_lunardate.rb

@@ -167,6 +167,17 @@ LUNARDAYS_FOR_MONTHTYPE = {
   6 => [60, 30, 30]
 }
 
+class Date
+  def to_lunar
+    days = LunarDate.get_dates(self)
+    return LunarDate.from_days(days, self.class)
+  end
+
+  def to_lunar!
+    self.self.to_lunar
+  end
+end
+
 class LunarDate
   attr_accessor :year, :month, :day, :is_leap_month
 
@@ -196,11 +207,15 @@ class LunarDate
     return CALENDAR_YEAR_INFO_MAP[@calendar_symbol]
   end
 
+  def self.get_dates(solar_date)
+  	return (solar_date - @start_date).to_i
+  end
+
   def self.to_lunar(year, month, day, locale = :ko)
     solar_date = Date.new(year, month, day)
-    days = (solar_date - @start_date).to_i
+    days = self.get_dates(solar_date)
     # @calendar_symbol = locale
-    return self.from_days(days)
+    return self.from_days(days, self)
   end
 
   def self.is_in_this_days(days, left_days)
@@ -211,7 +226,7 @@ class LunarDate
     return self.is_in_this_days(days, left_days) == false
   end
 
-  def self.from_days(days)
+  def self.from_days(days, type)
     start_year = 1900
     target_month = 0
     is_leap_month = false
@@ -244,6 +259,9 @@ class LunarDate
       start_year += 1
     end
 
-    return self.new(start_year, target_month + 1, days + 1, is_leap_month)
+    target_date = type.new(start_year, target_month + 1, days + 1)
+    target_date.is_leap_month = is_leap_month if type == self
+
+    return target_date
   end
 end

data/test/test_ruby_lunardate.rb

@@ -76,4 +76,12 @@ class TestRubyLunarDate < Minitest::Test
     assert_equal(date.day, 19)
     assert_equal(date.is_leap_month, false)
   end
+
+  def test_to_lunar_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)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_lunardate
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - sunsidew