easy_captcha 0.4.1 → 0.4.2

data/Gemfile

@@ -1,9 +1,11 @@
 source "http://rubygems.org"
-gem "rails", ">= 3.0.0"
+gem "rails", "~> 3.0.0"
 gem "rmagick"
 
 group :development do
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "cover_me"
+  gem "jeweler", "~> 1.5.2"
+  gem 'simplecov', '>= 0.3.8', :require => false
+  gem "rspec", "~> 2.3.0"
+  gem "yard", "~> 0.6.0"
 end

data/Gemfile.lock

@@ -2,87 +2,95 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.7)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.10)
     builder (2.1.2)
-    configatron (2.6.4)
-      yamler (>= 0.1.0)
-    cover_me (1.0.0.rc5)
-      configatron
-      hashie
+    diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     git (1.2.5)
-    hashie (0.4.0)
     i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
     rmagick (2.13.1)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    yamler (0.1.0)
+    tzinfo (0.3.27)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  cover_me
-  jeweler (~> 1.5.1)
-  rails (>= 3.0.0)
+  jeweler (~> 1.5.2)
+  rails (~> 3.0.0)
   rmagick
+  rspec (~> 2.3.0)
+  simplecov (>= 0.3.8)
+  yard (~> 0.6.0)

data/README.rdoc

@@ -80,7 +80,7 @@ You can configure easy_captcha in "config/initializers/easy_captcha.rb", if you
   <% end %>  
 
 == Example app
-You find an example app under: http://github.com/traxanos/easy_captcha_example
+You find an example app under: http://github.com/phatworx/easy_captcha_example
 
 == History
  * 0.1 init
@@ -90,6 +90,7 @@ You find an example app under: http://github.com/traxanos/easy_captcha_example
 
 == Maintainers
 
+* Team Phatworx (http://github.com/phatworx)
 * Marco Scholl (http://github.com/traxanos)
 
 == Contributing to EasyCaptcha

data/Rakefile

@@ -9,47 +9,26 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "easy_captcha"
-  gem.homepage = "http://github.com/traxanos/easy_captcha"
+  gem.homepage = "http://github.com/phatworx/easy_captcha"
   gem.license = "MIT"
-  gem.summary = "Captcha-Plugin for Rails"
-  gem.description = "Captcha-Plugin for Rails"
-  gem.email = "develop@marco-scholl.de"
+  gem.summary = %Q{Captcha-Plugin for Rails}
+  gem.description = %Q{Captcha-Plugin for Rails}
+  gem.email = "team@phatworx.de"
   gem.authors = ["Marco Scholl"]
-  gem.add_runtime_dependency 'rails', '>= 3.0.0'
-  gem.add_runtime_dependency 'rmagick'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-namespace :cover_me do
-  task :report do
-    require 'cover_me'
-    CoverMe.complete!
-  end
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :test do
-  Rake::Task['cover_me:report'].invoke
-end
+task :default => :spec
 
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "easy_captcha #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/easy_captcha.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_captcha}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Scholl"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-06-07}
   s.description = %q{Captcha-Plugin for Rails}
-  s.email = %q{develop@marco-scholl.de}
+  s.email = %q{team@phatworx.de}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -42,10 +42,10 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/traxanos/easy_captcha}
+  s.homepage = %q{http://github.com/phatworx/easy_captcha}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Captcha-Plugin for Rails}
   s.test_files = [
     "spec/easy_captcha_spec.rb",
@@ -53,34 +53,33 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<rmagick>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<cover_me>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<rmagick>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<simplecov>, [">= 0.3.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_dependency(%q<rmagick>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<cover_me>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<rmagick>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<simplecov>, [">= 0.3.8"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<rails>, ["~> 3.0.0"])
     s.add_dependency(%q<rmagick>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<cover_me>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<rmagick>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<simplecov>, [">= 0.3.8"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
   end
 end
 

data/lib/easy_captcha/controller_helpers.rb

@@ -4,7 +4,7 @@ module EasyCaptcha
 
     def self.included(base) #:nodoc:
       base.class_eval do
-        helper_method :valid_captcha?
+        helper_method :valid_captcha?, :captcha_valid?
       end
     end
 
@@ -46,10 +46,11 @@ module EasyCaptcha
     end
 
     # validate given captcha code and re
-    def valid_captcha?(code)
+    def captcha_valid?(code)
       return false if session[:captcha].blank? or code.blank?
       session[:captcha].to_s.upcase == code.to_s.upcase
     end
+    alias_method :valid_captcha?, :captcha_valid?
 
     # reset the captcha code in session for security after each request
     def reset_last_captcha_code!

data/lib/easy_captcha/model_helpers.rb

@@ -20,9 +20,10 @@ module EasyCaptcha
       end
 
       # validate captcha
-      def valid_captcha?
+      def captcha_valid?
         errors.add(:captcha, :invalid) if @captcha.blank? or @captcha_verification.blank? or @captcha.to_s.upcase != @captcha_verification.to_s.upcase 
       end
+      alias_method :valid_captcha?, :captcha_valid?
     end
   end
 end

data/spec/easy_captcha_spec.rb

@@ -1,7 +1,116 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "EasyCaptcha" do
-  it "fails" do
-    #fail "hey buddy, you should probably rename this file and start specing for real"
+describe EasyCaptcha do
+
+  describe :setup do
+    EasyCaptcha.setup do |config|
+      # Cache
+      config.cache        = false
+
+      # Chars
+      config.chars        = %w(2 3 4 5 6 7 9 A C D E F G H J K L M N P Q R S T U X Y Z)
+
+      # Length
+      config.length       = 6
+
+      # Image
+      config.image_height = 40
+      config.image_width  = 140
+
+      # configure generator
+      config.generator :default do |generator|
+
+        # Font
+        generator.font_size              = 24
+        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.image_background_color = "#FFFFFF"
+
+        # Wave
+        generator.wave                   = true
+        generator.wave_length            = (60..100)
+        generator.wave_amplitude         = (3..5)
+
+        # Sketch
+        generator.sketch                 = true
+        generator.sketch_radius          = 3
+        generator.sketch_sigma           = 1
+
+        # Implode
+        generator.implode                = 0.1
+
+        # Blur
+        generator.blur                   = true
+        generator.blur_radius            = 1
+        generator.blur_sigma             = 2
+      end
+    end
+
+    it "sould not cache" do
+      EasyCaptcha.cache?.should be_false
+    end
+
+    it "should have default generator" do
+      EasyCaptcha.generator.should be_an(EasyCaptcha::Generator::Default)
+    end
+
+    describe :depracations do
+      before do
+        EasyCaptcha.setup do |config|
+          # Length
+          config.length                 = 6
+
+          # Image
+          config.image_height           = 40
+          config.image_width            = 140
+
+          # Font
+          config.font_size              = 24
+          config.font_fill_color        = '#333333'
+          config.font_stroke_color      = '#000000'
+          config.font_stroke            = 0
+          config.font_family            = File.expand_path('../../resources/afont.ttf', __FILE__)
+
+          config.image_background_color = "#FFFFFF"
+
+          # Wave
+          config.wave                   = true
+          config.wave_length            = (60..100)
+          config.wave_amplitude         = (3..5)
+
+          # Sketch
+          config.sketch                 = true
+          config.sketch_radius          = 3
+          config.sketch_sigma           = 1
+
+          # Implode
+          config.implode                = 0.1
+
+          # Blur
+          config.blur                   = true
+          config.blur_radius            = 1
+          config.blur_sigma             = 2
+        end
+      end
+
+      it "get config" do
+        [
+            :font_size, :font_fill_color, :font_family, :font_stroke, :font_stroke_color,
+            :image_background_color, :sketch, :sketch_radius, :sketch_sigma, :wave,
+            :wave_length, :wave_amplitude, :implode, :blur, :blur_radius, :blur_sigma
+        ].each do |method|
+          EasyCaptcha.send("#{method}").should_not be_nil
+        end
+      end
+
+      it "method_missing should call normal on non depracations" do
+        lambda { EasyCaptcha.send("a_missing_method") }.should raise_error 
+      end
+    end
+
   end
+
 end

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'simplecov'
+SimpleCov.start 'rails'
+require 'rspec'
 require 'easy_captcha'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+
 end

metadata

@@ -1,131 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: easy_captcha
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 0.4.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Marco Scholl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-06-07 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &12696620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *12696620
+- !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &12696040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *12696040
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &12695460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *12695460
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &12694680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cover_me
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *12694680
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &12693820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *12693820
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &12693040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rmagick
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *12693040
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &12692040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *12692040
 description: Captcha-Plugin for Rails
-email: develop@marco-scholl.de
+email: team@phatworx.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -151,38 +122,34 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/traxanos/easy_captcha
-licenses: 
+homepage: http://github.com/phatworx/easy_captcha
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 465524661579164899
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4431429861703401670
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Captcha-Plugin for Rails
-test_files: 
+test_files:
 - spec/easy_captcha_spec.rb
 - spec/spec_helper.rb