lita-genius 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b099232d6c0b02497b383540cd083c1ae0db22
-  data.tar.gz: 016a389d1a02cc878852e6ce94386c0d4e78f4a1
+  metadata.gz: 64191fc2d664ec32485c2d16528c8a5f54e4b438
+  data.tar.gz: 12f19a6ca3230e4dca6685f628b52a3539156f41
 SHA512:
-  metadata.gz: fe208bce4587fb3f68e6c7c0913660642c320a0bfb24cd93ace145d64562392b8484c503eb214d2230d1593d96b29f7ba5c64e2c6d1614762cbc85c9261718a9
-  data.tar.gz: c8d6c679c6135b395f3bdfb7c146ad8a86c51e11c141038820efaad390af7b8ef7e38422c7d4909c8a7536bfbd7623f4d67ef94ae9bdb0ac194971010c2b3e99
+  metadata.gz: a1895e101852b68ce0965cd6ffae157062411ba9989978d274eb46c81e0b0771be7e3ea8158ca137597d13be2af0537e4bc9abf377debb99e936c13283f829f5
+  data.tar.gz: d52983076538cda0a98954a474198545e77b842da9f1b329d53b94ccef8b65b82e730203e98c54e8c80f875e08b16ab6c288c4f3c3b1598fcae1f6df6ab22a68

data/README.md

@@ -13,6 +13,16 @@ Add lita-genius to your Lita instance's Gemfile:
 gem "lita-genius"
 ```
 
+## Configuration
+
+In order to use this plugin, you must obtain a [Genius client access token](http://genius.com/api-clients).
+
+``` ruby
+Lita.configure do |config|
+  config.handlers.genius.access_token = "YOUR ACCESS TOKEN GOES HERE"
+end
+```
+
 ## Usage
 
 Using the `genius` command will return the top Genius result for your query. Song titles and lyrics are both valid types of search strings.

data/lib/lita/handlers/genius.rb

@@ -1,22 +1,35 @@
-require "rapgenius"
-
 module Lita
   module Handlers
     class Genius < Handler
 
+      API_URL = "http://api.genius.com"
+
+      config :access_token, type: String, required: true
+
       route(/^genius\s+(.+)/i, :search, command:true,
             help: {t("help.search_key") => t("help.search_value")})
 
       def search(response)
         query = response.matches.first.first
-        songs = RapGenius.search(query)
-        if !songs.empty?
-          song = songs.first
-          response.reply song.description.gsub(/\n+/, " ")
-          response.reply "#{song.artist.name} - #{song.title} | http://genius.com/songs/#{song.id}"
-        else
-          response.reply "No songs found for '#{query}'"
-        end
+        search_response = http.get(
+          "#{API_URL}/search",
+          {q: query},
+          {"Authorization" => "Bearer #{config.access_token}"}
+        )
+        songs = MultiJson.load(search_response.body)["response"]["hits"]
+        return response.reply "No songs found for '#{query}'" if songs.empty?
+        song = songs.first
+        id = song["result"]["id"]
+        song_response = http.get(
+          "#{API_URL}/songs/#{id}",
+          {text_format: "plain"},
+          {"Authorization" => "Bearer #{config.access_token}"}
+        )
+        description = MultiJson.load(song_response.body)["response"]["song"]["description"]["plain"].gsub(/\n+/, " ")
+        artist = song["result"]["primary_artist"]["name"]
+        title = song["result"]["title"]
+        response.reply description
+        response.reply "#{artist} - #{title} | http://genius.com/songs/#{id}"
       end
 
     end

data/lita-genius.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-genius"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Tristan Chong"]
   spec.email         = ["ong@tristaneuan.ch"]
   spec.description   = "A Lita handler that returns requested songs from (Rap) Genius."
@@ -15,7 +15,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "lita", ">= 4.3"
-  spec.add_runtime_dependency "rapgenius", "1.0.5"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-byebug"

data/spec/lita/handlers/genius_spec.rb

@@ -2,6 +2,10 @@ require "spec_helper"
 
 describe Lita::Handlers::Genius, lita_handler: true do
 
+  before do
+    registry.config.handlers.genius.access_token = ENV["GENIUS_ACCESS_TOKEN"]
+  end
+
   it { is_expected.to route_command("genius weeknd montreal").to(:search) }
 
   describe "#search" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-genius
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tristan Chong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: rapgenius
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement