From cf766d253197f939c56136935143a48384d73952 Mon Sep 17 00:00:00 2001
From: Jimmy Cuadra <jimmy@jimmycuadra.com>
Date: Thu, 23 Oct 2014 07:56:20 -0700
Subject: [PATCH] Updates for Lita 4.

---
 lib/lita/handlers/google_images.rb       | 22 ++++++++++------------
 lita-google-images.gemspec               |  6 +++---
 spec/lita/handlers/google_images_spec.rb |  8 ++++----
 spec/spec_helper.rb                      |  2 ++
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/lita/handlers/google_images.rb b/lib/lita/handlers/google_images.rb
index 30f73af..55f377a 100644
--- a/lib/lita/handlers/google_images.rb
+++ b/lib/lita/handlers/google_images.rb
@@ -4,15 +4,20 @@ module Lita
   module Handlers
     class GoogleImages < Handler
       URL = "https://ajax.googleapis.com/ajax/services/search/images"
+      VALID_SAFE_VALUES = %w(active moderate off)
+
+      config :safe_search, types: [String, Symbol], default: :active do
+        validate do |value|
+          unless VALID_SAFE_VALUES.include?(value.to_s.strip)
+            "valid values are :active, :moderate, or :off"
+          end
+        end
+      end
 
       route(/(?:image|img)(?:\s+me)? (.+)/, :fetch, command: true, help: {
         "image QUERY" => "Displays a random image from Google Images matching the query."
       })
 
-      def self.default_config(handler_config)
-        handler_config.safe_search = :active
-      end
-
       def fetch(response)
         query = response.matches[0][0]
 
@@ -20,7 +25,7 @@ def fetch(response)
           URL,
           v: "1.0",
           q: query,
-          safe: safe_value,
+          safe: config.safe_search,
           rsz: 8
         )
 
@@ -50,13 +55,6 @@ def ensure_extension(url)
           "#{url}#.png"
         end
       end
-
-      def safe_value
-        safe = Lita.config.handlers.google_images.safe_search || "active"
-        safe = safe.to_s.downcase
-        safe = "active" unless ["active", "moderate", "off"].include?(safe)
-        safe
-      end
     end
 
     Lita.register_handler(GoogleImages)
diff --git a/lita-google-images.gemspec b/lita-google-images.gemspec
index b68984c..1655a39 100644
--- a/lita-google-images.gemspec
+++ b/lita-google-images.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-google-images"
-  spec.version       = "1.0.5"
+  spec.version       = "2.0.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{A Lita handler for fetching images from Google.}
@@ -14,11 +14,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lita", ">= 2.0"
+  spec.add_runtime_dependency "lita", ">= 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.0.0.beta2"
+  spec.add_development_dependency "rspec", ">= 3.0.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
 end
diff --git a/spec/lita/handlers/google_images_spec.rb b/spec/lita/handlers/google_images_spec.rb
index 2094115..aeced07 100644
--- a/spec/lita/handlers/google_images_spec.rb
+++ b/spec/lita/handlers/google_images_spec.rb
@@ -1,10 +1,10 @@
 require "spec_helper"
 
 describe Lita::Handlers::GoogleImages, lita_handler: true do
-  it { routes_command("image me foo").to(:fetch) }
-  it { routes_command("image foo").to(:fetch) }
-  it { routes_command("img foo").to(:fetch) }
-  it { routes_command("img me foo").to(:fetch) }
+  it { is_expected.to route_command("image me foo").to(:fetch) }
+  it { is_expected.to route_command("image foo").to(:fetch) }
+  it { is_expected.to route_command("img foo").to(:fetch) }
+  it { is_expected.to route_command("img me foo").to(:fetch) }
 
   describe "#foo" do
     let(:response) { double("Faraday::Response") }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index baffc0f..71d039e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,3 +8,5 @@
 
 require "lita-google-images"
 require "lita/rspec"
+
+Lita.version_3_compatibility_mode = false