ticking_away 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e696ea9fcd6af36dfc8a9bd7be89923a35fdf70eb4d05bb9fe3c3003606de6f
-  data.tar.gz: 6d22e898217913ac1b7bb349f62c83d220c2d83be92bf2b5c4976e382cc4a90e
+  metadata.gz: 0c06d94aad03bc4e9947771ec24dd99e561b1d45693b2333147c8dd957ffff87
+  data.tar.gz: c829b7fb99e9afb7c36c6ab81a28a41dbae087ebbe74c52dadb43430d0528588
 SHA512:
-  metadata.gz: 487b5fc04e9f0994bd8e082e09d389496457bb7357a3f770076b83b441f10caa76a839835e89e2a9b2e3afadc072c4dd034c3c6b754e5f2f0793dc789bcf203f
-  data.tar.gz: 3dbe408e1701b270c3494c1701ee3dbc97f395e1b83e3b38994dc5edd96b603d4af7b34a806bc190b14b97d76359a738b42101ce0cfea00212b7f674f3bb4c9c
+  metadata.gz: 91440c550061b71bda6bcd8c730485db7d3dba0f6fcdfe8230efc2c4bf90be90395fee1d75f7a04b0c5f9d463f33eb21b5811d95cd7a2eb6b9037efccc77b6f0
+  data.tar.gz: 191755c7921062d692e4e6344c0056a5b820a4fce35b90cc4077dd918029eddb6ad3ce247aec49f63b1fc3828f86ff8ff488ceefef60e652e478ca7bedb485ba

data/lib/ticking_away.rb

@@ -1,6 +1,6 @@
 require 'ticking_away/chat_bot'
 require 'ticking_away/cinch/plugins/time_info'
 require 'ticking_away/world_time'
-require 'ticking_away/custom_errors'
+require 'ticking_away/errors'
 require 'ticking_away/json_file_storage'
 require 'ticking_away/bot'

data/lib/ticking_away/bot.rb

@@ -20,7 +20,7 @@ module TickingAway
     end
 
     # Send a string to the Bot in the format of
-    # <user_name>: <message>
+    # <user_name>: <message> or just <message>
     # Only !timeat <tz_info> and !timepopularity <tz_info or prefix>
     # commands will return a string response
     def chat(msg)
@@ -64,7 +64,7 @@ module TickingAway
       msg[cmd_length..msg.length]
     end
 
-    # Generate the time message, returning "unknown location"
+    # Generate the time message, returning "unknown timezone"
     # for any unrecognized time zones and logging any uncaught
     # errors before returning an excuse at random.
     # Stats will only be incremented if the api call was successful
@@ -76,7 +76,7 @@ module TickingAway
     rescue TickingAway::Errors::UnrecognizedTimeZone => e
       puts e.message
       'unknown timezone'
-    rescue => e
+    rescue TickingAway::Errors::TimeTravelIsHard => e
       puts e.message
       EXCUSES.sample
     end

data/lib/ticking_away/cinch/plugins/time_info.rb

@@ -35,25 +35,16 @@
 # Copyright © 2021 Jeff Wood
 #
 # This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# it under the terms of the MIT License.
 require 'cinch'
 
 module TickingAway
   class TimeInfo
     include ::Cinch::Plugin
 
-    match (/timeat */), method: :timeat
-    match (/timepopularity */), method: :timepopularity
+    # regex needs work
+    match %r{timeat [a-zA-Z0-9_\-/]+}, method: :timeat
+    match %r{timepopularity [a-zA-Z0-9_\-/]+}, method: :timepopularity
 
     listen_to :connect, method: :on_connect
 

data/lib/ticking_away/{custom_errors.rb → errors.rb}

@@ -2,6 +2,7 @@ module TickingAway
   module Errors
     # Custom Errors
     class UnrecognizedTimeZone < StandardError; end
-    class ApiUrlNotFound < StandardError; end
+
+    class TimeTravelIsHard < StandardError; end
   end
 end

data/lib/ticking_away/json_file_storage.rb

@@ -24,20 +24,22 @@ module TickingAway
     end
 
     # Get the number of times !timeat was called for a
-    # tz_info or prefix. Partial prefix matches count towards
-    # the total.
-    # If we didn't want them to, it could check the
-    # next char in the key after the .start_with? match. If it's outside the
-    # length or a "/", then the prefix or tz_info matches exactly
+    # tz_info or prefix. Partial prefix matches do not count.
     def get_stat(stat_name)
       call_count = 0
       stats.each do |key, value|
-        call_count += value if key.start_with?(stat_name)
+        call_count += value if key.start_with?(stat_name) && full_match?(stat_name, key)
       end
 
       call_count
     end
 
+    def full_match?(stat_name, key)
+      return true if key.length == stat_name.length || key[stat_name.length] == '/'
+
+      false
+    end
+
     def save_stats
       File.write(filename, JSON.dump(stats))
     end

data/lib/ticking_away/world_time.rb

@@ -14,19 +14,24 @@ module TickingAway
       def time_at(base_url, tz_info)
         request_url = "#{base_url}/timezone/#{tz_info}"
 
-        response = HTTParty.get(request_url)
+        response = call_api(request_url)
         handle_response(response, request_url)
+      end
+
+      def call_api(request_url)
+        HTTParty.get(request_url)
       rescue => e
-        puts "Could not connect to time server #{request_url}"
-        raise e
+        raise TickingAway::Errors::TimeTravelIsHard, e.message
       end
 
       def handle_response(response, request_url)
         # Convert JSON response to Hash, handling an empty or nil body
-        parsed_response = response.body.nil? || response.body.empty? ? {} : JSON.parse(response.body)
+        parsed_response = parse_response(response.body)
 
         case response.code
         when 200
+          raise TickingAway::Errors::UnrecognizedTimeZone, 'Error: non-time response' unless parsed_response.is_a?(Hash)
+
           puts "Event: Retreived current time for #{parsed_response['timezone']}: #{parsed_response['datetime']}"
         when 404
           # Differentiate between an unknown location response and a random 404 by checking the response body
@@ -34,14 +39,20 @@ module TickingAway
             raise TickingAway::Errors::UnrecognizedTimeZone, "Error: Unrecognized Time Zone #{request_url}"
           end
 
-          raise TickingAway::Errors::ApiUrlNotFound, "Error: 404 response for #{request_url}"
+          raise TickingAway::Errors::TimeTravelIsHard, "Error: 404 response for #{request_url}"
         else
-          raise "Error: #{response.code} #{parsed_response}"
+          raise TickingAway::Errors::TimeTravelIsHard, "Error: #{response.code} #{parsed_response}"
         end
 
         # Convert the time from a RFC3339 formatted string to a Time object
         Time.parse(parsed_response['datetime'])
       end
+
+      def parse_response(body)
+        JSON.parse(body)
+      rescue => e
+        raise TickingAway::Errors::TimeTravelIsHard, e.message
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ticking_away
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeff Wood
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -104,7 +104,7 @@ files:
 - lib/ticking_away/bot.rb
 - lib/ticking_away/chat_bot.rb
 - lib/ticking_away/cinch/plugins/time_info.rb
-- lib/ticking_away/custom_errors.rb
+- lib/ticking_away/errors.rb
 - lib/ticking_away/json_file_storage.rb
 - lib/ticking_away/world_time.rb
 homepage: https://github.com/woodjeffrey2/ticking_away