catptcha 0.0.3 → 0.0.4

data/README.markdown

@@ -13,24 +13,38 @@ From within your Rails application:
 
 Add the gem to your Gemfile and load the rake tasks.
 
-   echo "gem 'catptcha'" >> Gemfile
-   echo "load 'tasks/catptcha.rake'" >> Rakefile
+    echo "gem 'catptcha'" >> Gemfile
+    echo "load 'tasks/catptcha.rake'" >> Rakefile
 
 Put your flickr keys in config/flickr.yml, see flickr.example.yml.
 
 Generate and run the migration.
 
-   ruby script/generate catptcha_migration add_catptcha_tables
-   rake db:migrate
+    ruby script/generate catptcha_migration add_catptcha_tables
+    rake db:migrate
 
 Seed the images.
 
-   rake catptcha:seed
+    rake catptcha:seed
 
 Run the tests.
 
-   rake db:test:prepare
-   rake catptcha:test
+    rake db:test:prepare
+    rake catptcha:test
+
+## Usage
+
+Include the partial in your form contents.
+
+    render :inline => Catptcha.puzzle_tags
+
+Check the result in your controller. 
+
+    if Catptcha.check_guess(params[:catptcha_guess])`.
+      # passed
+    else
+      # failed
+    end
 
 ## Author
 

data/lib/catptcha/photo_group.rb

@@ -16,7 +16,6 @@ class Catptcha::PhotoGroup < ActiveRecord::Base
   end
 
   def self.random count
-    # TODO generate an identity/key column that isn't easy to guess
     Catptcha::Photo.all(
       :conditions => ['photo_group_id in (?)', all.map(&:id)],
       :offset => rand(photos_count-count).to_i,

data/lib/catptcha.rb

@@ -1,5 +1,5 @@
 module Catptcha
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   class << self
     # Get a list of 3 kitten photos
@@ -12,13 +12,33 @@ module Catptcha
       PhotoGroup.not_kittens.random(6)
     end
 
-    def check_guesses *ids
-      guesses = ids.flatten.compact
+    def puzzle
+      (kittens + not_kittens).sort_by {rand}
+    end
+
+    def puzzle_tags
+      tags = '<div class="catptcha" style="width:350px"><p>Click the kittens!</p>'
+      puzzle.each do |photo|
+        tags << <<-EOT
+        <span class="catptcha_guess" style="float:left">
+          <input type="checkbox" id="catptcha_guess_#{photo.key}" name="catptcha_guess[]" value="#{ photo.key }" />
+          <label for="catptcha_guess_#{photo.key }">
+            <img src="#{ photo.url }" />
+          </label>
+        </span>
+        EOT
+      end
+      tags << '</div>'
+      tags
+    end
+
+    def check_guess *keys
+      guesses = keys.flatten.compact
       if guesses.size != 3
         return false
       end
       3 == Photo.count(:include => 'photo_group', :conditions => [
-        'catptcha_photos.id in (?) and kittens = ?', guesses, true
+        'catptcha_photos.key in (?) and kittens = ?', guesses, true
       ])
     end
   end

data/test/catptcha_test.rb

@@ -12,10 +12,15 @@ class CatptchaTest < Test::Unit::TestCase
   end
 
   def test_kittens
-    assert Catptcha.check_guesses(Catptcha.kittens.map(&:id))
+    assert Catptcha.check_guesses(Catptcha.kittens.map(&:key))
   end
 
   def test_not_kittens
-    assert !Catptcha.check_guesses(Catptcha.not_kittens.map(&:id)[0,3])
+    assert !Catptcha.check_guesses(Catptcha.not_kittens.map(&:key)[0,3])
   end
+
+  def test_puzzle
+    assert_equal 9, Catptcha.puzzle.size
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: catptcha
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Zack Hobson