easy_captcha 0.5.0 → 0.5.1

data/Gemfile.lock

@@ -1,113 +1,113 @@
 PATH
   remote: .
   specs:
-    easy_captcha (0.5.0)
-      bundler (~> 1.0.0)
+    easy_captcha (0.5.1)
+      bundler (>= 1.1.0)
       rails (>= 3.0.0)
       rmagick (>= 2.13.1)
-      rspec-rails (~> 2.8.1)
+      rspec-rails (>= 2.8.1)
       simplecov (>= 0.3.8)
       yard (>= 0.7.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.3)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.5)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.2.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rmagick (2.13.1)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    simplecov (0.6.1)
+      rspec (~> 2.11.0)
+    simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
-    yard (0.7.5)
+    tzinfo (0.3.33)
+    yard (0.8.2.1)
 
 PLATFORMS
   java

data/README.rdoc

@@ -1,6 +1,8 @@
 = EasyCaptcha
 A simple captcha implementation for rails 3 based on rmagick
 
+Tested with Rails 3.2.8
+
 https://travis-ci.org/phatworx/easy_captcha.png
 
 == Installation

data/easy_captcha.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('rails', [">= 3.0.0"])
-  s.add_dependency('bundler', ["~> 1.0.0"])
+  s.add_dependency('bundler', [">= 1.1.0"])
   s.add_dependency('simplecov', [">= 0.3.8"])
-  s.add_dependency('rspec-rails', ["~> 2.8.1"])
+  s.add_dependency('rspec-rails', [">= 2.8.1"])
   s.add_dependency('yard', [">= 0.7.0"])
 
 

data/lib/easy_captcha/generator/default.rb

@@ -94,15 +94,15 @@ module EasyCaptcha
         canvas = canvas.crop(Magick::CenterGravity, EasyCaptcha.image_width, EasyCaptcha.image_height)
 
 
-	# Combine images if background image is present
-	if config.background_image.present?
-	  background = Magick::Image.read(config.background_image).first
-	  background.composite!(canvas, Magick::CenterGravity, Magick::OverCompositeOp)
-	  
-	  image = background.to_blob { self.format = 'PNG' }
-	else
-          image = canvas.to_blob { self.format = 'PNG' }
-	end
+        # Combine images if background image is present
+        if config.background_image.present?
+          background = Magick::Image.read(config.background_image).first
+          background.composite!(canvas, Magick::CenterGravity, Magick::OverCompositeOp)
+
+          image = background.to_blob { self.format = 'PNG' }
+        else
+                image = canvas.to_blob { self.format = 'PNG' }
+        end
 
         # ruby-1.9
         image = image.force_encoding 'UTF-8' if image.respond_to? :force_encoding

data/lib/easy_captcha/parameters.rb

@@ -0,0 +1,31 @@
+module ActionDispatch
+  module Http
+    module Parameters
+      private
+
+      # TODO: Validate that the characters are UTF-8. If they aren't,
+      # you'll get a weird error down the road, but our form handling
+      # should really prevent that from happening
+      def encode_params(params)
+        return params unless "ruby".encoding_aware?
+
+        if params.is_a?(String)
+          return params.dup.force_encoding("UTF-8").encode!
+        elsif !params.is_a?(Hash)
+          return params
+        end
+
+        params.each do |k, v|
+          case v
+          when Hash
+            encode_params(v)
+          when Array
+            v.map! {|el| encode_params(el) }
+          else
+            encode_params(v)
+          end
+        end
+      end
+		end
+	end
+end

data/lib/easy_captcha/version.rb

@@ -1,3 +1,3 @@
 module EasyCaptcha
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/easy_captcha/view_helpers.rb

@@ -5,7 +5,7 @@ module EasyCaptcha
     def captcha_tag(*args)
       options = { :alt => 'captcha', :width => EasyCaptcha.image_width, :height => EasyCaptcha.image_height }
       options.merge! args.extract_options!
-      image_tag(captcha_path(:i => Time.now.to_i), options)
+      image_tag(captcha_url(:i => Time.now.to_i), options)
     end
   end
 end

data/lib/easy_captcha.rb

@@ -3,6 +3,7 @@ require 'rails'
 require 'action_controller'
 require 'active_record'
 require 'active_support'
+require 'easy_captcha/parameters'
 
 # Captcha-Plugin for Rails
 module EasyCaptcha

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_captcha
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -33,17 +33,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +65,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.1
   type: :runtime
@@ -73,7 +73,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.1
 - !ruby/object:Gem::Dependency
@@ -133,6 +133,7 @@ files:
 - lib/easy_captcha/generator/base.rb
 - lib/easy_captcha/generator/default.rb
 - lib/easy_captcha/model_helpers.rb
+- lib/easy_captcha/parameters.rb
 - lib/easy_captcha/routes.rb
 - lib/easy_captcha/version.rb
 - lib/easy_captcha/view_helpers.rb
@@ -157,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2678361388398322387
+      hash: 4538857605889255644
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: