simple_captcha2 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e289c77c2ba483a5f6a97578cc107ce7b6429d
-  data.tar.gz: e9bbd53602642e958644e2daeefaca5f260cab40
+  metadata.gz: e59bb7e3f61e3c9f11d561c0bd8d4092bd8d2777
+  data.tar.gz: 8463a940c3d8388a788ce4f0284c84e23b363d71
 SHA512:
-  metadata.gz: 5da26157f9f1dbc8df22fed158939865e01b813e94506dda4ee329359fd5bee28f64c5e576b7c13604a582fa09e43884dd7550330f224f761165cf936d4c30c2
-  data.tar.gz: 2e5330b6f248b00862c1eb36c4c6568ff743ced1e42f2ed8ba020300db067b1a8bad39926808e694b369314f6de16b4ac663e7108e9c6f97311a072c8224e424
+  metadata.gz: c9b3b883001bef8e12d2a00ce43c9c3e090a7249db8c196679879bd537ceb7e72e6cc227414f586aa10a21a92a1bdb7011c838cdc931e0fd86c81ab327e3a38b
+  data.tar.gz: 3754be1742f26b3210adcd52bdd85fcd1565e003756692a2f2d4cfba6f8d7db305c39d9e4ccfea24cc2e5390a91541a23b1e0e53e8a2ccc7b18468d07e069b12

data/README.md

@@ -1,6 +1,7 @@
 #SimpleCaptcha2
 
 [![Build Status](https://travis-ci.org/pludoni/simple-captcha.png?branch=master)](https://travis-ci.org/pludoni/simple-captcha)
+[![Gem Version](https://badge.fury.io/rb/simple_captcha2.svg)](https://badge.fury.io/rb/simple_captcha2)
 
 SimpleCaptcha(2) is the simplest and a robust captcha plugin. Its implementation requires adding up a single line in views and in controllers/models.
 SimpleCaptcha2 is available to be used with Rails 3 + 4.
@@ -44,7 +45,7 @@ and run ``bundle install``.
 After installation, follow these simple steps to setup the plugin. The setup will depend on the version of rails your application is using.
 
 ```bash
-rails generate simple_captcha
+rails generate simple_captcha [template_format] # Available options erb, haml. Default: erb
 rake db:migrate # Mongoid: skip this step and remove the migration
 ```
 
@@ -247,15 +248,6 @@ SimpleCaptcha.setup do |sc|
 end
 ```
 
-You can provide the path where should be stored tmp files.
-It's usefull when you dont have acces to /tmp (default directory)
-
-```ruby
-SimpleCaptcha.setup do |sc|
-  sc.tmp_path = '/tmp' # or somewhere in project eg. Rails.root.join('tmp/simple_captcha').to_s, make shure directory exists
-end
-```
-
 
 ### How to change the CSS for SimpleCaptcha DOM elements?
 

data/lib/generators/USAGE

@@ -1,4 +1,7 @@
-SimplaCaptcha
+SimpleCaptcha
 =============
 # Generate migration and copy view partial
-  rails generate simple_captcha
+  rails generate simple_captcha [template_format]
+  template_format               Sets template format to be generated
+                                Available options: erb, haml
+                                Default: erb

data/lib/generators/simple_captcha_generator.rb

@@ -1,6 +1,7 @@
 require 'rails/generators'
 
 class SimpleCaptchaGenerator < Rails::Generators::Base
+  argument :template_format, :type => :string, :default => 'erb'
   include Rails::Generators::Migration
 
   def self.source_root
@@ -12,7 +13,7 @@ class SimpleCaptchaGenerator < Rails::Generators::Base
   end
 
   def create_partial
-    template "partial.erb", File.join('app/views', 'simple_captcha', "_simple_captcha.erb")
+    template "partial.#{template_format}", File.join('app/views', 'simple_captcha', "_simple_captcha.#{template_format}")
   end
 
   def create_captcha_migration

data/lib/generators/templates/partial.haml

@@ -0,0 +1,28 @@
+:css
+  .simple_captcha{border: 1px solid #ccc; padding: 5px !important;}
+  .simple_captcha,
+  .simple_captcha div{display: table;}
+  .simple_captcha .simple_captcha_field,
+  .simple_captcha .simple_captcha_image{
+    border: 1px solid #ccc;
+    margin: 0px 0px 2px 0px !important;
+    padding: 0px !important;
+  }
+  .simple_captcha .simple_captcha_image img{
+    margin: 0px !important;
+    padding: 0px !important;
+    width: 110px !important;
+  }
+  .simple_captcha .simple_captcha_label{font-size: 12px;}
+  .simple_captcha .simple_captcha_field input{
+    width: 150px !important;
+    font-size: 16px;
+    border: none;
+    background-color: #efefef;
+  }
+
+.simple_captcha
+  .simple_captcha_image= simple_captcha_options[:image]
+  .simple_captcha_field= simple_captcha_options[:field]
+  .simple_captcha_label= simple_captcha_options[:label]
+  .simple_captcha_refresh_button= simple_captcha_options[:refresh_button]

data/lib/simple_captcha/controller.rb

@@ -18,9 +18,10 @@ module SimpleCaptcha #:nodoc
       return @_simple_captcha_result unless @_simple_captcha_result.nil?
 
       if params[:captcha]
-        data = SimpleCaptcha::Utils::simple_captcha_value(params[:captcha_key] || session[:captcha])
+        captcha_key = params[:captcha_key] || session[:captcha]
+        data = SimpleCaptcha::Utils::simple_captcha_value(captcha_key)
         result = data == params[:captcha].delete(" ").upcase
-        SimpleCaptcha::Utils::simple_captcha_passed!(session[:captcha]) if result
+        SimpleCaptcha::Utils::simple_captcha_passed!(captcha_key) if result
         @_simple_captcha_result = result
         result
       else

data/lib/simple_captcha/form_builder.rb

@@ -14,14 +14,14 @@ module SimpleCaptcha
 
     module ClassMethods
       # Example:
-		  # <% form_for :post, :url => posts_path do |form| %>
-		  #   ...
-		  #   <%= form.simple_captcha :label => "Enter numbers.." %>
-		  # <% end %>
-		  #
-		  def simple_captcha(options = {})
-      	options.update :object => @object_name
-      	show_simple_captcha(objectify_options(options))
+      # <% form_for :post, :url => posts_path do |form| %>
+      #   ...
+      #   <%= form.simple_captcha :label => "Enter numbers.." %>
+      # <% end %>
+      #
+      def simple_captcha(options = {})
+        options.update :object => @object_name
+        show_simple_captcha(objectify_options(options))
       end
 
       private
@@ -31,7 +31,7 @@ module SimpleCaptcha
         end
 
         def simple_captcha_field(options={})
-          html = {:autocomplete => 'off', :required => 'required', :value => ''}
+          html = {:autocomplete => 'off', :autocorrect => 'off', :autocapitalize => 'off', :required => 'required', :value => ''}
           html.merge!(options[:input_html] || {})
           html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
 

data/lib/simple_captcha/image.rb

@@ -75,7 +75,9 @@ module SimpleCaptcha #:nodoc
         params << "-pointsize 22"
         params << "-implode #{ImageHelpers.implode}"
         params << "label:#{text}"
-        params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
+        if SimpleCaptcha.noise and SimpleCaptcha.noise > 0
+          params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
+        end
         params << "jpeg:-"
 
         SimpleCaptcha::Utils::run("convert", params.join(' '))

data/lib/simple_captcha/simple_captcha_data.rb

@@ -15,7 +15,7 @@ module SimpleCaptcha
 
     class << self
       def get_data(key)
-        where(key: key).first || new(key: key)
+        where(key: key).first_or_initialize
       end
 
       def remove_data(key)

data/lib/simple_captcha/version.rb

@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.3.4".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/simple_captcha/view.rb

@@ -90,7 +90,7 @@ module SimpleCaptcha #:nodoc
       end
 
       def simple_captcha_field(options={})
-        html = {:autocomplete => 'off', :required => 'required'}
+        html = {:autocomplete => 'off', :autocorrect => 'off', :autocapitalize => 'off', :required => 'required'}
         html.merge!(options[:input_html] || {})
         html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_captcha2
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Pavlo Galeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - lib/generators/simple_captcha_generator.rb
 - lib/generators/templates/migration.rb
 - lib/generators/templates/partial.erb
+- lib/generators/templates/partial.haml
 - lib/simple_captcha.rb
 - lib/simple_captcha/controller.rb
 - lib/simple_captcha/engine.rb
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: SimpleCaptcha is the simplest and a robust captcha plugin.