easy_captcha 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/easy_captcha.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_captcha}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Scholl"]
-  s.date = %q{2011-01-26}
+  s.date = %q{2011-01-27}
   s.description = %q{Captcha-Plugin for Rails}
   s.email = %q{develop@marco-scholl.de}
   s.extra_rdoc_files = [

data/lib/easy_captcha/captcha.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module EasyCaptcha
   # captcha generation class
   class Captcha
@@ -7,9 +8,9 @@ module EasyCaptcha
     attr_reader :image
 
     # generate captcha by code
-    def initialize(code, file = nil)
+    def initialize code
       @code = code
-      generate_captcha(file)
+      generate_captcha
     end
 
     def inspect #:nodoc:
@@ -18,8 +19,8 @@ module EasyCaptcha
 
     private
 
-    def generate_captcha(file = nil) #:nodoc:
-      @image = EasyCaptcha.generator.generate(@code, file)
+    def generate_captcha #:nodoc:
+      @image = EasyCaptcha.generator.generate(@code)
     end
   end
 end

data/lib/easy_captcha/controller_helpers.rb

@@ -11,8 +11,12 @@ module EasyCaptcha
     # generate captcha image and return it as blob
     def generate_captcha
       if EasyCaptcha.cache
+        # create cache dir
         FileUtils.mkdir_p(EasyCaptcha.cache_temp_dir)
+
+        # select all generated captchas from cache
         files = Dir.glob(EasyCaptcha.cache_temp_dir + "*")
+        
         unless files.size < EasyCaptcha.cache_size
           file              = File.open(files.at(Kernel.rand(files.size)))
           session[:captcha] = File.basename(file.path)
@@ -24,7 +28,13 @@ module EasyCaptcha
           end
         end
         generated_code = generate_captcha_code
-        Captcha.new(generated_code, EasyCaptcha.cache_temp_dir + "#{generated_code}").image
+        image = Captcha.new(generated_code).image
+
+        # write captcha for caching
+        File.open(EasyCaptcha.cache_temp_dir + "#{generated_code}", 'w') { |f| f.write image }
+
+        # return image
+        image
       else
         Captcha.new(generate_captcha_code).image
       end

data/lib/easy_captcha/generator/default.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module EasyCaptcha
   module Generator
 
@@ -55,7 +56,7 @@ module EasyCaptcha
       end
 
       # generate image
-      def generate(code, file = nil)
+      def generate(code)
         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?
@@ -91,10 +92,11 @@ module EasyCaptcha
         # Crop image because to big after waveing
         canvas = canvas.crop(Magick::CenterGravity, EasyCaptcha.image_width, EasyCaptcha.image_height)
 
-        unless file.nil?
-          canvas.write(file) { self.format = 'PNG' }
-        end
         image = canvas.to_blob { self.format = 'PNG' }
+
+        # ruby-1.9
+        image = image.force_encoding 'UTF-8' if image.respond_to? :force_encoding
+
         canvas.destroy!
         image
       end

data/lib/easy_captcha/view_helpers.rb

@@ -3,7 +3,7 @@ module EasyCaptcha
   module ViewHelpers
     # generate an image_tag for captcha image
     def captcha_tag(*args)
-      options = { :alt => 'captcha' }
+      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)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Marco Scholl
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +01:00
+date: 2011-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -88900623567721278
+      hash: 465524661579164899
       segments: 
       - 0
       version: "0"