re_captcha 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31d347814d5c601917ac05acf02312f452c94c77
-  data.tar.gz: f7090e239fbb30e554882620e668553b1cd3d010
+  metadata.gz: 0ca32da95a571dc0176b5e575c2035bc7e1cd129
+  data.tar.gz: ace2e275c19d90ab39beadade6dd26c57a830ef3
 SHA512:
-  metadata.gz: 6bee91c96cd61887d7ed7befd9583580724c8753316457245747a4a8ac16b6e4ed1459f03ded78d0ff7ec3e91358b9f33b379e2a621b93342ca53e80e479caa2
-  data.tar.gz: 3e8614228add6f9c91f8068a4f05919c4ade5e25523becd3c0675637f0611a0057567d6e58661d7cac3a01156a79f947f58553dfedd113a94c6e5e84358aeab1
+  metadata.gz: 304b18bec79e191ee1eca20cdfd66bd61475f9d30f48f62a6a46fa29a8a6070120042b7c9b04d1cbceb3a3933ceecbd7aab33908ea7c4ec204743abd2119cd43
+  data.tar.gz: 55ec2d825e617b9d32856a954dcc118c14c281dc4e75e96b47a3a6a354fc779092b033c9502e9e5225aee312398afa64d48a98ecaee855e608426e75418f2452

data/lib/re_captcha/application.rb

@@ -5,13 +5,11 @@ module ReCaptcha
   module Application
     include API
 
-    def recaptcha_valid?(response, remote_ip: nil, model: nil, message: nil)
+    def recaptcha_valid?(response, remote_ip: nil)
       return true if skip_verification?
       params = generate_verification_params(response, remote_ip)
       verification = verify_recaptcha(params)
-      valid = verification['success']
-      add_error_on_model(model, message) unless valid
-      valid
+      verification['success']
     end
 
     private
@@ -27,9 +25,5 @@ module ReCaptcha
     def skip_verification?
       skipped_env.include? env
     end
-
-    def add_error_on_model(model, message)
-      model.errors.add :base, message if model && message
-    end
   end
 end

data/lib/re_captcha/engine.rb

@@ -0,0 +1,15 @@
+require 're_captcha/rails/helpers'
+
+module ReCaptcha
+  class Engine < ::Rails::Engine
+    initializer 're_captcha.action_controller.helpers' do
+      ActiveSupport.on_load(:action_controller) do
+        include ReCaptcha::Rails::Helpers
+      end
+    end
+
+    initializer 're_captcha.action_view.helpers' do
+      ApplicationHelper.send(:include, ReCaptcha::Helpers)
+    end
+  end
+end

data/lib/re_captcha/{helper.rb → helpers.rb}

@@ -1,5 +1,5 @@
 module ReCaptcha
-  module Helper
+  module Helpers
     def recaptcha_tags(options = {})
       html = ''
       html << %(<div class="g-recaptcha" data-sitekey="#{ReCaptcha.client.public_key}" )

data/lib/re_captcha/rails/helpers.rb

@@ -0,0 +1,21 @@
+module ReCaptcha
+  module Rails
+    module Helpers
+      extend ActiveSupport::Concern
+
+      def recaptcha_valid?(model: nil, message: nil)
+        recaptcha_response = params.fetch(:"g-recaptcha-response", "")
+        remote_ip = request.remote_ip
+        valid = ReCaptcha.client.recaptcha_valid?(recaptcha_response, remote_ip: remote_ip)
+        add_error_on_model(model, message) unless valid
+        valid
+      end
+
+      private
+
+      def add_error_on_model(model, message)
+        model.errors.add :base, message if model && message
+      end
+    end
+  end
+end

data/lib/re_captcha/version.rb

@@ -1,3 +1,3 @@
 module ReCaptcha
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.0.9'.freeze
 end

data/lib/re_captcha.rb

@@ -1,6 +1,6 @@
 require 're_captcha/configurable'
 require 're_captcha/client'
-require 're_captcha/helper'
+require 're_captcha/helpers'
 
 module ReCaptcha
   extend Configurable
@@ -13,3 +13,7 @@ module ReCaptcha
     end
   end
 end
+
+if defined?(Rails)
+  require 're_captcha/engine'
+end

data/spec/re_captcha/{helper_spec.rb → helpers_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe ReCaptcha::Helper do
-  let(:dummy_class) { Class.new { include ReCaptcha::Helper } }
+describe ReCaptcha::Helpers do
+  let(:dummy_class) { Class.new { include ReCaptcha::Helpers } }
 
   before(:all) do
     ReCaptcha.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: re_captcha
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - David Jeusette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -86,14 +86,16 @@ files:
 - lib/re_captcha/client.rb
 - lib/re_captcha/configurable.rb
 - lib/re_captcha/configuration.rb
+- lib/re_captcha/engine.rb
 - lib/re_captcha/exceptions.rb
-- lib/re_captcha/helper.rb
+- lib/re_captcha/helpers.rb
+- lib/re_captcha/rails/helpers.rb
 - lib/re_captcha/secure_token_builder.rb
 - lib/re_captcha/version.rb
 - re_captcha.gemspec
 - spec/re_captcha/client_spec.rb
 - spec/re_captcha/configuration_spec.rb
-- spec/re_captcha/helper_spec.rb
+- spec/re_captcha/helpers_spec.rb
 - spec/re_captcha/secure_token_builder_spec.rb
 - spec/re_captcha_spec.rb
 - spec/spec_helper.rb
@@ -124,7 +126,7 @@ summary: reCaptcha helpers
 test_files:
 - spec/re_captcha/client_spec.rb
 - spec/re_captcha/configuration_spec.rb
-- spec/re_captcha/helper_spec.rb
+- spec/re_captcha/helpers_spec.rb
 - spec/re_captcha/secure_token_builder_spec.rb
 - spec/re_captcha_spec.rb
 - spec/spec_helper.rb