yandex_captcha 0.4.3.5 → 0.4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec49d32aa312a91762b280c934c38aa8fc44890
-  data.tar.gz: 42b4f188c419dc203b5742e5bbbd0c8d5f0e560f
+  metadata.gz: 3f3c550c9209b0bb1f5b67ea60688d30abee59e5
+  data.tar.gz: 6af1b0ac0c5ece46e60c54cd67baa8ad71a366d1
 SHA512:
-  metadata.gz: ba4557d65c6bbd374c806e01c846f6ff3c0e4f8e1df1523ced84905d754bb43af1afed921f52e300ca0cc18b3636b0789de68031dd6167d055daad3df0b9cc74
-  data.tar.gz: 0b64cb323d9b11471b83c648b20263159e6436b35911cbce215e3a6fd8995ec16ddb34f755a4946994428336cbaa766878149917c72be7945876cd9a7d0b445a
+  metadata.gz: 8547a1a047cf4ad1370798df4ef90fbe9ce5064c871eb11c2abce55f4595fd2b2d0b7c22afea6c5dcf8df1bb3d6aabe6f3aa6b5f4cdddc2e3bca1d5260b055e9
+  data.tar.gz: 070ad9f9fcc2668d9c66628cf158cc9de4d7bb2fc4d8c027adde625a48ad128d10961bc52bd030286c9c2a934e41701f94b1cf54776e74c5c7cd2a90b872b42b

data/lib/yandex_captcha/version.rb

@@ -1,3 +1,3 @@
 module YandexCaptcha
-  VERSION = "0.4.3.5"
+  VERSION = "0.4.3.6"
 end

data/test/test_helper.rb

@@ -4,6 +4,8 @@ require "minitest/autorun"
 require "minitest/spec"
 require "minitest/pride"
 require "minitest-spec-context"
-require "fakeweb"
+require 'webmock/minitest'
 
-require "yandex_captcha"
+require "yandex_captcha"
+
+WebMock.allow_net_connect!

data/test/yandex_captcha_test.rb

@@ -85,50 +85,53 @@ describe YandexCaptcha do
       end
     end
 
-    # describe "#spam?" do
-    #
-    #   describe "simple check" do
-    #     it "works" do
-    #       YandexCaptcha::Verify.spam?("фраза").must_equal false
-    #       YandexCaptcha::Verify.spam?("недорого увеличение пениса проститутки").must_equal false
-    #     end
-    #   end
-    #
-    #   describe "advanced mode" do
-    #     it "works" do
-    #       YandexCaptcha::Verify.spam?(body_plain: "my text", ip: "80.80.40.3").must_equal false
-    #     end
-    #
-    #     it "with some html" do
-    #       result = YandexCaptcha::Verify.spam?(body_html: "some spam <a href='http://spam.com'>spam link</a>")
-    #
-    #       result[:id].wont_be_empty
-    #       result[:links].must_be_empty
-    #     end
-    #   end
-    # end
+    describe "#spam?" do
+
+      describe "simple check" do
+        it "works" do
+          YandexCaptcha::Verify.spam?("фраза").must_equal false
+          YandexCaptcha::Verify.spam?("недорого увеличение пениса проститутки").must_equal false
+        end
+      end
+
+      describe "advanced mode" do
+        it "works" do
+          YandexCaptcha::Verify.spam?(body_plain: "my text", ip: "80.80.40.3").must_equal false
+        end
+
+        it "with some html" do
+          result = YandexCaptcha::Verify.spam?(body_html: "some spam <a href='http://spam.com'>spam link</a>")
+
+          result[:id].wont_be_empty
+          result[:links].must_be_empty
+        end
+      end
+    end
 
     describe "#get_captcha + #valid_captcha?" do
 
       it "works for not valid captchas" do
-        captcha = YandexCaptcha::Verify.get_captcha
+        result = YandexCaptcha::Verify.spam?(body_html: "some spam <a href='http://spam.com'>spam link</a>")
+        captcha = YandexCaptcha::Verify.get_captcha(result[:id])
 
         captcha[:url].wont_be_empty
         captcha[:captcha].wont_be_empty
 
-        valid = YandexCaptcha::Verify.valid_captcha?(captcha[:captcha], "1234")
+        valid = YandexCaptcha::Verify.valid_captcha?(captcha[:captcha], "1234", result[:id])
         valid.must_equal false
       end
     end
 
     describe "raises BadResponseException in case of empty result" do
       before do
-        FakeWeb.clean_registry
+        WebMock.disable_net_connect!
       end
 
       it "check for spam" do
-        FakeWeb.register_uri(:post, "http://cleanweb-api.yandex.ru/1.0/check-spam", body: "")
+        stub_request(:post, "http://cleanweb-api.yandex.ru/1.0/check-spam")
         proc { YandexCaptcha::Verify.spam?(body_plain: "any text") }.must_raise(YandexCaptcha::BadResponseException)
+        WebMock.reset!
+        WebMock.allow_net_connect!
       end
     end
   end

data/yandex_captcha.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex_captcha
 version: !ruby/object:Gem::Version
-  version: 0.4.3.5
+  version: 0.4.3.6
 platform: ruby
 authors:
 - Alexander Merkulov
@@ -68,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="