lita-catme 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2307b654950c7b78e5f047f75a35800cb5ff427fab514548b04abcba6159c7ca
-  data.tar.gz: ead0ffc9872beeb1d97ed6943d2452214c2965f7129561a0788e50464663a079
+  metadata.gz: 7a466b67acaa35ef3d8495087458ae691519a3d180f640ff25dbfd8e5d9bb8e7
+  data.tar.gz: 687e467213f7429b7e85c1be3833534ab327605071b0a5ed9f73123a62bdb266
 SHA512:
-  metadata.gz: 92da9fced694aff5ba92e1e991fa90c603f36509f3581164528c9d5e049335edf01b55a29fc57dd8926220e91da2dd69d597b16ef7d6c96a509c8736bbce7f5d
-  data.tar.gz: 49350be21724da47bdc2b48c2225de8f96c0c62fc96e163f192d57c7ce1ce02e5a08071f330e9176a4ef80208d332619455054d334d8a35d266c48fa22b9b863
+  metadata.gz: b75144a0754a6d39631bf0f3bb1b57268745dfa7268d0d0420c72891c5361df0c8ebf65634dba54baf07cef3f2e7f3fdf6621ad63d4562b901ab31ba4cb7ef08
+  data.tar.gz: a8ee57256b738aee69b276960bbaf74dccd201e993e1a9928c9789f26a2e096f5712ce69691545167d0fcd6a305465fed9fbd4a0305b83d5df5ab78fe3db1b7b

data/lib/lita-catme.rb

@@ -1,5 +1,4 @@
 require "lita"
-require 'nokogiri'
 require 'open-uri'
 
 Lita.load_locales Dir[File.expand_path(

data/lib/lita/handlers/cat.rb

@@ -1,26 +1,45 @@
-
 module Lita
   module Handlers
     class Cat
-      BASE_URL = 'http://api.thecatapi.com/api'.freeze
+      BASE_URL = 'http://api.thecatapi.com/v1'.freeze
+      CATEGORIES = {
+        hats: 1,
+        space: 2,
+        funny: 3,
+        sunglasses: 4,
+        boxes: 5,
+        caturday: 6,
+        ties: 7,
+        dream: 9,
+        kittens: 10,
+        sinks: 14,
+        clothes: 15,
+      }
+
       attr_accessor :url
 
       class << self
         def fetch(count: nil, category: nil)
-          url = "#{BASE_URL}/images/get?format=xml"
-          url += "&results_per_page=#{count}" unless count.nil?
-          url += "&category=#{category}" unless category.nil?
+          url = "#{BASE_URL}/images/search?format=json"
+          url += "&limit=#{count}" unless count.nil?
+          if category.present?
+            return [] unless valid_category?(category)
+            url += "&category_ids=#{CATEGORIES[category.to_sym]}"
+          end
 
-          Nokogiri::XML(open(url)).css('//url').each_with_object([]) do |cat, cats|
-            cats << new(cat.content)
+          JSON.parse(open(url) { |io| io.read }).each_with_object([]) do |cat, cats|
+            cats << new(cat["url"])
           end
         end
 
         def fetch_categories
-          url = "#{BASE_URL}/categories/list"
-          Nokogiri::XML(open(url)).css('//name').each_with_object([]) do |category, categories|
-            categories << category.content
-          end
+          CATEGORIES.keys.map(&:to_s)
+        end
+
+        private
+
+        def valid_category?(category)
+          fetch_categories.include?(category)
         end
       end
 

data/lib/lita/handlers/catme.rb

@@ -1,8 +1,6 @@
 module Lita
   module Handlers
     class Catme < Handler
-      BASE_URL = 'http://thecatapi.com/api/images/get'.freeze
-
       route(/^cat( me)?$/i, :cat_me, command: true, help: { 'cat me' => t('help.cat_me') })
       route(/^cat bomb( (\d+))?$/i, :cat_bomb, command: true, help: { 'cat bomb N' => t('help.cat_bomb') })
       route(/^cat categories$/i, :cat_categories, command: true, help: { 'cat categories' => t('help.cat_categories') })

data/lita-catme.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-catme"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Emile Filteau"]
   spec.email         = ["emile.filteau@gmail.com"]
   spec.description   = %q(A lita handler that fetch random cat images)
@@ -15,7 +15,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "lita", "~> 4.7"
-  spec.add_dependency "nokogiri", "~> 1.8.4"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-byebug"

data/spec/fixtures/vcr_cassettes/fetch_cat.yml

@@ -1,53 +1,58 @@
+---
 http_interactions:
-  - request:
-      method: get
-      uri: http://api.thecatapi.com/api/images/get?format=xml
-      body:
-        encoding: US-ASCII
-        string: ""
-      headers:
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-        Accept:
-          - "*/*"
-        User-Agent:
-          - Ruby
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Date:
-          - Tue, 12 Apr 2016 16:01:53 GMT
-        Server:
-          - Apache
-        X-Powered-By:
-          - PHP/5.4.45
-        Access-Control-Allow-Origin:
-          - "*"
-        Access-Control-Allow-Methods:
-          - GET, POST
-        Access-Control-Allow-Headers:
-          - X-Requested-With
-        Transfer-Encoding:
-          - chunked
-        Content-Type:
-          - text/xml
-      body:
-        encoding: UTF-8
-        string: |
-          <?xml version="1.0"?>
-          <response>
-            <data>
-              <images>
-                <image>
-                  <url>http://24.media.tumblr.com/tumblr_low6n5JHJF1qbhms5o1_500.jpg</url>
-                  <id>6kf</id>
-                  <source_url>http://thecatapi.com/?id=6kf</source_url>
-                </image>
-              </images>
-            </data>
-          </response>
-      ? http_version
-    recorded_at: Tue, 12 Apr 2016 16:01:53 GMT
-recorded_with: VCR 3.0.1
+- request:
+    method: get
+    uri: http://api.thecatapi.com/v1/images/search?format=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 18 Sep 2018 14:31:44 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Server:
+      - nginx/1.12.1
+      X-Dns-Prefetch-Control:
+      - 'off'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Strict-Transport-Security:
+      - max-age=15552000; includeSubDomains
+      X-Download-Options:
+      - noopen
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Vary:
+      - Origin
+      Expires:
+      - Tue, 03 Jul 2001 06:00:00 GMT
+      Last-Modified:
+      - Tue Sep 18 2018 14:31:44 GMT+0000 (UTC)
+      Cache-Control:
+      - post-check=0, pre-check=0
+      X-Response-Time:
+      - 28ms
+    body:
+      encoding: ASCII-8BIT
+      string: '[{"id":"78j","url":"https://24.media.tumblr.com/tumblr_m0mjqs3zeu1r6b7kmo1_500.jpg","breeds":[],"categories":[]}]'
+    http_version: 
+  recorded_at: Tue, 18 Sep 2018 14:31:44 GMT
+recorded_with: VCR 4.0.0

data/spec/fixtures/vcr_cassettes/fetch_multiple_cats.yml

@@ -1,98 +1,58 @@
+---
 http_interactions:
-  - request:
-      method: get
-      uri: http://api.thecatapi.com/api/images/get?format=xml&results_per_page=10
-      body:
-        encoding: US-ASCII
-        string: ""
-      headers:
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-        Accept:
-          - "*/*"
-        User-Agent:
-          - Ruby
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Date:
-          - Tue, 12 Apr 2016 16:06:10 GMT
-        Server:
-          - Apache
-        X-Powered-By:
-          - PHP/5.4.45
-        Access-Control-Allow-Origin:
-          - "*"
-        Access-Control-Allow-Methods:
-          - GET, POST
-        Access-Control-Allow-Headers:
-          - X-Requested-With
-        Transfer-Encoding:
-          - chunked
-        Content-Type:
-          - text/xml
-      body:
-        encoding: UTF-8
-        string: |
-          <?xml version="1.0"?>
-          <response>
-            <data>
-              <images>
-                <image>
-                  <url>http://25.media.tumblr.com/tumblr_lzv0qmw51M1qlyuwso1_1280.jpg</url>
-                  <id>8ve</id>
-                  <source_url>http://thecatapi.com/?id=8ve</source_url>
-                </image>
-                <image>
-                  <url>http://25.media.tumblr.com/tumblr_mat8o75KS01rptlauo1_1280.jpg</url>
-                  <id>MTY5Njc5Mg</id>
-                  <source_url>http://thecatapi.com/?id=MTY5Njc5Mg</source_url>
-                </image>
-                <image>
-                  <url>http://25.media.tumblr.com/tumblr_lmmuhbqBII1qd477zo1_1280.jpg</url>
-                  <id>cn9</id>
-                  <source_url>http://thecatapi.com/?id=cn9</source_url>
-                </image>
-                <image>
-                  <url>http://24.media.tumblr.com/tumblr_lgqhdsGcgO1qfyzelo1_500.jpg</url>
-                  <id>6s0</id>
-                  <source_url>http://thecatapi.com/?id=6s0</source_url>
-                </image>
-                <image>
-                  <url>http://25.media.tumblr.com/tumblr_m22h2qhwn61qcxyrro1_500.jpg</url>
-                  <id>atp</id>
-                  <source_url>http://thecatapi.com/?id=atp</source_url>
-                </image>
-                <image>
-                  <url>http://24.media.tumblr.com/tumblr_lwidfjYoSI1qlyuwso1_1280.jpg</url>
-                  <id>925</id>
-                  <source_url>http://thecatapi.com/?id=925</source_url>
-                </image>
-                <image>
-                  <url>http://25.media.tumblr.com/tumblr_luowluVKdx1qdth8zo1_1280.jpg</url>
-                  <id>cev</id>
-                  <source_url>http://thecatapi.com/?id=cev</source_url>
-                </image>
-                <image>
-                  <url>http://24.media.tumblr.com/tumblr_m4pwtpa2Nw1r6jd7fo1_500.jpg</url>
-                  <id>eb9</id>
-                  <source_url>http://thecatapi.com/?id=eb9</source_url>
-                </image>
-                <image>
-                  <url>http://24.media.tumblr.com/tumblr_lr8ng062t01qhwlspo1_500.jpg</url>
-                  <id>53s</id>
-                  <source_url>http://thecatapi.com/?id=53s</source_url>
-                </image>
-                <image>
-                  <url>http://25.media.tumblr.com/tumblr_m33ib9ERyW1qflacro1_1280.jpg</url>
-                  <id>9me</id>
-                  <source_url>http://thecatapi.com/?id=9me</source_url>
-                </image>
-              </images>
-            </data>
-          </response>
-      ? http_version
-    recorded_at: Tue, 12 Apr 2016 16:06:10 GMT
-recorded_with: VCR 3.0.1
+- request:
+    method: get
+    uri: http://api.thecatapi.com/v1/images/search?format=json&limit=10
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 18 Sep 2018 14:32:20 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Server:
+      - nginx/1.12.1
+      X-Dns-Prefetch-Control:
+      - 'off'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Strict-Transport-Security:
+      - max-age=15552000; includeSubDomains
+      X-Download-Options:
+      - noopen
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Vary:
+      - Origin
+      Expires:
+      - Tue, 03 Jul 2001 06:00:00 GMT
+      Last-Modified:
+      - Tue Sep 18 2018 14:32:20 GMT+0000 (UTC)
+      Cache-Control:
+      - post-check=0, pre-check=0
+      X-Response-Time:
+      - 28ms
+    body:
+      encoding: ASCII-8BIT
+      string: '[{"id":"5gg","url":"https://25.media.tumblr.com/tumblr_lt95ovYgPG1r4xjo2o1_500.jpg","breeds":[],"categories":[]},{"id":"39a","url":"https://25.media.tumblr.com/tumblr_ltwqocDfjo1qdvbl3o1_500.jpg","breeds":[],"categories":[]},{"id":"80j","url":"https://25.media.tumblr.com/tumblr_lel3kmDMRE1qcn249o1_250.gif","breeds":[],"categories":[]},{"id":"v1","url":"https://27.media.tumblr.com/tumblr_m1pgvd5CPM1qjahcpo1_500.jpg","breeds":[],"categories":[]},{"id":"1bh","url":"https://24.media.tumblr.com/tumblr_m3brelrcMw1qzulfbo1_500.jpg","breeds":[],"categories":[]},{"id":"bt","url":"https://24.media.tumblr.com/ZabOTt2mpdp8cpiurcr3ZTxy_400.jpg","breeds":[],"categories":[]},{"id":"2ib","url":"https://25.media.tumblr.com/tumblr_m3ibz8iESF1r6b7kmo1_500.jpg","breeds":[],"categories":[]},{"id":"18l","url":"https://cdn2.thecatapi.com/images/18l.gif","breeds":[],"categories":[]},{"id":"85d","url":"https://24.media.tumblr.com/tumblr_lx0csyDRUL1qdlh1io1_250.gif","breeds":[],"categories":[]},{"id":"15r","url":"https://25.media.tumblr.com/ZabOTt2mpelinebllqGw8kAZo1_500.jpg","breeds":[],"categories":[]}]'
+    http_version: 
+  recorded_at: Tue, 18 Sep 2018 14:32:20 GMT
+recorded_with: VCR 4.0.0

data/spec/fixtures/vcr_cassettes/fetch_with_category.yml

@@ -1,53 +1,58 @@
+---
 http_interactions:
-  - request:
-      method: get
-      uri: http://api.thecatapi.com/api/images/get?category=boxes&format=xml
-      body:
-        encoding: US-ASCII
-        string: ""
-      headers:
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-        Accept:
-          - "*/*"
-        User-Agent:
-          - Ruby
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Date:
-          - Tue, 12 Apr 2016 16:15:49 GMT
-        Server:
-          - Apache
-        X-Powered-By:
-          - PHP/5.4.45
-        Access-Control-Allow-Origin:
-          - "*"
-        Access-Control-Allow-Methods:
-          - GET, POST
-        Access-Control-Allow-Headers:
-          - X-Requested-With
-        Transfer-Encoding:
-          - chunked
-        Content-Type:
-          - text/xml
-      body:
-        encoding: UTF-8
-        string: |
-          <?xml version="1.0"?>
-          <response>
-            <data>
-              <images>
-                <image>
-                  <url>http://25.media.tumblr.com/tumblr_lwwd01DBVo1r0mbi6o1_1280.jpg</url>
-                  <id>f6</id>
-                  <source_url>http://thecatapi.com/?id=f6</source_url>
-                </image>
-              </images>
-            </data>
-          </response>
-      ? http_version
-    recorded_at: Tue, 12 Apr 2016 16:15:49 GMT
-recorded_with: VCR 3.0.1
+- request:
+    method: get
+    uri: http://api.thecatapi.com/v1/images/search?category_ids=5&format=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 18 Sep 2018 14:53:55 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Server:
+      - nginx/1.12.1
+      X-Dns-Prefetch-Control:
+      - 'off'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Strict-Transport-Security:
+      - max-age=15552000; includeSubDomains
+      X-Download-Options:
+      - noopen
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Vary:
+      - Origin
+      Expires:
+      - Tue, 03 Jul 2001 06:00:00 GMT
+      Last-Modified:
+      - Tue Sep 18 2018 14:53:55 GMT+0000 (UTC)
+      Cache-Control:
+      - post-check=0, pre-check=0
+      X-Response-Time:
+      - 25ms
+    body:
+      encoding: ASCII-8BIT
+      string: '[{"id":"ed","url":"https://28.media.tumblr.com/tumblr_lwa29aW9RO1r0mbi6o1_500.jpg","breeds":[],"categories":[]}]'
+    http_version: 
+  recorded_at: Tue, 18 Sep 2018 14:53:55 GMT
+recorded_with: VCR 4.0.0

data/spec/lita/handlers/cat_spec.rb

@@ -11,7 +11,7 @@ describe Lita::Handlers::Cat do
       it 'returns an array containing one cat' do
         cats = described_class.fetch
         expect(cats.length).to eq(1)
-        expect(cats.first.url).to eq("http://24.media.tumblr.com/tumblr_low6n5JHJF1qbhms5o1_500.jpg")
+        expect(cats.first.url).to eq("https://24.media.tumblr.com/tumblr_m0mjqs3zeu1r6b7kmo1_500.jpg")
       end
     end
 
@@ -38,11 +38,11 @@ describe Lita::Handlers::Cat do
       it 'returns an array containing one cat in the given category' do
         cats = described_class.fetch(category: 'boxes')
         expect(cats.length).to eq(1)
-        expect(cats.first.url).to eq("http://25.media.tumblr.com/tumblr_lwwd01DBVo1r0mbi6o1_1280.jpg")
+        expect(cats.first.url).to eq("https://28.media.tumblr.com/tumblr_lwa29aW9RO1r0mbi6o1_500.jpg")
       end
     end
 
-    context 'with category argument set to invalid value', vcr: { cassette_name: 'fetch)with_invalid_category' } do
+    context 'with category argument set to invalid value' do
       it 'instaniate no cat object' do
         expect(described_class).to receive(:new).never
         described_class.fetch(category: 'foobar')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-catme
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Emile Filteau
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +157,6 @@ files:
 - spec/fixtures/vcr_cassettes/fetch_cat.yml
 - spec/fixtures/vcr_cassettes/fetch_multiple_cats.yml
 - spec/fixtures/vcr_cassettes/fetch_with_category.yml
-- spec/fixtures/vcr_cassettes/fetch_with_invalid_category.yml
 - spec/lita/handlers/cat_spec.rb
 - spec/lita/handlers/catme_spec.rb
 - spec/spec_helper.rb
@@ -205,7 +190,6 @@ test_files:
 - spec/fixtures/vcr_cassettes/fetch_cat.yml
 - spec/fixtures/vcr_cassettes/fetch_multiple_cats.yml
 - spec/fixtures/vcr_cassettes/fetch_with_category.yml
-- spec/fixtures/vcr_cassettes/fetch_with_invalid_category.yml
 - spec/lita/handlers/cat_spec.rb
 - spec/lita/handlers/catme_spec.rb
 - spec/spec_helper.rb

data/spec/fixtures/vcr_cassettes/fetch_with_invalid_category.yml

@@ -1,47 +0,0 @@
-http_interactions:
-  - request:
-      method: get
-      uri: http://api.thecatapi.com/api/images/get?category=foobar&format=xml
-      body:
-        encoding: US-ASCII
-        string: ""
-      headers:
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-        Accept:
-          - "*/*"
-        User-Agent:
-          - Ruby
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Date:
-          - Tue, 12 Apr 2016 16:18:16 GMT
-        Server:
-          - Apache
-        X-Powered-By:
-          - PHP/5.4.45
-        Access-Control-Allow-Origin:
-          - "*"
-        Access-Control-Allow-Methods:
-          - GET, POST
-        Access-Control-Allow-Headers:
-          - X-Requested-With
-        Transfer-Encoding:
-          - chunked
-        Content-Type:
-          - text/xml
-      body:
-        encoding: UTF-8
-        string: |
-          <?xml version="1.0"?>
-          <response>
-            <data>
-              <images/>
-            </data>
-          </response>
-      ? http_version
-    recorded_at: Tue, 12 Apr 2016 16:18:16 GMT
-recorded_with: VCR 3.0.1