lita-onewheel-halfstaff 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9656b12cc4f75c5089728667d36fbdbe729685b
-  data.tar.gz: 14f06de14e8477ef51be3c576b1a797ac3fab627
+  metadata.gz: 9502983a107c4791eb493f93759410db6d9ecc41
+  data.tar.gz: cf82b16c85cc73962a3d6d4f52c1abd8095491ec
 SHA512:
-  metadata.gz: ca8f149aeb1b5646b4ee79b3f6b7ce82ca666621331401efc248e4410cd4db207d1bca0a3184fe8f2eae6f1b1eafc64321fde18257e5201c12ed273bd901d01d
-  data.tar.gz: d349189f097baf8ab74ef4d42bd9bca88e531547d6685848eddc63849b718143ab562483fe8dbf99f7bffa5cc4bcd6c38d7aff5f3c0e07cbababfe517c086b7e
+  metadata.gz: a2fff00158cb85df20de12fbc50a67cdf9ca96d7592b07e1b33c8e8053d67c27a9d6c47a1df84bfffe852b28fc0da8cc5263bf192d2edfc86d941528894bd806
+  data.tar.gz: 96612331d3be0450592afbc8dc4a33feeea76595db89fe8ceee287d7126daaa4d2c9d0110feff6e0e83d595ddac3a033b1b5d52f5e07ebacecd26575846e125e

data/lib/lita/handlers/onewheel_halfstaff.rb

@@ -67,6 +67,12 @@ module Lita
             end_month = date_matches[3]
             end_day = date_matches[4]
             half_staff = does_today_match_date_range(start_month, start_day, end_month, end_day, current_year)
+          elsif date_matches = pieces[0].match(/(\w+)\s+(\d+) until the (\d+)\w+, (\d+)/i)   # March 7 until the 11th, 2016
+            # Lita.logger.info 'until sunset'
+            start_month = date_matches[1]
+            start_day = date_matches[2]
+            end_day = date_matches[3]
+            half_staff = does_today_match_date_range(start_month, start_day, start_month, end_day, current_year)
           else
             Lita.logger.info "Couldn't match #{pieces[0]}"
           end
@@ -75,10 +81,10 @@ module Lita
         half_staff
       end
 
-      def does_today_match_date_range(month_start, day_start, month_end, day_end, current_year)
-        start_time = DateTime::parse("#{month_start} #{day_start} #{current_year} 00:00")
-        end_time = DateTime::parse("#{month_end} #{day_end} #{current_year} 23:59")
-        return (start_time..end_time).include? Time.now
+      def does_today_match_date_range(start_month, start_day, end_month, end_day, current_year)
+        start_time = DateTime::parse("#{start_month} #{start_day} #{current_year} 00:00")
+        end_time = DateTime::parse("#{end_month} #{end_day} #{current_year} 23:59:59")
+        return (start_time..end_time).cover? DateTime.now
       end
 
       def get_history(response)

data/lita-onewheel-halfstaff.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-halfstaff'
-  spec.version       = '0.1.2'
+  spec.version       = '0.2.0'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = %q{View the current US flag half-staff status.}
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'lita', '~> 4'
+  spec.add_runtime_dependency 'lita', '~> 4.7'
   spec.add_runtime_dependency 'rest-client', '~> 1.8'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
 

data/spec/fixtures/halfstaff.html

@@ -303,6 +303,12 @@ Production: 7 2013
                                                     </div>
                                                     <b><br/>
                                                         <inline style="font-size: 25px;"><center>Click on the appropriate link below</center></inline></b><hr/><br/>
+                                                    <a href="http://www.flagsexpress.com/Articles.asp?ID=552"><b><inline style="color: rgb(192, 80, 77);">March 9-10, 2016 - COLORADO ONLY - Honoring Las Animas County Deputy Sheriff Travis Russell </inline></b></a><br/><hr/><br/>
+                                                    <a href="http://www.flagsexpress.com/Articles.asp?ID=551">March 7, 2016 - OKLAHOMA ONLY - Honoring Former Representative Steve Boeckman </a><br/><hr/><br/>
+                                                    <a href="http://www.flagsexpress.com/Articles.asp?ID=550"><b><inline style="color: rgb(192, 80, 77);">March 7 until the 11th, 2016 - ENTIRE UNITED STATES - Honoring Nancy Reagan </inline></b></a><br/><hr/><br/>
+                                                    <a href="http://www.flagsexpress.com/Articles.asp?ID=549">March 4, 2016 - LOUISIANA ONLY - Honoring State Representative Ronnie Edwards </a><br/><hr/><br/>
+                                                    <a href="http://www.flagsexpress.com/Articles.asp?ID=548">March 2, 2016 - MASSACHUSETTS ONLY - Honoring Major Glenn G. Milliken, Massachusetts Air National Guard, of Wilbraham, MA </a><br/><hr/><br/>
+                                                    <a href="http://www.flagsexpress.com/Articles.asp?ID=547">March 1, 2016 - VIRGINIA ONLY - Honoring Prince William County Police Department Officer Ashley Guindon</a><br/><hr/><br/>
                                                     <a href="http://www.flagsexpress.com/Articles.asp?ID=546"><b><inline style="color: rgb(192, 80, 77);">February 26, 2016 - KANSAS ONLY - Honoring  the victims of the Hesston shootings</inline></b></a><br/><hr/><br/>
                                                     <a href="http://www.flagsexpress.com/Articles.asp?ID=545"><b><inline style="color: rgb(192, 80, 77);">February 26, 2016 - MINNESOTA ONLY - Honoring Marine Corps Sergeant and Delano, Minnesota resident Dillion J. Semolina</inline></b></a><br/><hr/><br/>
                                                     <a href="http://www.flagsexpress.com/Articles.asp?ID=544">February 25, 2016 - WASHINGTON ONLY - Honoring National Guard SSG Matthew McClintock</a><br/><hr/><br/>

data/spec/lita/handlers/onewheel_halfstaff_spec.rb

@@ -14,8 +14,10 @@ describe Lita::Handlers::OnewheelHalfstaff, lita_handler: true do
   it { is_expected.to route_command('halfmast history') }
 
   it 'gives half-staff status' do
-    send_command 'halfstaff'
-    expect(["Everything's cool, yo.", "No half staff known."].include? replies.last).to be true
+    Timecop.freeze(Time.local(2016, 2, 2, 10, 5, 0)) do
+      send_command 'halfstaff'
+      expect(["Everything's cool, yo.", "No half staff known."].include? replies.last).to be true
+    end
   end
 
   it 'gives half-staff affirmative' do
@@ -27,6 +29,15 @@ describe Lita::Handlers::OnewheelHalfstaff, lita_handler: true do
     end
   end
 
+  it 'checks some edge cases for multi-day half staffs.' do
+    Timecop.freeze(Time.local(2016, 3, 9, 10, 5, 0)) do
+      send_command 'halfstaff'
+      expect(replies.count).to eq(2)
+      expect(replies[0]).to eq('COLORADO ONLY - Honoring Las Animas County Deputy Sheriff Travis Russell  - http://www.flagsexpress.com/Articles.asp?ID=552')
+      expect(replies[1]).to eq('ENTIRE UNITED STATES - Honoring Nancy Reagan  - http://www.flagsexpress.com/Articles.asp?ID=550')
+    end
+  end
+
   it 'will return history link' do
     send_command 'halfstaff history'
     expect(replies.last).to eq('https://en.wikipedia.org/wiki/Half-mast')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-halfstaff
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kreps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-28 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement