lita-yelpme 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738d11901b22de4eb7c960b9fc774c9404f6ec0c
-  data.tar.gz: 12059976c0884af0506393341d65e7470c144441
+  metadata.gz: 7c14a1a9987d94ae1b311ec22452378998ce5564
+  data.tar.gz: 86aab3594dd42af3e7782e340200dbc44c3e18ff
 SHA512:
-  metadata.gz: 62f55bf005867d57869e4cad76dd8fc1edd2fc241cadc09e474f779c8ca7d51b91094459185866f07766ed76375e50ea918c3f9ee95f4dcc2fca4c67f2004abe
-  data.tar.gz: 65269bb83a2c76064bf97f45309d9bdee7bfe760ad8531cd5d507a270011fa21f0e9c0bcab22e4c4761e3475c54e1bf0021d49ea4dca8a585919929adbbba620
+  metadata.gz: d8a1fad4bf070abdf1715b70dc41ffdc2890eb75c25d5271da07f2f012676be9aad3ea247643e642928e45fb00c2ea70b110143312b3f77362d194793b0a9ff2
+  data.tar.gz: fd70ff35831442238371353f44d303fb76df04ea06caa11134e3d9d79a439bdc0c474dad1dce329a83329bf64f286d979014a7878fa9d8db7d50c250652ebcb1

data/lib/lita/handlers/yelpme.rb

@@ -3,10 +3,12 @@ require 'yelp'
 module Lita
   module Handlers
   class Yelpme < Handler
-  	route(/^(?:yelp|y)\s+(.+)/u, :yelp, command: true, help: {
+  	route(/^(?:yelp|y)\s+(.+)./u, :yelp, command: true, help: {
       "yelp QUERY" => "Return the first Yelp result with information about the first business found"
     })
-
+    route(/^(?:yelp|y)\s+(.+)@\s(.*)/u, :yelp_city, command: true, help: {
+            "yelp QUERY @ CITY" => "Return the first Yelp result with information about the first business found"
+                })
     def self.default_config(handler_config)
       handler_config.default_city = "San Francisco"
     end
@@ -20,12 +22,28 @@ module Lita
         response.reply('Sorry, could not fetch a response from Yelp')
         return
       end
+      response.reply create_reply(config.default_city, query, yelp_response)
+    end
+    def yelp_city(response)
+      query = response.matches[0][0]
+      city = response.matches[0][1]
+      begin
+        yelp_response = client.search(city, { term: query, limit: 1 })
+      rescue Yelp::Error::MissingAPIKeys
+        Lita.logger.error('Could not receive response from yelp, check your API keys')
+        response.reply('Sorry, could not fetch a response from Yelp')
+        return
+      end
+      response.reply create_reply(city, query, yelp_response)
+    end
+
+    def create_reply(city, query, yelp_response)
       if yelp_response.businesses.length == 0
-        response.reply('Cannot find any businesses in #{config.default_city} matching #{query}')
+        return "Cannot find any businesses in #{city} matching #{query}"
       end
       result = yelp_response.businesses[0]
       address = "#{result.location.address.join(' ')}, #{result.location.city}, #{result.location.state_code} #{result.location.postal_code}"
-      response.reply("#{result.name} (#{result.rating} from #{result.review_count} reviews) @ #{address} - #{result.display_phone} #{result.url}")
+      "#{result.name} (#{result.rating} from #{result.review_count} reviews) @ #{address} - #{result.display_phone} #{result.url}"
     end
 
     def client

data/lita-yelpme.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-yelpme"
-  spec.version       = "0.0.3"
+  spec.version       = "0.1.0"
   spec.authors       = ["Ted"]
   spec.email         = ["ted@stuckinacan.com"]
   spec.description   = %q{A yelp handler for lita}

data/spec/lita/handlers/yelpme_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 
 describe Lita::Handlers::Yelpme, lita_handler: true do
   it { routes_command('yelp state bird provisions').to(:yelp) }
+  it { routes_command('yelp original gravity @ san jose').to(:yelp_city) }
 
   describe "without valid API keys" do
     it "returns an error when no api keys are defined" do
@@ -11,32 +12,71 @@ describe Lita::Handlers::Yelpme, lita_handler: true do
   end
 
   describe "with valid API keys" do
-    let(:yelp_response) {
-        BurstStruct::Burst.new({
-          businesses: [
-            {
-              location: {
-                city: "San Francisco",
-                address: ["1529", "Fillmore", "St"],
-                state_code: "CA",
-                postal_code: "94115"
-              },
-              name: "State Bird Provisions",
-              rating: "4.5",
-              review_count: 787,
-              display_phone: "+1-415-795-1272",
-              url: "http://www.yelp.com/biz/state-bird-provisions-san-francisco"
-            }
-          ]
-      })
-    }
+
     before do
       allow(Yelp::Client).to receive(:new) { Yelp::Client }
       allow(Yelp::Client).to receive(:search) { yelp_response }
     end
-    it "fetches a result from yelp" do
-      send_command("yelp state bird provisions")
-      expect(replies.last).to eq ("State Bird Provisions (4.5 from 787 reviews) @ 1529 Fillmore St, San Francisco, CA 94115 - +1-415-795-1272 http://www.yelp.com/biz/state-bird-provisions-san-francisco")
+    describe "using the default city" do
+      let(:yelp_response) {
+        BurstStruct::Burst.new({
+            businesses: [
+              {
+                location: {
+                  city: "San Francisco",
+                  address: ["1529", "Fillmore", "St"],
+                  state_code: "CA",
+                  postal_code: "94115"
+                },
+                name: "State Bird Provisions",
+                rating: "4.5",
+                review_count: 787,
+                display_phone: "+1-415-795-1272",
+                url: "http://www.yelp.com/biz/state-bird-provisions-san-francisco"
+              }
+            ]
+        })
+      }
+      it "fetches a result from yelp" do
+        send_command("yelp state bird provisions")
+        expect(replies.last).to eq ("State Bird Provisions (4.5 from 787 reviews) @ 1529 Fillmore St, San Francisco, CA 94115 - +1-415-795-1272 http://www.yelp.com/biz/state-bird-provisions-san-francisco")
+      end
+    end
+    describe "using the specified city" do
+      let(:yelp_response) {
+        BurstStruct::Burst.new({
+            businesses: [
+              {
+                location: {
+                  city: "San Jose",
+                  address: ["66", "S", "1st", "St"],
+                  state_code: "CA",
+                  postal_code: "95113"
+                },
+                name: "Original Gravity Public House",
+                rating: "4.0",
+                review_count: 348,
+                display_phone: "+1-408-915-2337",
+                url: "http://www.yelp.com/biz/original-gravity-public-house-san-jose"
+              }
+            ]
+        })
+      }
+      it "fetches a result from the specified city" do
+        send_command('yelp original gravity @ san jose')
+        expect(replies.last).to eq ("Original Gravity Public House (4.0 from 348 reviews) @ 66 S 1st St, San Jose, CA 95113 - +1-408-915-2337 http://www.yelp.com/biz/original-gravity-public-house-san-jose")
+      end
+    end
+    describe "if there are no results" do
+      let(:yelp_response) {
+        BurstStruct::Burst.new({
+            businesses: []
+        })
+      }
+      it "returns an error" do
+        send_command("yelp fhaskjlfhaskfhdaskjlgflaskjhdalkhflaksjhfsa")
+        expect(replies.last).to eq("Cannot find any businesses in San Francisco matching fhaskjlfhaskfhdaskjlgflaskjhdalkhflaksjhfs")
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-yelpme
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Ted
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita