lita-google-images 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e837926f13c2f72258cadd4d8d470245d1fde9
-  data.tar.gz: c9eac5032a52ec69a82e31a714dbbd7bac2ddd6f
+  metadata.gz: 4fac06aeba1ac09047a0c7307451dc796ea991eb
+  data.tar.gz: 98f0683b9b18b2586c0309bf6f085522d1112848
 SHA512:
-  metadata.gz: 1a06cda07b0d9d71380d8f9c996d92f3318f86fd7fcd089c344f260c343608d9c850a1f0ac2ef810220caaf9eefbdf252e8eae9575b807458f988d6cab53e4c5
-  data.tar.gz: 613ae9819e9ce3bf14bde247297e2eaa6ef34bca57d18d8c66685c6f84b9de3bdab8366dee8dca8c15ba5421d447a8b48ebfae137b5bdbcd5359d9a1dc61e6cb
+  metadata.gz: a898432e90044e6129411b7fcb79ccc1f36c78cd73ab8a4085d43793e4fee0755d8d84ac4e013804ae0085f43ab5251bedb445e7fe99e7a5f57229b7b661bcfc
+  data.tar.gz: 65eec2f6975e994aac9e9b71efb8b576e9da7f00cca265efb052faab5308aa38d6e02b908f3e3d3676e89def03ed2a3538ed53ac8066186c44daf9693c38f429

data/README.md

@@ -16,11 +16,15 @@ gem "lita-google-images"
 
 ## Configuration
 
-Set `safe_search` to `false` if you want to allow explicit images. (Default is `true`.)
+### Optional attributes
+
+* `safe_search` (String, Symbol) - The safe search setting to use when querying for images. Possible values are `:active`, `:moderate`, and `:off`. Default: `:active`.
+
+### Example
 
 ```
 Lita.configure do |config|
-  config.handlers.google_images.safe_search = false
+  config.handlers.google_images.safe_search = :off
 end
 ```
 

data/lib/lita/handlers/google_images.rb

@@ -1,27 +1,22 @@
 require "lita"
 
-require "multi_json"
-require "faraday"
-
 module Lita
   module Handlers
     class GoogleImages < Handler
-      def self.help
-        name = Lita.config.robot.mention_name || Lita.config.robot.name
-
-        {
-          "#{name}: image QUERY" => "Displays a random image from Google Images matching the query."
-        }
-      end
-
       URL = "https://ajax.googleapis.com/ajax/services/search/images"
 
-      route(/(?:image|img)(?:\s+me)? (.+)/, to: :fetch)
+      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(matches)
-        query = matches[0][0]
+      def fetch(response)
+        query = response.matches[0][0]
 
-        response = Faraday.get(
+        http_response = http.get(
           URL,
           v: "1.0",
           q: query,
@@ -29,11 +24,11 @@ module Lita
           rsz: 8
         )
 
-        data = MultiJson.load(response.body)
+        data = MultiJson.load(http_response.body)
 
         if data["responseStatus"] == 200
           choice = data["responseData"]["results"].sample
-          reply "#{choice["unescapedUrl"]}#.png"
+          response.reply "#{choice["unescapedUrl"]}#.png"
         else
           reason = data["responseDetails"] || "unknown error"
           Lita.logger.warn(

data/lita-google-images.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-google-images"
-  spec.version       = "0.0.2"
+  spec.version       = "1.0.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{A Lita handler for fetching images from Google.}
@@ -13,9 +13,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lita", "~> 1.0"
-  spec.add_runtime_dependency "multi_json", "~> 1.7"
-  spec.add_runtime_dependency "faraday", "~> 0.8"
+  spec.add_runtime_dependency "lita", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/lita/handlers/google_images_spec.rb

@@ -1,21 +1,19 @@
 require "spec_helper"
 
-describe Lita::Handlers::GoogleImages, lita: true do
-  it { routes("#{robot.name}: image me foo").to(:fetch) }
-  it { routes("#{robot.name}: image foo").to(:fetch) }
-  it { routes("#{robot.name}: img foo").to(:fetch) }
-  it { routes("#{robot.name}: img me foo").to(:fetch) }
-
-  describe ".help" do
-    it "returns a hash of command help" do
-      expect(described_class.help).to be_a(Hash)
-    end
-  end
+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) }
 
   describe "#foo" do
     let(:response) { double("Faraday::Response") }
 
-    before { allow(Faraday).to receive(:get).and_return(response) }
+    before do
+      allow_any_instance_of(
+        Faraday::Connection
+      ).to receive(:get).and_return(response)
+    end
 
     it "replies with a matching image URL on success" do
       allow(response).to receive(:body).and_return(<<-JSON.chomp
@@ -31,8 +29,10 @@ describe Lita::Handlers::GoogleImages, lita: true do
 }
 JSON
       )
-      expect_reply("http://www.example.com/path/to/an/image.jpg#.png")
-      send_test_message("Lita: image carl")
+      send_command("image carl")
+      expect(replies.last).to eq(
+        "http://www.example.com/path/to/an/image.jpg#.png"
+      )
     end
 
     it "logs a warning on failure" do
@@ -43,9 +43,9 @@ JSON
 }
 JSON
       )
-      expect_no_reply
       expect(Lita.logger).to receive(:warn).with(/google fail/)
-      send_test_message("Lita: image carl")
+      send_command("image carl")
+      expect(replies).to be_empty
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
-SimpleCov.start
+SimpleCov.start { add_filter "/spec/" }
 
 require "lita-google-images"
 require "lita/rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-google-images
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -16,42 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +103,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile

data/CHANGELOG.md

@@ -1,9 +0,0 @@
-# Changelog
-
-## 0.0.2 (June 23, 2013)
-
-* Added command help.
-
-## 0.0.1 (June 22, 2013)
-
-Initial release.