catptcha 0.1.4 → 0.1.5

data/README.markdown

@@ -37,7 +37,7 @@ Run the tests.
 
 Include the partial in your form contents.
 
-    render :inline => Catptcha.puzzle_tags
+    render :inline => Catptcha.puzzle_tags :catptcha_guess
 
 Check the result in your controller. 
 
@@ -47,9 +47,19 @@ Check the result in your controller.
       # failed
     end
 
+There are also tools for implementing an admin/review UI:
+
+    # Get all kitten images, paginated (uses will_paginate)
+    Catptcha.paginate_kitten_images(page)
+
+    # Get all not-a-kitten images, paginated (uses will_paginate)
+    Catptcha.paginate_not_kitten_images(page)
+
+    # remove an image given the key
+    Catptcha.remove_image(key)
+
 ## TODO and Known Bugs
 
-* lacks a review step for seeded photos
 * lacks the ability to store or upload photos to external storage
 * current implementation is closely tied to ActiveRecord and Flickr
 

data/catptcha.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   EOD
   s.add_dependency "commonthread-flickr_fu", "0.3.0"
   s.add_dependency "activerecord", "~>2.3"
+  s.add_dependency "will_paginate"
   s.add_development_dependency "rr"
   s.authors = ['Zack Hobson']
   s.files = `git ls-files`.split("\n")

data/lib/catptcha.rb

@@ -1,5 +1,5 @@
 module Catptcha
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   class << self
     # Get a list of 3 kitten photos
@@ -16,6 +16,18 @@ module Catptcha
       (kittens + not_kittens).sort_by {rand}
     end
 
+    def paginate_kittens(page)
+      PhotoGroup.kittens.paginate(page)
+    end
+
+    def paginate_not_kittens(page)
+      PhotoGroup.not_kittens.paginate(page)
+    end
+
+    def remove_image(key)
+      Photo.first(:conditions => {:key => key}).try(:destroy)
+    end
+
     def puzzle_js
       return <<-EOJS
           function catptcha_click(e) {
@@ -27,12 +39,12 @@ module Catptcha
           }
       EOJS
     end
-    def puzzle_tags
+    def puzzle_tags param_name='catptcha_guess'
       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;"/>
+          <input type="checkbox" id="catptcha_guess_#{photo.key}" name="#{ param_name }[]" 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 }" title="#{photo.attribution}" alt="#{photo.attribution}" style="padding: 2px" />
           </label>

data/lib/catptcha/photo_group.rb

@@ -15,6 +15,15 @@ class Catptcha::PhotoGroup < ActiveRecord::Base
     sum(:photos_count)
   end
 
+  def self.paginate(page)
+    Catptcha::Photo.paginate(
+      :conditions => {:photo_group_id => all.map(&:id)},
+      :order => 'photo_group_id',
+      :page => page,
+      :per_page => 110
+    )
+  end
+
   def self.random count
     Catptcha::Photo.all(
       :conditions => ['photo_group_id in (?)', all.map(&:id)],

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 4, Catptcha::PhotoGroup.count
+    assert_equal 6, Catptcha::PhotoGroup.count
     assert_equal 0, Catptcha::Photo.count
     # doesn't recreate groups
     Catptcha::Seed.update :silent
-    assert_equal 4, Catptcha::PhotoGroup.count
+    assert_equal 6, 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 4, Catptcha::Photo.count
+    assert_equal 6, Catptcha::Photo.count
   end
 end

data/test/test_helper.rb

@@ -12,7 +12,7 @@ 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).license { stub(Object.new).name {'http://license.info'} }
       stub(photo).owner { "abc" }
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: catptcha
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Zack Hobson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 -07:00
+date: 2012-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: will_paginate
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,8 +61,22 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: "    Choose the kitten!\n"
 email: 
 executables: []