yandex_captcha 0.4.3.1 → 0.4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8bfb7505a2114b720360721d2a5e81a9bfdf0a2
-  data.tar.gz: 982bdd9d04c3ea6f697404bbaed5680bf91e5484
+  metadata.gz: fe8fbc6198a6875f892a9e1f5f89a18322027d39
+  data.tar.gz: be090633fc2c299407adedfa06eb8813587724b2
 SHA512:
-  metadata.gz: 4cde01cbaf9648ec509839e43a8792e6ed7ae5d91c3d10f05fd93593afe188005124c681c12914b071fbcaaa76d04f5622ab642e136ee8688defa5edcc235d43
-  data.tar.gz: 720f1b250f37bf0d44b07b0f236ba45b66a6d360c8c21688cdf22f0890a489fea2036f2e480638b72717260dca3612c9d6dd3a2293ac4bbdd9dbb74f1f634730
+  metadata.gz: 597c3dbc4ef6714854d8499f772d2371170b3573e78d60dd77ee7d1eb66e87e03dfb5f95668d1fc22d905756f0e6aeb79ccdc84675104ba32edf7dc8ac6e018c
+  data.tar.gz: 4c8a9aac908039065b28754547a320c0365cc24a3631fb2da76a54d36b6fbcea3128cfc2ca2403a9a76879883baddd79a0e5f64d284cb91dd909bbeca7aba8ab

data/README.md

@@ -60,14 +60,28 @@ end
 #### Code
 
 ```erb
-<%= captcha_tags %>
-<%= captcha_tags ajax:true %>
-<%= captcha_tags noscript:true %>
+<form action="/path" method="POST">
+  <%= captcha_tags ajax:true %>
+  <input type="submit" value="Submit" />
+</form>
+
+or
+
+<%= form_tag some_response_path do %>
+  <%= captcha_tags ajax:true %>
+  <%= submit_tag 'Submit' %>
+<% end %>
 ```
 
 ### In Controllers
 
 ```ruby
+# Rails / Sinatra / or if you included helpers
+if valid_captcha?(params[:captcha_response_id], params[:captcha_response_field])
+  # some
+end
+
+# Long way
 if YandexCaptcha::Verify.valid_captcha?(params[:captcha_response_id], params[:captcha_response_field])
   # some
 end
@@ -76,6 +90,10 @@ end
 ### Other examples
 
 ```ruby
+# Helpers
+spam?("just phrase")
+  => false
+
 # Methods
 YandexCaptcha::Verify.spam?("just phrase")
   => false

data/app/controllers/yandex_captcha/application_controller.rb

@@ -1,6 +1,5 @@
 module YandexCaptcha
   class ApplicationController < ActionController::Base
-    layout false
     protect_from_forgery
   end
 end

data/app/controllers/yandex_captcha/captcha_controller.rb

@@ -2,7 +2,7 @@ module YandexCaptcha
   class CaptchaController < YandexCaptcha::ApplicationController
     respond_to :json
     def show
-      respond_with YandexCaptcha::Verify.get_captcha
+      respond_with get_captcha
     end
   end
 end

data/lib/yandex_captcha/engine.rb

@@ -1,7 +1,6 @@
 module YandexCaptcha
   class Engine < Rails::Engine
     isolate_namespace YandexCaptcha
-    engine_name 'yandex_captcha'
 
     if Rails.version >= '3.1'
       initializer :assets do |app|
@@ -10,10 +9,8 @@ module YandexCaptcha
     end
 
     initializer "setup config" do
-      begin
-        ActionView::Base.send(:include, ::YandexCaptcha::Helpers::Rails)
-        ActionController::Base.send(:include, ::YandexCaptcha::Verify)
-      end
+      ActionView::Base.send(:include, ::YandexCaptcha::Helpers::Rails)
+      ActionController::Base.send(:include, ::YandexCaptcha::Helpers::Base)
     end
   end
 end

data/lib/yandex_captcha/helpers/base.rb

@@ -0,0 +1,25 @@
+module YandexCaptcha
+  module Helpers
+    module Base
+
+      def self.included(base)
+        base.send :include, InstanceMethods
+      end
+
+      module InstanceMethods
+        def spam? *args
+          YandexCaptcha::Verify.spam? *args
+        end
+
+        def get_captcha *args
+          YandexCaptcha::Verify.get_captcha *args
+        end
+
+        def valid_captcha? *args
+          YandexCaptcha::Verify.valid_captcha? *args
+        end
+      end
+
+    end
+  end
+end

data/lib/yandex_captcha/helpers/rails.rb

@@ -1,7 +1,6 @@
 module YandexCaptcha
   module Helpers
     module Rails
-
       def captcha_tags(options = {})
 
         error = options[:error] ||= ((defined? flash) ? flash[:captcha_error] : "")

data/lib/yandex_captcha/helpers/sinatra.rb

@@ -1,7 +1,6 @@
 module YandexCaptcha
   module Helpers
     module Sinatra
-
       def captcha_tags(options = {})
         template = settings.captcha_ajax_template.to_s.to_sym
         if options[:ajax]

data/lib/yandex_captcha/sinatra.rb

@@ -14,6 +14,7 @@ module YandexCaptcha
       end
 
       app.helpers Helpers::Sinatra
+      app.helpers Helpers::Base
     end
   end
 end

data/lib/yandex_captcha/version.rb

@@ -1,3 +1,3 @@
 module YandexCaptcha
-  VERSION = "0.4.3.1"
+  VERSION = "0.4.3.3"
 end

data/lib/yandex_captcha.rb

@@ -1,7 +1,9 @@
 require 'yandex_captcha/configuration'
 require 'yandex_captcha/verify'
+require 'yandex_captcha/helpers/base'
 
 module YandexCaptcha
+  module Helpers ; end
   class NoApiKeyException < Exception; end
   class BadResponseException < Exception; end
   class YandexCaptchaError < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex_captcha
 version: !ruby/object:Gem::Version
-  version: 0.4.3.1
+  version: 0.4.3.3
 platform: ruby
 authors:
 - Alexander Merkulov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -107,6 +107,7 @@ files:
 - lib/yandex_captcha.rb
 - lib/yandex_captcha/configuration.rb
 - lib/yandex_captcha/engine.rb
+- lib/yandex_captcha/helpers/base.rb
 - lib/yandex_captcha/helpers/rails.rb
 - lib/yandex_captcha/helpers/sinatra.rb
 - lib/yandex_captcha/rails.rb
@@ -114,7 +115,7 @@ files:
 - lib/yandex_captcha/verify.rb
 - lib/yandex_captcha/version.rb
 - test/test_helper.rb
-- test/yandex_cleanweb_test.rb
+- test/yandex_captcha_test.rb
 - yandex_captcha.gemspec
 homepage: https://github.com/merqlove/yandex-captcha
 licenses: []
@@ -141,4 +142,4 @@ specification_version: 4
 summary: Ruby wrapper for Yandex.Cleanweb spam detector
 test_files:
 - test/test_helper.rb
-- test/yandex_cleanweb_test.rb
+- test/yandex_captcha_test.rb