datte 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0e1c8fca7c6a73723a3bc60574de95c406468d
-  data.tar.gz: 1078bb00faf8a3bbacfcf5a0628d4c21fc69e540
+  metadata.gz: 47ea673d705622d1bdc0a948f5176642ced4efb1
+  data.tar.gz: 23d0c88f4952ab62f3e6930c923f38bbde6b7d5b
 SHA512:
-  metadata.gz: e8034556e393d1f32c190701ea4bfbaee059c1887afe2822f8836ce05988a7f19248484a134e80371ee0fb932797cdaf7ec19c9a5e8922c94f4f3fda11dec2ec
-  data.tar.gz: f8e3320d07bfd9897e34d3aead8ff0713226c77b1fca081e75b7d931cae1939b3f3c7db0ab9703abe21074e541bd26e1bd1a31317c2d1f9f2007fc575aa607b3
+  metadata.gz: 67e32414d8019a6ce6dad8b9c20f73069b12a3567d7485d3a2fb1234ad64077a0149a7ac3d93df920981f52a1cf9130155602516ea155e9b86198dc9977b5dd1
+  data.tar.gz: 4f4020ee371670fb1671f1795f62182c52062fc74cbbfd733ab61f2b1c119c52883b1f445e3a58146b236f2fef1f4f55c2b1a12303cef3f691adc00e0c8a804d

data/lib/datte/dattetime.rb

@@ -35,11 +35,23 @@ module Datte
 
     # 何年後、何ヶ月後、何日後, 何時間後, 何分後
     def after(md)
-      @date >> (md[:year].to_i * 12) if md.matched?(:year) # 何年後
-      @date >> md[:month].to_i if md.matched?(:month) # 何ヶ月後
-      @date + md[:day].to_i if md.matched?(:day) # 何日後
-      @date + Rational(md[:hour].to_i, 24) # 何時間後
-      @date + Rational(md[:hour].to_i, 24 * 60) # 何分後
+      if md.matched?(:year)
+        @year, @month, @day = now[:year] + md[:year].to_i, now[:month], now[:day]
+      end
+      if md.matched?(:month)
+        @year, @month, @day = now[:year], now[:month] + md[:month].to_i, now[:day]
+      end
+      if md.matched?(:day)
+        @year, @month, @day = now[:year], now[:month], now[:day] + md[:day].to_i
+      end
+      if md.matched?(:hour)
+        @hour, @min = now[:hour] + md[:hour].to_i, now[:min]
+      end
+      # @date >> (md[:year].to_i * 12) if md.matched?(:year) # 何年後
+      # @date >> md[:month].to_i if md.matched?(:month) # 何ヶ月後
+      # @date + md[:day].to_i if md.matched?(:day) # 何日後
+      # @date + Rational(md[:hour].to_i, 24) if md.matched?(:hour) # 何時間後
+      # @date + Rational(md[:hour].to_i, 24 * 60) if md.matched?(:hour) # 何分後
     end
 
     private

data/lib/datte/version.rb

@@ -1,3 +1,3 @@
 module Datte
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datte
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - pokohide
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler