lita-google-images 1.0.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70de47b530e136b71b4cc669084d261366860c42
-  data.tar.gz: 326ee33d20ebfeb13276ab39036cd3bb13de1a11
+  metadata.gz: a3d9a71b531642fd0dbf1a9e84488fd8474c8e1a
+  data.tar.gz: 8a479aa429d9217b6c32786dfcfa48d0a80899a5
 SHA512:
-  metadata.gz: 0ffdffd8175cf3bde9e0fc3df978824ac39b7f24c596e19f68f78cb59ebdb802be9ecdc15e14976128f3a14ab576f7d534e9653298e166b33ddf2707e88813aa
-  data.tar.gz: 91eb3377b4dfb204225be6c71334cd68285ce0c5bb462c2a86d1de4be304db257b66c18a9f550eac179fb199ebb4838ca653227a3e6dda519f4b9fc1c11caa98
+  metadata.gz: 31884376917a510d9682a390861a65ed6e950cf640197d6240dc11018708df8e7c844b90577d40efa7dafaf050d355db11d828042d134fa06db594a6bb9467ca
+  data.tar.gz: 34ef2fde97127a128d0f661180b51ad1eb13ae500e398049db911831abc117dabc5bd3748eaa0a4082f4e5b2e5822e5d5ffb9c67c96c754da1cba17626b76b0b

data/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 @@ module Lita
           URL,
           v: "1.0",
           q: query,
-          safe: safe_value,
+          safe: config.safe_search,
           rsz: 8
         )
 
@@ -50,13 +55,6 @@ module Lita
           "#{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)

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

data/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") }

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-google-images
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 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.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        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