british_suntimes 0.1.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 38a8f6343d904803f701d10d143f170abb35971e
-  data.tar.gz: 3a9a693a25d25a83d320d8170040ee8135df2708
+SHA256:
+  metadata.gz: 1216b26e7c62951c228d8cfa7f3fd731d53b08cad84802da98135541cc5e3f30
+  data.tar.gz: cfce6f3a0054424bca50e8a28c2e1c55ed9d25b77e190f3c16791c6a85a9bbe9
 SHA512:
-  metadata.gz: ee040b326c73ca799e8afdad5e48ccb964ca0395d2c37e40616a803bc0efe5df2b4d86fd0cdd2436734b6c81fc3632674abff132718e09ffee60352228472c1a
-  data.tar.gz: 3eae29293490f39a9fa195ac2569c12170b061f6c92d70343151b71a962532f81e292bbffb482cb4603011c087bdc59b71a9e9dd3be2e2872b8aba75d5ba09e6
+  metadata.gz: c71b48736907a9a093043573ff6dec821db92775b95681ce3098a31b38d19406ac8ae25912e3e647d97b183dd21cf82fbffee8dcee5f6c1fcfd33ac52b600678
+  data.tar.gz: 0b11a55f64a5b059af12711a10827d2a43a03efea137c8fa695760baace1c3e00395a320f519ed67ece3ceab9eea6f360aebfe8e4628d75fef9a076a0b6524df

data/lib/british_suntimes.rb

@@ -3,22 +3,30 @@
 # file: british_suntimes.rb
 
 
+require 'dynarex'
 require 'geocoder'
 require 'chronic_cron'
 require 'solareventcalculator'
 
+require 'subunit'
+require 'human_speakable'
+
 
 
 class BritishSuntimes
 
-  attr_reader :to_h, :bst_start, :bst_end
+  attr_reader :to_h, :bst_start, :bst_end, :to_dx, :longest_day, :shortest_day
+
 
+  def initialize(year=Date.today.year.to_s, location: 'edinburgh',
+                 debug: false)
 
-  def initialize(year= Date.today.year.to_s, location: 'edinburgh')
+    @location, @debug = location, debug
 
     a = (Date.parse(year + ' Jan')...Date.parse(year.succ + ' Jan')).to_a
     g = Geocoder.search(location)
 
+    puts 'finding the times ...' if @debug
     times = a.inject({}) do |r, date|
 
       calc = SolarEventCalculator.new(date, *g[0].coordinates)
@@ -33,20 +41,82 @@ class BritishSuntimes
 
     # alter the times for British summertime
 
-    d1 = ChronicCron.new('last sunday in March at 1am', 
+    @bst_start = ChronicCron.new('last sunday in March at 1am',
           Time.local(year)).to_date
-    d2 = ChronicCron.new('last sunday in October at 2am', 
+    @bst_end = ChronicCron.new('last sunday in October at 2am',
           Time.local(year)).to_date
 
-    @bst_start, @bst_end = d1, d2
 
-    (d1...d2).to_a.each do |d|
+    (@bst_start...@bst_end).to_a.each do |d|
       t1, t2 = times[d.strftime("%d %b")].map {|x| Time.parse(x)}
       t1 += 60 * 60; t2 += 60 * 60
       times[d.strftime("%d %b")] = [t1.strftime("%H:%M"), t2.strftime("%H:%M")]
     end
 
-    @to_h = times  
+    @year, @location, @to_h = year, location, times
+    puts 'buklding @to_dx' if @debug
+    @to_dx = build_dx()
+
+  end
+
+  # exports the sun times to a raw Dynarex file
+  #
+  def export(filename=@location + "-suntimes-#{@year}.txt")
+    File.write filename, @to_dx.to_s
+  end
+
+  private
+
+  def build_dx()
+
+    dx = Dynarex.new 'times[title, tags, desc, bst_start, ' +
+        'bst_end, longest_day, shortest_day]/day(date, sunrise, sunset)'
+    dx.title = @location + " sunrise sunset times " + @year
+    dx.tags = @location + " times sunrise sunset %s" % [@year]
+    dx.delimiter = ' # '
+    dx.bst_start, dx.bst_end = @bst_start.to_s, @bst_end.to_s
+    dx.desc = 'Adjusted for British summertime'
+
+    @to_h.each {|k,v| dx.create({date: k, sunrise: v[0], sunset: v[1]}) }
+
+    a = dx.all.map do |x|
+      Time.parse(x.date + ' ' + x.sunset) - Time.parse(x.date + ' ' + x.sunrise)
+    end
+
+    shortest, longest = a.minmax.map {|x| dx.all[a.index(x)]}
+    @longest_day = dx.longest_day = longest.date
+    @shortest_day = dx.shortest_day = shortest.date
+
+    dx
+  end
+
+end
+
+class BritishSuntimesAgent < BritishSuntimes
+  using HumanSpeakable
+  using Ordinals
+
+
+  def longest_day()
+
+    d = super()
+    days = (Date.parse(d) - Date.today).to_i
+    sunrise, sunset = to_dx().to_h[d]
+
+    t1 = Time.parse(d + ' ' + sunrise)
+    t2 = Time.parse(d + ' ' + sunset)
+
+    su = Subunit.new(units={minutes:60, hours:60}, seconds: (t2 - t1).to_i)
+    duration = su.to_s omit: [:seconds]
+
+    d2 = Date.parse(d)
+    day = d2.strftime("#{d2.day.ordinal} %B")
+
+    s = d2.humanize
+    msg =  s[0].upcase + s[1..-1] + ", the longest day of the year, #%s \
+will enjoy %s of sunshine. The sun will rise at %sam \
+and set at %spm." % [@location, duration, t1.strftime("%-I:%M"), \
+                             t2.strftime("%-I:%M")]
 
   end
 

data.tar.gz.sig

@@ -1,2 +1 @@
-l	����s��1˪xNc�a�'�+N�nes��d'���Q���=��(oEB����f=v9���B�%}LTz$�S�b-����ґ��%�/���T�G��vû��Ɯ3���:�H��wİ��B�4��
-�3�ͬ����4@���'��qK�u׈��0|��1;�2:Fc�*RkF�>���~tO�����&�>�b�K���,��V��u���+�����ӆ#�weQ|���a����V;�x
+�%����DX�z?�mM�Q�V��B�Z@�Y��)��9����q���l�f����/���s�e�k�}���&Sw�C�!5�y�d��7iQ!����Vy�A'����(�JB�G����F���ǔ��%w�Q.��Z��El8��AW�D��hoJ���ls��{�
|-���=��ʼ��/�F�Rd({���ro$y�Ҩ(�\I��]�z�=�XHخ�Tp}9��޴�{T�Z�J%n����]�\��Z�@�)}*�xB���h�	c

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: british_suntimes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,68 +10,93 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzA4MjMyMjA5WhcN
-  MTkwMzA4MjMyMjA5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiAALr
-  RUV3gWaErxprpgvbKvK0BXBDbt7bg2g6yT4k7VmZLg3jSxIcYw4kg5OUQou+Rawo
-  geosw2OlYPwhWk/Mi6BSUOk8oxPplPBjSiFeAVPllcl+c/wDVPBOw5UIyAORRtqO
-  /jPjpOSU/rWsI29+TlyW3xJyrygZQq7Qt6FyxNn0d4JNi5muCfhDeW0eoYA7SP2p
-  U8HH/wNn2ywYALtsLBGAVsgPvklyjJPVWiRSyIvvsjzbw7A5FShZyzHjks5vYesi
-  81j3L+nXsKdUxAJvTsF7pla3R38S77Ofzpu0e+/oLe9YcsyfJ8mEMHaQ8ZQpwT/d
-  XYVXASZE0nF0MV+/AgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFJswy1odtxLSCTl/h63FVI/I+bZHMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBADDcd+EUEgN89jQnTJR9
-  h2HBjCEY7pi34Uvt7r6j0JQ1KdxiImCzuodCwhG/N7GdSvsbEz7NIiFYCGOpuz/P
-  bfG4Mgm5HvF23peANQb/4FsyLrTeU6kfVVX9Y4+fNzqvtoZcGFatwkd6HwTVeAcF
-  MADD6VocV947BlLDCnvXhItufSvlXBePeagBrHwU9Rn4ZlXRBqfY3ARgoKds4JOD
-  Uaa19ssID793D5r9XNEJaj4b71bc3ZV9xN5T7pjk6xR+qo9UDpbjjebNDmXyRF+k
-  6NfdgdbEPoIwx9xSj/tJ26i0eNPJ53cC1rDinNZhk6WUm3t/kVCn79iPKg1SWhvl
-  /Zg=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjA3MTAwNTM2WhcN
+  MjMwMjA3MTAwNTM2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCqnO2W
+  AgUy2WtEBeOP97aNKIH2uevqxLjSSPaD8wd/wRrcERhCQy1kCSRSMRdRN6Ho0rAN
+  47Hba3oy62NhliBBeANqTTv4B6wbLrlc3DYhlk0Gh9JlX6C7gIaS4QUVh202bqhc
+  glmsYh4y/6XJqjqb4zrhORK3n0AKohUDDX5GKBewcD/6ToGZ9Xpu4TdFz6RnoeBP
+  pkoA+cQSuJop6NenaRoHB7qoGBNTbvXhNwT3MBTOJWQdTzBHAyFbEBbMQ4XUX350
+  bfufpRFoWmyL14Cxh1tElx5OajX3kw3Cq6xKwPII6GBaKKAMExCiOT0J91q0DFhh
+  MlNoP5gTO3WNg5HyCbutQzl1BHPrHxJr3kLlhz2yIhJCSl+WRCItXF33CvJh89h3
+  t5Nvxg86DzP4ZpVs3X68tKAR00KBPOtVm25DFC23fAA4W5BA4ezOiArEiq9svLPf
+  w1F7JsXxOTLp5ul7j5r4vPWA9zlSnHB4TRKwh8dCvpn6IJmuUTz+IY+xxbMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU7QIkdGZN
+  j1FMBxigQNUvCCdvbU8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAF2UDw3TXBk/1o9VNI3TKnfvluH7sKYON0h3oXAU6
+  iU7Dh2sp+v/tSFpvHhNC1PCzq4Y8sIrNOQrGHmTvan6kFqf9YFsN16jNtVlZzv6V
+  3couH2Tfb9Tw/kxPOz18sNz5EimXf01lnjK7QFzgrtTUwJ5BGj7781IYN/XpytZ9
+  v59XTGxwNKdKWLT0dVI57j3yEHV88e8P1UPRaEEcZmV9Qxm/iGuAyKF7Fd2x91j5
+  qatVoadW1TpYTcfZXQr5B6qwAdn6LT2QCfr1h8tTLp0975kbojr0i/PQW2aDPQH5
+  IFIKW3ML1zCL9CRhBtCgXDtqnVg8IRBKW8T1XsEnveDtywyECDRDX0jkv5oM5ZWO
+  csOuxXIf8sq4OG5FCXoWb2GDk5TwUQx2/kGhflzf+0a/2sf98tSYerGzYeobAlS9
+  FW4AJTaOjuf5+cYOQjF3Di+9vB/yLrtvGk4Be/xxiWpo0DNyql5byYIyD5vt8Ce2
+  6MBcxBvjf/Cxj/wrZclExElj
   -----END CERTIFICATE-----
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dynarex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: RubySunrise
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +106,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,9 +116,49 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
+- !ruby/object:Gem::Dependency
+  name: subunit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+- !ruby/object:Gem::Dependency
+  name: human_speakable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Generates the British sunrise and sunset times.