catptcha 0.1.5 → 0.1.6

data/README.markdown

@@ -24,14 +24,19 @@ Generate and run the migration.
     ruby script/generate catptcha_migration add_catptcha_tables
     rake db:migrate
 
+Run the tests.
+
+    rake db:test:prepare
+    rake catptcha:test
+
 Seed the images.
 
     rake catptcha:seed
 
-Run the tests.
+If you have Amazon S3 configured on Rails boot, you can easily upload the
+images to your own bucket. Otherwise images are still served from Flickr!
 
-    rake db:test:prepare
-    rake catptcha:test
+    ./script/runner 'Catptcha::Seed.s3_upload("YOUR_BUCKET_NAME")'
 
 ## Usage
 
@@ -60,7 +65,6 @@ There are also tools for implementing an admin/review UI:
 
 ## TODO and Known Bugs
 
-* lacks the ability to store or upload photos to external storage
 * current implementation is closely tied to ActiveRecord and Flickr
 
 ## Author

data/catptcha.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.add_dependency "commonthread-flickr_fu", "0.3.0"
   s.add_dependency "activerecord", "~>2.3"
   s.add_dependency "will_paginate"
+  s.add_dependency "aws-s3"
   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.5'
+  VERSION = '0.1.6'
 
   class << self
     # Get a list of 3 kitten photos

data/lib/catptcha/seed.rb

@@ -1,4 +1,6 @@
 require 'flickr_fu'
+require 'aws/s3'
+require 'open-uri'
 
 module Catptcha::Seed
   SEED_GROUP_KITTENS = {
@@ -36,6 +38,19 @@ module Catptcha::Seed
       end
     end
 
+    def s3_upload bucket_name, silent=false
+      loop do
+        photos = Catptcha::Photo.all(:conditions => "url like '%flickr.com/%'", :limit => 50)
+        break if photos.empty?
+        photos.each do |photo|
+          open(photo.url) {|f| AWS::S3::S3Object.store("catptcha_#{photo.key}", f, bucket_name, :access => :public_read) }
+          photo.url = AWS::S3::S3Object.url_for("catptcha_#{photo.key}", bucket_name, :authenticated => false)
+          photo.save
+          puts "image #{photo.key} uploaded to #{photo.url}" unless silent
+        end
+      end
+    end
+
     # fetches up to 2500 photos
     def update_photos group
       # http://www.flickr.com/services/api/flickr.photos.search.html

metadata

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