From fa762c2f748deca611e0c489e5a4e07b417b23ef Mon Sep 17 00:00:00 2001
From: Jimmy Cuadra <jimmy@jimmycuadra.com>
Date: Thu, 23 Oct 2014 07:47:31 -0700
Subject: [PATCH] Use Lita 4 configuration system.

---
 lib/lita/handlers/google.rb       | 24 ++++++++++--------------
 lita-google.gemspec               |  6 +++---
 spec/lita/handlers/google_spec.rb |  6 +++---
 spec/spec_helper.rb               |  2 ++
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/lib/lita/handlers/google.rb b/lib/lita/handlers/google.rb
index 5ea0117..8050efd 100644
--- a/lib/lita/handlers/google.rb
+++ b/lib/lita/handlers/google.rb
@@ -7,21 +7,26 @@ module Lita
   module Handlers
     class Google < Handler
       URL = "https://ajax.googleapis.com/ajax/services/search/web"
+      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(/^(?:google|g)\s+(.+)/i, :search, command: true, help: {
         "google QUERY" => "Return the first Google search result for QUERY."
       })
 
-      def self.default_config(handler_config)
-        handler_config.safe_search = :active
-      end
-
       def search(response)
         query = response.matches[0][0]
 
         http_response = http.get(
           URL,
-          safe: safe_value,
+          safe: config.safe_search,
           q: query,
           v: "1.0"
         )
@@ -43,15 +48,6 @@ def search(response)
           )
         end
       end
-
-      private
-
-      def safe_value
-        safe = Lita.config.handlers.google.safe_search || "active"
-        safe = safe.to_s.downcase
-        safe = "active" unless ["active", "moderate", "off"].include?(safe)
-        safe
-      end
     end
 
     Lita.register_handler(Google)
diff --git a/lita-google.gemspec b/lita-google.gemspec
index 472b77f..f0e41ff 100644
--- a/lita-google.gemspec
+++ b/lita-google.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-google"
-  spec.version       = "0.1.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{A Lita handler for returning Google search results.}
@@ -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.6"
+  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_spec.rb b/spec/lita/handlers/google_spec.rb
index 72557df..6dc6d5e 100644
--- a/spec/lita/handlers/google_spec.rb
+++ b/spec/lita/handlers/google_spec.rb
@@ -1,9 +1,9 @@
 require "spec_helper"
 
 describe Lita::Handlers::Google, lita_handler: true do
-  it { routes_command("google ruby").to(:search) }
-  it { routes_command("google me ruby").to(:search) }
-  it { routes_command("g ruby").to(:search) }
+  it { is_expected.to route_command("google ruby").to(:search) }
+  it { is_expected.to route_command("google me ruby").to(:search) }
+  it { is_expected.to route_command("g ruby").to(:search) }
 
   describe "#search" do
     let(:response) do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 703fd04..c388c5a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,3 +8,5 @@
 
 require "lita-google"
 require "lita/rspec"
+
+Lita.version_3_compatibility_mode = false