easy_captcha 0.4.7 → 0.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_captcha (0.4.7)
+    easy_captcha (0.5.0)
       bundler (~> 1.0.0)
       rails (>= 3.0.0)
       rmagick (>= 2.13.1)
@@ -12,66 +12,66 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.0)
-      actionpack (= 3.2.0)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
       mail (~> 2.4.0)
-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.0)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-    activesupport (3.2.0)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.0)
+    journey (1.0.3)
     json (1.6.5)
-    mail (2.4.1)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    mime-types (1.18)
+    multi_json (1.2.0)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.0)
-      actionmailer (= 3.2.0)
-      actionpack (= 3.2.0)
-      activerecord (= 3.2.0)
-      activeresource (= 3.2.0)
-      activesupport (= 3.2.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)
       bundler (~> 1.0)
-      railties (= 3.2.0)
-    railties (3.2.0)
-      actionpack (= 3.2.0)
-      activesupport (= 3.2.0)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -93,8 +93,8 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    simplecov (0.5.3)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sprockets (2.1.2)
@@ -106,8 +106,8 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    yard (0.7.3)
+    tzinfo (0.3.32)
+    yard (0.7.5)
 
 PLATFORMS
   java

data/README.rdoc

@@ -22,7 +22,7 @@ You can configure easy_captcha in "config/initializers/easy_captcha.rb", if you
     # Cache
     # config.cache          = true
     # Cache temp dir from Rails.root
-    # config.cache_temp_dir = Rails.root + 'tmp' + 'captchas'
+    # config.cache_temp_dir = Rails.root.join('tmp/captchas')
     # Cache size
     # config.cache_size     = 500
     # Cache expire
@@ -46,9 +46,13 @@ You can configure easy_captcha in "config/initializers/easy_captcha.rb", if you
       # generator.font_fill_color        = '#333333'
       # generator.font_stroke_color      = '#000000'
       # generator.font_stroke            = 0
-      # generator.font_family            = File.expand_path('../../resources/afont.ttf', __FILE__)
+      # generator.font                   = File.expand_path('../../resources/afont.ttf', __FILE__)
 
+
+      # Background color
       # generator.image_background_color = "#FFFFFF"
+      # Or background image (e.g. transparent png)
+      # generator.background_image       = File.expand_path('../../resources/captcha_bg.png', __FILE__)
 
       # Wave
       # generator.wave                   = true
@@ -94,11 +98,13 @@ You find an example app under: http://github.com/phatworx/easy_captcha_example
  * 0.2 cache support for high frequented sites
  * 0.3 use generators, optimizations, update licence to same of all my plugins
  * 0.4 generator support
+ * 0.5 (transparent) background support
 
 == Maintainers
 
 * Team Phatworx (http://github.com/phatworx)
 * Marco Scholl (http://github.com/traxanos)
+* Alexander Dreher (http://github.com/alexdreher)
 
 == Contributing to EasyCaptcha
 

data/easy_captcha.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = EasyCaptcha::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Marco Scholl}]
+  s.authors = [%q{Marco Scholl}, %q{Alexander Dreher}]
   s.date = %q{2011-09-15}
   s.description = %q{Captcha-Plugin for Rails}
   s.email = %q{team@phatworx.de}

data/lib/easy_captcha/generator/default.rb

@@ -9,7 +9,7 @@ module EasyCaptcha
       def defaults
         @font_size              = 24
         @font_fill_color        = '#333333'
-        @font_family            = File.expand_path('../../../../resources/captcha.ttf', __FILE__)
+        @font		        = File.expand_path('../../../../resources/captcha.ttf', __FILE__)
         @font_stroke            = '#000000'
         @font_stroke_color      = 0
         @image_background_color = '#FFFFFF'
@@ -26,10 +26,10 @@ module EasyCaptcha
       end
 
       # Font
-      attr_accessor :font_size, :font_fill_color, :font_family, :font_stroke, :font_stroke_color
+      attr_accessor :font_size, :font_fill_color, :font, :font_family, :font_stroke, :font_stroke_color
 
       # Background
-      attr_accessor :image_background_color
+      attr_accessor :image_background_color, :background_image
 
       # Sketch
       attr_accessor :sketch, :sketch_radius, :sketch_sigma
@@ -60,12 +60,13 @@ module EasyCaptcha
         config = self
         canvas = Magick::Image.new(EasyCaptcha.image_width, EasyCaptcha.image_height) do |variable|
           self.background_color = config.image_background_color unless config.image_background_color.nil?
+          self.background_color = 'none' if config.background_image.present?
         end
 
         # Render the text in the image
         canvas.annotate(Magick::Draw.new, 0, 0, 0, 0, code) {
           self.gravity     = Magick::CenterGravity
-          self.font_family = config.font_family
+          self.font 	   = config.font
           self.font_weight = Magick::LighterWeight
           self.fill        = config.font_fill_color
           if config.font_stroke.to_i > 0
@@ -92,7 +93,16 @@ module EasyCaptcha
         # Crop image because to big after waveing
         canvas = canvas.crop(Magick::CenterGravity, EasyCaptcha.image_width, EasyCaptcha.image_height)
 
-        image = canvas.to_blob { self.format = 'PNG' }
+
+	# 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
@@ -103,4 +113,4 @@ module EasyCaptcha
 
     end
   end
-end
+end

data/lib/easy_captcha/version.rb

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

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: easy_captcha
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
 - Marco Scholl
+- Alexander Dreher
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -13,7 +14,7 @@ date: 2011-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &7457160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7457160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7456540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +38,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7456540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &7455880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,15 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *7455880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &7455220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +70,15 @@ dependencies:
         version: 2.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *7455220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7454260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +86,15 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *7454260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &7468660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +102,12 @@ dependencies:
         version: 2.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *7468660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.1
 description: Captcha-Plugin for Rails
 email: team@phatworx.de
 executables: []
@@ -126,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3853637032844908925
+      hash: -2678361388398322387
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Captcha-Plugin for Rails