negative_captcha 0.2.beta2 → 0.2.beta3

data/lib/negative_captcha/form_builder.rb

@@ -1,6 +1,13 @@
 module ActionView
   module Helpers
     class FormBuilder
+      def negative_captcha(captcha)
+        [
+          hidden_field_tag('timestamp', captcha.timestamp),
+          hidden_field_tag('spinner', captcha.spinner),
+        ].join
+      end
+
       def negative_text_field(captcha, method, options = {})
         html = @template.negative_text_field_tag(
           captcha,

data/lib/negative_captcha/view_helpers.rb

@@ -1,64 +1,62 @@
-module NegativeCaptchaViewHelpers
-  extend ActiveSupport::Concern
-
-  included do
-  end
+module ActionView
+  module Helpers
+    module FormTagHelpers
+      def negative_captcha(captcha)
+        [
+          hidden_field_tag('timestamp', captcha.timestamp),
+          hidden_field_tag('spinner', captcha.spinner),
+        ].join
+      end
 
-  module ClassMethods
-    def negative_captcha(captcha)
-      [
-        hidden_field_tag('timestamp', captcha.timestamp),
-        hidden_field_tag('spinner', captcha.spinner),
-      ].join
-    end
+      def negative_text_field_tag(negative_captcha, field, options={})
+        text_field_tag(
+          negative_captcha.fields[field],
+          negative_captcha.values[field],
+          options
+        ) +
+          content_tag('div', :style => 'position: absolute; left: -2000px;') do
+          text_field_tag(field, '', :tabindex => '999', :autocomplete => 'off')
+        end
+      end
 
-    def negative_text_field_tag(negative_captcha, field, options={})
-      text_field_tag(
-        negative_captcha.fields[field],
-        negative_captcha.values[field],
-        options
-      ) +
-        content_tag('div', :style => 'position: absolute; left: -2000px;') do
-        text_field_tag(field, '', :tabindex => '999', :autocomplete => 'off')
+      def negative_text_area_tag(negative_captcha, field, options={})
+        text_area_tag(
+          negative_captcha.fields[field],
+          negative_captcha.values[field],
+          options
+        ) +
+          content_tag('div', :style => 'position: absolute; left: -2000px;') do
+          text_area_tag(field, '', :tabindex => '999', :autocomplete => 'off')
+        end
       end
-    end
 
-    def negative_text_area_tag(negative_captcha, field, options={})
-      text_area_tag(
-        negative_captcha.fields[field],
-        negative_captcha.values[field],
-        options
-      ) +
-        content_tag('div', :style => 'position: absolute; left: -2000px;') do
-        text_area_tag(field, '', :tabindex => '999', :autocomplete => 'off')
+      def negative_hidden_field_tag(negative_captcha, field, options={})
+        hidden_field_tag(
+          negative_captcha.fields[field],
+          negative_captcha.values[field],
+          options
+        ) +
+          "<div style='position: absolute; left: -2000px;'>" +
+          hidden_field_tag(field, '', :tabindex => '999') +
+          "</div>"
       end
-    end
 
-    def negative_hidden_field_tag(negative_captcha, field, options={})
-      hidden_field_tag(
-        negative_captcha.fields[field],
-        negative_captcha.values[field],
-        options
-      ) +
-        "<div style='position: absolute; left: -2000px;'>" +
-        hidden_field_tag(field, '', :tabindex => '999') +
-        "</div>"
-    end
+      def negative_password_field_tag(negative_captcha, field, options={})
+        password_field_tag(
+          negative_captcha.fields[field],
+          negative_captcha.values[field],
+          options
+        ) +
+          "<div style='position: absolute; left: -2000px;'>" +
+          password_field_tag(field, '', :tabindex => '999') +
+          "</div>"
+      end
 
-    def negative_password_field_tag(negative_captcha, field, options={})
-      password_field_tag(
-        negative_captcha.fields[field],
-        negative_captcha.values[field],
-        options) +
-        "<div style='position: absolute; left: -2000px;'>" +
-        password_field_tag(field, '', :tabindex => '999') +
-        "</div>"
+      def negative_label_tag(negative_captcha, field, name, options={})
+        label_tag(negative_captcha.fields[field], name, options)
+      end
     end
 
-    def negative_label_tag(negative_captcha, field, name, options={})
-      label_tag(negative_captcha.fields[field], name, options)
-    end
+    #TODO: Select, check_box, etc
   end
-
-  #TODO: Select, check_box, etc
 end

data/lib/negative_captcha.rb

@@ -78,6 +78,4 @@ end
 
 
 require 'negative_captcha/view_helpers'
-ActionView::Base.send :include, NegativeCaptchaViewHelpers
-
 require "negative_captcha/form_builder"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: negative_captcha
 version: !ruby/object:Gem::Version
-  version: 0.2.beta2
+  version: 0.2.beta3
   prerelease: 4
 platform: ruby
 authors: