wareki 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b36739d46cbd6fd70410c22e27494c22d4bb895
-  data.tar.gz: cff175bc8ba633cb0521eb0d2e330be0f7568c09
+  metadata.gz: e17edc37b9e9bab6955fa886a4b2150927d75e1c
+  data.tar.gz: cf48656bd64cbbf26a3d541af8f553e649d4757e
 SHA512:
-  metadata.gz: d388a21610e1f9be78807c87898d4c9b6df93302f6d8b97a7590e35b81903d2c6a69dde21aacead7d3384622f8c84cdd55ddd96cad850c6a8fe7e2ffde2075ed
-  data.tar.gz: 3091f85bde645d4d34ba827bd8e94e3bf4e332dbdf265c9ab6702414746a283e029bc06c4e75da871b37fa82373b5fb0506e278af9f5b2f23c34c0300acc769a
+  metadata.gz: 4b437da1a431d1059d5ff1a4f849e999613cb06ca94c0b6d47d86350cf7e18abc30bc993605a41432ab3f64c50a606406ee3c69dd484ee7f0d440372cb26efb5
+  data.tar.gz: 3cfc6b10e3906c358d57c19bf179f440df2b18c2365989f7b80d66637c628875fa16cc441d53dcbea9a582855b0e5ce93582d0b379397502a5d00930a65b21ff

data/ChangeLog

@@ -1,3 +1,10 @@
+2017-07-25  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 0.2.0
+	* Support date calculation (limited with Number)
+	* Add compare methods
+	* Fix error with "晦日" after Date::GREGORIAN
+
 2017-06-01  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version: 0.1.4

data/lib/wareki/date.rb

@@ -3,11 +3,14 @@ require 'date'
 require 'wareki/common'
 require 'wareki/utils'
 module Wareki
-
   class Date
     attr_reader :jd
     attr_accessor :year, :month, :day, :era_year, :era_name
 
+    def self.today
+      jd(::Date.today.jd)
+    end
+
     def self._parse(str)
       match = REGEX.match(str.to_s.gsub(/[[:space:]]/, ''))
       if !match || !match[:year]
@@ -144,6 +147,10 @@ module Wareki
       ::Date.jd(jd, start)
     end
 
+    def to_time
+      to_date.to_time
+    end
+
     def strftime(format_str = "%JF")
       ret = format_str.to_str.gsub(/%J([fFyYegGoOiImMsSlLdD][kK]?)/) { format($1) || $& }
       ret.index("%") or return ret
@@ -204,5 +211,46 @@ module Wareki
         nil
       end
     end
+
+    def eql?(other)
+      begin
+        [:year, :month, :day, :era_year, :era_name, :leap_month?].each do |attr|
+          other.public_send(attr) == public_send(attr) or return false
+        end
+      rescue => e
+        return false
+      end
+      true
+    end
+    alias_method :==, :eql?
+
+    def ===(other)
+      begin
+        other.jd == jd or return false
+      rescue => e
+        return false
+      end
+      true
+    end
+
+    def -(other)
+      if other.class.to_s == "ActiveSupport::Duration"
+        raise NotImplementedError, "Date calcration with ActiveSupport::Duration currently is not supported. Please use numeric."
+      else
+        other.respond_to?(:to_date) and other = other.to_date
+        other.respond_to?(:jd) and other = other.jd
+        self.class.jd jd - other
+      end
+    end
+
+    def +(other)
+      if other.class.to_s == "ActiveSupport::Duration"
+        raise NotImplementedError, "Date calcration with ActiveSupport::Duration currently is not supported. Please use numeric."
+      else
+        other.respond_to?(:to_date) and other = other.to_date
+        other.respond_to?(:jd) and other = other.jd
+        self.class.jd jd + other
+      end
+    end
   end
 end

data/lib/wareki/utils.rb

@@ -101,7 +101,7 @@ module Wareki
         else
           tmp_m += 1
         end
-        day = (::Date.new(tmp_y, tmp_m, 1, Date::GREGORIAN)-1).day
+        day = (::Date.new(tmp_y, tmp_m, 1, ::Date::GREGORIAN)-1).day
       else
         yobj = YEAR_BY_NUM[year] or
           raise UnsupportedDateRange, "Cannot find year #{self.inspect}"

data/lib/wareki/version.rb

@@ -1,3 +1,3 @@
 module Wareki
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Tatsuki Sugiura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler