convertible 0.0.1 → 0.0.2

data/README.md

@@ -21,6 +21,9 @@ options to override. When using STDIN and/or STDOUT you have to use one or both
 to specify the format of the data. To specify a file format, use the well known file name postfix
 (i.e. pdf for PDF documents) or the official mime type string like application/pdf.
 
+When passing an URL as input file the convertible.io service will attempt to load the input data
+directly from there.
+
 convert pdf to plain text:
 convertible document.pdf document.txt
 
@@ -33,6 +36,9 @@ convertible -c -o txt document.pdf > document.txt
 convert pdf to plain text using both STDIN/STDOUT:
 convertible -i pdf -o txt < document.pdf > document.txt
 
+scale down flickr image to 700x700px with cropping and write it to image.jpg:
+convertible --width=700 --height=700 --crop http://farm7.static.flickr.com/6123/5994459827_ba62c5a5bb_b_d.jpg image.jpg
+
 
 # Querying supported conversions
 

data/bin/convertible

@@ -2,10 +2,12 @@
 
 require 'optparse'
 require 'convertible/cli'
+require 'yaml'
 require 'pp'
 
 @options = { :debug => false }
 @max_file_args = 2
+@config = File.expand_path '~/.convertible'
 
 OptionParser.new do |optparser|
   optparser.banner = <<-HELP
@@ -77,9 +79,24 @@ HELP
     @max_file_args -= 1
   end
 
+  optparser.on('-a', '--api-key=KEY', "use the given API key (will be stored in #{@config} for future use)") do |arg|
+    @api_key = arg
+  end
+
+  optparser.on(nil, '--width=WIDTH', "Image scaling: output width") do |arg|
+    @options[:width] = arg.to_i
+  end
+  optparser.on(nil, '--height=HEIGHT', "Image scaling: output height") do |arg|
+    @options[:height] = arg.to_i
+  end
+  optparser.on(nil, '--crop', "Image scaling: crop image to fit desired output dimensions") do
+    @options[:crop] = true
+  end
+
+
   files = optparser.permute!(ARGV)
   (puts optparser; exit(1)) unless files.size <= @max_file_args
-  
+
   @out ||= files.pop || 'STDOUT'
   @in = files.pop || 'STDIN'
   STDERR.puts "#{@in} => #{@out}\n#{@options.inspect}" if @options[:debug]
@@ -87,8 +104,20 @@ HELP
   @command ||= :convert
 end
 
+if @api_key
+  (File.open(@config, 'w') << {:key => @api_key}.to_yaml).close
+elsif File.readable?(@config)
+  @api_key = YAML.load(File.read(@config))[:key] rescue nil
+end
+
+if @api_key.nil?
+  puts "Please use the -a option to set your API key."
+  puts optparser
+  exit(1)
+end
+
 begin
-  Convertible::Cli.new(@in, @out, @options).send @command
+  Convertible::Cli.new(@api_key, @in, @out, @options).send @command
 rescue ArgumentError
   STDERR.puts $!
   exit 1

data/lib/convertible/cli.rb

@@ -3,19 +3,27 @@ require 'convertible/mime_types'
 
 module Convertible
   class Cli
-    def initialize(input, output = nil, options = {})
+    def initialize(key, input, output = nil, options = {})
+      @key = key
       @input = input
       @output = output
       @options = options
     end
 
     def convert
-      unless @input == 'STDIN' || File.readable?(@input)
-        raise ArgumentError, "cannot open #{@input} for reading"
+      data = case @input
+      when 'STDIN'
+        $stdin.read
+      when /^https?:\/\//
+        URI.parse @input
+      else
+        File.read(@input) if File.readable?(@input)
       end
-      check_mimetypes
+      raise ArgumentError, "cannot open #{@input} for reading" unless data
+
+      check_mimetypes !(URI === data)
       $stderr.puts "converting #{@input} to #{@output} with options #{@options.inspect}" if @options[:debug]
-      data = @input == 'STDIN' ? $stdin.read : File.read(@input)
+      
       response = client.convert data, @input_type, @output_type, @options
       if @output == 'STDOUT'
         $stdout << response

data/lib/convertible/client.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'json'
+require 'uri'
 
 module Convertible
   API_ENDPOINT = 'http://api.convertible.io/'
@@ -7,10 +8,19 @@ module Convertible
   class Client
     include HTTParty
     base_uri API_ENDPOINT
+    CONVERT = '/convert'
 
     # content_type and output_content_type must be valid mime types like 'application/pdf' or 'text/plain' 
+    # if an URI instance is passed as data, the content will be fetched server side from said uri. content_type is 
+    # ignored an should be nil in this case (convertible.io will use the content type from the remote resource).
     def convert(data, content_type, output_content_type, options = {})
-      response = self.class.post '/convert', :body => data, :headers => { 'Content-Type' => content_type, 'Accept' => output_content_type, 'X-Convert-Options' => option_string(options) }
+      response = if URI === data
+        self.class.get CONVERT, :headers => { 'Accept' => output_content_type,
+                                              'X-Convert-Options' => option_string(options),
+                                              'X-Source' => data.to_s }
+      else
+        self.class.post CONVERT, :body => data, :headers => { 'Content-Type' => content_type, 'Accept' => output_content_type, 'X-Convert-Options' => option_string(options) }
+      end
       if response.code == 200
         return response
       else

data/lib/convertible/version.rb

@@ -1,3 +1,3 @@
 module Convertible
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: convertible
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jens Kraemer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 +02:00
+date: 2011-10-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency