yandex_cleanweb 0.0.5 → 0.0.6

data/README.md

@@ -10,7 +10,7 @@ Unfortunatelly, this gem *is not capable with MRI 1.8.7* because of MRI 1.8.7 do
 
 Add this line to your application's Gemfile:
 
-    gem 'yandex_cleanweb'
+    gem 'yandex_cleanweb', '~> 0.0.5'
 
 And then execute:
 

data/lib/yandex_cleanweb/version.rb

@@ -1,3 +1,3 @@
 module YandexCleanweb
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/yandex_cleanweb.rb

@@ -6,8 +6,9 @@ require "net/http"
 
 module YandexCleanweb
   class NoApiKeyException < Exception; end
+  class BadResponseException < Exception; end
 
-  API_URL = 'http://cleanweb-api.yandex.ru/1.0/'
+  API_URL = 'http://cleanweb-api.yandex.ru/1.0'
 
   class << self
     attr_accessor :api_key
@@ -19,6 +20,8 @@ module YandexCleanweb
       request_id_tag = doc.xpath('//check-spam-result/id')
       spam_flag_tag = doc.xpath('//check-spam-result/text')
 
+      raise BadResponseException if request_id_tag.size.zero?
+
       request_id = request_id_tag[0].content
       spam_flag = spam_flag_tag[0].attributes["spam-flag"].content
 
@@ -29,7 +32,7 @@ module YandexCleanweb
           [el.attributes["url"], el.attributes["spam_flag"] == 'yes']
         end
 
-        { :id => request_id, :links => links }
+        { id: request_id, links: links }
       else
         false
       end
@@ -42,7 +45,7 @@ module YandexCleanweb
       url = doc.xpath('//get-captcha-result/url').text
       captcha_id = doc.xpath('//get-captcha-result/captcha').text
 
-      { :url => url, :captcha => captcha_id }
+      { url: url, captcha: captcha_id }
     end
 
     def valid_captcha?(request_id, captcha_id, value)
@@ -56,10 +59,10 @@ module YandexCleanweb
     def api_check_captcha(request_id, captcha_id, value)
       check_captcha_url = "#{API_URL}/check-captcha"
       params = {
-        :key => prepare_api_key,
-        :id => request_id,
-        :captcha => captcha_id,
-        :value => value
+        key: prepare_api_key,
+        id: request_id,
+        captcha: captcha_id,
+        value: value
       }
 
       uri = URI.parse(check_captcha_url)
@@ -70,7 +73,7 @@ module YandexCleanweb
 
     def api_get_captcha(request_id)
       get_captcha_url = "#{API_URL}/get-captcha"
-      params = { :key => prepare_api_key, :id => request_id }
+      params = { key: prepare_api_key, id: request_id }
 
       uri = URI.parse(get_captcha_url)
       uri.query = URI.encode_www_form(params)
@@ -79,7 +82,7 @@ module YandexCleanweb
     end
 
     def api_check_spam(options)
-      cleanweb_options = { :key => prepare_api_key }
+      cleanweb_options = { key: prepare_api_key }
 
       if options[0].is_a?(String) # quick check
         cleanweb_options[:body_plain] = options[0]

data/test/test_helper.rb

@@ -4,5 +4,6 @@ require "minitest/autorun"
 require "minitest/spec"
 require "minitest/pride"
 require "minitest-spec-context"
+require "fakeweb"
 
 require "yandex_cleanweb"

data/test/yandex_cleanweb_test.rb

@@ -63,11 +63,11 @@ describe YandexCleanweb do
 
       describe "advanced mode" do
         it "works" do
-          YandexCleanweb.spam?(:body_plain => "my text", :ip => "80.80.40.3").must_equal false
+          YandexCleanweb.spam?(body_plain: "my text", ip: "80.80.40.3").must_equal false
         end
 
         it "with some html" do
-          result = YandexCleanweb.spam?(:body_html => "some spam <a href='http://spam.com'>spam link</a>")
+          result = YandexCleanweb.spam?(body_html: "some spam <a href='http://spam.com'>spam link</a>")
 
           result[:id].wont_be_empty
           result[:links].must_be_empty
@@ -78,7 +78,7 @@ describe YandexCleanweb do
     describe "#get_captcha + #valid_captcha?" do
 
       it "works for not valid captchas" do
-        result = YandexCleanweb.spam?(:body_html => "some spam <a href='http://spam.com'>spam link</a>")
+        result = YandexCleanweb.spam?(body_html: "some spam <a href='http://spam.com'>spam link</a>")
         captcha = YandexCleanweb.get_captcha(result[:id])
 
         captcha[:url].wont_be_empty
@@ -88,5 +88,16 @@ describe YandexCleanweb do
         valid.must_equal false
       end
     end
+
+    describe "raises BadResponseException in case of empty result" do
+      before do
+        FakeWeb.clean_registry
+      end
+
+      it do
+        FakeWeb.register_uri(:post, "http://cleanweb-api.yandex.ru/1.0/check-spam", body: "")
+        proc { YandexCleanweb.spam?(body_plain: "any text") }.must_raise(YandexCleanweb::BadResponseException)
+      end
+    end
   end
 end

data/yandex_cleanweb.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest", "~> 3.0"
   gem.add_development_dependency "minitest-spec-context"
+  gem.add_development_dependency "fakeweb"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex_cleanweb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper for Yandex.Cleanweb
 email:
 - shatrov@me.com