galetahub-simple_captcha 0.1.1 → 0.1.2

data/README.rdoc

@@ -24,6 +24,10 @@ backward compatibility with previous versions of Rails.
 
 ==Installation
 
+  gem "galetahub-simple_captcha", :require => "simple_captcha"
+
+or
+
   gem 'simple_captcha', :git => 'git://github.com/galetahub/simple-captcha.git'
 
 ==Setup

data/Rakefile

@@ -20,22 +20,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "galetahub-simple_captcha"
-    gemspec.version = '0.1.1'
-    gemspec.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."
-    gemspec.description = "SimpleCaptcha is available to be used with Rails 3 or above and also it provides the backward compatibility with previous versions of Rails."
-    gemspec.email = "superp1987@gmail.com"
-    gemspec.homepage = "http://github.com/galetahub/simple-captcha"
-    gemspec.authors = ["Pavlo Galeta", "Igor Galeta"]
-    gemspec.files = FileList["[A-Z]*", "{lib}/**/*", "{app}/**/*", "{config}/**/*", "{test}/**/*"]
-    gemspec.rubyforge_project = "simple_captcha"
-  end
-  
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/lib/simple_captcha.rb

@@ -12,6 +12,7 @@ module SimpleCaptcha
   autoload :CustomFormBuilder, 'simple_captcha/formtastic'
 
   autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data'
+  autoload :Middleware,        'simple_captcha/middleware'
 
   mattr_accessor :image_size
   @@image_size = "100x28"
@@ -48,4 +49,4 @@ module SimpleCaptcha
   end
 end
 
-require 'simple_captcha/railtie'
+require 'simple_captcha/engine' if defined?(Rails)

data/lib/simple_captcha/active_record.rb

@@ -32,8 +32,8 @@ module SimpleCaptcha #:nodoc
       def apply_simple_captcha(options = {})
         options = { :add_to_base => false }.merge(options)
                   
-        write_inheritable_attribute :simple_captcha_options, options
-        class_inheritable_reader :simple_captcha_options
+        class_attribute :simple_captcha_options
+        self.simple_captcha_options = options
         
         unless self.is_a?(ClassMethods)
           include InstanceMethods

data/lib/simple_captcha/{railtie.rb → engine.rb}

@@ -3,7 +3,7 @@ require 'rails'
 require 'simple_captcha'
 
 module SimpleCaptcha
-  class Railtie < ::Rails::Engine
+  class Engine < ::Rails::Engine
     config.before_initialize do
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.send(:include, SimpleCaptcha::ModelHelpers)
@@ -18,6 +18,8 @@ module SimpleCaptcha
         Formtastic::SemanticFormHelper.builder = SimpleCaptcha::CustomFormBuilder
       end
     end
+    
+    config.app_middleware.use SimpleCaptcha::Middleware
   end
 end
 

data/lib/simple_captcha/formtastic.rb

@@ -1,5 +1,5 @@
 module SimpleCaptcha
-  class CustomFormBuilder < Formtastic::SemanticFormBuilder
+  class CustomFormBuilder < Formtastic::FormBuilder
 
     private
 

data/lib/simple_captcha/middleware.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+module SimpleCaptcha
+  class Middleware
+    include SimpleCaptcha::ImageHelpers
+    
+    def initialize(app, options={})
+      @app = app
+      self
+    end
+    
+    def call(env) # :nodoc:
+      if env["REQUEST_METHOD"] == "GET" && captcha_path?(env['PATH_INFO'])
+        make_image(env)
+      else
+        @app.call(env)
+      end
+    end
+    
+    protected
+      def make_image(env, body = '', status = 404)
+        request = Rack::Request.new(env)
+        code = request.params["code"]
+        
+        if !code.blank? && Utils::simple_captcha_value(code)
+          status = 200
+          body = generate_simple_captcha_image(code)
+          body = File.open(body, "rb")
+        end
+        
+        [status, {'Content-Type' => 'image/jpeg', 'Content-Length' => body.size.to_s}, body]
+      end
+      
+      def captcha_path?(request_path)
+        request_path.include?('/simple_captcha')
+      end
+  end
+end

data/lib/simple_captcha/version.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+module SimpleCaptcha
+  VERSION = "0.1.2".freeze
+end

data/lib/simple_captcha/view.rb

@@ -62,7 +62,7 @@ module SimpleCaptcha #:nodoc
         defaults[:time] = options[:time] || Time.now.to_i
         
         query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        url = "/simple_captcha/#{simple_captcha_key}?#{query}"
+        url = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
         
         "<img src='#{url}' alt='captcha' />".html_safe
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: galetahub-simple_captcha
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Pavlo Galeta
@@ -16,12 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 +03:00
+date: 2011-11-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: SimpleCaptcha is available to be used with Rails 3 or above and also it provides the backward compatibility with previous versions of Rails.
-email: superp1987@gmail.com
+email: galeta.igor@gmail.com
 executables: []
 
 extensions: []
@@ -29,24 +29,24 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- README.rdoc
-- Rakefile
-- app/controllers/simple_captcha_controller.rb
-- config/routes.rb
-- lib/generators/USAGE
 - lib/generators/simple_captcha_generator.rb
 - lib/generators/templates/migration.rb
 - lib/generators/templates/partial.erb
+- lib/generators/USAGE
 - lib/simple_captcha.rb
-- lib/simple_captcha/active_record.rb
+- lib/simple_captcha/engine.rb
+- lib/simple_captcha/utils.rb
 - lib/simple_captcha/controller.rb
-- lib/simple_captcha/form_builder.rb
+- lib/simple_captcha/view.rb
 - lib/simple_captcha/formtastic.rb
-- lib/simple_captcha/image.rb
-- lib/simple_captcha/railtie.rb
+- lib/simple_captcha/form_builder.rb
 - lib/simple_captcha/simple_captcha_data.rb
-- lib/simple_captcha/utils.rb
-- lib/simple_captcha/view.rb
+- lib/simple_captcha/middleware.rb
+- lib/simple_captcha/version.rb
+- lib/simple_captcha/active_record.rb
+- lib/simple_captcha/image.rb
+- Rakefile
+- README.rdoc
 - test/simple_captcha_test.rb
 has_rdoc: true
 homepage: http://github.com/galetahub/simple-captcha
@@ -77,10 +77,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: simple_captcha
+rubyforge_project: galetahub-simple_captcha
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: SimpleCaptcha is the simplest and a robust captcha plugin.
-test_files: []
-
+test_files: 
+- test/simple_captcha_test.rb

data/app/controllers/simple_captcha_controller.rb

@@ -1,17 +0,0 @@
-class SimpleCaptchaController < ActionController::Metal
-  include ActionController::Streaming
-  include SimpleCaptcha::ImageHelpers
-
-  # GET /simple_captcha
-  def show
-    unless params[:id].blank?
-      send_file(
-        generate_simple_captcha_image(params[:id]),
-        :type => 'image/jpeg',
-        :disposition => 'inline',
-        :filename => 'simple_captcha.jpg')
-    else
-      self.response_body = [404, {"Content-Type" => "text/html"}, ["Not Found"]]
-    end
-  end
-end

data/config/routes.rb

@@ -1,3 +0,0 @@
-Rails.application.routes.draw do
-  match '/simple_captcha/:id', :to => 'simple_captcha#show', :as => :simple_captcha
-end