ruby_lunardate 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3982761f8a047576b3f1fbef2665397a3986bd68
-  data.tar.gz: f05ea450e7dea591ce5b3f88f2c5bafa376db893
+  metadata.gz: e27df958bc842fd3b234da92b3f17650d513bc23
+  data.tar.gz: aacff5f2856b9b928b1669708bc713394bb02c1c
 SHA512:
-  metadata.gz: 389adbfa69caf9e06ebda5aaec0f2961c2bf7705eacca751e8f0f186d736d67099b535816b5f23655cebe70af14b5030d55b45bae26604b03c11cfec9552c318
-  data.tar.gz: 390716a6d4caa79388984318333bb49dd8ce5c56617eaa3025749d7ba28522e853178b3c3cf3f6e3754e0944f3e7ddb4e6798d31e1df0e2751f9e82909ef0d9a
+  metadata.gz: ba4bc961dc82040eba279cd62ee02abfa710c078f130c729cf5f9e9385382ec8eb2138ade7fde0df1f43e94794cc7243318b1f96e427763ec5fe7203fa26d7aa
+  data.tar.gz: d42a36287e5ca14dab5976c779435d209952140a84bc0fb0a22e4cc11c9a247e05fdc2e118b6faae87be17dad06f5906d33473cb6cf1e8175d3b242e62e5acb1

data/lib/ruby_lunardate.rb

@@ -168,13 +168,12 @@ LUNARDAYS_FOR_MONTHTYPE = {
 }
 
 class Date
-  def to_lunar
-    days = LunarDate.get_dates(self)
-    return LunarDate.lunar_from_days(days, self.class)
+  def from_solar
+    return LunarDate.from_solar(self.year, self.month, self.day)
   end
 
   def to_solar(is_leap_month = false)
-    return LunarDate.to_solar(self.year, self.month, self.day, is_leap_month, self.class)
+    return LunarDate.to_solar(self.year, self.month, self.day, is_leap_month)
   end
 end
 
@@ -207,14 +206,14 @@ class LunarDate
     return CALENDAR_YEAR_INFO_MAP[@calendar_symbol]
   end
 
-  def self.get_dates(solar_date)
-  	return (solar_date - @start_date).to_i
+  def self.get_days(solar_date)
+    return (solar_date - @start_date).to_i
   end
 
   def self.from_solar(year, month, day)
     solar_date = Date.new(year, month, day)
-    days = self.get_dates(solar_date)
-    return self.lunar_from_days(days, self)
+    days = self.get_days(solar_date)
+    return self.lunar_from_days(days)
   end
 
   def self.is_in_this_days(days, left_days)
@@ -225,7 +224,7 @@ class LunarDate
     return self.is_in_this_days(days, left_days) == false
   end
 
-  def self.lunar_from_days(days, type)
+  def self.lunar_from_days(days)
     start_year = 1900
     target_month = 0
     is_leap_month = false
@@ -257,14 +256,13 @@ class LunarDate
       days -= year_days
       start_year += 1
     end
+    
+    lunar_date = 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
+    return lunar_date
   end
 
-  def self.to_solar(year, month, day, is_leap_month = false, type = self)
+  def self.to_solar(year, month, day, is_leap_month = false)
     days = 0
     year_diff = year-1900
     year_info = self.year_info_map
@@ -286,9 +284,6 @@ class LunarDate
 
     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
+    return solar_date
   end
-end
+end

data/test/test_ruby_lunardate.rb

@@ -146,17 +146,17 @@ class TestRubyLunarDate < Minitest::Test
     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)
+  def test_from_lunar_solar_from_Date_class_variable_20150908
+  	lunar_date = Date.new(2015,9,8).from_solar
+  	assert_equal(lunar_date.year, 2015)
+    assert_equal(lunar_date.month, 7)
+    assert_equal(lunar_date.day, 26)
+    assert_equal(lunar_date.class, LunarDate)
+
+    solar_date = Date.new(2015,7,26).to_solar
+  	assert_equal(solar_date.year, 2015)
+    assert_equal(solar_date.month, 9)
+    assert_equal(solar_date.day, 8)
+    assert_equal(solar_date.class, Date)
   end
 end

metadata

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