lita-onewheel-moonphase 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b601c31654b9f635df46a9e42fa8c6c41e00e0d
-  data.tar.gz: d1d2585d746d61aa58a0b1bc043f48e70904fc4b
+  metadata.gz: 183a754e5ff2c25a117568596c0caa002e62b8fe
+  data.tar.gz: fc8f1303613a395dcfb0fe0b18c921ff0f6d5c0a
 SHA512:
-  metadata.gz: 54ebd8c8590fbd07da4fbe89c3fe91a4764cde116914124f74e1613093b6d40504da3b5a5a698e4c967ceb841e12756dec9f57a77a78f0d182c709ec64209444
-  data.tar.gz: a5cc314cca06a484062af7c42371ab7adfaeb6b6eb2f85e11832f44fdc01da177b4b368c6d0d8d5a604b38e4e2d94c0b83c77e940e7d8f9f09a3b0c82296b5c8
+  metadata.gz: ae62b04972b4b3a0d71fe661d0a0f39b88274b2576188dce8d60bf173fe16605a035532134da5c40650bd13262eac62fa1f2969a8c2f14cba920103841cfd16e
+  data.tar.gz: f4154c2e2296e9ea8a9d88ed9ca587522a05f1f312864ab9b664dd8d0a498b3d8711fc59480733f25c9a4c909a1900cb733b22da69fcbc83974d2481c314e6a7

data/lib/lita/handlers/onewheel_moonphase.rb

@@ -8,6 +8,9 @@ module Lita
             command: true,
             help: {'moon [location]' => 'Get Moon phase data'}
 
+      # 🌑🌛
+      # emoonjis = %w(🌚🌘🌗🌔🌕🌖🌓🌒)
+
       def moon(response)
         location = get_location(response)
 
@@ -17,7 +20,7 @@ module Lita
         rise_time = Time.parse moon['moondata']['rise']
         set_time = Time.parse moon['moondata']['set']
 
-        reply = "Moon phase #{moon['moondata']['fracillum']}, #{moon['moondata']['curphase']}.  "
+        reply = "#{get_moonmoji(moon['moondata']['fracillum'], moon['moondata']['curphase'])} Moon phase #{moon['moondata']['fracillum']}, #{moon['moondata']['curphase']}.  "
         reply += "Rise: #{rise_time.strftime("%H:%M")}  Set: #{set_time.strftime('%H:%M')}"
         Lita.logger.debug "Replying with #{reply}"
         response.reply reply
@@ -40,6 +43,30 @@ module Lita
         location
       end
 
+      # Next step, determine waxing or waning.
+      def get_moonmoji(percent_full, phase)
+        moonmoji = ''
+        waning = false
+
+        if phase.match /waning/i
+          waning = true
+        end
+
+        case percent_full.sub('%', '').to_i
+          when 0..1
+            moonmoji = '🌚'
+          when 2..32
+            moonmoji = waning ? '🌘' : '🌒'
+          when 33..62
+            moonmoji = phase.match(/last/i) ? '🌗' : '🌓'
+          when 63..90
+            moonmoji = waning ? '🌖' : '🌔'
+          when 91..100
+            moonmoji = '🌕'
+        end
+        moonmoji
+      end
+
       Lita.register_handler(self)
     end
   end

data/lita-onewheel-moonphase.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-moonphase'
-  spec.version       = '1.0.0'
+  spec.version       = '2.0.0'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = %q{Lita interface to a lambda representing Moon phase data.}

data/spec/fixtures/moon_first_quarter.json

@@ -0,0 +1,25 @@
+{
+  "year": 2017,
+  "month": 8,
+  "day": 27,
+  "dayOfWeek": "Sunday",
+  "lng": -122.676552,
+  "lat": 45.523316,
+  "location": "45.5230622,-122.6764816",
+  "address": "11 NW 6th Ave, Portland, OR 97209, USA",
+  "tz": -8,
+  "sundata": {
+    "civilRise": "2017-8-27T04:55:00-8",
+    "rise": "2017-8-27T05:26:00-8",
+    "transit": "2017-8-27T12:12:00-8",
+    "set": "2017-8-27T18:57:00-8",
+    "civilSet": "2017-8-27T19:28:00-8"
+  },
+  "moondata": {
+    "fracillum": "35%",
+    "curphase": "First Quarter",
+    "rise": "2017-8-27T11:45:00-8",
+    "transit": "2017-8-27T17:03:00-8",
+    "set": "2017-8-27T22:16:00-8"
+  }
+}

data/spec/fixtures/moon_last_quarter.json

@@ -0,0 +1,25 @@
+{
+  "year": 2017,
+  "month": 8,
+  "day": 27,
+  "dayOfWeek": "Sunday",
+  "lng": -122.676552,
+  "lat": 45.523316,
+  "location": "45.5230622,-122.6764816",
+  "address": "11 NW 6th Ave, Portland, OR 97209, USA",
+  "tz": -8,
+  "sundata": {
+    "civilRise": "2017-8-27T04:55:00-8",
+    "rise": "2017-8-27T05:26:00-8",
+    "transit": "2017-8-27T12:12:00-8",
+    "set": "2017-8-27T18:57:00-8",
+    "civilSet": "2017-8-27T19:28:00-8"
+  },
+  "moondata": {
+    "fracillum": "35%",
+    "curphase": "Last Quarter",
+    "rise": "2017-8-27T11:45:00-8",
+    "transit": "2017-8-27T17:03:00-8",
+    "set": "2017-8-27T22:16:00-8"
+  }
+}

data/spec/fixtures/moon_waning_crescent.json

@@ -0,0 +1,25 @@
+{
+  "year": 2017,
+  "month": 8,
+  "day": 27,
+  "dayOfWeek": "Sunday",
+  "lng": -122.676552,
+  "lat": 45.523316,
+  "location": "45.5230622,-122.6764816",
+  "address": "11 NW 6th Ave, Portland, OR 97209, USA",
+  "tz": -8,
+  "sundata": {
+    "civilRise": "2017-8-27T04:55:00-8",
+    "rise": "2017-8-27T05:26:00-8",
+    "transit": "2017-8-27T12:12:00-8",
+    "set": "2017-8-27T18:57:00-8",
+    "civilSet": "2017-8-27T19:28:00-8"
+  },
+  "moondata": {
+    "fracillum": "15%",
+    "curphase": "Waning Crescent",
+    "rise": "2017-8-27T11:45:00-8",
+    "transit": "2017-8-27T17:03:00-8",
+    "set": "2017-8-27T22:16:00-8"
+  }
+}

data/spec/fixtures/moon_waning_gibbous.json

@@ -0,0 +1,25 @@
+{
+  "year": 2017,
+  "month": 8,
+  "day": 27,
+  "dayOfWeek": "Sunday",
+  "lng": -122.676552,
+  "lat": 45.523316,
+  "location": "45.5230622,-122.6764816",
+  "address": "11 NW 6th Ave, Portland, OR 97209, USA",
+  "tz": -8,
+  "sundata": {
+    "civilRise": "2017-8-27T04:55:00-8",
+    "rise": "2017-8-27T05:26:00-8",
+    "transit": "2017-8-27T12:12:00-8",
+    "set": "2017-8-27T18:57:00-8",
+    "civilSet": "2017-8-27T19:28:00-8"
+  },
+  "moondata": {
+    "fracillum": "75%",
+    "curphase": "Waning Gibbous",
+    "rise": "2017-8-27T11:45:00-8",
+    "transit": "2017-8-27T17:03:00-8",
+    "set": "2017-8-27T22:16:00-8"
+  }
+}

data/spec/fixtures/{moon.json → moon_waxing_crescent.json}

@@ -16,7 +16,7 @@
     "civilSet": "2017-8-27T19:28:00-8"
   },
   "moondata": {
-    "fracillum": "36%",
+    "fracillum": "13%",
     "curphase": "Waxing Crescent",
     "rise": "2017-8-27T11:45:00-8",
     "transit": "2017-8-27T17:03:00-8",

data/spec/fixtures/moon_waxing_gibbous.json

@@ -0,0 +1,25 @@
+{
+  "year": 2017,
+  "month": 8,
+  "day": 27,
+  "dayOfWeek": "Sunday",
+  "lng": -122.676552,
+  "lat": 45.523316,
+  "location": "45.5230622,-122.6764816",
+  "address": "11 NW 6th Ave, Portland, OR 97209, USA",
+  "tz": -8,
+  "sundata": {
+    "civilRise": "2017-8-27T04:55:00-8",
+    "rise": "2017-8-27T05:26:00-8",
+    "transit": "2017-8-27T12:12:00-8",
+    "set": "2017-8-27T18:57:00-8",
+    "civilSet": "2017-8-27T19:28:00-8"
+  },
+  "moondata": {
+    "fracillum": "75%",
+    "curphase": "Waxing Gibbous",
+    "rise": "2017-8-27T11:45:00-8",
+    "transit": "2017-8-27T17:03:00-8",
+    "set": "2017-8-27T22:16:00-8"
+  }
+}

data/spec/lita/handlers/onewheel_moonphase_spec.rb

@@ -4,10 +4,44 @@ describe Lita::Handlers::OnewheelMoonphase, lita_handler: true do
   it { is_expected.to route_command('moon') }
   it { is_expected.to route_command('moon portland') }
 
-  it 'shows the current moon phase.' do
-    mock = File.open('spec/fixtures/moon.json').read
+  def load_mock(file)
+    mock = File.open("spec/fixtures/#{file}.json").read
     allow(RestClient).to receive(:get) { mock }
+  end
+
+  it 'waning crescent' do
+    load_mock('moon_waning_crescent')
+    send_command 'moon'
+    expect(replies.last).to eq('🌘 Moon phase 15%, Waning Crescent.  Rise: 11:45  Set: 22:16')
+  end
+
+  it 'waxing crescent' do
+    load_mock('moon_waxing_crescent')
+    send_command 'moon'
+    expect(replies.last).to eq('🌒 Moon phase 13%, Waxing Crescent.  Rise: 11:45  Set: 22:16')
+  end
+
+  it 'first_quarter' do
+    load_mock('moon_first_quarter')
+    send_command 'moon'
+    expect(replies.last).to eq('🌓 Moon phase 35%, First Quarter.  Rise: 11:45  Set: 22:16')
+  end
+
+  it 'last quarter' do
+    load_mock('moon_last_quarter')
+    send_command 'moon'
+    expect(replies.last).to eq('🌗 Moon phase 35%, Last Quarter.  Rise: 11:45  Set: 22:16')
+  end
+
+  it 'waning gibbous' do
+    load_mock('moon_waning_gibbous')
+    send_command 'moon'
+    expect(replies.last).to eq('🌖 Moon phase 75%, Waning Gibbous.  Rise: 11:45  Set: 22:16')
+  end
+
+  it 'waxing gibbous' do
+    load_mock('moon_waxing_gibbous')
     send_command 'moon'
-    expect(replies.last).to eq('Moon phase 36%, Waxing Crescent.  Rise: 11:45  Set: 22:16')
+    expect(replies.last).to eq('🌔 Moon phase 75%, Waxing Gibbous.  Rise: 11:45  Set: 22:16')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-moonphase
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Kreps
@@ -138,7 +138,12 @@ files:
 - lib/lita-onewheel-moonphase.rb
 - lib/lita/handlers/onewheel_moonphase.rb
 - lita-onewheel-moonphase.gemspec
-- spec/fixtures/moon.json
+- spec/fixtures/moon_first_quarter.json
+- spec/fixtures/moon_last_quarter.json
+- spec/fixtures/moon_waning_crescent.json
+- spec/fixtures/moon_waning_gibbous.json
+- spec/fixtures/moon_waxing_crescent.json
+- spec/fixtures/moon_waxing_gibbous.json
 - spec/lita/handlers/onewheel_moonphase_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/onewheelskyward/lita-onewheel-moonphase
@@ -167,6 +172,11 @@ signing_key:
 specification_version: 4
 summary: Lita interface to a lambda representing Moon phase data.
 test_files:
-- spec/fixtures/moon.json
+- spec/fixtures/moon_first_quarter.json
+- spec/fixtures/moon_last_quarter.json
+- spec/fixtures/moon_waning_crescent.json
+- spec/fixtures/moon_waning_gibbous.json
+- spec/fixtures/moon_waxing_crescent.json
+- spec/fixtures/moon_waxing_gibbous.json
 - spec/lita/handlers/onewheel_moonphase_spec.rb
 - spec/spec_helper.rb