lita-google 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a736e45151936a08f585996935f61ae6c143b7
-  data.tar.gz: 241882390f67b56d38c3aaaa95eac37e97575850
+  metadata.gz: b4079fc2e7915b16fec653ee9d7d7a4cc66a5ede
+  data.tar.gz: 0119e80fa94736073a9739433cddbe58419d1cb3
 SHA512:
-  metadata.gz: 27d6dd89a82c4c41b4a3f2f155de5225ca725e6435cada67558567dc69d8da2260f16d1f7302ca6abe85093c5ebce6e9d09410733d750a17e8b39a2f00d1fdf8
-  data.tar.gz: f4af94320aba838a1ef3793f4ad0ba9f8f0b4f18bb1efecbcf5ab0924baf56093ddf1f0d28c5e644243ec663f7d08dd62df61c77ed60a926efbc80f004bf7662
+  metadata.gz: 64ac5a07542ac85e256a5630fa8490e3bfad184e95d47a1d3cda5073ba73da97c8649cebf654a74040848da945a1a35252b3032960dc27933c6db277e743ba2b
+  data.tar.gz: de3541305ed634f5ddea55afcbd13156f19d4fa46233ee367a5b5e5d3028662eab0475d57d9d33f7d4fe623d2754a3c709e77978c00c303e2b3c183f58851419

data/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 @@ module Lita
           )
         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)

data/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

data/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

data/spec/spec_helper.rb

@@ -8,3 +8,5 @@ SimpleCov.start { add_filter "/spec/" }
 
 require "lita-google"
 require "lita/rspec"
+
+Lita.version_3_compatibility_mode = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-google
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement