mk_sunmoon 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 712def1dc7bb74b6e2e4b679726ba56fcffc1d1a
-  data.tar.gz: acc68ffa5f24534fd3e6903ca9d3fbbd3794f730
+SHA256:
+  metadata.gz: 798ad15b04b4a1662681d39c737b9c2985fce0a4334d50160ac8077a7da9a790
+  data.tar.gz: 2af757aa31f3b981c2c30e7fc4494c8015d254059d7ea1316d6dfb321e766dd8
 SHA512:
-  metadata.gz: d77610522d299fc58d61ba65a5fc0c33c332b84b3e582267b78977a24ca1a3bbf2f7f6521cb09458cb8120647e33c47d1383f72dd53e32763a03d35943a4debe
-  data.tar.gz: e43d9662120d775da3a8af37cf1004c775d40aaa7408c7ec01aa596767de00471c915aba32c7c3948e1ae480b6f29b87530aa27af164c13cea45e351e7839f09
+  metadata.gz: f26a1c02a1dbec6c6350f89bf0cb1015b9a627431391f6f338b6d6f56f67edc53250d74d889a59c17a0ac3e9059bc0410eb0858ea4e6adc7c138380e1f11b26f
+  data.tar.gz: b786093d1a752aef02e382b515ffccf6458448d8651c26da17b6dfb9b63d60e9629786db900f61f42022d5aca7ef60fa0aaff932cbdb5dd4e6efef973fc0b1cc

data/lib/mk_sunmoon/compute.rb

@@ -1,3 +1,5 @@
+require 'mk_time'
+
 module MkSunmoon
   module Compute
     module_function
@@ -57,157 +59,9 @@ module MkSunmoon
     # @return: dt
     #=========================================================================
     def compute_dt(year, month, day)
-      ym = sprintf("%04d-%02d", year, month)
-      y = year + (month - 0.5) / 12
-      case
-      when year < -500
-        t = (y - 1820) / 100.0
-        dt  = -20 + 32 * t ** 2
-      when -500 <= year && year < 500
-        t = y / 100.0
-        dt  = 10583.6
-             (-1014.41        + \
-             (   33.78311     + \
-             (   -5.952053    + \
-             (   -0.1798452   + \
-             (    0.022174192 + \
-             (    0.0090316521) \
-             * t) * t) * t) * t) * t) * t
-      when 500 <= year && year < 1600
-        t = (y - 1000) / 100.0
-        dt  = 1574.2         + \
-             (-556.01        + \
-             (  71.23472     + \
-             (   0.319781    + \
-             (  -0.8503463   + \
-             (  -0.005050998 + \
-             (   0.0083572073) \
-             * t) * t) * t) * t) * t) * t
-      when 1600 <= year && year < 1700
-        t = y - 1600
-        dt  = 120           + \
-             ( -0.9808      + \
-             ( -0.01532     + \
-             (  1.0 / 7129.0) \
-             * t) * t) * t
-      when 1700 <= year && year < 1800
-        t = y - 1700
-        dt  =  8.83           + \
-             ( 0.1603         + \
-             (-0.0059285      + \
-             ( 0.00013336     + \
-             (-1.0 / 1174000.0) \
-             * t) * t) * t) * t
-      when 1800 <= year && year < 1860
-        t = y - 1800
-        dt  = 13.72          + \
-             (-0.332447      + \
-             ( 0.0068612     + \
-             ( 0.0041116     + \
-             (-0.00037436    + \
-             ( 0.0000121272  + \
-             (-0.0000001699  + \
-             ( 0.000000000875) \
-             * t) * t) * t) * t) * t) * t) * t
-      when 1860 <= year && year < 1900
-        t = y - 1860
-        dt  =  7.62          + \
-             ( 0.5737        + \
-             (-0.251754      + \
-             ( 0.01680668    + \
-             (-0.0004473624  + \
-             ( 1.0 / 233174.0) \
-             * t) * t) * t) * t) * t
-      when 1900 <= year && year < 1920
-        t = y - 1900
-        dt  = -2.79      + \
-             ( 1.494119  + \
-             (-0.0598939 + \
-             ( 0.0061966 + \
-             (-0.000197  ) \
-             * t) * t) * t) * t
-      when 1920 <= year && year < 1941
-        t = y - 1920
-        dt  = 21.20     + \
-             ( 0.84493  + \
-             (-0.076100 + \
-             ( 0.0020936) \
-             * t) * t) * t
-      when 1941 <= year && year < 1961
-        t = y - 1950
-        dt  = 29.07      + \
-             ( 0.407     + \
-             (-1 / 233.0 + \
-             ( 1 / 2547.0) \
-             * t) * t) * t
-      when 1961 <= year && year < 1986
-        case
-        when ym < sprintf("%04d-%02d", 1972, 1)
-          t = y - 1975
-          dt = 45.45      + \
-              ( 1.067     + \
-              (-1 / 260.0 + \
-              (-1 / 718.0)  \
-              * t) * t) * t
-        when ym < sprintf("%04d-%02d", 1972, 7); dt = Const::TT_TAI + 10
-        when ym < sprintf("%04d-%02d", 1973, 1); dt = Const::TT_TAI + 11
-        when ym < sprintf("%04d-%02d", 1974, 1); dt = Const::TT_TAI + 12
-        when ym < sprintf("%04d-%02d", 1975, 1); dt = Const::TT_TAI + 13
-        when ym < sprintf("%04d-%02d", 1976, 1); dt = Const::TT_TAI + 14
-        when ym < sprintf("%04d-%02d", 1977, 1); dt = Const::TT_TAI + 15
-        when ym < sprintf("%04d-%02d", 1978, 1); dt = Const::TT_TAI + 16
-        when ym < sprintf("%04d-%02d", 1979, 1); dt = Const::TT_TAI + 17
-        when ym < sprintf("%04d-%02d", 1980, 1); dt = Const::TT_TAI + 18
-        when ym < sprintf("%04d-%02d", 1981, 7); dt = Const::TT_TAI + 19
-        when ym < sprintf("%04d-%02d", 1982, 7); dt = Const::TT_TAI + 20
-        when ym < sprintf("%04d-%02d", 1983, 7); dt = Const::TT_TAI + 21
-        when ym < sprintf("%04d-%02d", 1985, 7); dt = Const::TT_TAI + 22
-        when ym < sprintf("%04d-%02d", 1988, 1); dt = Const::TT_TAI + 23
-        end
-      when 1986 <= year && year < 2005
-        #t = y - 2000
-        #dt  = 63.86         + \
-        #     ( 0.3345       + \
-        #     (-0.060374     + \
-        #     ( 0.0017275    + \
-        #     ( 0.000651814  + \
-        #     ( 0.00002373599) \
-        #     * t) * t) * t) * t) * t
-        case
-        when ym < sprintf("%04d-%02d", 1988, 1); dt = Const::TT_TAI + 23
-        when ym < sprintf("%04d-%02d", 1990, 1); dt = Const::TT_TAI + 24
-        when ym < sprintf("%04d-%02d", 1991, 1); dt = Const::TT_TAI + 25
-        when ym < sprintf("%04d-%02d", 1992, 7); dt = Const::TT_TAI + 26
-        when ym < sprintf("%04d-%02d", 1993, 7); dt = Const::TT_TAI + 27
-        when ym < sprintf("%04d-%02d", 1994, 7); dt = Const::TT_TAI + 28
-        when ym < sprintf("%04d-%02d", 1996, 1); dt = Const::TT_TAI + 29
-        when ym < sprintf("%04d-%02d", 1997, 7); dt = Const::TT_TAI + 30
-        when ym < sprintf("%04d-%02d", 1999, 1); dt = Const::TT_TAI + 31
-        when ym < sprintf("%04d-%02d", 2006, 1); dt = Const::TT_TAI + 32
-        end
-      when 2005 <= year && year < 2050
-        case
-        when ym < sprintf("%04d-%02d", 2006, 1); dt = Const::TT_TAI + 32
-        when ym < sprintf("%04d-%02d", 2009, 1); dt = Const::TT_TAI + 33
-        when ym < sprintf("%04d-%02d", 2012, 7); dt = Const::TT_TAI + 34
-        when ym < sprintf("%04d-%02d", 2015, 7); dt = Const::TT_TAI + 35
-        when ym < sprintf("%04d-%02d", 2018, 1); dt = Const::TT_TAI + 36  # <= 第27回うるう秒実施までの暫定措置
-        else
-          t = y - 2000
-          dt  = 62.92    + \
-               ( 0.32217 + \
-               ( 0.005589) \
-               * t) * t
-        end
-      when 2050 <= year && year <= 2150
-        dt  = -20 \
-            + 32 * ((y - 1820) / 100.0) ** 2
-            - 0.5628 * (2150 - y)
-      when 2150 < year
-        t = (y - 1820) / 100.0
-        dt  = -20 + 32 * t ** 2
-      end
-      return dt
+      ymd = sprintf("%04d%02d%02d", year, month, day)
+      tm = MkTime.new(ymd)
+      return tm.dt
     end
 
     #=========================================================================
@@ -636,6 +490,14 @@ module MkSunmoon
       val_m = (val_2 * 60).truncate   # (分)計算
       val_3 = val_2 - (val_m / 60.0)  # (秒)計算
       val_s = (val_3 * 60 * 60).round
+      if val_s == 60
+        val_s = 0
+        val_m +=1
+      end
+      if val_m == 60
+        val_m = 0
+        val_h += 1
+      end
       return sprintf("%02d:%02d:%02d", val_h, val_m, val_s)
     end
 

data/lib/mk_sunmoon/version.rb

@@ -1,3 +1,3 @@
 module MkSunmoon
-  VERSION = "0.1.2"
+  VERSION = "0.1.7"
 end

data/mk_sunmoon.gemspec

@@ -27,7 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "mk_time"
+  #spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  #spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mk_sunmoon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - komasaru
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mk_time
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +96,7 @@ homepage: https://github.com/komasaru/mk_sunmoon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.2.9
+signing_key:
 specification_version: 4
 summary: Sunrise, Sunset, Moonrise, Moonset library.
 test_files: []