catptcha 0.1.1 → 0.1.2

data/generators/catptcha_migration/templates/migration.rb

@@ -3,6 +3,7 @@ class <%= class_name %> < ActiveRecord::Migration
     create_table :catptcha_photos do |t|
       t.belongs_to :photo_group
       t.string :key
+      t.string :attribution
       t.string :url
     end
     add_index :catptcha_photos, :photo_group_id

data/lib/catptcha.rb

@@ -1,5 +1,5 @@
 module Catptcha
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   class << self
     # Get a list of 3 kitten photos
@@ -20,7 +20,7 @@ module Catptcha
       return <<-EOJS
           function catptcha_click(e) {
             if (e.checked) {
-              e.parentNode.getElementsByTagName('img')[0].setAttribute("style","border: 2px inset black;");
+              e.parentNode.getElementsByTagName('img')[0].setAttribute("style","border: 2px solid black;");
             } else {
               e.parentNode.getElementsByTagName('img')[0].setAttribute("style", "padding: 2px");
             }
@@ -28,13 +28,13 @@ module Catptcha
       EOJS
     end
     def puzzle_tags
-      tags = '<div class="catptcha" style="width:340px"><p>Click the 3 kittens!</p>'
+      tags = '<div class="catptcha" style="width:340px"><p>Click the 3 kitties!</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 }" onclick="catptcha_click(this)" style="opacity:0.0;width:0px;"/>
           <label for="catptcha_guess_#{photo.key }" style="margin:2px">
-            <img src="#{ photo.url }" style="padding: 2px" />
+            <img src="#{ photo.url }" title="#{photo.attribution}" alt="#{photo.attribution}" style="padding: 2px" />
           </label>
         </span>
         EOT

data/lib/catptcha/seed.rb

@@ -15,6 +15,11 @@ module Catptcha::Seed
       @flickr ||= Flickr.new(Rails.root.join("config/flickr.yml").to_s)
     end
 
+    def reset
+      Catptcha::Photo.delete_all
+      Catptcha::PhotoGroup.delete_all
+    end
+
     def update silent=false
       SEED_GROUP_KITTENS.each do |name, id|
         Catptcha::PhotoGroup.create(:name => name.to_s, :flickr_group_id => id, :kittens => true)
@@ -33,6 +38,7 @@ module Catptcha::Seed
     def update_photos group
       params = {
         :group_id => group.flickr_group_id, :safe_search => 1, :content_type => 1,
+        :license => '4,6', #Attribution/NoDerivs
         :per_page => 500, :page => 1
       }
       params[:min_upload_date] = group.photos_updated_at if group.photos_updated_at
@@ -42,7 +48,9 @@ module Catptcha::Seed
       loop do
         result = flickr.photos.search(params)
         result.each do |photo|
-          group.photos.create(:url => photo.url(:square))
+          owner = flickr.people.find_by_id(photo.owner)
+          attribution = owner ?  "© #{owner.realname || owner.username} (CC #{photo.license.name})" : ''
+          group.photos.create(:url => photo.url(:square), :attribution => attribution)
           photo_count += 1
         end
         if total_pages.nil?

data/lib/tasks/catptcha.rake

@@ -3,6 +3,11 @@ namespace :catptcha do
   task :seed => :environment do
     Catptcha::Seed.update
   end
+
+  desc 'clear all captcha groups and images'
+  task :reset => :environment do
+    Catptcha::Seed.reset
+  end
     
   desc 'run catptcha plugin tests'
   Rake::TestTask.new do |t|

data/test/catptcha_seed_test.rb

@@ -9,16 +9,16 @@ class CatptchaSeedTest < Test::Unit::TestCase
   def test_seed_with_no_photos
     stub(Catptcha::Seed).flickr { build_flickr_stub [] }
     Catptcha::Seed.update :silent
-    assert_equal 3, Catptcha::PhotoGroup.count
+    assert_equal 4, Catptcha::PhotoGroup.count
     assert_equal 0, Catptcha::Photo.count
     # doesn't recreate groups
     Catptcha::Seed.update :silent
-    assert_equal 3, Catptcha::PhotoGroup.count
+    assert_equal 4, Catptcha::PhotoGroup.count
   end
 
   def test_seed_with_photos
     stub(Catptcha::Seed).flickr { build_flickr_stub { [ build_flickr_photo_stub ] } }
     Catptcha::Seed.update :silent
-    assert_equal 3, Catptcha::Photo.count
+    assert_equal 4, Catptcha::Photo.count
   end
 end

data/test/catptcha_test.rb

@@ -12,11 +12,11 @@ class CatptchaTest < Test::Unit::TestCase
   end
 
   def test_kittens
-    assert Catptcha.check_guesses(Catptcha.kittens.map(&:key))
+    assert Catptcha.check_guess(Catptcha.kittens.map(&:key))
   end
 
   def test_not_kittens
-    assert !Catptcha.check_guesses(Catptcha.not_kittens.map(&:key)[0,3])
+    assert !Catptcha.check_guess(Catptcha.not_kittens.map(&:key)[0,3])
   end
 
   def test_puzzle

data/test/test_helper.rb

@@ -12,6 +12,8 @@ class Test::Unit::TestCase
     @index += 1
     Object.new.tap do |photo|
       stub(photo).url { "http://#{@index}" }
+      stub(photo).license { stub(Object.new).url {'http://license.info'} }
+      stub(photo).owner { "abc" }
     end
   end
 
@@ -19,6 +21,10 @@ class Test::Unit::TestCase
   # for lazy evaluation pass the photos in a block instead
   def build_flickr_stub value=nil
     Object.new.tap do |flickr|
+      people = Object.new
+      stub(flickr).people { stub(people).find_by_id {
+        Object.new.tap {|result| stub(result).realname { 'bob' } }
+      }}
       photos = Object.new
       stub(flickr).photos { stub(photos).search {
         (value || yield).tap {|result| stub(result).pages { 1 } }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: catptcha
 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: 
 - Zack Hobson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-18 00:00:00 -07:00
+date: 2012-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency