lita-onewheel-xkcd 0.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35d89afb36af4bc8f816521dc5efc28dd017308
-  data.tar.gz: 6b4d2430623972cebad8afb4474a97d8c7908534
+  metadata.gz: 82ec66801a1371892e26c9b90b94b8fac24b7e3b
+  data.tar.gz: 8e30eb41c11a7b54fc7c6dda8f980ec7490a953f
 SHA512:
-  metadata.gz: 5d55c341e5dc44673d53c9fefad480017890f535a6eb94216ab3c642393c2b6df14a0c068f4afa952e543100291c90d33ada38638dcc2ef0b03768b8003a1dc7
-  data.tar.gz: d5a2e0ed7a4eed78e0b3bff00424940ccd149618f6a763226d71ba7a698dc6de6fdf6f619121ea7b54deed0bba113d5a714d40f3aefd0a23450ec994e89e5185
+  metadata.gz: a960af3845d62077e2b4307b138cf0ba3ff31d169385ea342569800bef75bfbb7de51f1ab721602761afba16d3c73862347bfcd7cae299edd583ec813db6218a
+  data.tar.gz: 7eb6d47cfe39cf52446a2fc1ec990020650620d084dde3ca818975f2305da76769a80d24548cd32c1e61948891227174afeaae9c315db267e3c46956b07abe8b

data/lib/lita/handlers/onewheel_xkcd.rb

@@ -12,6 +12,11 @@ module Lita
       config :db_port, required: true, default: 5432
       config :alt_delay, default: 9
 
+      route /^xkcdupdate$/,
+            :update,
+            command: true
+            # admin_only
+
       route /^xkcd$/i,
             :random,
             command: true,
@@ -37,6 +42,16 @@ module Lita
             command: true,
             help: {'xkcd prev' => 'return the next XKCD comic by date.'}
 
+      route(/^xkcd (\d{1,2})[-\/](\d{1,2})[-\/](\d{2,4})$/i,
+            :find_by_mdy,
+            command: true,
+            help: { 'xkcd 1/1/2014' => 'Get an XKCD comic for a m/d/y date.'})
+
+      route(/^xkcd (\d{2,4})-(\d{1,2})-(\d{1,2})$/i,
+            :find_by_ymd,
+            command: true,
+            help: { 'xkcd 2014-1-1' => 'Get an XKCD comic for a y-m-d date.'})
+
       ##
       # Search the title for a string, and return the comic.
       #
@@ -53,6 +68,20 @@ module Lita
         end
       end
 
+      ##
+      # Search for the date, and return the comic.
+      #
+      def find_by_date(month, day, year)
+        db = init_db
+        result = db["
+          select id, data->'img' as img, data->'title' as title, data->'alt' as alt
+          from comics
+          where data->>'month' = ? and data->>'day' = ? and data->>'year' = ? limit 1", month.to_s, day.to_s, year.to_s]
+        if row = result[:data]
+          Comic.new(row[:id], row[:img], row[:title], row[:alt])
+        end
+      end
+
       ##
       # Find by xkcd id.
       #
@@ -108,6 +137,18 @@ module Lita
         end
       end
 
+      def find_by_ymd(response)
+        date = Date.civil(response.match_data[1].to_i, response.match_data[2].to_i, response.match_data[3].to_i)
+        comic = find_by_date(date.month, date.day, date.year)
+        reply_with_comic response, comic
+      end
+
+      def find_by_mdy(response)
+        date = Date.civil(response.match_data[3].to_i, response.match_data[1].to_i, response.match_data[2].to_i)
+        comic = find_by_date(date.month, date.day, date.year)
+        reply_with_comic response, comic
+      end
+
       ##
       # Grab the comic object by xkcd id (which is also db id)
       #
@@ -124,10 +165,12 @@ module Lita
       # Helper function to display comic and set timer for alt tag.
       #
       def reply_with_comic(response, comic)
-        set_state comic, response.user
-        response.reply "XKCD #{comic.id} \"#{comic.title}\" #{comic.image}"
-        after(config.alt_delay) do |timer|
-          response.reply comic.alt
+        if comic
+          set_state comic, response.user
+          response.reply "XKCD #{comic.id} \"#{comic.title}\" #{comic.image}"
+          after(config.alt_delay) do |timer|
+            response.reply comic.alt
+          end
         end
       end
 
@@ -138,7 +181,6 @@ module Lita
         db = init_db
         state = db[:state]
         user_state = state.where(:user => user.name)
-        puts user_state.count
         if user_state.count > 0
           log.debug 'Updating state!'
           user_state.update(:last_comic => comic.id)
@@ -159,7 +201,33 @@ module Lita
         else
           log.debug("get_last_comic called with no user state for #{user.name}")
         end
+      end
+
+      def update(response)
+        db = init_db
+        # Check tables? run schema?
+        max_id = db[:comics].max(:id) || 1  # Get the last id or start with one.
+        top_num = get_top_num
+        response.reply "Updating from #{max_id} to #{top_num}!"
+        perform_update(max_id + 1, top_num)
+      end
 
+      def get_top_num
+        top_response = RestClient.get 'http://xkcd.com/info.0.json'
+        top_json = JSON.parse top_response
+        top_num = top_json['num']
+        top_json
+      end
+
+      def perform_update(max_id, top_num)
+        for num in max_id..top_num do
+          if num == 404
+            db_comics.insert(data: '{"status":"not found"}')
+            next
+          end
+          response = RestClient.get "http://xkcd.com/#{num}/info.0.json"
+          db_comics.insert(data: response)
+        end
       end
 
       def init_db

data/lita-onewheel-xkcd.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-xkcd'
-  spec.version       = '0.0.0'
+  spec.version       = '1.0.1'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = 'XKCD searchable archive for comics by keyword, id and date*.  * date coming soon to a minor update near you'
@@ -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.6'
+  spec.add_runtime_dependency 'lita', '~> 4'
   spec.add_runtime_dependency 'lita-irc', '~> 2.0'
   spec.add_runtime_dependency 'sequel', '~> 4.27'
   spec.add_runtime_dependency 'sequel_pg', '~> 1.6'

data/readme.rst

@@ -9,6 +9,7 @@ A Lita_ handler to display XKCD comics in your chat handler of choice.
 
 Installation
 ------------
+Get a postgres instance running, give this guy access to write to the two tables in scripts/schema.rb.
 Add lita-onewheel-xkcd to your Lita instance's Gemfile:
 ::
   gem "lita-onewheel-xkcd"
@@ -36,7 +37,7 @@ All commands return the comic, and then display the alt text alt_delay seconds l
 :xkcd ballmer: returns my favorite Steve Ballmer comic.
 :xkcd next: returns the next comic by index.
 :xkcd prev: returns the previous comic by index.
-
+:xkcdupdate: Updates the database with the latest comics.  Manually, for now.
 
 Engineering Notes
 -----------------
@@ -47,8 +48,6 @@ Comic by number: http://xkcd.com/1/info.0.json
 
 How to map # to date?  - it's in the meta
 
-Parser script, import into postgres?  Best way to handle json
-
 Keyword tokenizer, it's substring searching at the moment.
 
 Add postgres setup and details on how to update the database with new comics.

data/scripts/pop.rb

@@ -22,4 +22,3 @@ for num in max_id..top_json['num'] do
   db_comics.insert(data: response)
   puts "#{num}/#{top_json['num']}"
 end
-

data/spec/lita/handlers/onewheel_xkcd_spec.rb

@@ -11,8 +11,13 @@ describe Lita::Handlers::OnewheelXkcd, lita_handler: true do
   it { is_expected.to route_command('xkcd 1998-5-5') }
   it { is_expected.to route_command('xkcd prev') }
   it { is_expected.to route_command('xkcd next') }
+  it { is_expected.to route_command('xkcdupdate') }
 
-  @img_url = 'http://imgs.xkcd.com/comics/'
+  attr_accessor :img_url
+
+  before do
+    @img_url = 'http://imgs.xkcd.com/comics/'
+  end
 
   it 'will return a random xkcd comic' do
     send_command 'xkcd random'
@@ -26,10 +31,10 @@ describe Lita::Handlers::OnewheelXkcd, lita_handler: true do
     expect(replies.last).to include(@img_url)
   end
 
-  it 'will return today\'s xkcd comic' do
-    send_command 'xkcd today'
-    expect(replies.last).to include(@img_url)
-  end
+  # it 'will return today\'s xkcd comic' do
+  #   send_command 'xkcd today'
+  #   expect(replies.last).to include(@img_url)
+  # end
 
   it 'will return today\'s xkcd comic' do
     send_command 'xkcd last'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-xkcd
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrew Kreps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: lita-irc
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ever wanted a way to display XKCD comics in your chat client of choice?  Look