flickrcaptionr 0.0.1 → 1.0.0

data/lib/flickrcaptionr/app.rb

@@ -13,37 +13,41 @@ class Flickrcaptionr::App < Sinatra::Base
   get '/' do
     haml :index
   end
+  get '/get/:image_url' do
+    handle_image_generation(params)
+    haml :index
+  end
+  get '/get/:image_url/:caption_text' do
+    handle_image_generation(params)
+    haml :index
+  end
+  get '/get/:image_url/:image_width/:image_height' do
+    handle_image_generation(params)
+    haml :index
+  end
   get '/get/:image_url/:image_width/:image_height/:caption_text' do
-    @f ||= Flickrcaptionr::Fetcher.new
-    @p ||= Flickrcaptionr::Processor.new
-    # {"image_url"=>"https://secure.flickr.com/photos/must_love_cartoons/7474524298/",
-    #  "image_width"=>"300", "image_height"=>"400", 
-    #  "caption_text"=>"You have angered the developer", "caption_font_size"=>"36", "caption_font_stroke"=>"2"}
-
-    if params['image_url'] and params['image_url'].size > 0
-      caption_opts = {}
-      if params['caption_text'] and params['caption_text'] != ''
-        caption_opts[:font_size] = params['caption_font_size'].to_i if params['caption_font_size'] and params['caption_font_size'].size > 0
-        caption_opts[:font_stroke] = params['caption_font_stroke'].to_i if params['caption_font_stroke'] and params['caption_font_stroke'].size > 0
-      end
-      begin
-        file = @f.fetch(params['image_url'])
-        w = params['image_width'].to_i
-        h = params['image_height'].to_i
-        if w > 0 and h > 0
-          file = @p.resize!(file, w, h)
-        end
-        file = @p.add_text!(file, params['caption_text'], caption_opts) if params['caption_text'] and params['caption_text'] != ''
-        send_file file
-      rescue Exception => e
-        params['error'] = e.message
-      end
-    else
-      params['error'] = "You didn't supply a URL. Not sure what you expect me to do without that."
-    end
+    handle_image_generation(params)
     haml :index
   end
   post '/' do
+    params['redirect'] = 'true'
+    handle_image_generation(params)
+    haml :index
+  end
+  get '/image/:filename' do
+    send_file File.join(Flickrcaptionr::Config.output_path, params['filename'])
+  end
+  get '/favicon.ico' do
+    ""
+  end
+  @@public_files.each do |public_file, public_file_type|
+    get "/#{public_file}" do
+      content_type(public_file_type)
+      ::File.open(::File.expand_path("../../../pub/#{public_file}", __FILE__)).read
+    end
+  end
+
+  def handle_image_generation(params)
     @f ||= Flickrcaptionr::Fetcher.new
     @p ||= Flickrcaptionr::Processor.new
     # {"image_url"=>"https://secure.flickr.com/photos/must_love_cartoons/7474524298/",
@@ -51,7 +55,6 @@ class Flickrcaptionr::App < Sinatra::Base
     #  "caption_text"=>"You have angered the developer", "caption_font_size"=>"36", "caption_font_stroke"=>"2"}
 
     if params['image_url'] and params['image_url'].size > 0
-      
       caption_opts = {}
       if params['caption_text'] and params['caption_text'] != ''
         caption_opts[:font_size] = params['caption_font_size'].to_i if params['caption_font_size'] and params['caption_font_size'].size > 0
@@ -65,26 +68,16 @@ class Flickrcaptionr::App < Sinatra::Base
           file = @p.resize!(file, w, h)
         end
         file = @p.add_text!(file, params['caption_text'], caption_opts) if params['caption_text'] and params['caption_text'] != ''
-        redirect "/image/#{File.basename(file)}"
+        if params['redirect'] and params['redirect'] == 'true'
+          redirect "/image/#{File.basename(file)}"
+        else
+          send_file file
+        end
       rescue Exception => e
         params['error'] = e.message
       end
-      
     else
       params['error'] = "You didn't supply a URL. Not sure what you expect me to do without that."
     end
-    haml :index
-  end
-  get '/image/:filename' do
-    send_file File.join(Flickrcaptionr::Config.output_path, params['filename'])
-  end
-  get '/favicon.ico' do
-    ""
-  end
-  @@public_files.each do |public_file, public_file_type|
-    get "/#{public_file}" do
-      content_type(public_file_type)
-      ::File.open(::File.expand_path("../../../pub/#{public_file}", __FILE__)).read
-    end
   end
 end

data/lib/flickrcaptionr/processor.rb

@@ -3,7 +3,6 @@ require 'dimensions'
 class Flickrcaptionr::Processor
   def initialize
     Flickrcaptionr::Processor.has_dependencies?
-
   end
   # Resize an image, fitting the space provided as best as possible with a centre-weighted crop
   def resize!(path, width, height)
@@ -29,7 +28,7 @@ class Flickrcaptionr::Processor
       puts "Already added text to this image, not doing it again"
     else
       puts "Adding text '#{text}' to #{path}"
-      `convert -background none -fill white -font "#{opts[:font_path] ? opts[:font_path] : (File.join(File.dirname(__FILE__), '..', '..', 'fonts', 'Coda-Heavy.ttf' ))}" -stroke black -strokewidth #{opts[:font_stroke] ? opts[:font_stroke].to_s : 2.to_s} -pointsize #{opts[:font_size] ? opts[:font_size].to_s : 36.to_s} -size #{((Dimensions.width(path)-10).to_s)}  -gravity Center caption:'#{text.gsub(/[^A-Za-z0-9 \-"\.,]/,"")}' caption-tmp.png`
+      `convert -background none -fill white -font "#{opts[:font_path] ? opts[:font_path] : (File.join(File.dirname(__FILE__), '..', '..', 'fonts', 'Coda-Heavy.ttf' ))}" -stroke black -strokewidth #{opts[:font_stroke] ? opts[:font_stroke].to_s : 2.to_s} -pointsize #{opts[:font_size] ? opts[:font_size].to_s : 36.to_s} -size #{((Dimensions.width(path)-10).to_s)}  -gravity Center caption:'#{text.gsub(/[^A-Za-z0-9 \-"\.,\?\!]/,"")}' caption-tmp.png`
       `composite caption-tmp.png #{path} -compose atop -gravity South #{out_filename}`
       `rm -rf caption-tmp.png`
     end

data/lib/flickrcaptionr/version.rb

@@ -1,3 +1,3 @@
 module Flickrcaptionr
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/views/index.haml

@@ -32,11 +32,11 @@
               .control-group
                 %label.control-label Image Width
                 .controls
-                  %input{type: 'text', name: 'image_width', value: params[:image_width] ? params[:image_width] : 300}
+                  %input{type: 'text', name: 'image_width', value: params[:image_width] ? params[:image_width] : 400}
               .control-group
                 %label.control-label Image Height
                 .controls
-                  %input{type: 'text', name: 'image_height', value: params[:image_height] ? params[:image_height] : 400}
+                  %input{type: 'text', name: 'image_height', value: params[:image_height] ? params[:image_height] : 300}
                   %p.help-block
                     We can resize your image to whichever size you desire. The image will be cropped to fit these dimensions if required.
             %fieldset
@@ -60,8 +60,19 @@
 
         %p
           You can also use the GET API as follows:
-          %code
-            \/get/flickr-photo-id-or-encoded-url/width/height/caption-text
+          %pre /get/flickr-photo-id-or-encoded-url/width/height/caption-text
         %p
           For instance,
-          %a{href: "/get/6792442709/300/400/I%20has%20a%20LED"} something like this.
+          %a{href: "/get/6792442709/400/300/I%20has%20a%20LED"} something like this.
+        %p
+          You can omit values to disable functionality, for instance
+          %code /get/flickr-photo-id-or-encoded-url/width/height
+          will not add a caption,
+          %code /get/flickr-photo-id-or-encoded-url/caption
+          will not resize the image and
+          %code /get/flickr-photo-id-or-encoded-url
+          will just provide the unresized image.
+        %p
+          You can add a
+          %code ?redirect=true
+          flag if you prefer to be redirected to the image path rather than be served the image directly.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrcaptionr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors: